diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-dso.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-dso.patch
new file mode 100644
index 000000000000..3a24baafe7df
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-dso.patch
@@ -0,0 +1,32 @@
+From 2c839bf2703e99c3851b58695545fed90b6226fc Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 29 Aug 2012 22:28:47 -0400
+Subject: [PATCH] Explicitly link to libgmodule-2.0
+
+With >=gdk-pixbuf-2.24 and >=pango-1.30, libgmodule-2.0 is no longer
+provided by "pkg-config --libs gtk+-2.0 gthread-2.0", so link to it
+explicitly (as is already done in server/).
+
+Fixes build failure with gnu ld.gold in gkrellm-2.3.5.
+
+https://bugs.gentoo.org/show_bug.cgi?id=428532
+---
+ src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 6d482a7..19b0c29 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -69,7 +69,7 @@ STRIP ?= -s
+ GKRELLM_INCLUDES = gkrellm.h gkrellm-public-proto.h $(SHARED_PATH)/log.h
+ 
+ PKG_INCLUDE = `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0`
+-PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0`
++PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gmodule-2.0 gthread-2.0`
+ 
+ FLAGS = -O2 -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE) $(PTHREAD_INC)\
+  ${SSL_INCLUDE} ${NTLM_INCLUDE} -DGKRELLM_CLIENT
+-- 
+1.7.12
+
diff --git a/app-admin/gkrellm/gkrellm-2.3.5-r2.ebuild b/app-admin/gkrellm/gkrellm-2.3.5-r2.ebuild
new file mode 100644
index 000000000000..42c8eb8e90f6
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.3.5-r2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.5-r2.ebuild,v 1.1 2012/12/22 18:32:52 ottxor Exp $
+
+EAPI=4
+
+inherit eutils multilib toolchain-funcs user
+
+DESCRIPTION="Single process stack of various system monitors"
+HOMEPAGE="http://www.gkrellm.net/"
+SRC_URI="http://members.dslextreme.com/users/billw/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="hddtemp gnutls lm_sensors nls ssl ntlm X kernel_FreeBSD"
+
+RDEPEND="dev-libs/glib:2
+	hddtemp? ( app-admin/hddtemp )
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( ssl? ( dev-libs/openssl ) )
+	lm_sensors? ( sys-apps/lm_sensors )
+	nls? ( virtual/libintl )
+	ntlm? ( net-libs/libntlm )
+	X? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	enewgroup gkrellmd
+	enewuser gkrellmd -1 -1 -1 gkrellmd
+	TARGET=
+	use kernel_FreeBSD && TARGET="freebsd"
+}
+
+src_prepare() {
+	sed -e 's:-O2 ::' \
+		-e 's:override CC:CFLAGS:' \
+		-e 's:-L/usr/X11R6/lib::' \
+		-i */Makefile || die "sed Makefile(s) failed"
+
+	sed -e 's:#user\tnobody:user\tgkrellmd:' \
+		-e 's:#group\tproc:group\tgkrellmd:' \
+		-i server/gkrellmd.conf || die "sed gkrellmd.conf failed"
+
+	sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
+		-e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
+		-i src/${PN}.h || die "sed ${PN}.h failed"
+
+	epatch "${FILESDIR}/${P}-autofs.patch"
+	epatch "${FILESDIR}/${P}-cifs.patch"
+	epatch "${FILESDIR}/${P}-dso.patch"
+}
+
+src_compile() {
+	if use X ; then
+		local sslopt=""
+		if use gnutls; then
+			sslopt="without-ssl=yes"
+		elif use ssl; then
+			sslopt="without-gnutls=yes"
+		else
+			sslopt="without-ssl=yes without-gnutls=yes"
+		fi
+
+		emake ${TARGET} \
+			CC="$(tc-getCC)" \
+			STRIP="" \
+			INSTALLROOT="${EPREFIX}/usr" \
+			INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
+			LOCALEDIR="${EPREFIX}/usr/share/locale" \
+			$(use nls || echo enable_nls=0) \
+			$(use lm_sensors || echo without-libsensors=yes) \
+			$(use ntlm || echo without-ntlm=yes) \
+			${sslopt} \
+		|| die "emake failed"
+	else
+		cd server
+		emake ${TARGET} \
+			CC="$(tc-getCC)" \
+			LINK_FLAGS="$LDFLAGS -Wl,-E" \
+			STRIP="" \
+			$(use nls || echo enable_nls=0) \
+			$(use lm_sensors || echo without-libsensors=yes) \
+		|| die "emake failed"
+	fi
+}
+
+src_install() {
+	if use X ; then
+		emake install${TARGET:+_}${TARGET} \
+			$(use nls || echo enable_nls=0) \
+			STRIP="" \
+			INSTALLDIR="${ED}/usr/bin" \
+			INCLUDEDIR="${ED}/usr/include" \
+			LOCALEDIR="${ED}/usr/share/locale" \
+			PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
+			MANDIR="${ED}/usr/share/man/man1" \
+		|| die "emake install failed"
+
+		dohtml *.html
+
+		newicon src/icon.xpm ${PN}.xpm
+		make_desktop_entry ${PN} GKrellM ${PN}
+	else
+		dobin server/gkrellmd || die "dobin failed"
+
+		insinto /usr/include/gkrellm2
+		doins server/gkrellmd.h || die "doins failed"
+		doins shared/log.h || die "doins failed"
+	fi
+
+	doinitd "${FILESDIR}"/gkrellmd || die "doinitd failed"
+	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd || die "newconfd failed"
+
+	insinto /etc
+	doins server/gkrellmd.conf || die "doins failed"
+
+	dodoc Changelog CREDITS README
+}
diff --git a/app-admin/logrotate/logrotate-3.8.3.ebuild b/app-admin/logrotate/logrotate-3.8.3.ebuild
index f20fe0b9c670..cabd9832b031 100644
--- a/app-admin/logrotate/logrotate-3.8.3.ebuild
+++ b/app-admin/logrotate/logrotate-3.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.3.ebuild,v 1.4 2012/12/18 17:14:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.3.ebuild,v 1.5 2012/12/22 13:50:57 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="acl selinux"
 
 RDEPEND="
diff --git a/app-admin/webalizer/webalizer-2.23.05.ebuild b/app-admin/webalizer/webalizer-2.23.05.ebuild
index d666de8cd6af..7e05bf8d4776 100644
--- a/app-admin/webalizer/webalizer-2.23.05.ebuild
+++ b/app-admin/webalizer/webalizer-2.23.05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.23.05.ebuild,v 1.4 2012/12/19 14:30:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.23.05.ebuild,v 1.5 2012/12/22 13:53:40 ago Exp $
 
 # uses webapp.eclass to create directories with right permissions
 # probably slight overkill but works well
@@ -24,7 +24,7 @@ SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2
 	mirror://gentoo/${PN}.conf.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ~ppc64 ~sparc ~x86"
 IUSE="geoip nls xtended"
 SLOT="0"
 
diff --git a/app-backup/bacula/bacula-5.0.3-r3.ebuild b/app-backup/bacula/bacula-5.0.3-r3.ebuild
index 1aac8d4b9312..4ab746825a6a 100644
--- a/app-backup/bacula/bacula-5.0.3-r3.ebuild
+++ b/app-backup/bacula/bacula-5.0.3-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/app-backup/bacula/bacula-5.0.3-r3.ebuild,v 1.15 2012/12/21 06:45:20 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.3-r3.ebuild,v 1.16 2012/12/22 14:07:05 ago Exp $
 
 EAPI="5"
 PYTHON_DEPEND="python? 2"
@@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 hppa ppc ~sparc ~x86"
 IUSE="acl bacula-clientonly bacula-nodir bacula-nosd ipv6 logwatch mysql postgres python qt4 readline +sqlite3 ssl static tcpd vim-syntax X"
 
 # maintainer comment:
diff --git a/app-benchmarks/expedite/Manifest b/app-benchmarks/expedite/Manifest
new file mode 100644
index 000000000000..14641031515c
--- /dev/null
+++ b/app-benchmarks/expedite/Manifest
@@ -0,0 +1 @@
+DIST expedite-1.7.4.tar.bz2 5792836 SHA256 8d547b2cae69045c01765ea5903be17f7174c31133b3309ffc2a9a8409f8c330 SHA512 9085b409e21bb6c9d5d4335c30aad4ffba0bcadacc05c630e6f9719db76d3c2ebfe0e16d7a6ab7da8fd4c5128c8d3b9031f06ef23e3f62ebf9b7a28d28ef3167 WHIRLPOOL 9a23abd516f18f140cb9358028349f4edbe859ff9a5f5d8b2612434498aaaddd89271e5fc7f3556646bc65adc6b2b48c7c64ad2df34aeabf6cf22e74976b8361
diff --git a/app-benchmarks/expedite/expedite-1.7.4.ebuild b/app-benchmarks/expedite/expedite-1.7.4.ebuild
new file mode 100644
index 000000000000..303164fcaf2a
--- /dev/null
+++ b/app-benchmarks/expedite/expedite-1.7.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/expedite/expedite-1.7.4.ebuild,v 1.1 2012/12/21 21:08:52 tommy Exp $
+
+EAPI=2
+
+inherit enlightenment
+
+DESCRIPTION="Performance and correctness test suite for Evas"
+SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="directfb fbcon opengl X xcb"
+
+RDEPEND="dev-libs/eina
+	media-libs/evas[directfb?,fbcon?,opengl?,X?,xcb?]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	if use X ; then
+		if use xcb ; then
+			ewarn "You have enabled both 'X' and 'xcb', so we will use"
+			ewarn "X as it's considered the most stable for evas"
+		fi
+		MY_ECONF="
+			--disable-xrender-xcb
+			$(use_enable opengl opengl-x11)
+		"
+	elif use xcb ; then
+		MY_ECONF="
+			--enable-xrender-xcb
+		"
+	else
+		MY_ECONF="
+			--disable-gl-xlib
+			--disable-software-xcb
+			--disable-gl-xcb
+		"
+	fi
+	MY_ECONF+="
+		$(use_enable directfb)
+		$(use_enable fbcon fb)
+		$(use_enable X simple-x11)
+		$(use_enable X software-x11)
+		$(use_enable X xrender-x11)
+	"
+	enlightenment_src_configure
+}
diff --git a/app-benchmarks/expedite/metadata.xml b/app-benchmarks/expedite/metadata.xml
new file mode 100644
index 000000000000..5e1261900709
--- /dev/null
+++ b/app-benchmarks/expedite/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>enlightenment</herd>
+</pkgmetadata>
diff --git a/app-crypt/coolkey/Manifest b/app-crypt/coolkey/Manifest
index f9a175242260..9eefa3e483ea 100644
--- a/app-crypt/coolkey/Manifest
+++ b/app-crypt/coolkey/Manifest
@@ -1,3 +1,4 @@
+DIST coolkey-1.1.0-patches-001.tar.gz 19336 SHA256 324977ba41f8eec4490aaeb22f91c74d207cf820deb3264f5cf0941aae65e88c SHA512 530a49094177fd598a104a341b837a377ec3559546a92ecc8602b8d8b92c52968d81039c7f87488852c8df70936c3fd42961b29c6ffb50bd3fc71017dd2eb22f WHIRLPOOL 0f5728191ee98044d593903b346929cdea9bbd4ff6dcefee6a6e2ac9020f94ae0da01eac49ae8ce8e6a58a1cfb154f54ff52d67d8909411faa3669cb5f508418
 DIST coolkey-1.1.0.tar.gz 432808 SHA256 8448e3abb81bffc593c96b577dcfbc05b40e8684188456c31be15fae73d730f7 SHA512 4b61de9b40abcf620fbb519d5e3cf1e93ebdd0470854cb63a597fc91e0182998217353014327f7bc4f255d22515d8ea2b08d36b3a831f5f09134fdcd418bc08b WHIRLPOOL 60408f606a5cf5d9ec1ba3938a96a6f938c8d9f4b7ace2677ff35ce125104995675bf0decae92575e82dfc1a2eeaa26c4197ad174a4d3901250c43d906976c24
 DIST coolkey-patches-20110419.tar.gz 18966 SHA256 717827b73f704ae46b07e4835d0f1428b4d83efc5c35f501b495c00b0afe2627 SHA512 fa3ad205437a9a385141c2176efcf45079d711c6c2ebcdd3e336bcb45123e2628d8d9eef47769509241b22e7b8f73aad2181bd071ce80e99746a34ee4d90fb45 WHIRLPOOL 56721bf4ece4e527480edfde5a7b37ab82f0f7d39967522d6f8e3b63ebf525c22cfce1b569f7608a402dddfa8fb5d503f6d1e431f4219a227a143a8f42fce73b
 DIST coolkey-patches.tar.gz 19457 SHA256 441abc27412c41a3fd36a60569734b3aba4f35b3e9c85e34a93ec9acc62e98f4 SHA512 657867323eb6555da0a00f20bfadc4a07883bc748dfcdf82ee650ff0e9179a05ffd1297102741e87d328d1500dc7a6695e64451d6f33f6d95bb60277be6fa5a9 WHIRLPOOL cdf6f9de2ffda869fb2532ab679074f64566769607d05d0f9222b2edeab557192579763583c5f7d44e19066d0188acc616edc7027ccbd0f11f337247762513fb
diff --git a/app-crypt/coolkey/coolkey-1.1.0-r5.ebuild b/app-crypt/coolkey/coolkey-1.1.0-r5.ebuild
new file mode 100644
index 000000000000..46c28b5bea27
--- /dev/null
+++ b/app-crypt/coolkey/coolkey-1.1.0-r5.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/coolkey/coolkey-1.1.0-r5.ebuild,v 1.1 2012/12/22 00:34:06 alonbl Exp $
+
+EAPI=3
+
+inherit eutils
+
+PATCHVER="001"
+
+DESCRIPTION="Linux Driver support for the CoolKey and CAC products"
+HOMEPAGE="http://directory.fedora.redhat.com/wiki/CoolKey"
+SRC_URI="http://directory.fedora.redhat.com/download/coolkey/${P}.tar.gz
+	mirror://gentoo/${P}-patches-${PATCHVER}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.6.4
+	dev-libs/nss[utils]
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}
+	>=app-crypt/ccid-1.4.0
+	virtual/pkgconfig"
+
+pkg_setup() {
+	pk="pk11install"
+	dbdir="/etc/pki/nssdb"
+	ck_mod_name="CoolKey PKCS #11 Module"
+
+	if ! [[ -x $dbdir ]]; then
+		ewarn "No /etc/pki/nssdb found; check under \$HOME/.pki and"
+		ewarn "follow the suggested commands using the correct path."
+	fi
+}
+
+src_prepare() {
+	epatch "${WORKDIR}/${PN}-patches"/*
+}
+
+src_configure() {
+	econf --enable-pk11install $(use_enable debug) \
+		|| die "configure failed"
+}
+
+src_compile() {
+	emake CFLAGS+="-fno-strict-aliasing" -j1 || die "make failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	diropts -m 1777
+	keepdir /var/cache/coolkey
+}
+
+pkg_postinst() {
+	if [[ -x $dbdir ]]; then
+		if ! $(modutil -rawlist -dbdir $dbdir | grep libcoolkeypk11); then
+			elog "You still need to install libcoolkey in your PKCS11 library:"
+			elog "$pk -p $dbdir 'name=$ck_mod_name library=libcoolkeypk11.so'"
+
+		fi
+	else
+		elog ""
+		elog "You still need to setup your PKCS11 library, or at least"
+		elog "find where it is (perhaps \$HOME/.pki/nssdb).  Once you"
+		elog "find it, use 'modutil -rawlist -dbdir \$db' to look for"
+		elog "libcoolkeypk11.so, and if not found, add it using:"
+		elog ""
+		elog "$pk -p \$db 'name=$ck_mod_name library=libcoolkeypk11.so'"
+		elog ""
+		elog "where \$db is the full path to your pki/nssdb directory."
+		elog ""
+	fi
+}
+
+pkg_postrm() {
+	if [[ -x $dbdir ]]; then
+		if $(modutil -rawlist -dbdir $dbdir | grep libcoolkeypk11); then
+			elog "You should remove libcoolkey from your PKCS11 library."
+		fi
+	fi
+}
diff --git a/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild b/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..3b5702355df4
--- /dev/null
+++ b/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild,v 1.1 2012/12/22 00:55:28 alonbl Exp $
+
+EAPI="4"
+inherit toolchain-funcs
+
+DESCRIPTION="PkZip cipher breaker"
+HOMEPAGE="http://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack.html"
+SRC_URI="http://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack/${P}.tar.gz"
+
+LICENSE="pkcrack"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+
+DEPEND="test? ( app-arch/zip[crypt] )"
+RDEPEND="!<app-text/html-xml-utils-5.3"
+
+src_prepare() {
+	cd "${S}/src"
+	sed -i -e "s/^CC=.*/CC=$(tc-getCC)/" \
+		-e "/^CFLAGS=.*/d" \
+		-e "s/CFLAGS/LDFLAGS/" \
+		Makefile
+	sed -i -e "s:void main:int main:" *.c
+}
+
+src_compile() {
+	cd "${S}/src"
+	emake
+}
+
+src_test() {
+	cd "${S}/test"
+	make CC="$(tc-getCC)" all
+}
+
+src_install() {
+	cd "${S}/src"
+	dobin pkcrack zipdecrypt findkey makekey
+	newbin extract "$PN-extract"
+	dodoc "${S}/doc/"*
+}
+
+pkg_postinst() {
+	elog "Author DEMANDS :-) a postcard be sent to:"
+	elog
+	elog "    Peter Conrad"
+	elog "    Am Heckenberg 1"
+	elog "    56727 Mayen"
+	elog "    Germany"
+	elog
+	elog "See: http://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack/pkcrack-readme.html"
+
+	ewarn
+	ewarn "Due to file collision, extract utility was renamed to $PN-extract,"
+	ewarn "see bug#247394"
+}
diff --git a/app-crypt/truecrypt/metadata.xml b/app-crypt/truecrypt/metadata.xml
index 432920121fe0..3a55144a398f 100644
--- a/app-crypt/truecrypt/metadata.xml
+++ b/app-crypt/truecrypt/metadata.xml
@@ -6,4 +6,7 @@
 		<email>c1pher@gentoo.org</email>
 		<name>Dane Smith</name>
 	</maintainer>
+	<use>
+		<flag name='asm'>Enable assembly for optimization</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-crypt/truecrypt/truecrypt-7.1a.ebuild b/app-crypt/truecrypt/truecrypt-7.1a.ebuild
index e256009b019a..87eca808d266 100644
--- a/app-crypt/truecrypt/truecrypt-7.1a.ebuild
+++ b/app-crypt/truecrypt/truecrypt-7.1a.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-crypt/truecrypt/truecrypt-7.1a.ebuild,v 1.4 2012/12/14 22:26:47 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-7.1a.ebuild,v 1.5 2012/12/22 00:10:44 alonbl Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="${P}.tar.gz
 LICENSE="truecrypt-3.0"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~ppc ~x86"
-IUSE="X"
+IUSE="X +asm"
 RESTRICT="mirror fetch bindist"
 
 RDEPEND="|| ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper )
@@ -66,6 +66,7 @@ src_compile() {
 	local EXTRA
 
 	use X || EXTRA+=" NOGUI=1"
+	use asm  || EXTRA+=" NOASM=1"
 	append-flags -DCKR_NEW_PIN_MODE=0x000001B0 -DCKR_NEXT_OTP=0x000001B1
 
 	emake \
diff --git a/app-editors/hteditor/Manifest b/app-editors/hteditor/Manifest
index 2a40c42ff9b0..b2f22071b6d7 100644
--- a/app-editors/hteditor/Manifest
+++ b/app-editors/hteditor/Manifest
@@ -1 +1,2 @@
 DIST ht-2.0.20.tar.bz2 900575 SHA256 4aa162f10a13e60859bef1f04c6529f967fdfd660ae421ee25eab1fbabcd1ed0 SHA512 ac6cf153783bde37a4cc0c1c087a1b284239c9ac20f0ad34d3389c4bdea0866f2a4a03fbd6ef3871d8c9312c005ad3ab9cc8f0de84134aa94103ae1c1768183d WHIRLPOOL 8955f3a7c448f7a45a7945a0667388068febac04f1e9ec9363cf544e0d6beaddc3874cd01eebf2882bafd2b6426f95d613b8e49cd6010b32da1b69c16ac70a2a
+DIST ht-2.0.21.tar.bz2 897891 SHA256 f9c04f2074d6a774bae0d7fdc3f8b2c579db39aad0761b33b4884949fc378934 SHA512 317abb86fbd05b48ef0e52e5f6e3bbaaa558d909bfec99b3005a8119c5bf3c825e5fe63df5c97d7858cedef1e6c333f45d6b246f14f0d5c54fef43eb8fcf9ca0 WHIRLPOOL bcc29454bfc33b9d665195ebf486bd7a9fa9ed9a359dfadb3b1cad20a3a82e5a3d793d8a5fb088315229e46edc0c1aba9d4d9f354ecf261da1e07402d304638b
diff --git a/app-editors/hteditor/hteditor-2.0.21.ebuild b/app-editors/hteditor/hteditor-2.0.21.ebuild
new file mode 100644
index 000000000000..fc22093c9e7f
--- /dev/null
+++ b/app-editors/hteditor/hteditor-2.0.21.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-editors/hteditor/hteditor-2.0.21.ebuild,v 1.2 2012/12/22 06:26:55 radhermit Exp $
+
+EAPI=5
+
+inherit toolchain-funcs
+
+MY_P=${P/editor}
+
+DESCRIPTION="A file viewer, editor and analyzer for text, binary, and executable files"
+HOMEPAGE="http://hte.sourceforge.net/"
+SRC_URI="mirror://sourceforge/hte/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="X"
+
+RDEPEND="sys-libs/ncurses
+	X? ( x11-libs/libX11 )
+	>=dev-libs/lzo-2"
+DEPEND="${RDEPEND}
+	virtual/yacc
+	sys-devel/flex"
+
+DOCS=( AUTHORS ChangeLog KNOWNBUGS README TODO )
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	econf \
+		$(use_enable X x11-textmode) \
+		--enable-maintainermode
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	#For prefix
+	chmod u+x "${S}/install-sh"
+
+	default
+
+	dohtml doc/*.html
+	doinfo doc/*.info
+}
diff --git a/app-editors/hteditor/metadata.xml b/app-editors/hteditor/metadata.xml
index 81c50a664941..c4e59ab3e399 100644
--- a/app-editors/hteditor/metadata.xml
+++ b/app-editors/hteditor/metadata.xml
@@ -2,7 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">hte</remote-id>
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 322210a9f8a3..ec3a764b7d72 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,3 +1,4 @@
 DIST VBoxGuestAdditions_4.1.22.iso 52207616 SHA256 5c7d9a4a31c8a926ba6dbae2b9704a561638e94ea0fc4f805a9231dd4f932d46 SHA512 529e5f236a1c4bad9123941d8fc3b0d73f93309d42656bf72090282bd970843457af548323079e36ea95d14b8320b3aaafb3ae790da5694d22f538ff8aa1fcf3 WHIRLPOOL f826dd334cfcc25b64b0ecdfb6a5e15bed60d3ceb398710a1787ea43f154b72e1117840f448ba398dcfe149ce0897799b57f0cf1e1e8b070cc055bc9e98896f9
-DIST VBoxGuestAdditions_4.2.2.iso 56872960 SHA256 26f5390b36a3bb9855846d194dcd287b8e53613b599c6ffd7aff1b451cc7f1f1 SHA512 f82e3c4705140cd33737c0819b541bb7c8613ca03bf13fc8d7baeba7f0425b29f04beea7d1e0235080023ef2e23521f458c2a208ddc36736db791955f5c12780 WHIRLPOOL b58f0cead91e291abe61168caef4405884f625c93fd593abe6995abacb9fb078908f11289604c016c5293ff5d557975ebb368fb3e763bf11c31390913cabcf73
+DIST VBoxGuestAdditions_4.1.24.iso 53532672 SHA256 6db32584eb4e2ace0fd5fbbd9d63bdb8f50f0c28821d03dafd0ed1018d133cc7 SHA512 7c327b98468e2309084c34a9f3ce99391027f5aa9637cd07d1118c7079e00433e8ea0284884cabb1bc1e7dc6d8292eef4a7051842cbb96ff6d0f3d3ea19c756e WHIRLPOOL 23c98108f5ef7ec052965057c6be140bb553ddc10ca200339d53035ccd403133d18b222cfd0b7b00b08010d82c1a216c0cd8c194c6236e17ec8ee7149090b64b
 DIST VBoxGuestAdditions_4.2.4.iso 55379968 SHA256 3d7d909a0fe9ac5ffcca6afdd4142b88bad116d2ffed6e95588dbfbcf00ca5e9 SHA512 650c570a6cb1631546070ba5166a049ec7273632e5e02b4ada399c3efdb9b8da658b67197df9c20ef0f838cc05b570d61773d1b17244bcba1e9f8e83e9591ce5 WHIRLPOOL ab0497b69c540e1b9a1c6ce8a18a8885d3e62b9dc89d721fd5f63a315976b53cd71debbd15499c28531169b942e277f6998863b76d237d5f0e3257fee1b4f7f2
+DIST VBoxGuestAdditions_4.2.6.iso 57401344 SHA256 b9afd356d85fe6822fd28009fd63faddd2ac7cbd75c415ea4ce6a22925243ed3 SHA512 336c17b271df5650f1e1af9f4d1e79b982efd56eb0d98a0aec97e0823e53a3ee54d9843235e1825aad01f012c6e1cf1cf99255fef896877ec31c208362cb9fb9 WHIRLPOOL ad201a7c8e816a654f54e1d35be2b09e21d152d8236190395c379f184f092a85b789b8ad1db60d045387574afb4ff11b9f97921a9565d82442ab7dc56185da82
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.24.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-4.1.24.ebuild
new file mode 100644
index 000000000000..ee16bb4d4844
--- /dev/null
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.1.24.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.1.24.ebuild,v 1.1 2012/12/22 12:25:44 polynomial-c Exp $
+
+EAPI=2
+
+inherit eutils
+
+MY_PN=VBoxGuestAdditions
+MY_P=${MY_PN}_${PV}
+
+DESCRIPTION="CD image containing guest additions for VirtualBox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"
+
+LICENSE="PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	!=app-emulation/virtualbox-9999"
+
+src_unpack() {
+	return 0
+}
+
+src_install() {
+	insinto /usr/share/${PN/-additions}
+	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
+}
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-4.2.2.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-4.2.6.ebuild
similarity index 89%
rename from app-emulation/virtualbox-additions/virtualbox-additions-4.2.2.ebuild
rename to app-emulation/virtualbox-additions/virtualbox-additions-4.2.6.ebuild
index 1f8131bf729d..1609e7da50b4 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.2.2.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.2.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/app-emulation/virtualbox-additions/virtualbox-additions-4.2.2.ebuild,v 1.1 2012/10/24 04:40:47 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.2.6.ebuild,v 1.1 2012/12/22 12:25:44 polynomial-c Exp $
 
 EAPI=2
 
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index 49fefc70b5c1..e7a48c145671 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -1,12 +1,16 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.22-80657.tar.gz 10778079 SHA256 837ea30834b7c80e2ae114bb62becac4745ad2878658239cc8eb13ff54cea75f SHA512 1dc1aa1d57a51b05e01004cabbdd40b2b5ff410d3f514cb499c50d847f8830610108bde225a6156a0d9c0c03a7ab96c4d767a7c7a6a5616191cbc1fb46486cca WHIRLPOOL 6758b41ac4d2169b618fbaff6f759ba0b5a3595c77025f61c74ef57ee180ba49c31a9d7ce2b65d37de3e921c2d734878a6deaa00741603e3d5717d203510838d
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.2-81494.tar.gz 11008309 SHA256 2a0824a7f6b93842feb13fe15de16a1bb33c9221116d62ce759eed6878169c2b SHA512 1f1ef106959d342303abbc5e15f07e63ce01335c3f05d525e1d9ba1e21309f2d51bf855b3f7bb0dac62a1d9b57bb8422425a45c313e232795b2e342f0c9ffe7e WHIRLPOOL 071053f6337da7a749c49c945d383b852e6d8d669e59c36e528966d278c2f99b58760977d6c59eaa41965472a2a787268492dfdea9f8321ef4370cdff2a37359
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.24-82872.tar.gz 10785167 SHA256 3e392eb6ca11558b339183ca1e94af66239b05f4b33892ad74576da9ea650941 SHA512 3b6810ec8c208c092e25d262701ea5b263dcdb3d152d57145d99da566e4ef9585688cdac787539466fdbb235662f735cd94ca8859abad22d726b5cd0c9ac28f4 WHIRLPOOL 275380721ad2c0b57c377bf8afb5966f2df6753674ea2f3f3a5970b3fd1badc58a9facc2c09a0dcfc9fa84f28bfc26e2c835998d7782acda1febde647bfc30d5
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.4-81684.tar.gz 11010592 SHA256 62078e057a4ab56aec5ac086746522b3d94787333d0444169471fa5152c609ed SHA512 4e9bcd949e115e8b1f3e268dd933e2fed000d564cfd48408e304a167a2167f85240a7bb4c845c01a7c965e4ff5a60783cc3a8ff40a0246611cf5cc2ac5d0c580 WHIRLPOOL 1e9f6dbd22c917eb9b983e39ad4321ce23741ef8c5a357c3900954194bb5280051ebc29cc5b0d6f2efa98024412ce50d0a61dc793a7bb23a9561873100675c65
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.6-82870.tar.gz 11018821 SHA256 f0113688a76efa0426c27c5541c78506b18637025c35aa682ecc6eeed5d56582 SHA512 a063aa27e1ff727fc90a388b9239bec54064060ef0b51b20b014f0bee1feeb79ca974ae69fc73a22cd41617f330e51492e953e5724b21c2896a5a275c64944f6 WHIRLPOOL e9c2c5fc3e987f3b3b685dfe5cededef995fcc213399f4937d501e739e81da113b0408878d5edbbb5ae24d60fc8b34e9c394b64038a9eb3b10d0f05f6e5aec20
 DIST VirtualBox-4.1.22-80657-Linux_amd64.run 78693841 SHA256 d53a5cc2d1b9431d4f9443462b84549678e943be1d8b4a714d7844c741507c76 SHA512 cdd2920099c0c0349bc6750ab7cad67f23cfba109db62297ad8bede1e7a5658781a29ea1111c8ae1b07cf1eeaf2394baf419be1b9b174575f3c10c13aa9d9b68 WHIRLPOOL c532b3b48c9a0b8057c65db4cbd6e31f17e93a88a4bb5842f9b8c821e8f102d4e2b1bcbfd081ec6a1ecc95b697d8f7914542e8aefcebeb9b2137ad8edf267696
 DIST VirtualBox-4.1.22-80657-Linux_x86.run 78632398 SHA256 a18a2b7723bc8c325149b5581ae36208211c7d8651269516d366db9cdafcd0ae SHA512 0f9dd4fc25828cec3ac3d2961b925a57dd88e0af1c3cf75c9199428b4090790ebd439015700b63def6c53b5acc94135e7766f36f29d6befcb03339d563fac054 WHIRLPOOL 76d06e577f2ee3d9ec0eea0b9800b618af97205ac9b036fe3f1c73b7ecccfbf6f57e49ddc224e9963eb048c5fe6e88cfedf9743b8af2df97137feb03e89fac36
-DIST VirtualBox-4.2.2-81494-Linux_amd64.run 81960401 SHA256 a4d1d1f3047fb3e242338dbaa59d781b189d58021a04d29aac0a3f8ab7b54733 SHA512 8d807c05e3e47ff5613c76356a50a522b1a8dc3d665ed0f7c7f24db47f0495278e5877aa8a0057a50f0c7dac14d5b1f4aa18fb54dc61b2f4dc9d9f91b99320b0 WHIRLPOOL df48a91e981f0edc34b3e1e52691a8efe768107a02459423c740b977aae90f55e1540ee17b40f696b3d325a589eba29feeed7ef69a517b256e9a8f270298e84b
-DIST VirtualBox-4.2.2-81494-Linux_x86.run 81694157 SHA256 c9f1609d9df2f467e1b79ce483e21a912dc3a1431219d5e7528815517de1c175 SHA512 2a593d6ab7d77c60ce1743e86edc6a5d50ec6e07a65dada1bb13c8a3dd7c2e5c2f454f94f32502297746615a09b08f3ffdf27b3e362ac3762fed80dfcdfe556a WHIRLPOOL 15ccffe8ebf00c8acc811911b84d1413c74b36cff1893772aa1cdaac9627c8bbefe84162b6175956bf365dc88a5efc54b924a2acaff953ff3bbc154d3410e98b
+DIST VirtualBox-4.1.24-82872-Linux_amd64.run 79789520 SHA256 feecdc800fa799f49048ddc7a4af14770cf31591e4ffc420e5295208c35541df SHA512 3b741cae8af4ad16cb653551ac8173f6b719f987abae3a5adb2ca85b1c572f9ae8eb4e68713819295749ecd2f5cf15e0ac995c25e2e483de01e554e9effeac8e WHIRLPOOL 5d44db906533287efd13f57ebe93e9b68ebb84f2d1bb2dc6dcd0b2c2b955c36c234b5de56150570c071b0fc6da0192e54f870dcf7c1a8c0137f8a2647aac939b
+DIST VirtualBox-4.1.24-82872-Linux_x86.run 79769035 SHA256 ae3ca9389e1940daf432d8853621ee7e383405f922e924aac42927bdd1257744 SHA512 eeefa5acb674b2d6aa39fffe39bf6a008c57d30e133e0e6d639fa2e224d174f9afa2e827f7d78bdcd6487bcab6f2b2eef12747d566bfd471a9c5e89aa09e4b79 WHIRLPOOL 128aad99482a47e950282b4817c6be0f48d5a3df867202b836f44ca132cb8226d10aae5ebba560263da50efd132e0791cf2f84478e2df26af5084406bd2089a1
 DIST VirtualBox-4.2.4-81684-Linux_amd64.run 80362961 SHA256 4dcd1609dc26c978e7d61e52ae166005e2220acaed159ad5af24c14c3051d51b SHA512 c2aea9bdd9aa5e67331e07104231386093a819304d36c602f1400c92251ea343a00899d3bf3e2cafadd3bcc1965ea1c7851c3571b01887027e74edda0f1e5256 WHIRLPOOL cdca20c6be233767f604325bb561247aa7104a702088a591db169a3c1bd32c28d75f609ea19892b3046cb92e799481ea8ab824173789b5b5283a59b1af9bcd11
 DIST VirtualBox-4.2.4-81684-Linux_x86.run 80106957 SHA256 e691b5ca67d625463c6337ec491a6752f0784a85e3c0f9a6550cd02b508e3f5c SHA512 49c88a29de3fc1d70daf3410d6aef64a60db65e36271778623a265a50680f1847232d6dbb701b3bfe778cb8ba014701c8040287ddb9a4e61314be14f863201fe WHIRLPOOL 68a9b2299ff6f033d48a3c4b22c32a2f75edb27092de75a1afc7e3a3d5b329fe2611b3074fd0a6659b8e20ce8cff46acb7f180c8cf77689a2586b2b2f9fa424e
+DIST VirtualBox-4.2.6-82870-Linux_amd64.run 83527120 SHA256 7e8a85289934d243682f500e42799d0409440ef5380225fba45850851d0df893 SHA512 82df231433653abb6f0128d78442c24b21cc603f6f3eb7160eaf75e1e009d69a84f9a5d93d083244959c97562454059c30f211cd021dd7472f79fe5e642861e4 WHIRLPOOL 2b884f49a05aad0edbbdd641b47b0014469feb0528db9d8e555421ac93f5209ba59d24b81882bc17641f46ff264f8e65a2c4a336d5a6da7b72102098e830be3f
+DIST VirtualBox-4.2.6-82870-Linux_x86.run 83178956 SHA256 ecdf5eb76e469521dfa633b31a4798550232f345d2fbf676fa7d9ead8218446b SHA512 9dd664d72bc6cf2e5e4cb6b04dd06ac2f031ef08d1b48be4b1c360c16fe4707dd61648e42d6d8165a08f1d6af0163fba9c74bc6dd885cec5b1415a61ad2c44a2 WHIRLPOOL 795eefde34c07499b1fba045dd129336a403787cc332e2d454c5cf43da5fc03f150ad57408e8304b3efbcc7d4564e9caa9d6c1c071b29482ecc0385260da1016
 DIST VirtualBoxSDK-4.1.22-80657.zip 8805310 SHA256 89f221ae08863342e7a8da3186135796430614e5792d7f8eae284b1360f669d2 SHA512 e488f6099f814174555112bccb06710d1dd782943c01ae4afb6f907328f28b198caf992f6c142751223b71cff02cdaca206fddd5f61b00c4c010ed84f922f94d WHIRLPOOL 69d9c3c1e44e5657d88b1d6b6da0deb8b65d0f88656eea895249fb610bdc0c0539b0c6daadaf04185296fbc2553873acf86308d26725d3292760ff395bf3390d
-DIST VirtualBoxSDK-4.2.2-81494.zip 9714925 SHA256 694fe0bef149e4f0802d2415f914e77e49f897b69316d608f4d7c4ef62acfbb9 SHA512 169982667582534cf160d6049ca8bd9a0f62b1c33c2e4037747eedafecd999218084fb85d8d4af3fca00b8126eb64a6b845e3d5590cd0ab24e0dfbd394ff6e53 WHIRLPOOL 96673147e0a9fa35ded2c84a6e36f1884ac91584824daef0b90f1b137db115cc0dce9837ae15aa5d8a1f6b424db1fc1f24cbf99c25fb55fc68714e64a1519f7f
+DIST VirtualBoxSDK-4.1.24-82872.zip 8804758 SHA256 b4b516f01a9f8c1290b6875dd9ac07aeaf8a9c13bff4b837345a8dbb4539ce19 SHA512 ffab25cd1bd2c550e2c208d91cfd013ad12e47346be1db392f72e5f20e70c6fd6abaf760b2741ad3371bb4c50a2d3947c1bb5614edca03d6aa0a70e8248b3c33 WHIRLPOOL be4a300aaf24268b615b16a0f23c86ac5230bb0ba41e45d5c131983880ab4dcff98ca7958d7b017e35dcb431200129f9857d01fcc4674d6175265dd1b9da3df6
 DIST VirtualBoxSDK-4.2.4-81684.zip 9715854 SHA256 eb42fd92692746094a03e5bd468e1a87670f3d6806b8d645ecb3d78d2cb80e7e SHA512 e777fdd95bccd23abbd2abcb53bb7fd70221fa82ac875493e87430e3a549f374846de84dbba30874cfbc0021604ff440faec897e3a7415707d3a633ae88e7f52 WHIRLPOOL 1f8eec48ee0c67e3d36352a5e1259dd273b240374b5b5514149dae675c320218d21142195c23e6329edfc44f5d0e413abf4d402591a95dae9fbac731e8234c5f
+DIST VirtualBoxSDK-4.2.6-82870.zip 9716413 SHA256 e4a0192f27b5e2d18d642fdb3d5d46d06a9139120d18cea1f37e8078e4292ede SHA512 b9c1eae0ea29e6930c65db69389b6a3089bd5452e52587f12ff2252e3ac7b6a9b21550e00bbad618ca82242f2421d525a3a00e0df7141150a00c1728d6d6c863 WHIRLPOOL 6ad866128bb2188cfddb3466762c125fe8bf18c849dc6381ae345167155bd0e6531ef3c405ce06ee6c0ce5c0777524c9b8fb930a04926cfe1988574620e712a9
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.24.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.24.ebuild
new file mode 100644
index 000000000000..652786c467fc
--- /dev/null
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.24.ebuild
@@ -0,0 +1,344 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.24.ebuild,v 1.1 2012/12/22 12:25:14 polynomial-c Exp $
+
+EAPI=2
+
+inherit eutils unpacker fdo-mime gnome2 pax-utils
+
+MY_PV=${PV}-82872
+SDK_PV=${MY_PV}
+EXTP_PV=${SDK_PV}
+MY_P=VirtualBox-${MY_PV}-Linux
+EXTP_PN=Oracle_VM_VirtualBox_Extension_Pack
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_amd64.run )
+	x86? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_x86.run )
+	sdk? ( http://download.virtualbox.org/virtualbox/${PV}/VirtualBoxSDK-${SDK_PV}.zip )
+	http://download.virtualbox.org/virtualbox/${PV}/${EXTP_PN}-${EXTP_PV}.vbox-extpack -> ${EXTP_PN}-${EXTP_PV}.tar.gz"
+
+LICENSE="GPL-2 PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+additions +chm headless python sdk vboxwebsrv rdesktop-vrdp"
+RESTRICT="mirror"
+
+DEPEND="app-arch/unzip"
+
+RDEPEND="!!app-emulation/virtualbox
+	!app-emulation/virtualbox-additions
+	~app-emulation/virtualbox-modules-${PV}
+	!headless? (
+		x11-libs/libXcursor
+		media-libs/libsdl[X]
+		x11-libs/libXrender
+		x11-libs/libXfixes
+		media-libs/libpng
+		x11-libs/libXi
+		x11-libs/libXrandr
+		x11-libs/libXinerama
+		x11-libs/libXft
+		media-libs/freetype
+		media-libs/fontconfig
+		x11-libs/libXext
+		dev-libs/glib
+		chm? ( dev-libs/expat )
+	)
+	x11-libs/libXt
+	dev-libs/libxml2
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXdmcp
+	python? ( || (
+			dev-lang/python:2.7
+			dev-lang/python:2.6
+			dev-lang/python:2.5
+		) )"
+
+S=${WORKDIR}
+
+QA_TEXTRELS_amd64="opt/VirtualBox/VBoxVMM.so"
+QA_TEXTRELS_x86="opt/VirtualBox/VBoxGuestPropSvc.so
+	opt/VirtualBox/VBoxSDL.so
+	opt/VirtualBox/VBoxDbg.so
+	opt/VirtualBox/VBoxSharedFolders.so
+	opt/VirtualBox/VBoxDD2.so
+	opt/VirtualBox/VBoxOGLrenderspu.so
+	opt/VirtualBox/VBoxPython.so
+	opt/VirtualBox/VBoxPython2_5.so
+	opt/VirtualBox/VBoxPython2_6.so
+	opt/VirtualBox/VBoxPython2_7.so
+	opt/VirtualBox/VBoxDD.so
+	opt/VirtualBox/VBoxVRDP.so
+	opt/VirtualBox/VBoxDDU.so
+	opt/VirtualBox/VBoxREM64.so
+	opt/VirtualBox/VBoxSharedClipboard.so
+	opt/VirtualBox/VBoxHeadless.so
+	opt/VirtualBox/VBoxRT.so
+	opt/VirtualBox/VRDPAuth.so
+	opt/VirtualBox/VBoxREM.so
+	opt/VirtualBox/VBoxSettings.so
+	opt/VirtualBox/VBoxKeyboard.so
+	opt/VirtualBox/VBoxSharedCrOpenGL.so
+	opt/VirtualBox/VBoxVMM.so
+	opt/VirtualBox/VirtualBox.so
+	opt/VirtualBox/VBoxOGLhosterrorspu.so
+	opt/VirtualBox/components/VBoxC.so
+	opt/VirtualBox/components/VBoxSVCM.so
+	opt/VirtualBox/VBoxREM32.so
+	opt/VirtualBox/VBoxPython2_5.so
+	opt/VirtualBox/VBoxXPCOMC.so
+	opt/VirtualBox/VBoxOGLhostcrutil.so
+	opt/VirtualBox/VBoxNetDHCP.so
+	opt/VirtualBox/VBoxGuestControlSvc.so"
+QA_PRESTRIPPED="opt/VirtualBox/VBoxDD.so
+	opt/VirtualBox/VBoxDD2.so
+	opt/VirtualBox/VBoxDDU.so
+	opt/VirtualBox/VBoxDbg.so
+	opt/VirtualBox/VBoxGuestControlSvc.so
+	opt/VirtualBox/VBoxGuestPropSvc.so
+	opt/VirtualBox/VBoxHeadless
+	opt/VirtualBox/VBoxHeadless.so
+	opt/VirtualBox/VBoxKeyboard.so
+	opt/VirtualBox/VBoxManage
+	opt/VirtualBox/VBoxNetAdpCtl
+	opt/VirtualBox/VBoxNetDHCP
+	opt/VirtualBox/VBoxNetDHCP.so
+	opt/VirtualBox/VBoxOGLhostcrutil.so
+	opt/VirtualBox/VBoxOGLhosterrorspu.so
+	opt/VirtualBox/VBoxOGLrenderspu.so
+	opt/VirtualBox/VBoxPython.so
+	opt/VirtualBox/VBoxPython2_5.so
+	opt/VirtualBox/VBoxPython2_6.so
+	opt/VirtualBox/VBoxPython2_7.so
+	opt/VirtualBox/VBoxREM.so
+	opt/VirtualBox/VBoxREM32.so
+	opt/VirtualBox/VBoxREM64.so
+	opt/VirtualBox/VBoxRT.so
+	opt/VirtualBox/VBoxSDL
+	opt/VirtualBox/VBoxSDL.so
+	opt/VirtualBox/VBoxSVC
+	opt/VirtualBox/VBoxSettings.so
+	opt/VirtualBox/VBoxSharedClipboard.so
+	opt/VirtualBox/VBoxSharedCrOpenGL.so
+	opt/VirtualBox/VBoxSharedFolders.so
+	opt/VirtualBox/VBoxTestOGL
+	opt/VirtualBox/VBoxTunctl
+	opt/VirtualBox/VBoxVMM.so
+	opt/VirtualBox/VBoxVRDP.so
+	opt/VirtualBox/VBoxXPCOM.so
+	opt/VirtualBox/VBoxXPCOMC.so
+	opt/VirtualBox/VBoxXPCOMIPCD
+	opt/VirtualBox/VRDPAuth.so
+	opt/VirtualBox/VirtualBox
+	opt/VirtualBox/VirtualBox.so
+	opt/VirtualBox/accessible/libqtaccessiblewidgets.so
+	opt/VirtualBox/components/VBoxC.so
+	opt/VirtualBox/components/VBoxSVCM.so
+	opt/VirtualBox/components/VBoxXPCOMIPCC.so
+	opt/VirtualBox/kchmviewer
+	opt/VirtualBox/libQtCoreVBox.so.4
+	opt/VirtualBox/libQtGuiVBox.so.4
+	opt/VirtualBox/libQtNetworkVBox.so.4
+	opt/VirtualBox/libQtOpenGLVBox.so.4
+	opt/VirtualBox/vboxwebsrv"
+
+PYTHON_UPDATER_IGNORE="1"
+
+src_unpack() {
+	unpack_makeself ${MY_P}_${ARCH}.run
+	unpack ./VirtualBox.tar.bz2
+
+	mkdir "${S}"/${EXTP_PN} || die
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	unpack ${EXTP_PN}-${EXTP_PV}.tar.gz
+	popd &>/dev/null || die
+
+	if use sdk; then
+		unpack VirtualBoxSDK-${SDK_PV}.zip
+	fi
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# create virtualbox configurations files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-config" vbox.cfg
+
+	if ! use headless ; then
+		pushd "${S}"/icons &>/dev/null || die
+		for size in * ; do
+			if [ -f "${size}/virtualbox.png" ] ; then
+				insinto "/usr/share/icons/hicolor/${size}/apps"
+				newins "${size}/virtualbox.png" ${PN}.png
+			fi
+		done
+		dodir /usr/share/pixmaps
+		cp "48x48/virtualbox.png" "${D}/usr/share/pixmaps/${PN}.png" \
+			|| die
+		popd &>/dev/null || die
+
+		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
+	fi
+
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+	popd &>/dev/null || die
+	rm -rf "${S}"/${EXTP_PN}
+
+	insinto /opt/VirtualBox
+	dodir /opt/bin
+
+	doins UserManual.pdf
+
+	if use sdk ; then
+		doins -r sdk || die
+	fi
+
+	if use additions; then
+		doins -r additions || die
+	fi
+
+	if use vboxwebsrv; then
+		doins vboxwebsrv || die
+		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
+		fperms 0750 /opt/VirtualBox/vboxwebsrv
+		dosym /opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	if use rdesktop-vrdp; then
+		doins rdesktop-vrdp || die
+		doins -r rdesktop-vrdp-keymaps || die
+		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
+		dosym /opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
+	fi
+
+	if ! use headless && use chm; then
+		doins kchmviewer VirtualBox.chm || die
+		fowners root:vboxusers /opt/VirtualBox/kchmviewer
+		fperms 0750 /opt/VirtualBox/kchmviewer
+	fi
+
+	if use python; then
+		local pyver
+		for pyver in 2.5 2.6 2.7; do
+			if has_version "=dev-lang/python-${pyver}*" && [ -f "${S}/VBoxPython${pyver/./_}.so" ] ; then
+				doins VBoxPython${pyver/./_}.so || die
+			fi
+		done
+	fi
+
+	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
+		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
+		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
+		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
+		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
+		VBoxPython?_*.so
+
+	if use headless ; then
+		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
+	fi
+
+	doins -r * || die
+
+	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
+	dosym /opt/VirtualBox/VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
+	dosym /opt/VirtualBox/VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
+	dosym /opt/VirtualBox/VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
+	dosym /opt/VirtualBox/VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
+	dosym /opt/VirtualBox/VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
+
+	local each
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,TestOGL,ExtPackHelperApp}; do
+		fowners root:vboxusers /opt/VirtualBox/${each}
+		fperms 0750 /opt/VirtualBox/${each}
+		pax-mark -m "${D}"/opt/VirtualBox/${each}
+	done
+	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
+	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
+
+	if ! use headless ; then
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		for each in VBox{SDL,Headless} VirtualBox; do
+			fowners root:vboxusers /opt/VirtualBox/${each}
+			fperms 4510 /opt/VirtualBox/${each}
+			pax-mark -m "${D}"/opt/VirtualBox/${each}
+		done
+
+		dosym /opt/VirtualBox/VBox.sh /opt/bin/VirtualBox
+		dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxSDL
+	else
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
+		fperms 4510 /opt/VirtualBox/VBoxHeadless
+		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
+	fi
+
+	exeinto /opt/VirtualBox
+	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh" || die
+	fowners root:vboxusers /opt/VirtualBox/VBox.sh
+	fperms 0750 /opt/VirtualBox/VBox.sh
+
+	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxManage
+	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxVRDP
+	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxHeadless
+	dosym /opt/VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	insinto /lib/udev/rules.d
+	doins "${FILESDIR}"/10-virtualbox.rules
+	# move udev scripts into /lib/udev (bug #372491)
+	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"/lib/udev
+	fperms 0750 /lib/udev/VBoxCreateUSBNode.sh
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	gnome2_icon_cache_update
+
+	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
+
+	elog ""
+	if ! use headless ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\""
+		elog ""
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
+	elog "an overview about the different features of ${PN}"
+	elog "and virtualbox-ose"
+	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.6.ebuild
similarity index 99%
rename from app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild
rename to app-emulation/virtualbox-bin/virtualbox-bin-4.2.6.ebuild
index 73c45ede2bec..80e0140dccac 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.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/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild,v 1.2 2012/12/04 09:40:13 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.6.ebuild,v 1.1 2012/12/22 12:25:14 polynomial-c Exp $
 
 EAPI=2
 
@@ -8,7 +8,7 @@ inherit eutils unpacker fdo-mime gnome2 pax-utils udev
 
 MY_PV=${PV/beta/BETA}
 MY_PV=${MY_PV/rc/RC}
-VBOX_PV=${MY_PV}-81494
+VBOX_PV=${MY_PV}-82870
 SDK_PV=${VBOX_PV}
 EXTP_PV=${SDK_PV}
 MY_P=VirtualBox-${VBOX_PV}-Linux
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 54bea9df80f1..29f466cb0ce5 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,3 +1,4 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.22-80657.tar.gz 10778079 SHA256 837ea30834b7c80e2ae114bb62becac4745ad2878658239cc8eb13ff54cea75f SHA512 1dc1aa1d57a51b05e01004cabbdd40b2b5ff410d3f514cb499c50d847f8830610108bde225a6156a0d9c0c03a7ab96c4d767a7c7a6a5616191cbc1fb46486cca WHIRLPOOL 6758b41ac4d2169b618fbaff6f759ba0b5a3595c77025f61c74ef57ee180ba49c31a9d7ce2b65d37de3e921c2d734878a6deaa00741603e3d5717d203510838d
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.2-81494.tar.gz 11008309 SHA256 2a0824a7f6b93842feb13fe15de16a1bb33c9221116d62ce759eed6878169c2b SHA512 1f1ef106959d342303abbc5e15f07e63ce01335c3f05d525e1d9ba1e21309f2d51bf855b3f7bb0dac62a1d9b57bb8422425a45c313e232795b2e342f0c9ffe7e WHIRLPOOL 071053f6337da7a749c49c945d383b852e6d8d669e59c36e528966d278c2f99b58760977d6c59eaa41965472a2a787268492dfdea9f8321ef4370cdff2a37359
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.24-82872.tar.gz 10785167 SHA256 3e392eb6ca11558b339183ca1e94af66239b05f4b33892ad74576da9ea650941 SHA512 3b6810ec8c208c092e25d262701ea5b263dcdb3d152d57145d99da566e4ef9585688cdac787539466fdbb235662f735cd94ca8859abad22d726b5cd0c9ac28f4 WHIRLPOOL 275380721ad2c0b57c377bf8afb5966f2df6753674ea2f3f3a5970b3fd1badc58a9facc2c09a0dcfc9fa84f28bfc26e2c835998d7782acda1febde647bfc30d5
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.4-81684.tar.gz 11010592 SHA256 62078e057a4ab56aec5ac086746522b3d94787333d0444169471fa5152c609ed SHA512 4e9bcd949e115e8b1f3e268dd933e2fed000d564cfd48408e304a167a2167f85240a7bb4c845c01a7c965e4ff5a60783cc3a8ff40a0246611cf5cc2ac5d0c580 WHIRLPOOL 1e9f6dbd22c917eb9b983e39ad4321ce23741ef8c5a357c3900954194bb5280051ebc29cc5b0d6f2efa98024412ce50d0a61dc793a7bb23a9561873100675c65
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.6-82870.tar.gz 11018821 SHA256 f0113688a76efa0426c27c5541c78506b18637025c35aa682ecc6eeed5d56582 SHA512 a063aa27e1ff727fc90a388b9239bec54064060ef0b51b20b014f0bee1feeb79ca974ae69fc73a22cd41617f330e51492e953e5724b21c2896a5a275c64944f6 WHIRLPOOL e9c2c5fc3e987f3b3b685dfe5cededef995fcc213399f4937d501e739e81da113b0408878d5edbbb5ae24d60fc8b34e9c394b64038a9eb3b10d0f05f6e5aec20
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.24.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.24.ebuild
new file mode 100644
index 000000000000..ba90b65d2e36
--- /dev/null
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.24.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.24.ebuild,v 1.1 2012/12/22 12:26:14 polynomial-c Exp $
+
+EAPI=2
+
+inherit eutils multilib
+
+MY_BUILD="82872"
+MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
+MY_P="${MY_PN}-${PV}-${MY_BUILD}"
+
+DESCRIPTION="PUEL extensions for VirtualBox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
+
+LICENSE="PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror strip"
+
+RDEPEND="~app-emulation/virtualbox-${PV}"
+
+QA_PREBUILT="/usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}/.*"
+
+src_install() {
+	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+}
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.2.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.6.ebuild
similarity index 88%
rename from app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.2.ebuild
rename to app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.6.ebuild
index a5ab66a7ecef..c21da69cfed9 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.2.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.6.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/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.2.ebuild,v 1.1 2012/10/24 04:42:36 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.6.ebuild,v 1.1 2012/12/22 12:26:14 polynomial-c Exp $
 
 EAPI=2
 
 inherit eutils multilib
 
-MY_BUILD="81494"
+MY_BUILD="82870"
 MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
 MY_PV="${PV/beta/BETA}"
 MY_PV="${MY_PV/rc/RC}"
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index c207b0512743..96adb468253b 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,3 +1,4 @@
 DIST VirtualBox-4.1.22.tar.bz2 73385514 SHA256 7abb506203dd0d69b4b408fd999b5b9a479a9adce5f80e9b5569641c053dd153 SHA512 1bc2e33f6ce1ab417887241ee95bc3042b5c6072b3babc221c349b36b923f0655e776e98468cc63f65662e5ae3819c974bc8b5c97bae531a2c4a0ebb1c1ebba6 WHIRLPOOL e52ee58fdf1b3d1e1323cb26df1791dbc4c9375061467191a73f12071ac99a5c2791ddb65eeff9af5a645ba39fe88d4f7bc4362c919c9c14ba10a99d1b6c3776
-DIST VirtualBox-4.2.2.tar.bz2 75655741 SHA256 943daa13694605d5d0a23ffef27c398b5e72ada669de89bad4b98f000f029700 SHA512 d6a85175e15d3dc49aab825aeb9aa4fb9b2640e6bb3c65dfeaaf492fe8589abe70ad5dbf8ed07d502f337c243b469a7da35d4bf23bb26f5ad3b0ee0a06a51a10 WHIRLPOOL ad45932ca5ea7e990af975a1c3823d58cc9b180a9f1e0c23576e1c6fb2aead39cdd2d0303b830f334d811c1f4b6b8b585d243a177253f13b53735303ae247c33
+DIST VirtualBox-4.1.24.tar.bz2 74612732 SHA256 74008b8e8942045668c1b7d06b0a4bb5fe8464066e343e3a2e1ba30b94ce8a7f SHA512 b4967621f848ff50d23e5f1afa63c2109cd10a602e6c742966ae7eef882417808cdc93edad67f55a0005fe3e4905034b08a1d21dcf242a9cc1e653ebef459174 WHIRLPOOL 0544cd637bfcc6cf7a502aa6fe27cb697ba4d570400ee2f7055406fca6deaed1b4b31e80de8e7d09a15152bfabe311d56a4ff256ae8f8f2940aa842c1701f941
 DIST VirtualBox-4.2.4.tar.bz2 75625513 SHA256 a7c607523c1c10b7b978ab39a92bb646517316548aa4a1a74b6e434ac2bf0adc SHA512 8238afd440e20842de27c8c68296c88bd18f561a45497ee97364d5720d73a9fe99eba9af3ad851d89e02540e304bcc3f48847704207ce2c8cdced8fa10dc4aa6 WHIRLPOOL 875184cc836ab65a368d1d9fea6eaed7deeea782d9d149a8f568ec372e190730e92ca13858fff51089bf0632136200909c49cf5ba1b9b5bb0fec3ec69293bade
+DIST VirtualBox-4.2.6.tar.bz2 76291326 SHA256 54526091bc2aa66b88ca878dd9ecc4466f96d607db2f6678a9d673ecf6646ae3 SHA512 b8b35f7777cc1386cb61720619a8df1b7adbc573da0bfa1e364887dd8680012ecabc57d7dd5848943be5e676430a66ae6d0ddf1654299891d89b82dadea3b78f WHIRLPOOL 1e95c4d1136e0c2e7740cb443a4effecf0b018a6c1492d13e61d81ae0a74f35d5f9b0adf89f52c0e36794512c6c001e01f775755c9a182581d0c36874b401be6
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.22.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.22.ebuild
index 639806d8842d..93eb13591b2d 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.22.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.22.ebuild,v 1.4 2012/11/17 11:54:03 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.22.ebuild,v 1.5 2012/12/22 12:28:08 polynomial-c Exp $
 
 EAPI=2
 
@@ -49,7 +49,7 @@ pkg_setup() {
 		linux-mod_pkg_setup
 		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
 		enewgroup vboxguest
-		enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest
+		enewuser vboxguest -1 /bin/sh /dev/null vboxguest
 }
 
 src_unpack() {
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.24.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.24.ebuild
new file mode 100644
index 000000000000..bacdc8f619e0
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.24.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.24.ebuild,v 1.1 2012/12/22 12:28:08 polynomial-c Exp $
+
+EAPI=2
+
+inherit eutils linux-mod user
+
+MY_P=VirtualBox-${PV}
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
+			 x11-apps/xrandr
+			 x11-apps/xrefresh
+			 x11-libs/libXmu
+			 x11-libs/libX11
+			 x11-libs/libXt
+			 x11-libs/libXext
+			 x11-libs/libXau
+			 x11-libs/libXdmcp
+			 x11-libs/libSM
+			 x11-libs/libICE )
+	!!x11-drivers/xf86-input-virtualbox"
+DEPEND="${RDEPEND}
+		>=dev-util/kbuild-0.1.999
+		>=dev-lang/yasm-0.6.2
+		sys-devel/bin86
+		sys-devel/dev86
+		sys-libs/pam
+		sys-power/iasl
+		X? ( x11-proto/renderproto )
+		!X? ( x11-proto/xproto )"
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
+			vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+		linux-mod_pkg_setup
+		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+		enewgroup vboxguest
+		enewuser vboxguest -1 /bin/sh /dev/null vboxguest
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Create and unpack a tarball with the sources of the Linux guest
+	# kernel modules, to include all the needed files
+	"${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
+	unpack ./vbox-kmod.tar.gz
+
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	cd "${S}"
+	rm -rf kBuild/bin tools
+}
+
+src_prepare() {
+	# PaX fixes (see bug #298988)
+	pushd "${WORKDIR}" &>/dev/null || die
+	epatch "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
+	popd &>/dev/null || die
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
+
+	# stupid new header references...
+	for vboxheader in {product,revision}-generated.h ; do
+		for mdir in vbox{guest,sf} ; do
+			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+				"${WORKDIR}/${mdir}/${vboxheader}"
+		done
+	done
+}
+
+src_configure() {
+		# build the user-space tools, warnings are harmless
+		./configure --nofatal \
+		--disable-xpcom \
+		--disable-sdl-ttf \
+		--disable-pulse \
+		--disable-alsa \
+		--build-headless || die "configure failed"
+}
+
+src_compile() {
+		source ./env.sh
+
+		for each in /src/VBox/{Runtime,Additions/common} \
+		/src/VBox/Additions/linux/{sharedfolders,daemon} ; do
+				cd "${S}"${each}
+				MAKE="kmk" emake TOOL_YASM_AS=yasm \
+				KBUILD_PATH="${S}/kBuild" \
+				|| die "kmk VBoxControl failed"
+		done
+
+		if use X; then
+				cd "${S}"/src/VBox/Additions/x11/VBoxClient
+				MAKE="kmk" emake TOOL_YASM_AS=yasm \
+				KBUILD_PATH="${S}/kBuild" \
+				|| die "kmk VBoxClient failed"
+		fi
+
+		# Now creating the kernel modules. We must do this _after_
+		# we compiled the user-space tools as we need two of the
+		# automatically generated header files. (>=3.2.0)
+		linux-mod_src_compile
+}
+
+src_install() {
+		linux-mod_src_install
+
+		cd "${S}"/out/linux.${ARCH}/release/bin/additions
+
+		insinto /sbin
+		newins mount.vboxsf mount.vboxsf
+		fperms 4755 /sbin/mount.vboxsf
+
+		newinitd "${FILESDIR}"/${PN}-7.initd ${PN}
+
+		insinto /usr/sbin/
+		newins VBoxService vboxguest-service
+		fperms 0755 /usr/sbin/vboxguest-service
+
+		insinto /usr/bin
+		doins VBoxControl
+		fperms 0755 /usr/bin/VBoxControl
+
+		# VBoxClient user service and xrandr wrapper
+		if use X; then
+			doins VBoxClient
+			fperms 0755 /usr/bin/VBoxClient
+
+			cd "${S}"/src/VBox/Additions/x11/Installer
+			newins 98vboxadd-xclient VBoxClient-all
+			fperms 0755 /usr/bin/VBoxClient-all
+		fi
+
+		# udev rule for vboxdrv
+		dodir /lib/udev/rules.d
+		echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
+			|| die
+		echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
+			|| die
+
+		# VBoxClient autostart file
+		insinto /etc/xdg/autostart
+		doins "${FILESDIR}"/vboxclient.desktop
+
+		# sample xorg.conf
+		insinto /usr/share/doc/${PF}
+		doins "${FILESDIR}"/xorg.conf.vbox
+}
+
+pkg_postinst() {
+		linux-mod_pkg_postinst
+		if ! use X ; then
+			elog "use flag X is off, enable it to install the"
+			elog "X Window System video driver."
+		fi
+		elog ""
+		elog "Please add users to the \"vboxguest\" group so they can"
+		elog "benefit from seamless mode, auto-resize and clipboard."
+		elog ""
+		elog "Please add:"
+		elog "/etc/init.d/${PN}"
+		elog "to the default runlevel in order to start"
+		elog "needed services."
+		elog "To use the VirtualBox X driver, use the following"
+		elog "file as your /etc/X11/xorg.conf:"
+		elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
+		elog ""
+		elog "Also make sure you use the Mesa library for OpenGL:"
+		elog "    eselect opengl set xorg-x11"
+		elog ""
+		elog "An autostart .desktop file has been installed to start"
+		elog "VBoxClient in desktop sessions."
+		elog ""
+		elog "You can mount shared folders with:"
+		elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
+		elog ""
+		elog "Warning:"
+		elog "this ebuild is only needed if you are running gentoo"
+		elog "inside a VirtualBox Virtual Machine, you don't need"
+		elog "it to run VirtualBox itself."
+		elog ""
+}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.4.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.4.ebuild
index 1c4dd74ad627..a362f1fc3e0f 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.4.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.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/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.4.ebuild,v 1.3 2012/12/01 11:28:40 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.4.ebuild,v 1.4 2012/12/22 12:28:08 polynomial-c Exp $
 
 EAPI=2
 
@@ -50,7 +50,7 @@ pkg_setup() {
 		linux-mod_pkg_setup
 		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
 		enewgroup vboxguest
-		enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest
+		enewuser vboxguest -1 /bin/sh /dev/null vboxguest
 }
 
 src_unpack() {
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.6.ebuild
similarity index 97%
rename from app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.2.ebuild
rename to app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.6.ebuild
index f693cc731761..fee068305655 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.2.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.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/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.2.ebuild,v 1.3 2012/12/01 11:28:40 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.6.ebuild,v 1.1 2012/12/22 12:28:08 polynomial-c Exp $
 
 EAPI=2
 
@@ -50,7 +50,7 @@ pkg_setup() {
 		linux-mod_pkg_setup
 		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
 		enewgroup vboxguest
-		enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest
+		enewuser vboxguest -1 /bin/sh /dev/null vboxguest
 }
 
 src_unpack() {
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 433795b1e6fb..744406cfb0d2 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,3 +1,4 @@
 DIST vbox-kernel-module-src-4.1.22.tar.xz 459980 SHA256 8d37d4c4497fd1de9511af2eb1aea4959045b47ad623f04e76958dfabd0848e3 SHA512 3ac0e55b794468b7b4b204500334d86763c523a2dfac84d830153b3ca324883fdce996eeaa35fa0e36606b46c126c0ab77374d1d3d7df8b65cf1058335ece214 WHIRLPOOL 19b2bfa3be78a845af962c80a5dd1defc7bbba2d30f0641ff02d069d5d2e3fab53eb4ce42a450ff16d5ea40f2ec3b5b88af8f341a481a93c6fe2aad03eca09ce
-DIST vbox-kernel-module-src-4.2.2.tar.xz 492868 SHA256 66fc2716195292e831ecec44dd94ec2a980d4b105708af871903f6c77322eadb SHA512 5cb312e6e89c5103fd982d107f57a324d96b5698d6b622364552581220b34f62e06232a7e563c4643ce7747b3f466ad39bd89dbd5890e13ae259caab622b53da WHIRLPOOL 9c1ddd0eb5065d31b9a6800b05b98a8f4831b12fef47f44266c91d0a8cec22048c2b1e6cb2592217adf2831ac42ede73dc3550aef47bc8e2a0f1e8bf8177cd59
+DIST vbox-kernel-module-src-4.1.24.tar.xz 459852 SHA256 f0113fc453f2c599a0afeb07539646ec14008693502436fca78966eb440b903c SHA512 bc92e387d83ecdffcf1f0eb71d3b0fb0401d4441821eccb7650319916b6f3351839b177cc2a61f0f20273cfa57e073797adc5692eb42975748cb7d52feb4f427 WHIRLPOOL 9bb4dff9e1dfd694f23f4ce121d89fa3c2a77ef1718df9c7ebeb5f53e7d7adb6061084727c2cb9a7f1b34b2000c17252ccfc02e7c7edb8c05d2fb3d7bc8905b1
 DIST vbox-kernel-module-src-4.2.4.tar.xz 492268 SHA256 fe27db126b09cfb3b950c1d6cae94bc7aa290d800c2c934e6eeae7da45e4b494 SHA512 30377867ef8455f339789c5fa26d5ab1381dacef714508d89b99ce57aa0a4d233c0a7b0c796d3001fc0f4c4cac01dc1c37cffefad59df0d9443125033b4e8f33 WHIRLPOOL 0b27c21e13303db1da6fdf2961e42bfa43cf1b01bfb249e150a52d6669a9cc3bf5d66d9ee31dff14eca434c659e2908a4dda2331aac5748a66dbb8beecb9be11
+DIST vbox-kernel-module-src-4.2.6.tar.xz 492632 SHA256 bc0ea714a253834b42094322b9f8afcbbe6ea4aa4b4097eba0311b76d526a11a SHA512 04e9f0fa1541564097fb9760f3310a0b3c730dc43c515d0444c5baecd01d52c9fc952b76793369e7ee1835b8034d0cf5066bd2564107dcb4df34a4dcad40ae1d WHIRLPOOL b1ec4527543f88c678a1d9ab3c8e35478c6db3b2ab7871d61c0e4c078d89fb63f7bbe3bb013727cce2affd2b7309dbb45de4e221fe2265dfdf7c229254821247
diff --git a/app-emulation/virtualbox-modules/files/create_vbox_modules_tarball.sh b/app-emulation/virtualbox-modules/files/create_vbox_modules_tarball.sh
new file mode 100755
index 000000000000..9bbc920616c0
--- /dev/null
+++ b/app-emulation/virtualbox-modules/files/create_vbox_modules_tarball.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Create a virtualbox modules tarball from a VirtualBox binary package.
+# We cannot download the package by this script because of the unpredictable 
+# build number being in the filename.
+# 
+# usage: create_vbox_modules_tarball.sh VirtualBox-4.1.18-78361-Linux_amd64.run
+
+[ -f "$1" ] || exit 1
+
+VBOX_PACKAGE="$1"
+
+VBOX_VER="$(echo ${VBOX_PACKAGE} | sed 's@.*VirtualBox-\([[:digit:]\.]\+\).*@\1@')"
+
+sh ${VBOX_PACKAGE} --noexec --keep --nox11 || exit 2
+cd install || exit 3
+tar -xaf VirtualBox.tar.bz2 || exit 4
+cd src/vboxhost || exit 5
+tar -cvJf ../../../vbox-kernel-module-src-${VBOX_VER}.tar.xz . || exit 6
+cd ../../.. && rm install -rf
+
+exit 0
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.24.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.24.ebuild
new file mode 100644
index 000000000000..2654208c1332
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.24.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.24.ebuild,v 1.1 2012/12/22 12:24:43 polynomial-c Exp $
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from virtualbox-bin
+
+EAPI=4
+
+inherit eutils linux-mod user
+
+MY_P=vbox-kernel-module-src-${PV}
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S=${WORKDIR}
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+	enewgroup vboxusers
+}
+
+src_prepare() {
+	if kernel_is -ge 2 6 33 ; then
+		# evil patch for new kernels - header moved
+		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
+	fi
+
+	if use pax_kernel && kernel_is -ge 3 0 0 ; then
+		epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	elog "Starting with the 3.x release new kernel modules were added,"
+	elog "be sure to load all the needed modules."
+	elog ""
+	elog "Please add \"vboxdrv\", \"vboxnetflt\" and \"vboxnetadp\" to:"
+	elog "/etc/conf.d/modules"
+}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.2.2.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.2.6.ebuild
similarity index 94%
rename from app-emulation/virtualbox-modules/virtualbox-modules-4.2.2.ebuild
rename to app-emulation/virtualbox-modules/virtualbox-modules-4.2.6.ebuild
index 27ada1912006..3c0c4e55db4e 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.2.2.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.2.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/app-emulation/virtualbox-modules/virtualbox-modules-4.2.2.ebuild,v 1.1 2012/10/24 04:44:17 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.2.6.ebuild,v 1.1 2012/12/22 12:24:43 polynomial-c Exp $
 
 # XXX: the tarball here is just the kernel modules split out of the binary
 #      package that comes from virtualbox-bin
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 807f2bbc09a8..be75606c16dd 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,8 +1,7 @@
 DIST VirtualBox-4.1.22.tar.bz2 73385514 SHA256 7abb506203dd0d69b4b408fd999b5b9a479a9adce5f80e9b5569641c053dd153 SHA512 1bc2e33f6ce1ab417887241ee95bc3042b5c6072b3babc221c349b36b923f0655e776e98468cc63f65662e5ae3819c974bc8b5c97bae531a2c4a0ebb1c1ebba6 WHIRLPOOL e52ee58fdf1b3d1e1323cb26df1791dbc4c9375061467191a73f12071ac99a5c2791ddb65eeff9af5a645ba39fe88d4f7bc4362c919c9c14ba10a99d1b6c3776
-DIST VirtualBox-4.2.2.tar.bz2 75655741 SHA256 943daa13694605d5d0a23ffef27c398b5e72ada669de89bad4b98f000f029700 SHA512 d6a85175e15d3dc49aab825aeb9aa4fb9b2640e6bb3c65dfeaaf492fe8589abe70ad5dbf8ed07d502f337c243b469a7da35d4bf23bb26f5ad3b0ee0a06a51a10 WHIRLPOOL ad45932ca5ea7e990af975a1c3823d58cc9b180a9f1e0c23576e1c6fb2aead39cdd2d0303b830f334d811c1f4b6b8b585d243a177253f13b53735303ae247c33
+DIST VirtualBox-4.1.24.tar.bz2 74612732 SHA256 74008b8e8942045668c1b7d06b0a4bb5fe8464066e343e3a2e1ba30b94ce8a7f SHA512 b4967621f848ff50d23e5f1afa63c2109cd10a602e6c742966ae7eef882417808cdc93edad67f55a0005fe3e4905034b08a1d21dcf242a9cc1e653ebef459174 WHIRLPOOL 0544cd637bfcc6cf7a502aa6fe27cb697ba4d570400ee2f7055406fca6deaed1b4b31e80de8e7d09a15152bfabe311d56a4ff256ae8f8f2940aa842c1701f941
 DIST VirtualBox-4.2.4.tar.bz2 75625513 SHA256 a7c607523c1c10b7b978ab39a92bb646517316548aa4a1a74b6e434ac2bf0adc SHA512 8238afd440e20842de27c8c68296c88bd18f561a45497ee97364d5720d73a9fe99eba9af3ad851d89e02540e304bcc3f48847704207ce2c8cdced8fa10dc4aa6 WHIRLPOOL 875184cc836ab65a368d1d9fea6eaed7deeea782d9d149a8f568ec372e190730e92ca13858fff51089bf0632136200909c49cf5ba1b9b5bb0fec3ec69293bade
-DIST VirtualBox_fa_IR.ts 424578 SHA256 4934fa27a2be76ee432a333b29a4ed8c0106821b88fc7057d3806270fed40b5c SHA512 fafb5e87c71bd22605ee4d11e8c9710a3f40adaf9a6dd2a530d3b0d1525fd36f3f18dfa5b50423f01bab0f49782b761934078ea9fcedebbfc0574c5b9c39beb6 WHIRLPOOL 63b258de9cc1411fdda7d8d991f55f767b187280752bc1379101c7541c19bac07ab64201c696357a6d2bbdfa00f1b5b785fc81380df4dfdd92f300d5eff89355
-DIST qt_fa_IR.ts 191494 SHA256 b2651c0329e53d3eecc78923905b9a7b68e3121b7b04fa3fd86499c940a5eb43 SHA512 3c6fdf2dac487bf72d4d85364e02c98f8366cecb85f46872aae689e02a83a22c99078c0296811e3f680275a10c8f30ba58ce52cc6d452d0b2d9b515163883aa7 WHIRLPOOL 50e8d14769f1659e9da51884f2475683ad6470a4b82d2a6f900f00e5e2643e11dfcb5b27f6188c75f25b51d8201da987b276f89eb1299ef7ac5c26cdfd97940c
+DIST VirtualBox-4.2.6.tar.bz2 76291326 SHA256 54526091bc2aa66b88ca878dd9ecc4466f96d607db2f6678a9d673ecf6646ae3 SHA512 b8b35f7777cc1386cb61720619a8df1b7adbc573da0bfa1e364887dd8680012ecabc57d7dd5848943be5e676430a66ae6d0ddf1654299891d89b82dadea3b78f WHIRLPOOL 1e95c4d1136e0c2e7740cb443a4effecf0b018a6c1492d13e61d81ae0a74f35d5f9b0adf89f52c0e36794512c6c001e01f775755c9a182581d0c36874b401be6
 DIST virtualbox-4.1.22-patches-01.tar.xz 3752 SHA256 2ff58f8d2bdfdcbf1ae4bbe9f68ad1256f1ae37091fd4b392582a062d206962f SHA512 9bba2a4352d52cddd27f55b4ad0e9de250c1d29359a8859f61fc413e53ac62206321c5e347391ca478b942967bd7974a3a469eb3bb133c79d7033692afe559dd WHIRLPOOL 1aa98913e7d4e1ddf5f775db200cddc18a7ed4d7dd915dda0dab6bffbf33bfd63a785cc7381bca74e4780e7dce21f18314dc093b9c6ba02addfd1330f3b61aa9
-DIST virtualbox-4.2.2-patches-01.tar.xz 3612 SHA256 5b844b3740bebfa0e7652cb6c5c89d94a333c7aa0873aa8a0aa653f7c9f3c06b SHA512 d12da10898c5bd440b6fd2211385bc223ff832fdce11b118cc56562903c8c87abcb1eeec3bbc2d4b5b22b1aa4a652e978277af7096a65276469be9e704a1aa69 WHIRLPOOL 58d43f0d2eeb30800b285c307871be64765301f7037d72752eb063286589fcccd12e6d8fd26610164701178fd497ca65127e91eb8f8d53db0889ccd7d7b988a9
 DIST virtualbox-4.2.4-patches-01.tar.xz 5388 SHA256 f69935ee8014af2d0badec799d2a9c3dea7db54bffeab00ac372cffe1ee84000 SHA512 6f339771e3fe3260ccabb3692999260cce71b30230a13bf637b11d08fe0ef5adca10402655a4b9ad44d8e89cc2621f8a491fdbb0bba9fe152719dc9176c2824d WHIRLPOOL 36ae0888cf9cdec4e85d5cd99d4741c58bfc7fbe024776f7ece4fa62d96b42053818b672bba56ea0ea4c6e24b1023b9f45510813287399282e506f73f0cc1c20
+DIST virtualbox-4.2.6-patches-01.tar.xz 3908 SHA256 0e548fc49e2367fcc04837670d145a4ae21221d06f028c6858db28f888edc100 SHA512 b542a81a2330db86fb8a890d4fc333d43e0f8b6e3bb2f1a6ec54dcc3a180d2a2395216324f30972f3997b2e42f2db8ba76f0bde3e8ac8796722d8dce53bbd359 WHIRLPOOL 17f5dbedea69d54c41614be86047ee557ec17dd9aea90aab635dc2d69ddb82ac40f11d77d127adb45563bfe463b1262cf3c669923e468ba78bff5c6df62a89df
diff --git a/app-emulation/virtualbox/virtualbox-4.1.24.ebuild b/app-emulation/virtualbox/virtualbox-4.1.24.ebuild
new file mode 100644
index 000000000000..86a8e9b6a257
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-4.1.24.ebuild
@@ -0,0 +1,381 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.24.ebuild,v 1.1 2012/12/22 12:26:56 polynomial-c Exp $
+
+EAPI=4
+
+inherit eutils fdo-mime flag-o-matic linux-info multilib pax-utils python qt4-r2 toolchain-funcs java-pkg-opt-2 udev
+
+if [[ ${PV} == "9999" ]] ; then
+	# XXX: should finish merging the -9999 ebuild into this one ...
+	ESVN_REPO_URI="http://www.virtualbox.org/svn/vbox/trunk"
+	inherit linux-mod subversion
+else
+	MY_P=VirtualBox-${PV}
+	SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-4.1.22-patches-01.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	dev-libs/openssl
+	dev-libs/libxml2
+	sys-libs/zlib
+	!headless? (
+		qt4? (
+			x11-libs/qt-gui:4
+			x11-libs/qt-core:4
+			opengl? ( x11-libs/qt-opengl:4 )
+			x11-libs/libXinerama
+		)
+		opengl? ( virtual/opengl media-libs/freeglut )
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		media-libs/libsdl[X,video]
+	)
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+	java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) )"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.999
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-devel/dev86
+	sys-power/iasl
+	media-libs/libpng
+	pam? ( sys-libs/pam )
+	sys-libs/libcap
+	doc? (
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	java? ( || ( virtual/jdk:1.7 virtual/jdk:1.6 ) )
+	virtual/pkgconfig
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	!headless? ( x11-libs/libXinerama )
+	pulseaudio? ( media-sound/pulseaudio )
+	vboxwebsrv? ( >=net-libs/gsoap-2.7.13 )"
+PDEPEND="additions? ( ~app-emulation/virtualbox-additions-${PV} )
+	extensions? ( ~app-emulation/virtualbox-extpack-oracle-${PV} )"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+	usr/lib/virtualbox/VBoxSDL.so
+	usr/lib/virtualbox/VBoxSharedFolders.so
+	usr/lib/virtualbox/VBoxDD2.so
+	usr/lib/virtualbox/VBoxOGLrenderspu.so
+	usr/lib/virtualbox/VBoxPython.so
+	usr/lib/virtualbox/VBoxDD.so
+	usr/lib/virtualbox/VBoxDDU.so
+	usr/lib/virtualbox/VBoxREM64.so
+	usr/lib/virtualbox/VBoxSharedClipboard.so
+	usr/lib/virtualbox/VBoxHeadless.so
+	usr/lib/virtualbox/VBoxRT.so
+	usr/lib/virtualbox/VBoxREM.so
+	usr/lib/virtualbox/VBoxSettings.so
+	usr/lib/virtualbox/VBoxKeyboard.so
+	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+	usr/lib/virtualbox/VBoxVMM.so
+	usr/lib/virtualbox/VirtualBox.so
+	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+	usr/lib/virtualbox/components/VBoxC.so
+	usr/lib/virtualbox/components/VBoxSVCM.so
+	usr/lib/virtualbox/components/VBoxDDU.so
+	usr/lib/virtualbox/components/VBoxRT.so
+	usr/lib/virtualbox/components/VBoxREM.so
+	usr/lib/virtualbox/components/VBoxVMM.so
+	usr/lib/virtualbox/VBoxREM32.so
+	usr/lib/virtualbox/VBoxPython2_4.so
+	usr/lib/virtualbox/VBoxPython2_5.so
+	usr/lib/virtualbox/VBoxPython2_6.so
+	usr/lib/virtualbox/VBoxPython2_7.so
+	usr/lib/virtualbox/VBoxXPCOMC.so
+	usr/lib/virtualbox/VBoxOGLhostcrutil.so
+	usr/lib/virtualbox/VBoxNetDHCP.so"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+"
+
+pkg_setup() {
+	if ! use headless && ! use qt4 ; then
+		einfo "No USE=\"qt4\" selected, this build will not include"
+		einfo "any Qt frontend."
+	elif use headless && use qt4 ; then
+		einfo "You selected USE=\"headless qt4\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	java-pkg-opt-2_pkg_setup
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -rf kBuild/bin tools
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-4-localconfig > LocalConfig.kmk || die
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		elog "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	if ! gcc-specs-pie ; then
+		EPATCH_EXCLUDE="050_${PN}-4.1.20-nopie.patch"
+	fi
+
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"/patches
+}
+
+src_configure() {
+	local myconf
+	use alsa       || myconf+=" --disable-alsa"
+	use opengl     || myconf+=" --disable-opengl"
+	use pulseaudio || myconf+=" --disable-pulse"
+	use python     || myconf+=" --disable-python"
+	use java       || myconf+=" --disable-java"
+	use vboxwebsrv && myconf+=" --enable-webservice"
+	use vnc        && myconf+=" --enable-vnc"
+	use doc        || myconf+=" --disable-docs"
+	if ! use headless ; then
+		use qt4 || myconf+=" --disable-qt4"
+	else
+		myconf+=" --build-headless --disable-opengl"
+	fi
+	# not an autoconf script
+	./configure \
+		--with-gcc="$(tc-getCC)" \
+		--with-g++="$(tc-getCXX)" \
+		--disable-kmods \
+		--disable-dbus \
+		${myconf} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	source ./env.sh
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	# and strip all flags
+	# strip-flags
+
+	MAKE="kmk" emake \
+		VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'_Gentoo_ \
+		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+		VBOX_GCC_OPT="${CXXFLAGS}" \
+		TOOL_YASM_AS=yasm KBUILD_PATH="${S}/kBuild" \
+		all || die "kmk failed"
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/release/bin || die
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the right libdir
+	sed -i \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Symlink binaries to the shipped wrapper
+	exeinto /usr/$(get_libdir)/${PN}
+	newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox" || die
+	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
+	fperms 0750 /usr/$(get_libdir)/${PN}/VBox
+
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
+	dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
+
+	# Install binaries and libraries
+	insinto /usr/$(get_libdir)/${PN}
+	doins -r components || die
+
+	if use sdk ; then
+		doins -r sdk || die
+	fi
+
+	if use vboxwebsrv ; then
+		doins vboxwebsrv || die
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
+		fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
+		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,ExtPackHelperApp} *so *r0 *gc ; do
+		doins $each || die
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
+	done
+	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetAdpCtl
+	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetDHCP
+
+	# VBoxSVC needs to be pax-marked (bug #403453)
+	pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxSVC || die
+
+	if ! use headless ; then
+		for each in VBox{SDL,Headless} ; do
+			doins $each || die
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+			fperms 4750 /usr/$(get_libdir)/${PN}/${each}
+			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
+		done
+
+		if use opengl && use qt4 ; then
+			doins VBoxTestOGL || die
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
+			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
+		fi
+
+		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
+
+		if use qt4 ; then
+			doins VirtualBox || die
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
+			fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
+			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox
+
+			dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
+
+			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Resources/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		popd &>/dev/null || die
+	else
+		doins VBoxHeadless || die
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
+		fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
+		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
+	fi
+
+	insinto /usr/$(get_libdir)/${PN}
+	# Install EFI Firmware files (bug #320757)
+	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
+	for fwfile in VBoxEFI{32,64}.fd ; do
+		doins ${fwfile} || die
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile} || die
+	done
+	popd &>/dev/null || die
+
+	# New way of handling USB device nodes for VBox (bug #356215)
+	local udevdir="$(udev_get_udevdir)"
+	insinto ${udevdir}
+	doins VBoxCreateUSBNode.sh
+	fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+	insinto ${udevdir}/rules.d
+	doins "${FILESDIR}"/10-virtualbox.rules
+	sed "s@%UDEVDIR%@${udevdir}@" \
+		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+
+	insinto /usr/share/${PN}
+	if ! use headless && use qt4 ; then
+		doins -r nls
+	fi
+
+	# VRDPAuth only works with this (bug #351949)
+	dosym VBoxAuth.so  /usr/$(get_libdir)/${PN}/VRDPAuth.so
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if use java ; then
+		java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+		java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
+
+	if ! use headless && use qt4 ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\"."
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "IMPORTANT!"
+	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
+	elog "\"env-update\" as root and logout and relogin as the user you wish"
+	elog "to run ${PN} as."
+	elog ""
+	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
+	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	elog "package."
+	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/virtualbox/virtualbox-4.2.2-r1.ebuild b/app-emulation/virtualbox/virtualbox-4.2.6.ebuild
similarity index 97%
rename from app-emulation/virtualbox/virtualbox-4.2.2-r1.ebuild
rename to app-emulation/virtualbox/virtualbox-4.2.6.ebuild
index e477cf26df74..6c3ec694728c 100644
--- a/app-emulation/virtualbox/virtualbox-4.2.2-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.2.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/app-emulation/virtualbox/virtualbox-4.2.2-r1.ebuild,v 1.3 2012/12/02 22:48:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.6.ebuild,v 1.1 2012/12/22 12:26:56 polynomial-c Exp $
 
 EAPI=4
 
@@ -21,9 +21,7 @@ fi
 DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
 HOMEPAGE="http://www.virtualbox.org/"
 SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.2.2-patches-01.tar.xz
-	http://dev.gentoo.org/~patrick/qt_fa_IR.ts
-	http://dev.gentoo.org/~patrick/VirtualBox_fa_IR.ts"
+	http://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.2.6-patches-01.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -173,11 +171,6 @@ src_prepare() {
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}/patches"
-
-	# missing files in 4.2.2 tarball
-	cp "${DISTDIR}"/{qt_fa_IR.ts,VirtualBox_fa_IR.ts} \
-		"${S}"/src/VBox/Frontends/VirtualBox/nls/ \
-			|| die "Failed to add missing files"
 }
 
 src_configure() {
@@ -201,6 +194,7 @@ src_configure() {
 		--with-g++="$(tc-getCXX)" \
 		--disable-kmods \
 		--disable-dbus \
+		--disable-devmapper \
 		${myconf} \
 		|| die "configure failed"
 }
diff --git a/app-emulation/vmware-modules/vmware-modules-271.1-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-271.1-r1.ebuild
index eadb6d7b785d..9cb866b869a4 100644
--- a/app-emulation/vmware-modules/vmware-modules-271.1-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-271.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/app-emulation/vmware-modules/vmware-modules-271.1-r1.ebuild,v 1.1 2012/12/16 14:19:07 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-271.1-r1.ebuild,v 1.2 2012/12/22 11:53:25 vadimk Exp $
 
 EAPI="4"
 
@@ -64,7 +64,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
 	use pax_kernel && epatch "${FILESDIR}/hardened.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
-	kernel_is 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
+	kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
 }
 
 src_install() {
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 05b8168c8b27..3d6defe2eb91 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -15,6 +15,7 @@ DIST wine-1.5.17.tar.bz2 20953751 SHA256 b15b4cbfab4b7f3d4cf80f88ea757e221feaefb
 DIST wine-1.5.18.tar.bz2 21043105 SHA256 a144900cc20e55623c8c9ab26e265eb2e76d88c9e21bd21a3bcfa030fdb3fbdf SHA512 35650828d0565669db6017f673319e9228eecb51a53afa64f6ea62546f35eb0aac6991d58f8dca26c49158befa17c1fa433613ef3ece745f14115600993c8e2e WHIRLPOOL a5fd90455ae6de41bee31f68554196c08f357012282557d8997a3e75ebe32764d03c291cc957ca04d4c4d2e8cdfe93aa03ab74bce963649ecda793ac385ff4d8
 DIST wine-1.5.19.tar.bz2 21013509 SHA256 51ad795ae62d8392ac6fbc3ad595ac57d44bcc779b716573a9d73ca122961023 SHA512 aefc05cb0ce6b41a7a70861fd85c5f5d30501f61923620837f3a8124b039e1eedaea75d261116b26770b64a21b27a4ee13133a07a36157bebd2cbeddd110de27 WHIRLPOOL 3ca550f2b0fb9d6b096f025e9f94b88648386c04d3a82350802fcd05d6b0604d6fe6aa4f6e68876abe523e60a8906438148613d4bdd8e7badd3a251d3c0e60e5
 DIST wine-1.5.2.tar.bz2 20104652 SHA256 8ee6fdaf716b5a1c7ccf9be9dc6d9b7546944e79351c4806b2fa596da418342f SHA512 da949f1943a1af1f4f9d75d41d35b5a968b4bb792f25c5d3202de5be944a04deac7116261d70b5b90f233e9fb526ae8d073e2cdd03304ac0f736926108fec7d7 WHIRLPOOL 947bff2ccda47e548e6eec4a1b7cc738b943fbbdf000e5686aa440c9d45962b5dee47e7060e93895cc398c2c82d7dce06c370091859bd46a6d09864c191d357c
+DIST wine-1.5.20.tar.bz2 21012282 SHA256 75e3073a62a933af5beaa8e8591298325edb57f255ca5b0de55a0f29a4ba2430 SHA512 25de10f4e3f94d79391e61bdadf00af0e6f191b064f61948911d0de4b1c71ab3a727510b7ec4a52882aed0c59e75bb0cd3fb46a0a4da3dc3707045a3af517754 WHIRLPOOL f85ed944dce117761b6509f090161e9d071027571c87675c03f0f78fb29679bf4d4fb382038c5512588e346f8a242ae4a66fa32992a3bacd48af63417158efe2
 DIST wine-1.5.3.tar.bz2 20171697 SHA256 d3e8e484cbc2c4888bc880d0b0c8b52299d36a5cecc96d9367b59142345a1206 SHA512 947c20100d02ec6d393f9bdc1899ddeda21be7fa75869f91953e0eec30f2083b2a7fd31ad92c44765b417e3023914db9cc9945fd241207d8189f20ae92da100a WHIRLPOOL a2e2752731feae4d2a44dd0db1edabadd8c7530abd6e988e5c8f862ba70e234874e1a21ad8a25f4dc68e965d4b5122431278b3ed7674145f7fa935e0c78dcca5
 DIST wine-1.5.4.tar.bz2 20187597 SHA256 90b10450b1afb4d54dfd20529e040daa4ee901c52b2f3bc452a86c2e06b4b759 SHA512 cb58358a2af9e15d7ebff21f9f834d521736eeaa44ce0c36d88400f3d3667c5432711bea64322e77c166e024d2ea03d47f64a4fd648d0a802bc44da80e1eb2fe WHIRLPOOL e007bc572181745c585bf24c6aa6a87830df17b57384d180e932b229f89b55d38f2b673243e8b5a5243afb303a18c52092bfbe61f0b49473c7c85edb0056a068
 DIST wine-1.5.5.tar.bz2 20158084 SHA256 e7d5ba716d2ac47193fa31eff66cc179145ddcb453c6923eaea70596a82b084e SHA512 f9d080cf3e17b73658222b95e15c353d40963aaaa9cbb4b6293ea69709e68715a97e89854c336288ba6a0a41cb0fc9e2713721705935835e4c9f53fa5b7a3e74 WHIRLPOOL 9f44bf75854410c142f94fe12e028ab120521ffd5b9de682c3eeb6690a35c8b4f5be2eecfd6e02e2bc28594f1524e2b6604035744d6b56a9c3d16d5c0cdc6d5d
@@ -47,3 +48,4 @@ DIST winepulse-patches-1.5.16.tar.bz2 48482 SHA256 a186bb6bc07c11f03989c24159ffc
 DIST winepulse-patches-1.5.17.tar.bz2 48079 SHA256 8f82d47534c57e85db6502fdde394a4a44ab5f285250cc41439f2125e47f96f7 SHA512 150b9329e3382f3d08b33a8165e9738f23dab7ab942a931441c73d952449af6d7c33fc41b8f519e090706aa003accb1799b3cdeeebc8b9de3fea0c86cd1056cd WHIRLPOOL 9b9243ff47d9a713c4d40fe723e5c208c73d4ea0f208607422e34fcb679392a251050243ab818392065910729c550755a52625e50927e2660e892e36925f65ff
 DIST winepulse-patches-1.5.18.tar.bz2 45298 SHA256 803a3ef5c9223dbb3ded3a20309456efdf8dd2b3e3ac9c909f3de95e7a96f40e SHA512 ca8b90cfb1c5bab214c1d1afed6f50da3663f0de64c22b44b31e68e49059c92ab7226f2d94ca6a4079b763f4d2af21b1be7b5c0bbf877492c99c5c43c3961dcc WHIRLPOOL b4e6842e2ee025919213fa18746154ee398452c675d55cb736319def4d4a10e9b0589478ccb66c2e0fca5ad00fc0c54074ede38c962e7da67ed04d8106d41a0a
 DIST winepulse-patches-1.5.19.tar.bz2 47081 SHA256 7fc8e5964bcd4cdd8f14b6a5d6d66d474b958084fd80fb0f0531b08eb7fdfc2a SHA512 54b593ce75ce1ecc8015c85e7de713ddea1331a2701a1ec81fab88dce90f41470469f05b4f2d924da824fc99b1b9c52ed6795158291d7e8f15b5b3c4341cb13f WHIRLPOOL 56b1506b0ffc60a052c923334d21e111707443caf138ba05c6708e4d652a5c7ee2d22d8a82862b1a87a12b49dc1c9bdd8d89000f529ddd8f06685ebbc03dd7f4
+DIST winepulse-patches-1.5.20_pre20121207.tar.bz2 47206 SHA256 7ce845841d1c53f5d2bee3e09e901598321362f8cabc32ff7012c24e366a47e6 SHA512 e0b575231b19c2231ec9648d9e128a2439c672221d579fa40adbe49218db0e98b548f562151cdcbe75a6f018ff9a1c57dbd048de2374ad0cb5748fc3da8060b7 WHIRLPOOL b5511237bac951b39c1fc707348593adc8e5c5b0bf0543e4714cab3e153b2a653fa7ce809097d8dd376cad6c20b1d5b5a9c06d655e0a28c5e035ae5eec761803
diff --git a/app-emulation/wine/wine-1.5.20.ebuild b/app-emulation/wine/wine-1.5.20.ebuild
new file mode 100644
index 000000000000..17d65233a887
--- /dev/null
+++ b/app-emulation/wine/wine-1.5.20.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.20.ebuild,v 1.2 2012/12/22 06:22:23 tetromino Exp $
+
+EAPI="5"
+
+inherit autotools eutils flag-o-matic gnome2-utils multilib pax-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
+	inherit git-2
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MY_P="${PN}-${PV/_/-}"
+	SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	S=${WORKDIR}/${MY_P}
+fi
+
+GV="1.8"
+MV="0.0.8"
+PULSE_PATCHES="winepulse-patches-1.5.20_pre20121207"
+WINE_GENTOO="wine-gentoo-2012.11.24"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	gecko? (
+		mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi
+		win64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+	)
+	mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
+	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2
+	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png pulseaudio samba scanner selinux ssl test +threads +truetype udisks vanilla v4l +win32 +win64 +X xcomposite xinerama xml"
+REQUIRED_USE="elibc_glibc? ( threads )
+	mono? ( || ( win32 !win64 ) )
+	osmesa? ( opengl )
+	vanilla? ( !pulseaudio )" #286560
+RESTRICT="test" #72375
+
+MLIB_DEPS="amd64? (
+	truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
+	X? (
+		>=app-emulation/emul-linux-x86-xlibs-2.1
+		>=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?]
+	)
+	mp3? ( app-emulation/emul-linux-x86-soundlibs )
+	odbc? ( app-emulation/emul-linux-x86-db )
+	openal? ( app-emulation/emul-linux-x86-sdl )
+	opengl? ( app-emulation/emul-linux-x86-opengl )
+	osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 )
+	scanner? ( app-emulation/emul-linux-x86-medialibs )
+	v4l? ( app-emulation/emul-linux-x86-medialibs )
+	app-emulation/emul-linux-x86-baselibs
+	>=sys-kernel/linux-headers-2.6
+	)"
+RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
+	perl? ( dev-lang/perl dev-perl/XML-Simple )
+	capi? ( net-dialup/capi4k-utils )
+	ncurses? ( >=sys-libs/ncurses-5.2 )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
+	udisks? (
+		sys-apps/dbus
+		sys-fs/udisks:2
+	)
+	gnutls? ( net-libs/gnutls:= )
+	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+	)
+	xinerama? ( x11-libs/libXinerama )
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups:= )
+	opencl? ( virtual/opencl )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
+	mp3? ( >=media-sound/mpg123-1.5.0 )
+	nls? ( sys-devel/gettext )
+	odbc? ( dev-db/unixODBC:= )
+	osmesa? ( media-libs/mesa[osmesa] )
+	pulseaudio? (
+		media-sound/pulseaudio
+		sys-auth/rtkit
+	)
+	samba? ( >=net-fs/samba-3.0.25 )
+	selinux? ( sec-policy/selinux-wine )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
+	v4l? ( media-libs/libv4l )
+	!win64? ( ${MLIB_DEPS} )
+	win32? ( ${MLIB_DEPS} )
+	xcomposite? ( x11-libs/libXcomposite )"
+DEPEND="${RDEPEND}
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	xinerama? ( x11-proto/xineramaproto )
+	!hardened? ( sys-devel/prelink )
+	virtual/pkgconfig
+	virtual/yacc
+	sys-devel/flex"
+
+src_unpack() {
+	if use win64 ; then
+		[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
+			&& die "you need gcc-4.4+ to build 64bit wine"
+	fi
+
+	if use win32 && use opencl; then
+		[[ x$(eselect opencl show) = "xintel" ]] &&
+			die "Cannot build wine[opencl,win32]: intel-ocl-sdk is 64-bit only" # 403947
+	fi
+
+	if [[ ${PV} == "9999" ]] ; then
+		git-2_src_unpack
+	else
+		unpack ${MY_P}.tar.bz2
+	fi
+
+	unpack "${PULSE_PATCHES}.tar.bz2"
+	unpack "${WINE_GENTOO}.tar.bz2"
+}
+
+src_prepare() {
+	local md5="$(md5sum server/protocol.def)"
+	# keep these even if USE=vanilla: they are needed to build
+	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+	epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
+	epatch "${FILESDIR}"/${PN}-1.5.17-osmesa-check.patch #429386
+	use vanilla || epatch "../${PULSE_PATCHES}"/*.patch #421365
+	epatch_user #282735
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	eautoreconf
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	use vanilla || sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+}
+
+do_configure() {
+	local builddir="${WORKDIR}/wine$1"
+	mkdir -p "${builddir}"
+	pushd "${builddir}" >/dev/null
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--sysconfdir=/etc/wine \
+		$(use_with alsa) \
+		$(use_with capi) \
+		$(use_with lcms cms) \
+		$(use_with cups) \
+		$(use_with ncurses curses) \
+		$(use_with udisks dbus) \
+		$(use_with fontconfig) \
+		$(use_with gnutls) \
+		$(use_with gphoto2 gphoto) \
+		$(use_with gsm) \
+		$(use_with gstreamer) \
+		--without-hal \
+		$(use_with jpeg) \
+		$(use_with ldap) \
+		$(use_with mp3 mpg123) \
+		$(use_with nls gettext) \
+		$(use_with openal) \
+		$(use_with opencl) \
+		$(use_with opengl) \
+		$(use_with ssl openssl) \
+		$(use_with osmesa) \
+		$(use_with oss) \
+		$(use_with png) \
+		$(use_with threads pthread) \
+		$(usex vanilla "" $(use_with pulseaudio pulse)) \
+		$(use_with scanner sane) \
+		$(use_enable test tests) \
+		$(use_with truetype freetype) \
+		$(use_with v4l) \
+		$(use_with X x) \
+		$(use_with xcomposite) \
+		$(use_with xinerama) \
+		$(use_with xml) \
+		$(use_with xml xslt) \
+		$2
+
+	emake -j1 depend
+
+	popd >/dev/null
+}
+
+src_configure() {
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	if use win64 ; then
+		do_configure 64 --enable-win64
+		use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
+	else
+		ABI=x86 do_configure 32 --disable-win64
+	fi
+}
+
+src_compile() {
+	local b
+	for b in 64 32 ; do
+		local builddir="${WORKDIR}/wine${b}"
+		[[ -d ${builddir} ]] || continue
+		emake -C "${builddir}" all
+	done
+}
+
+src_install() {
+	local b
+	for b in 64 32 ; do
+		local builddir="${WORKDIR}/wine${b}"
+		[[ -d ${builddir} ]] || continue
+		emake -C "${builddir}" install DESTDIR="${D}"
+	done
+	emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
+	dodoc ANNOUNCE AUTHORS README
+	if use gecko ; then
+		insinto /usr/share/wine/gecko
+		doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
+		use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+	fi
+	if use mono ; then
+		insinto /usr/share/wine/mono
+		doins "${DISTDIR}"/wine-mono-${MV}.msi
+	fi
+	if ! use perl ; then
+		rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
+	fi
+
+	if use win32 || ! use win64; then
+		pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
+	fi
+	use win64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
+
+	if use win64 && ! use win32; then
+		dosym /usr/bin/wine{64,} # 404331
+		dosym /usr/bin/wine{64,}-preloader
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 5954d1870b38..5c95516a8431 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.123 2012/12/08 05:11:36 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.125 2012/12/22 06:22:23 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit autotools eutils flag-o-matic gnome2-utils multilib pax-utils
 
@@ -20,7 +20,7 @@ fi
 
 GV="1.8"
 MV="0.0.8"
-PULSE_PATCHES="winepulse-patches-1.5.19"
+PULSE_PATCHES="winepulse-patches-1.5.20_pre20121207"
 WINE_GENTOO="wine-gentoo-2012.11.24"
 DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
@@ -35,10 +35,11 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png pulseaudio samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
+IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png pulseaudio samba scanner selinux ssl test +threads +truetype udisks vanilla v4l +win32 +win64 +X xcomposite xinerama xml"
 REQUIRED_USE="elibc_glibc? ( threads )
 	mono? ( || ( win32 !win64 ) )
-	osmesa? ( opengl )" #286560
+	osmesa? ( opengl )
+	vanilla? ( !pulseaudio )" #286560
 RESTRICT="test" #72375
 
 MLIB_DEPS="amd64? (
@@ -61,14 +62,14 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
 	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
 	udisks? (
 		sys-apps/dbus
 		sys-fs/udisks:2
 	)
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
 	X? (
 		x11-libs/libXcursor
@@ -80,19 +81,19 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	)
 	xinerama? ( x11-libs/libXinerama )
 	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
+	cups? ( net-print/cups:= )
 	opencl? ( virtual/opencl )
 	opengl? (
 		virtual/glu
 		virtual/opengl
 	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
+	odbc? ( dev-db/unixODBC:= )
 	osmesa? ( media-libs/mesa[osmesa] )
 	pulseaudio? (
 		media-sound/pulseaudio
@@ -101,9 +102,9 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
@@ -143,10 +144,11 @@ src_unpack() {
 
 src_prepare() {
 	local md5="$(md5sum server/protocol.def)"
+	# keep these even if USE=vanilla: they are needed to build
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
 	epatch "${FILESDIR}"/${PN}-1.5.17-osmesa-check.patch #429386
-	epatch "../${PULSE_PATCHES}"/*.patch #421365
+	use vanilla || epatch "../${PULSE_PATCHES}"/*.patch #421365
 	epatch_user #282735
 	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
 		einfo "server/protocol.def was patched; running tools/make_requests"
@@ -154,7 +156,7 @@ src_prepare() {
 	fi
 	eautoreconf
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+	use vanilla || sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 }
 
 do_configure() {
@@ -189,7 +191,7 @@ do_configure() {
 		$(use_with oss) \
 		$(use_with png) \
 		$(use_with threads pthread) \
-		$(use_with pulseaudio pulse) \
+		$(usex vanilla "" $(use_with pulseaudio pulse)) \
 		$(use_with scanner sane) \
 		$(use_enable test tests) \
 		$(use_with truetype freetype) \
diff --git a/app-i18n/ibus-chewing/Manifest b/app-i18n/ibus-chewing/Manifest
index bd23d74d1e56..a2b15e74d479 100644
--- a/app-i18n/ibus-chewing/Manifest
+++ b/app-i18n/ibus-chewing/Manifest
@@ -1,3 +1,4 @@
 DIST cmake-fedora-modules-only-latest.tar.gz 26660 SHA256 019b1d6727430e305996eb042410be83af9c780bcaf197501b16aca42ee68643 SHA512 cfde79db21ae7bc95b6437d227c243859b26f2dd1e7e8ad665a56d88d2dc0256d40a32309be982d72769413d51087f8547df15eeeb1170e09f4785dc3560c5eb WHIRLPOOL cac6892e322b218bf35820aa1782d966a0080addbd148da193e749284514b1a8b79c94136efa6ce06d96fe1fd823afe52c0aaadaf874645bb78a65612452376c
 DIST ibus-chewing-1.3.10-Source.tar.gz 75365 SHA256 171402a7d6d141d485454493e097746d73da7cef172d2ab5ec1a2c593a2ee1c8 SHA512 d9c326ef12a6e22cbfff5be1a0dd810e5c4be7ba426914ec832d50c9c2b54865fef020a3b81acad8d3a5d833365d78e4e7c53a751d4290214ae77280ba47737d WHIRLPOOL a2e35a3bd45b10ac3f09c46d4581e1c8f9450238651957c789fddd3c505b24b91806601593970db8da8b8553eb3cd673301d460b20f3a72902445a194f1ad714
 DIST ibus-chewing-1.4.2-Source.tar.gz 84351 SHA256 857f479ebd85ecc217550573f80e1bff91b6e9bca4d1c9189f790fa6a9e3f75f SHA512 7502abb553958bd6ea5a9bb8a9c600ee84f694aa2ff7d2c2733b74de088196f157f6023f26fe5307e3bec9dbb2c62cc46037355e2db9d90edb55feb89cb61d3c WHIRLPOOL dd90bb049d1d39c4bbc8f23fce5dbde2e923abc686715ea3ccd87fa6d8b57105c8b6d1dc0da89eb6ff48224386ce4a2bbdd0a53a4f1641bd04dc360b60fa6493
+DIST ibus-chewing-1.4.3-Source.tar.gz 84023 SHA256 3780fa780e8288934b35e4c321429ec6096273ebccff1511d801eb19398098af SHA512 b8aef1e39114bfd2a3440e1d04fa6ef355b30094abd86f696dcb523a39f122e01b0d07805c42cf786da99a614ed277c5c7fcc76eb6b28f308f8cceb81fb754ec WHIRLPOOL 1decbbf42db1b5aa507d340de13d7a64884ef65a8a528ae3789aac04ff353be981fc657ecc2b19832c2a4ba369aeccfc4e1de5644b82439bd386bc8029cef902
diff --git a/app-i18n/ibus-chewing/ibus-chewing-1.4.3.ebuild b/app-i18n/ibus-chewing/ibus-chewing-1.4.3.ebuild
new file mode 100644
index 000000000000..d15493c454f1
--- /dev/null
+++ b/app-i18n/ibus-chewing/ibus-chewing-1.4.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-chewing/ibus-chewing-1.4.3.ebuild,v 1.1 2012/12/22 10:11:06 naota Exp $
+
+EAPI=4
+inherit cmake-utils
+
+MY_P=${P}-Source
+
+DESCRIPTION="The Chewing IMEngine for IBus Framework"
+HOMEPAGE="http://code.google.com/p/ibus/"
+SRC_URI="http://ibus.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="x11-libs/libXtst
+	>=app-i18n/ibus-1.3
+	>=dev-libs/libchewing-0.3.3
+	x11-libs/gtk+:2
+	dev-util/gob:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+CMAKE_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.10-cflags.patch
+	)
+
+DOCS="AUTHORS ChangeLog ChangeLog.prev README RELEASE-NOTES.txt USER-GUIDE"
+
+src_configure() {
+	local mycmakeargs=(
+		-DPRJ_DOC_DIR=/usr/share/doc/${PF}
+		)
+
+	cmake-utils_src_configure
+}
diff --git a/app-misc/abook/abook-0.6.0_pre2.ebuild b/app-misc/abook/abook-0.6.0_pre2.ebuild
index bea9ea198479..174d21afba61 100644
--- a/app-misc/abook/abook-0.6.0_pre2.ebuild
+++ b/app-misc/abook/abook-0.6.0_pre2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/abook/abook-0.6.0_pre2.ebuild,v 1.1 2010/10/03 22:18:40 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/abook/abook-0.6.0_pre2.ebuild,v 1.4 2012/12/22 13:51:24 ago Exp $
 
 EAPI=3
 
@@ -13,10 +13,12 @@ SRC_URI="http://abook.sourceforge.net/devel/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls"
 
-RDEPEND="nls? ( virtual/libintl )"
+RDEPEND="sys-libs/ncurses
+	sys-libs/readline
+	nls? ( virtual/libintl )"
 DEPEND="nls? ( sys-devel/gettext )"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-misc/anki/anki-2.0.3-r1.ebuild b/app-misc/anki/anki-2.0.3-r1.ebuild
new file mode 100644
index 000000000000..7d78a25c4eff
--- /dev/null
+++ b/app-misc/anki/anki-2.0.3-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-2.0.3-r1.ebuild,v 1.1 2012/12/22 05:09:55 radhermit Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.6"
+PYTHON_USE_WITH="sqlite"
+
+inherit eutils python
+
+DESCRIPTION="A spaced-repetition memory training program (flash cards)"
+HOMEPAGE="http://ichi2.net/anki/"
+SRC_URI="http://ankisrs.net/download/mirror/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="latex +recording +sound"
+
+RDEPEND="dev-python/PyQt4[X,svg,webkit]
+	 >=dev-python/httplib2-0.7.4
+	 dev-python/beautifulsoup:python-2
+	 recording? ( media-sound/lame
+				  >=dev-python/pyaudio-0.2.4 )
+	 sound? ( media-video/mplayer )
+	 latex? ( app-text/texlive
+			  app-text/dvipng )"
+DEPEND=""
+
+pkg_setup(){
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-httplib2-0.7.7.patch
+	rm -r libanki/thirdparty || die
+	python_convert_shebangs -r 2 .
+}
+
+# Nothing to configure or compile
+src_configure() {
+	true;
+}
+
+src_compile() {
+	true;
+}
+
+src_install() {
+	exeinto /usr/bin/
+	doexe anki
+
+	doicon ${PN}.png
+	domenu anki.desktop
+
+	doman anki.1
+
+	dodoc README README.development README.translating
+	insinto "$(python_get_sitedir)"
+	doins -r aqt libanki/anki
+}
+
+pkg_preinst() {
+	if has_version "<app-misc/anki-2" ; then
+		elog "Anki 2 is a rewrite of Anki with many new features and"
+		elog "a new database format.  On the first run your decks are"
+		elog "converted to the new format and a backup of your Anki-1"
+		elog "decks is created.  Please read the following:"
+		elog "http://ankisrs.net/anki2.html"
+		elog "The mobile clients for Anki 2 are still under development."
+	fi
+}
diff --git a/app-misc/anki/files/anki-2.0.3-httplib2-0.7.7.patch b/app-misc/anki/files/anki-2.0.3-httplib2-0.7.7.patch
new file mode 100644
index 000000000000..8a77f250fb6f
--- /dev/null
+++ b/app-misc/anki/files/anki-2.0.3-httplib2-0.7.7.patch
@@ -0,0 +1,38 @@
+https://github.com/dae/anki/issues/1
+
+--- libanki/anki/sync.py
++++ libanki/anki/sync.py
+@@ -16,6 +16,15 @@
+ HTTP_TIMEOUT = 30
+ HTTP_PROXY = None
+ 
++try:
++    # httplib2 >=0.7.7
++    _proxy_info_from_environment = httplib2.proxy_info_from_environment
++    _proxy_info_from_url = httplib2.proxy_info_from_url
++except AttributeError:
++    # httplib2 <0.7.7
++    _proxy_info_from_environment = httplib2.ProxyInfo.from_environment
++    _proxy_info_from_url = httplib2.ProxyInfo.from_url
++
+ # Httplib2 connection object
+ ######################################################################
+ 
+@@ -42,7 +51,7 @@
+ def _setupProxy():
+     global HTTP_PROXY
+     # set in env?
+-    p = httplib2.ProxyInfo.from_environment()
++    p = _proxy_info_from_environment()
+     if not p:
+         # platform-specific fetch
+         url = None
+@@ -59,7 +68,7 @@
+             elif 'http' in r:
+                 url = r['http']
+         if url:
+-            p = httplib2.ProxyInfo.from_url(url, _proxyMethod(url))
++            p = _proxy_info_from_url(url, _proxyMethod(url))
+     HTTP_PROXY = p
+ 
+ def _proxyMethod(url):
diff --git a/app-misc/basenji/Manifest b/app-misc/basenji/Manifest
index 87da4cdac0f4..0f2b94c19d33 100644
--- a/app-misc/basenji/Manifest
+++ b/app-misc/basenji/Manifest
@@ -1,3 +1,4 @@
 DIST basenji-0.7.1.tar.gz 473336 SHA256 390a38489ef071beb8eceab52cdc209262fc5c574cfa83f47b12f922f0575623 SHA512 13bff0bbc16a525da9531ad6809e0d638398cfd2bcebebdd54669c7cf2bd9bf331bae78cf2a48e9520c294ab8ff6d59a670e6b587b30af4daed216bb2f084cbd WHIRLPOOL 8a5ec7420f44e7bb2727282b4dbabf2871fe0ca686ddf857d5b746b1965a2e1f12980bdfc1e603e8af951a2444247b8cd8c9ed79e71bd6349823c842b834f490
 DIST basenji-0.8.0.tar.gz 573262 SHA256 fe39be153901da8bfe4ef06b4fc9821c88b8b78981bb55eb0bf4690d39b7ae66 SHA512 f60a902e51754ac4a0d738802381a19201f40c97b31a66786dbdcf2d356c27b35f89a6477d19e561b189fbaa3665361a84f2ea344633613a52277c64675f9e8c WHIRLPOOL 50e634ddccf2e234686804de53997bef2c74ae39a5cb30eb8c0358ec6ae75d311a318b02f43745b2555a0ea7199007f2ce9a1d79a5ca91945d623b3151b376cd
-DIST basenji-0.9.0.tar.gz 582714 RMD160 eb3076a9c67287ab9ebb57fed95589f5e9b301c0 SHA1 ee93898113056d91a541d62aafed79d1bf1d0e09 SHA256 4e3b56ed783dfe669cff09c37dbde6e4a5a0151e5b2e67cfa249b2e5fb461478
+DIST basenji-0.9.0.tar.gz 582714 SHA256 4e3b56ed783dfe669cff09c37dbde6e4a5a0151e5b2e67cfa249b2e5fb461478
+DIST basenji-1.0.0.tar.gz 642763 SHA256 1a52c351a84ffe05801f1f440bfc9dbf4523136fad0da40d928e6e354c727c1e SHA512 9448545f345138cdef39f872a8bbd60d60a6e8f49a7ea518d58fa69c6711c5ca019d1d0257e26b80b95d5fe12d787ab9b2ed4bf5a76e4f6acccd904cc6fa6084 WHIRLPOOL 315ea82274acbb7e98ac44407fd10fa377940db7b47f37c54ad11806b2e7e0cc1a40568b12bb805316fb2d91cd550a568d305d9072194a7b5d94c392f8b28319
diff --git a/app-misc/basenji/basenji-1.0.0.ebuild b/app-misc/basenji/basenji-1.0.0.ebuild
new file mode 100644
index 000000000000..c2bdc57c8e62
--- /dev/null
+++ b/app-misc/basenji/basenji-1.0.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/basenji/basenji-1.0.0.ebuild,v 1.1 2012/12/22 11:26:51 elvanor Exp $
+
+EAPI="4"
+
+inherit multilib versionator
+
+DESCRIPTION="Basenji is a volume indexing tool designed for easy and fast indexing of volume collections."
+HOMEPAGE="http://launchpad.net/basenji"
+SRC_URI="http://launchpad.net/basenji/trunk/$(get_version_component_range 1-2)/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-dotnet/dbus-sharp
+	dev-dotnet/dbus-sharp-glib
+	dev-dotnet/gio-sharp
+	dev-dotnet/gtk-sharp
+	dev-dotnet/gnome-sharp
+	dev-dotnet/taglib-sharp
+	media-libs/libextractor"
+
+DEPEND="${CDEPEND}"
+
+RDEPEND="${CDEPEND}
+	dev-dotnet/gnome-desktop-sharp
+	sys-fs/udisks"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	sed -i -e "s/-pkg:mono-cairo/-r:Mono.Cairo/" Basenji/Makefile || die "sed failed."
+}
+
+src_configure() {
+	./configure --prefix="${EPREFIX}/usr"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+}
diff --git a/app-misc/realpath/realpath-1.17.ebuild b/app-misc/realpath/realpath-1.17.ebuild
index fc0f42570b47..d4ee3a4eeae9 100644
--- a/app-misc/realpath/realpath-1.17.ebuild
+++ b/app-misc/realpath/realpath-1.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/app-misc/realpath/realpath-1.17.ebuild,v 1.7 2012/12/19 06:39:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/realpath-1.17.ebuild,v 1.8 2012/12/22 16:06:58 ago Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs flag-o-matic multilib prefix
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="!sys-freebsd/freebsd-bin
diff --git a/app-misc/screen/screen-4.0.3-r8.ebuild b/app-misc/screen/screen-4.0.3-r8.ebuild
new file mode 100644
index 000000000000..23d0c901f89e
--- /dev/null
+++ b/app-misc/screen/screen-4.0.3-r8.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r8.ebuild,v 1.1 2012/12/21 21:02:27 swegener Exp $
+
+EAPI=4
+
+WANT_AUTOCONF="2.5"
+
+inherit eutils flag-o-matic toolchain-funcs pam autotools user
+
+DESCRIPTION="Full-screen window manager that multiplexes physical terminals between several processes"
+HOMEPAGE="http://www.gnu.org/software/screen/"
+SRC_URI="ftp://ftp.uni-erlangen.de/pub/utilities/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug nethack pam selinux multiuser"
+
+RDEPEND=">=sys-libs/ncurses-5.2
+	pam? ( virtual/pam )
+	selinux? ( sec-policy/selinux-screen )"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	>=sys-apps/openrc-0.11.6"
+
+pkg_setup() {
+	# Make sure utmp group exists, as it's used later on.
+	enewgroup utmp 406
+}
+
+src_prepare() {
+	# Bug 34599: integer overflow in 4.0.1
+	# (Nov 29 2003 -solar)
+	epatch "${FILESDIR}"/screen-4.0.1-int-overflow-fix.patch
+
+	# Bug 31070: configure problem which affects alpha
+	# (13 Jan 2004 agriffis)
+	epatch "${FILESDIR}"/screen-4.0.1-vsprintf.patch
+
+	# uclibc doesnt have sys/stropts.h
+	if ! (echo '#include <sys/stropts.h>' | $(tc-getCC) -E - &>/dev/null) ; then
+		epatch "${FILESDIR}"/4.0.2-no-pty.patch
+	fi
+
+	# Don't use utempter even if it is found on the system
+	epatch "${FILESDIR}"/4.0.2-no-utempter.patch
+
+	# Don't link against libelf even if it is found on the system
+	epatch "${FILESDIR}"/4.0.2-no-libelf.patch
+
+	# Patch for time function on 64bit systems
+	epatch "${FILESDIR}"/4.0.2-64bit-time.patch
+
+	# Patch that makes %u work for windowlist -b formats
+	epatch "${FILESDIR}"/4.0.2-windowlist-multiuser-fix.patch
+
+	# Open tty in non-blocking mode
+	epatch "${FILESDIR}"/4.0.2-nonblock.patch
+
+	# compability for sys-devel/autoconf-2.62
+	epatch "${FILESDIR}"/screen-4.0.3-config.h-autoconf-2.62.patch
+
+	# crosscompile patch
+	epatch "${FILESDIR}"/"${P}"-crosscompile.patch
+
+	# sched.h is a system header and causes problems with some C libraries
+	mv sched.h _sched.h || die
+	sed -i '/include/s:sched.h:_sched.h:' screen.h || die
+
+	# Allow for more rendition (color/attribute) changes in status bars
+	sed -i \
+		-e "s:#define MAX_WINMSG_REND 16:#define MAX_WINMSG_REND 64:" \
+		screen.c \
+		|| die "sed screen.c failed"
+
+	# Fix manpage.
+	sed -i \
+		-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+		-e "s:/usr/local/screens:${EPREFIX}/run/screen:g" \
+		-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+		-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
+		-e "s:/local/screens/S-:${EPREFIX}/run/screen/S-:g" \
+		doc/screen.1 \
+		|| die "sed doc/screen.1 failed"
+
+	# proper setenv detection for Solaris
+	epatch "${FILESDIR}"/${P}-setenv_autoconf.patch
+
+	# Allow TERM string large enough to use with rxvt-unicode-256color
+	# Allow usernames up to 32 chars
+	epatch "${FILESDIR}"/${PV}-extend-d_termname-ng2.patch
+
+	# support CPPFLAGS
+	epatch "${FILESDIR}"/${P}-cppflags.patch
+
+	# reconfigure
+	eautoconf
+}
+
+src_configure() {
+	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
+
+	[[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
+
+	use nethack || append-cppflags "-DNONETHACK"
+	use debug && append-cppflags "-DDEBUG"
+
+	econf \
+		--with-socket-dir="${EPREFIX}/run/screen" \
+		--with-sys-screenrc="${EPREFIX}/etc/screenrc" \
+		--with-pty-mode=0620 \
+		--with-pty-group=5 \
+		--enable-rxvt_osc \
+		--enable-telnet \
+		--enable-colors256 \
+		$(use_enable pam)
+
+	# Second try to fix bug 12683, this time without changing term.h
+	# The last try seemed to break screen at run-time.
+	# (16 Jan 2003 agriffis)
+	LC_ALL=POSIX make term.h || die "Failed making term.h"
+}
+
+src_install() {
+	local tmpfiles_perms tmpfiles_group
+
+	dobin screen
+
+	if use multiuser || use prefix
+	then
+		fperms 4755 /usr/bin/screen
+		tmpfiles_perms="0755"
+		tmpfiles_group="root"
+	else
+		fowners root:utmp /usr/bin/screen
+		fperms 2755 /usr/bin/screen
+		tmpfiles_perms="0775"
+		tmpfiles_group="utmp"
+	fi
+
+	dodir /etc/tmpfiles.d
+	echo "d /run/screen ${tmpfiles_perms} root ${tmpfiles_group}" >"${ED}"/etc/tmpfiles.d/screen.conf
+
+	insinto /usr/share/screen
+	doins terminfo/{screencap,screeninfo.src}
+	insinto /usr/share/screen/utf8encodings
+	doins utf8encodings/??
+	insinto /etc
+	doins "${FILESDIR}"/screenrc
+
+	pamd_mimic_system screen auth
+
+	dodoc \
+		README ChangeLog INSTALL TODO NEWS* patchlevel.h \
+		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
+
+	doman doc/screen.1
+	doinfo doc/screen.info*
+}
+
+pkg_postinst() {
+	elog "Some dangerous key bindings have been removed or changed to more safe values."
+	elog "We enable some xterm hacks in our default screenrc, which might break some"
+	elog "applications. Please check /etc/screenrc for information on these changes."
+
+	ewarn "This revision changes the screen socket location to /run/screen."
+}
diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild
index 62d9027a1308..d8310afa501b 100644
--- a/app-misc/screen/screen-9999.ebuild
+++ b/app-misc/screen/screen-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/app-misc/screen/screen-9999.ebuild,v 1.1 2012/12/02 22:48:41 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-9999.ebuild,v 1.2 2012/12/21 21:02:27 swegener Exp $
 
 EAPI=4
 
@@ -25,6 +25,8 @@ RDEPEND=">=sys-libs/ncurses-5.2
 	selinux? ( sec-policy/selinux-screen )"
 DEPEND="${RDEPEND}
 	sys-apps/texinfo"
+RDEPEND="${RDEPEND}
+	>=sys-apps/openrc-0.11.6"
 
 S="${WORKDIR}"/${P}/src
 
@@ -44,10 +46,10 @@ src_prepare() {
 	# Fix manpage.
 	sed -i \
 		-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
-		-e "s:/usr/local/screens:${EPREFIX}/var/run/screen:g" \
+		-e "s:/usr/local/screens:${EPREFIX}/run/screen:g" \
 		-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
 		-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
-		-e "s:/local/screens/S-:${EPREFIX}/var/run/screen/S-:g" \
+		-e "s:/local/screens/S-:${EPREFIX}/run/screen/S-:g" \
 		doc/screen.1 \
 		|| die "sed doc/screen.1 failed"
 
@@ -64,15 +66,14 @@ src_configure() {
 	use debug && append-cppflags "-DDEBUG"
 
 	econf \
-		--with-socket-dir="${EPREFIX}/var/run/screen" \
+		--with-socket-dir="${EPREFIX}/run/screen" \
 		--with-sys-screenrc="${EPREFIX}/etc/screenrc" \
 		--with-pty-mode=0620 \
 		--with-pty-group=5 \
 		--enable-rxvt_osc \
 		--enable-telnet \
 		--enable-colors256 \
-		$(use_enable pam) \
-		$(use multiuser || echo --disable-socket-dir)
+		$(use_enable pam)
 
 	LC_ALL=POSIX emake term.h
 	emake osdef.h
@@ -81,16 +82,25 @@ src_configure() {
 }
 
 src_install() {
+	local tmpfiles_perms tmpfiles_group
+
 	dobin screen
 
 	if use multiuser || use prefix
 	then
 		fperms 4755 /usr/bin/screen
+		tmpfiles_perms="0755"
+		tmpfiles_group="root"
 	else
 		fowners root:utmp /usr/bin/screen
 		fperms 2755 /usr/bin/screen
+		tmpfiles_perms="0775"
+		tmpfiles_group="utmp"
 	fi
 
+	dodir /etc/tmpfiles.d
+	echo "d /run/screen ${tmpfiles_perms} root ${tmpfiles_group}" >"${ED}"/etc/tmpfiles.d/screen.conf
+
 	insinto /usr/share/screen
 	doins terminfo/{screencap,screeninfo.src}
 	insinto /usr/share/screen/utf8encodings
@@ -112,4 +122,6 @@ pkg_postinst() {
 	elog "Some dangerous key bindings have been removed or changed to more safe values."
 	elog "We enable some xterm hacks in our default screenrc, which might break some"
 	elog "applications. Please check /etc/screenrc for information on these changes."
+
+	ewarn "This revision changes the screen socket location to /run/screen."
 }
diff --git a/app-portage/eix/eix-0.27.6.ebuild b/app-portage/eix/eix-0.27.6.ebuild
index a2d60adc4593..f5d32d141b43 100644
--- a/app-portage/eix/eix-0.27.6.ebuild
+++ b/app-portage/eix/eix-0.27.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/app-portage/eix/eix-0.27.6.ebuild,v 1.2 2012/12/17 20:22:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.27.6.ebuild,v 1.3 2012/12/22 16:42:43 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://berlios/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="clang debug +dep doc nls optimization security strong-optimization sqlite tools zsh-completion"
 
 RDEPEND="app-shells/push
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index b5fbde67621b..3a660e380268 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,6 +1,6 @@
-DIST zsh-4.3.15-doc.tar.bz2 2712215 SHA256 73b7ee1a737fbaf9be77cf6b55b27cca96bac39bc5ef25efa9ceb427cd1b5ad4 SHA512 cf7337d09a452d41f6ddc5fd29717e14208f3f1a27ac529ba3a23796ee0f6a1def2d215580761b20f623fcb17bcdf9a73b9566b28f9594685448020b58ece711 WHIRLPOOL ccc38e27bacd41acfef87be8be663373602c71b52e0d4cc558d1b67579cc010da2dd4a746f9aee9f2d3120af2680bb0fc599744a065cc69be7ba4e97f3953966
-DIST zsh-4.3.15.tar.bz2 2969951 SHA256 8708f485823fb7e51aa696776d0dfac7d3558485182672cf9311c12a50a95486 SHA512 1b8a9aba3c271349891b30da70955c414763aecab81f5843ad3ecb83a84091de07c72026d47283bc4398adaa425459cf4ac98a5876e57ec0f9ec1d78c1e848f8 WHIRLPOOL 7602f06d61b5cc892d19dacb90e109b476efcd651e87875b876dd0f3e752b08bcf7d62c4c8903d09fd386f865d3d47769c960d6b069e5754aae573859bed20f9
 DIST zsh-4.3.17-doc.tar.bz2 2719164 SHA256 68f71ba6ba0dc56bfdd93573c7f02dcc3a4f06fd8e24a5f9e17202cf5e68cb91 SHA512 1406ed031d8f95311efb2f1b17e3738aad58fded259cb2655f4cda3a68c9ffb37e48dcbd17ad7d583a8688c33048899cc3793eb30700b43d8a8d56b588f6a789 WHIRLPOOL 976ab384271b6c0fc079f2c149e2e033d3b5f9feb4c673f94c588036a33bcea824bda71697d53bf4779649fcf2be6e44105d1b2949bfba0a95d23ad732dfa29b
 DIST zsh-4.3.17.tar.bz2 2978903 SHA256 054e0452afd9c742c9f1489465175e1d4d7db50d88b602d132551d850cf7a704 SHA512 2849204c5633b3fbf4e61032fd81e20bc9275fa1f41316bf07c4ee482cf3fad070c228c6dd70a71fb63c31c4a34bd1b8e653e0f19649b4980510a278cdf97342 WHIRLPOOL ce599bb1fadacab49426a60625e47340f81978e57a753bc5b094440c201c10b5b0728c4b97f920f362dcc87ab23df2159be0440192daea6ce9e4baea281f7d30
 DIST zsh-5.0.0-doc.tar.bz2 2875712 SHA256 d2219eb3003c108af9d297ff055aa6df3cdb756ccf6b1b2ee3db8a72dbb2ef30 SHA512 9cacf1f77e44ab5c63f0826ed2f62a7fdcf27d96b39973e0e890689cd94773d9e3a5483d86224c48538cef1bfbecd1ad8e50cbf75c1e89f456f37c20e23d879d WHIRLPOOL 70504eae90a2b349c16c0868ee56321f5872afa660c16caf6b727060c197f9f979338d61ec94f358b396fbe9050a0603e697d4188856d844730be1a4cf2f9f71
 DIST zsh-5.0.0.tar.bz2 3014362 SHA256 cd014a8e09a3607c68369d1615db96d0fbb7279a125950b32032fd448c44a888 SHA512 59d8a0fdd58edc58b1d30e19ee3ce6c1a4a3129dd89aa11ed38b69ec75f0c13f91fc158dd5477c1d48092842807e34e07a5ce27e5d244c236405275131c811ae WHIRLPOOL 31c873e2e2c42e847659af568acb32da6625170c7207e28106fb0c2e7606c51779dfdf1b5733f73a7758043c955787f20b232d134f56af99b9a021c0566ee4e1
+DIST zsh-5.0.2-doc.tar.bz2 2902019 SHA256 99ee08cfc91935af8714bd98db652f016d6c7a8a71ba7c6d6223910cd0b7fbf1 SHA512 95a197b5220fccefce43b8cb3f868186a84db697de768d897a3a50f8eb74802e7974e9b9df15d39b897af54852f66d0af668cc8ab0e557412ea1a712ec1c601f WHIRLPOOL f13e09e71d51e769eec68910a155fcb036f0910adc87f357071dc78edf2c3a830d75e9d75a256aa2d6415c5aa0200721ddcbc7e590c84cf7d7febe92b0c513c3
+DIST zsh-5.0.2.tar.bz2 3025767 SHA256 eb220ae5a8076191ec6b4c6a5a2f18122d074a19f25b45f0320b44b8166c5a03 SHA512 096e9fee085bbcb88035984c28cc9d186ae549f9ab09d699f380438b82fcf09b03ac2e9635ddb3cef9d0f287403c10fd29d21ec18f79e8bfab63760db738a07d WHIRLPOOL ff5214ced2cebe50c3fd090a1d12727ee5672875f38fdda5f068ccdd260cc85336bb22fa445d028d6e8df8bdbe53605034e55c3f435cf5a11e981b8ae6821bf0
diff --git a/app-shells/zsh/zsh-4.3.15.ebuild b/app-shells/zsh/zsh-5.0.2.ebuild
similarity index 91%
rename from app-shells/zsh/zsh-4.3.15.ebuild
rename to app-shells/zsh/zsh-5.0.2.ebuild
index d18f8823d0c4..66a3d2176ba3 100644
--- a/app-shells/zsh/zsh-4.3.15.ebuild
+++ b/app-shells/zsh/zsh-5.0.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.15.ebuild,v 1.8 2012/03/18 19:17:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-5.0.2.ebuild,v 1.1 2012/12/22 10:16:30 radhermit Exp $
 
-EAPI=4
+EAPI=5
 
 # doc package for -dev version exists?
 doc_available=true
@@ -34,7 +34,7 @@ SRC_URI="${ZSH_URI}
 
 LICENSE="ZSH gdbm? ( GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug doc examples gdbm maildir pcre static unicode"
 
 RDEPEND="
@@ -117,8 +117,6 @@ src_configure() {
 			sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
 				"${S}"/config.modules || die
 		fi
-#	else
-#		sed -i -e "/LIBS/s%-lpcre%${EPREFIX}/usr/$(get_libdir)/libpcre.a%" Makefile
 	fi
 }
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 8720de633d14..efe81a09bea4 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,3 +1,3 @@
 DIST calibre-0.9.10.tar.xz 27775784 SHA256 4e269320f883a17c6c6d577f7e4947dcda47e73917f297b33e402d4c9da042d9 SHA512 9c5aeb32f2910d236961ca58e8f079656f6844f2cc2d6c511a1dda561fb4b9b0247c47e5a3fd8c52472c0424ca3f3a8a8567d091f30bf412669255c7541de3fb WHIRLPOOL 2c39cfad0696075a1b3641c909cc6bf05d58742dea3fbc2fa6ad8ac2f45101e6ed8d98b14779838d7698223f8ccf3cf21720798b839516490ed1d89d81a535c3
+DIST calibre-0.9.11.tar.xz 27869620 SHA256 e83d62db1f27c46e2865599d3e4c4d1ba8eeca539dee982dd9eb0a213a135a4a SHA512 91fa1b022ff0f828551344a61adeb8f34be897dada5d2ea06692872c640b1f826270bbbeec40d4a18fb54f4a7efb0c503941c662e5ca916578b5908e69550c26 WHIRLPOOL 9d10377d2906b443aaf716be32f4fc863429f82165297d6b610be8fb4b4017f8cda565aa78933dfd384d0f52d7de5510ea8cdde8e1fce4a6c7b625fbe99adabf
 DIST calibre-0.9.6.tar.xz 27346664 SHA256 d2cb83a8fc32b3258f3a491f33f4271bfd4020ac4fdbbf01131deb81bba9624f SHA512 6bbacc8ed9af318bdfc09807937ec5e3e2d99a9b1d408cbf4dd4976926b415736928a16ee8d712ae1b93e98ab612841123bb370440c78db9c350ebd6503f8e58 WHIRLPOOL 306662c0b7dae93ec0d5c63903e02fc6a9cdf6427290bd366464dca7c618f602380fec9767a23baafaf1257135f333553c345356bf06560785c0664f9d74cf36
-DIST calibre-0.9.9.tar.xz 27765504 SHA256 1fde798842c3ea22e04dbcb7e3d5e8f1a5a117e922dfd9e5ba762073feffae94 SHA512 eeaf8d4cc09933388f38b6caa2768e01a2255b8dfac9f4905b6fcda02d0d0bc4dd87553f706cff0419480c28adb02ea36b20a125ce82f90cdd853cc7afef93cd WHIRLPOOL 3cba05a9fe3ce535502b617b4cda76096685485c8c775c4f21b6264ed0bf255113a760f92711128e0708a7bc0f1e6f204784ebbff140996cf49e30d63bba40cf
diff --git a/app-text/calibre/calibre-0.9.9.ebuild b/app-text/calibre/calibre-0.9.11.ebuild
similarity index 95%
rename from app-text/calibre/calibre-0.9.9.ebuild
rename to app-text/calibre/calibre-0.9.11.ebuild
index d11b755f13d6..befa64500853 100644
--- a/app-text/calibre/calibre-0.9.9.ebuild
+++ b/app-text/calibre/calibre-0.9.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/app-text/calibre/calibre-0.9.9.ebuild,v 1.2 2012/12/12 10:25:59 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.11.ebuild,v 1.1 2012/12/21 20:52:27 zmedico Exp $
 
 EAPI=4
 PYTHON_DEPEND=2:2.7
@@ -88,12 +88,6 @@ src_prepare() {
 '-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
 '-i', 'Makefile'])" \
 		-i setup/extensions.py || die "sed failed to patch extensions.py"
-
-	# Disable destructive regex for Bug #446790.
-	if has_version '>=dev-python/PyQt4-4.9.6' ; then
-		sed -e "s|dat = re\.compile(r'QtGui\.QApplication\.translate.*|#\\0|" \
-			-i src/calibre/gui2/__init__.py || die
-	fi
 }
 
 src_install() {
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 8ce7302cd3da..d82b420beba6 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,2 +1,3 @@
 DIST iso-codes-3.30.tar.bz2 6229897 SHA256 a4da396dc0f7c7ca85cfd4b99a1c2abc898453911c6594da0777e89bd75898bd SHA512 1ba44ac218b1c8f26984d198c734bba7061a5c4e78cc3f72ffef36c558f3c3c4760e11d99aa9d4f268561fd0326d183bd1b9089cf5a90867fdabb1b0f165453a WHIRLPOOL 28c471c848cc1578c8a18808dff01212567b0ef707c3f02ae638e09c6b8cbe9fad23dad9cc92fbeba6f9cff35e674e25c4c61897795c9f74f816aeb9cc9c8810
 DIST iso-codes-3.37.tar.bz2 10192736 SHA256 408d1b8bbbd0c496c70e1a94093bc1f88495a7c6f6135c65c1cd53bdb1c62d90 SHA512 5202b526f4cf03343780b30ec38dd0197b3ef0fa467822a9c3213bfbcf10556e435f0abf0a66793dc6bba82aec59dc5785a0d3029eac8ad9d73f1e87b13ce709 WHIRLPOOL 22220f1f4424f53b07032d13e00bf64cdb5d47a392b6aa6b55fc21847c4912c6349d56ece7a2b6c0c7de4193f0a7188f62ea83a068fd1f7b5ba5d57d57f80be0
+DIST iso-codes-3.40.tar.xz 3634056 SHA256 f98a7022e8b642c9d2a6c03e05cafb0e5e8b5985ff8bd75b8493c08dac49f046 SHA512 1393a406aca36e2a49b07e373cb424166742e343f135e9a73cb1a29875c1c6fba95a597093af1043b395ea603dc69c46ba9639409826920ebb81be8129c47424 WHIRLPOOL 3ec551bc84675cadb79cc2f0490e906acb57056c5e6f5a6307342b9b25aa2cc7d771f3b15f0012aa53c347abffee993e54a3e5c5424f9192cd51a482fbedb685
diff --git a/app-text/iso-codes/iso-codes-3.40.ebuild b/app-text/iso-codes/iso-codes-3.40.ebuild
new file mode 100644
index 000000000000..3592550477ba
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-3.40.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-text/iso-codes/iso-codes-3.40.ebuild,v 1.1 2012/12/21 23:46:41 eva Exp $
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Provides the list of country and language names"
+HOMEPAGE="http://alioth.debian.org/projects/pkg-isocodes/"
+SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="sys-devel/gettext"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_prepare() {
+	local linguas_bak=${LINGUAS}
+	local mylinguas=""
+
+	for norm in iso_15924 iso_3166 iso_3166_2 iso_4217 iso_639 iso_639_3; do
+		einfo "Preparing ${norm}"
+
+		mylinguas=""
+		LINGUAS=${linguas_bak}
+		strip-linguas -i "${S}/${norm}"
+
+		for loc in ${LINGUAS}; do
+			mylinguas="${mylinguas} ${loc}.po"
+		done
+
+		if [ -n "${mylinguas}" ]; then
+			sed -e "s:pofiles =.*:pofiles = ${mylinguas}:" \
+				-e "s:mofiles =.*:mofiles = ${mylinguas//.po/.mo}:" \
+				-i "${S}/${norm}/Makefile.am" "${S}/${norm}/Makefile.in" \
+				|| die "sed in ${norm} folder failed"
+		fi
+	done
+}
diff --git a/app-vim/bufferexplorer/bufferexplorer-7.2.7.ebuild b/app-vim/bufferexplorer/bufferexplorer-7.2.7.ebuild
index c6e38c02df42..f6216ecdc26c 100644
--- a/app-vim/bufferexplorer/bufferexplorer-7.2.7.ebuild
+++ b/app-vim/bufferexplorer/bufferexplorer-7.2.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/bufferexplorer/bufferexplorer-7.2.7.ebuild,v 1.2 2010/10/27 05:49:21 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/bufferexplorer/bufferexplorer-7.2.7.ebuild,v 1.3 2012/12/22 08:14:53 ulm Exp $
 
 EAPI="2"
 
@@ -10,7 +10,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: easily browse vim buffers"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=42"
 SRC_URI="http://www.vim.org/scripts/download_script.php?src_id=12904 -> ${P}.zip"
-LICENSE="as-is"
+LICENSE="bufexplorer.vim"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
diff --git a/app-vim/bufferexplorer/bufferexplorer-7.2.8.ebuild b/app-vim/bufferexplorer/bufferexplorer-7.2.8.ebuild
index 63a92ea831af..b20ca52f9446 100644
--- a/app-vim/bufferexplorer/bufferexplorer-7.2.8.ebuild
+++ b/app-vim/bufferexplorer/bufferexplorer-7.2.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/bufferexplorer/bufferexplorer-7.2.8.ebuild,v 1.1 2010/11/11 22:18:29 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/bufferexplorer/bufferexplorer-7.2.8.ebuild,v 1.2 2012/12/22 08:14:53 ulm Exp $
 
 EAPI="2"
 
@@ -10,7 +10,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: easily browse vim buffers"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=42"
 SRC_URI="http://www.vim.org/scripts/download_script.php?src_id=14208 -> ${P}.zip"
-LICENSE="as-is"
+LICENSE="bufexplorer.vim"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
diff --git a/app-vim/cctree/cctree-1.60.ebuild b/app-vim/cctree/cctree-1.60.ebuild
index 0b92e9d0af69..0ed6b5c25504 100644
--- a/app-vim/cctree/cctree-1.60.ebuild
+++ b/app-vim/cctree/cctree-1.60.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-vim/cctree/cctree-1.60.ebuild,v 1.1 2011/07/15 18:48:09 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/cctree/cctree-1.60.ebuild,v 1.2 2012/12/22 08:16:16 ulm Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ MY_PN="CCTree"
 DESCRIPTION="vim plugin: Cscope based source-code browser and code flow analysis tool"
 HOMEPAGE="http://sites.google.com/site/vimcctree/"
 SRC_URI="https://github.com/vim-scripts/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
-LICENSE="as-is"
+LICENSE="bufexplorer.vim"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
diff --git a/app-vim/cctree/cctree-1.61.ebuild b/app-vim/cctree/cctree-1.61.ebuild
index ab8493f47e11..fcf912f9e864 100644
--- a/app-vim/cctree/cctree-1.61.ebuild
+++ b/app-vim/cctree/cctree-1.61.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/cctree/cctree-1.61.ebuild,v 1.1 2012/08/07 00:11:26 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/cctree/cctree-1.61.ebuild,v 1.2 2012/12/22 08:16:16 ulm Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit vim-plugin
 
 DESCRIPTION="vim plugin: Cscope based source-code browser and code flow analysis tool"
 HOMEPAGE="http://sites.google.com/site/vimcctree/"
-LICENSE="as-is"
+LICENSE="bufexplorer.vim"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
diff --git a/app-vim/lustyexplorer/lustyexplorer-4.1.ebuild b/app-vim/lustyexplorer/lustyexplorer-4.1.ebuild
index 5f385a2ad812..52b107f8fa94 100644
--- a/app-vim/lustyexplorer/lustyexplorer-4.1.ebuild
+++ b/app-vim/lustyexplorer/lustyexplorer-4.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/app-vim/lustyexplorer/lustyexplorer-4.1.ebuild,v 1.1 2011/05/20 10:01:11 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/lustyexplorer/lustyexplorer-4.1.ebuild,v 1.2 2012/12/22 08:17:37 ulm Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit vim-plugin
 
 DESCRIPTION="vim plugin: dynamic filesystem and buffer explorer"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1890"
-LICENSE="as-is"
+LICENSE="bufexplorer.vim"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
diff --git a/app-vim/lustyexplorer/lustyexplorer-4.3.ebuild b/app-vim/lustyexplorer/lustyexplorer-4.3.ebuild
index c0d5de67b765..9f6a6f4a02e0 100644
--- a/app-vim/lustyexplorer/lustyexplorer-4.3.ebuild
+++ b/app-vim/lustyexplorer/lustyexplorer-4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/lustyexplorer/lustyexplorer-4.3.ebuild,v 1.1 2012/08/06 00:01:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/lustyexplorer/lustyexplorer-4.3.ebuild,v 1.2 2012/12/22 08:17:37 ulm Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit vim-plugin
 
 DESCRIPTION="vim plugin: dynamic filesystem and buffer explorer"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1890"
-LICENSE="as-is"
+LICENSE="bufexplorer.vim"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
diff --git a/app-vim/minibufexpl/minibufexpl-6.4.3.ebuild b/app-vim/minibufexpl/minibufexpl-6.4.3.ebuild
index 124e3d4ff040..8fa246170a2e 100644
--- a/app-vim/minibufexpl/minibufexpl-6.4.3.ebuild
+++ b/app-vim/minibufexpl/minibufexpl-6.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/minibufexpl/minibufexpl-6.4.3.ebuild,v 1.5 2012/04/17 16:04:29 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/minibufexpl/minibufexpl-6.4.3.ebuild,v 1.6 2012/12/22 08:18:38 ulm Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ DESCRIPTION="vim plugin: easily switch between buffers"
 HOMEPAGE="https://github.com/fholgado/minibufexpl.vim"
 SRC_URI="https://github.com/fholgado/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="bufexplorer.vim"
 KEYWORDS="amd64 ~mips ppc x86"
 IUSE=""
 
diff --git a/app-vim/minibufexpl/minibufexpl-6.4.4.ebuild b/app-vim/minibufexpl/minibufexpl-6.4.4.ebuild
index eb2c3498f910..10bc6ee19e8c 100644
--- a/app-vim/minibufexpl/minibufexpl-6.4.4.ebuild
+++ b/app-vim/minibufexpl/minibufexpl-6.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/minibufexpl/minibufexpl-6.4.4.ebuild,v 1.4 2012/12/04 11:22:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/minibufexpl/minibufexpl-6.4.4.ebuild,v 1.5 2012/12/22 08:18:38 ulm Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ MY_PN="${PN}.vim"
 DESCRIPTION="vim plugin: easily switch between buffers"
 HOMEPAGE="https://github.com/fholgado/minibufexpl.vim"
 SRC_URI="https://github.com/fholgado/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
-LICENSE="as-is"
+LICENSE="bufexplorer.vim"
 KEYWORDS="amd64 ~mips ppc x86"
 IUSE=""
 
diff --git a/dev-cpp/tbb/tbb-4.1.20121003.ebuild b/dev-cpp/tbb/tbb-4.1.20121003.ebuild
index 0cb6753431d6..cca6a2d1dd9a 100644
--- a/dev-cpp/tbb/tbb-4.1.20121003.ebuild
+++ b/dev-cpp/tbb/tbb-4.1.20121003.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-cpp/tbb/tbb-4.1.20121003.ebuild,v 1.1 2012/11/30 20:37:31 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.1.20121003.ebuild,v 1.2 2012/12/22 14:06:43 blueness Exp $
 
 EAPI=4
 inherit eutils flag-o-matic multilib versionator toolchain-funcs
@@ -16,7 +16,7 @@ SRC_URI="http://threadingbuildingblocks.org/sites/default/files/software_release
 LICENSE="GPL-2-with-exceptions"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc examples"
 
 DEPEND=""
diff --git a/dev-db/sqldeveloper/Manifest b/dev-db/sqldeveloper/Manifest
index de975f2bd809..8745d3322a52 100644
--- a/dev-db/sqldeveloper/Manifest
+++ b/dev-db/sqldeveloper/Manifest
@@ -1,4 +1,5 @@
-DIST sqldeveloper-1.5.4.59.40-no-jre.zip 76430283 RMD160 5e4c76ca9bd173e99fb2bfb64d3694b65847f1a4 SHA1 635b34b87b058242694a797bc83ca655a56a924a SHA256 3849ea6560bc31a17f6c457ffdefde018041e8acb601426a027efd5fea62debc
-DIST sqldeveloper-2.1.1.64.45-no-jre.zip 98210855 RMD160 24747b7b10039bfa50dcd71357a5755b40f45d92 SHA1 56493e7eb40371d98c1a524ddeddad87511a56a3 SHA256 13ef31be293f48b1de809a19fbeebb99f41f708219065ab3b0a7b86e2f5d0864
-DIST sqldeveloper-3.0.04.34-no-jre.zip 154645376 RMD160 19ff1cbe56df6e8fa4565c48b914f844006762b1 SHA1 bf5e920fe183adecec47b447ff83aa3617af0e4e SHA256 fa31b31ead6120fe83ca27610345ad20124ff223ae27f4a8a47b5ef0f305f55e
-DIST sqldeveloper-3.1.07.42-no-jre.zip 179042620 RMD160 d88b4976c8a52bcc1965fc2139438f6b9815ab3a SHA1 bc367f35b09e49d070a85436d9c7600b3b65af1b SHA256 cfe14455abdd019543894f8841020708f6f5fc2ee4929b09b7cbb68890b25ada
+DIST sqldeveloper-1.5.4.59.40-no-jre.zip 76430283 SHA256 3849ea6560bc31a17f6c457ffdefde018041e8acb601426a027efd5fea62debc
+DIST sqldeveloper-2.1.1.64.45-no-jre.zip 98210855 SHA256 13ef31be293f48b1de809a19fbeebb99f41f708219065ab3b0a7b86e2f5d0864
+DIST sqldeveloper-3.0.04.34-no-jre.zip 154645376 SHA256 fa31b31ead6120fe83ca27610345ad20124ff223ae27f4a8a47b5ef0f305f55e
+DIST sqldeveloper-3.1.07.42-no-jre.zip 179042620 SHA256 cfe14455abdd019543894f8841020708f6f5fc2ee4929b09b7cbb68890b25ada
+DIST sqldeveloper-3.2.20.09.87-no-jre.zip 182052759 SHA256 787b703a3fa2d7969ae486b9f2f23bdafd31242b2af74257943cf826c535c8d4 SHA512 716e2f9584e192b8e72a0e9439ac3fb0aea297087640df7c7c5659170846376d8e44d0fbdc68c96e274b100aad3f26b0710691349bfc0092c86c42830e115efe WHIRLPOOL 1d9eb51cb263c14a89a44167a239f3be34b7ca9bd78eefc28a73c1b24e6f4e2f10a1665b0b4a03c6932f987fae375c95bfc310c485e179c76e9b7135bb9825e3
diff --git a/dev-db/sqldeveloper/sqldeveloper-3.2.20.09.87.ebuild b/dev-db/sqldeveloper/sqldeveloper-3.2.20.09.87.ebuild
new file mode 100644
index 000000000000..0a4f1aa2b059
--- /dev/null
+++ b/dev-db/sqldeveloper/sqldeveloper-3.2.20.09.87.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils java-pkg-2
+
+DESCRIPTION="Oracle SQL Developer is a graphical tool for database development"
+HOMEPAGE="http://www.oracle.com/technology/products/database/sql_developer/"
+SRC_URI="${P}-no-jre.zip"
+RESTRICT="fetch"
+
+LICENSE="OTN"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mssql mysql sybase"
+
+DEPEND="mssql? ( dev-java/jtds:1.2 )
+	mysql? ( dev-java/jdbc-mysql:0 )
+	sybase? ( dev-java/jtds:1.2 )"
+RDEPEND=">=virtual/jdk-1.6.0
+	${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+pkg_nofetch() {
+	eerror "Please go to"
+	eerror "	${HOMEPAGE}"
+	eerror "and download"
+	eerror "	Oracle SQL Developer for other platforms"
+	eerror "		${SRC_URI}"
+	eerror "and move it to ${DISTDIR}"
+}
+
+src_prepare() {
+	# we don't need these, do we?
+	find ./ \( -iname "*.exe" -or -iname "*.dll" -or -iname "*.bat" \) -exec rm {} \;
+
+	# they both use jtds, enabling one of them also enables the other one
+	if use mssql && ! use sybase; then
+		einfo "You requested MSSQL support, this also enables Sybase support."
+	fi
+	if use sybase && ! use mssql; then
+		einfo "You requested Sybase support, this also enables MSSQL support."
+	fi
+
+	if use mssql || use sybase; then
+		echo "AddJavaLibFile $(java-pkg_getjars jtds-1.2)" >> sqldeveloper/bin/sqldeveloper.conf
+	fi
+
+	if use mysql; then
+		echo "AddJavaLibFile $(java-pkg_getjars jdbc-mysql)" >> sqldeveloper/bin/sqldeveloper.conf
+	fi
+
+	# this fixes internal Classpath warning
+	cd "${T}"
+	unzip -q "${S}"/jdev/extensions/oracle.jdeveloper.runner.jar META-INF/extension.xml
+	sed -i 's@../../../oracle_common/modules/oracle.nlsrtl_11.1.0@../../jlib@' META-INF/extension.xml || die
+	zip -rq "${S}"/jdev/extensions/oracle.jdeveloper.runner.jar META-INF/extension.xml
+	rm -rf META-INF
+
+	# this fixes another internal Classpath warning
+	cd "${T}"
+	unzip -q "${S}"/sqldeveloper/extensions/oracle.datamodeler.jar META-INF/extension.xml
+	sed -i 's@<classpath>${ide.extension.install.home}/lib/ActiveQueryBuilder.jar</classpath>@<classpath>${ide.extension.install.home}/../../lib/ActiveQueryBuilder.jar</classpath>@' META-INF/extension.xml || die
+	zip -rq "${S}"/sqldeveloper/extensions/oracle.datamodeler.jar META-INF/extension.xml
+	rm -rf META-INF
+}
+
+src_install() {
+	dodir /opt/${PN}
+	cp -r {dataminer,ide,javavm,jdbc,jdev,jdev.label,jlib,jviews,modules,rdbms,readme.html,sleepycat,${PN},sqlj,timingframework} \
+		"${D}"/opt/${PN}/ || die "Install failed"
+
+	dobin "${FILESDIR}"/${PN} || die "Install failed"
+
+	mv icon.png ${PN}-32x32.png || die
+	doicon ${PN}-32x32.png || die
+	make_desktop_entry ${PN} "Oracle SQL Developer" ${PN}-32x32 || die
+}
+
+pkg_postinst() {
+	# this temporary fixes FileNotFoundException with datamodeler
+	# this is more like a workaround than permanent fix
+	test -d /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log \
+		|| mkdir /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log
+	touch /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log/datamodeler.log
+	chmod -R 1777 /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log/datamodeler.log
+
+	# this fixes another datamodeler FileNotFoundException
+	# also more like a workaround than permanent fix
+	chmod 1777 /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/types/dr_custom_scripts.xml
+
+	echo
+	einfo "If you want to use the TNS connection type you need to set up the"
+	einfo "TNS_ADMIN environment variable to point to the directory your"
+	einfo "tnsnames.ora resides in."
+	echo
+}
diff --git a/dev-games/etrophy/etrophy-0.5.1.ebuild b/dev-games/etrophy/etrophy-0.5.1.ebuild
index 5ee681718052..17579d1d1ad1 100644
--- a/dev-games/etrophy/etrophy-0.5.1.ebuild
+++ b/dev-games/etrophy/etrophy-0.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/etrophy/etrophy-0.5.1.ebuild,v 1.1 2012/12/21 14:42:02 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/etrophy/etrophy-0.5.1.ebuild,v 1.2 2012/12/21 17:40:00 tommy Exp $
 
 EAPI=2
 
@@ -9,7 +9,7 @@ inherit enlightenment
 DESCRIPTION="Library for managing scores, trophies and unlockables,stores them and provides views to display them"
 
 SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-LICENSE="LGPL-2.1"
+LICENSE="BSD-2"
 
 KEYWORDS="~amd64 ~x86"
 IUSE="doc static-libs"
diff --git a/dev-java/jnr-x86asm/jnr-x86asm-0.1.ebuild b/dev-java/jnr-x86asm/jnr-x86asm-0.1.ebuild
index e13cf60e4cb1..ae2174bf370e 100644
--- a/dev-java/jnr-x86asm/jnr-x86asm-0.1.ebuild
+++ b/dev-java/jnr-x86asm/jnr-x86asm-0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-x86asm/jnr-x86asm-0.1.ebuild,v 1.4 2010/06/30 15:23:59 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-x86asm/jnr-x86asm-0.1.ebuild,v 1.5 2012/12/22 19:47:03 ago Exp $
 
 EAPI=3
 
@@ -15,7 +15,7 @@ SRC_URI="http://github.com/wmeissner/${PN}/tarball/0.1 -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc x86"
 
 IUSE=""
 
diff --git a/dev-java/maven-bin/maven-bin-1.1-r3.ebuild b/dev-java/maven-bin/maven-bin-1.1-r3.ebuild
index c679b27446b8..1368c912a978 100644
--- a/dev-java/maven-bin/maven-bin-1.1-r3.ebuild
+++ b/dev-java/maven-bin/maven-bin-1.1-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/dev-java/maven-bin/maven-bin-1.1-r3.ebuild,v 1.4 2012/12/12 19:27:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-1.1-r3.ebuild,v 1.5 2012/12/22 15:39:57 ago Exp $
 
 EAPI="4"
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://maven.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="1.1"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="|| ( app-admin/eselect-java app-admin/eselect-maven )"
diff --git a/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild b/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild
index fa7431deef7e..b20da30ad2ec 100644
--- a/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild
+++ b/dev-java/maven-bin/maven-bin-2.0.11-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/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild,v 1.4 2012/12/12 19:27:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild,v 1.5 2012/12/22 15:39:57 ago Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://maven.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="2.0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="|| ( app-admin/eselect-java app-admin/eselect-maven )"
diff --git a/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild b/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild
index 7243ff9921c9..036a2626e404 100644
--- a/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild
+++ b/dev-java/maven-bin/maven-bin-2.2.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/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild,v 1.4 2012/12/12 19:27:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild,v 1.5 2012/12/22 15:39:57 ago Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://maven.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="2.2"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="|| ( app-admin/eselect-java app-admin/eselect-maven )"
diff --git a/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild b/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
index b6a82be4722a..c93579766926 100644
--- a/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild,v 1.4 2012/12/12 19:27:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild,v 1.5 2012/12/22 15:39:57 ago Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://maven.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="|| ( app-admin/eselect-java app-admin/eselect-maven )"
diff --git a/dev-lang/php/php-5.3.18.ebuild b/dev-lang/php/php-5.3.18.ebuild
index 3709e539f0f4..510b237cf253 100644
--- a/dev-lang/php/php-5.3.18.ebuild
+++ b/dev-lang/php/php-5.3.18.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/php/php-5.3.18.ebuild,v 1.7 2012/12/18 20:20:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.18.ebuild,v 1.8 2012/12/22 13:52:40 ago Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SUHOSIN_VERSION=""
 FPM_VERSION="builtin"
 EXPECTED_TEST_FAILURES=""
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
 
 function php_get_uri ()
 {
diff --git a/dev-lang/php/php-5.4.8.ebuild b/dev-lang/php/php-5.4.8.ebuild
index 03786b5d328b..4eabdb4d89b3 100644
--- a/dev-lang/php/php-5.4.8.ebuild
+++ b/dev-lang/php/php-5.4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.8.ebuild,v 1.6 2012/12/18 20:39:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.8.ebuild,v 1.7 2012/12/22 15:19:02 ago Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SUHOSIN_VERSION=""
 FPM_VERSION="builtin"
 EXPECTED_TEST_FAILURES=""
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 function php_get_uri ()
 {
diff --git a/dev-libs/e_dbus/Manifest b/dev-libs/e_dbus/Manifest
index e86de19f367d..6ac51d0d21d9 100644
--- a/dev-libs/e_dbus/Manifest
+++ b/dev-libs/e_dbus/Manifest
@@ -1,2 +1 @@
-DIST e_dbus-1.7.0.tar.bz2 425360 SHA256 178dd09574dee20c453d11949549a9cde65c5964b8123473ea0755a21d45f693 SHA512 2b7926372e890e1f8c364863df05830fe4c74e3d5aa42e4698ec527e104141f45ed4936c412266a2af01ece7f9796f371c1b0e0c8a96fa9fd2ecbf019d25b0bf WHIRLPOOL fce503fbb6af2b9e0a872bccde5b8ddf9a936ea38c61974eaf5f25f503df9314641bdcc3a305a176b93bb2d046177140c56ba8f8cb84d23d6dc0259322b6875d
-DIST e_dbus-1.7.1.tar.bz2 410367 SHA256 d3a3e0b81f6bb69d2fc3886c9885dad27ebf14b60c4a0bbd5a2a510b5a5ff2d1 SHA512 f54295dcbfcaf81539871b1121dbea1d3ede1971e2e3df00d38916f6fcc086c45b1d40880ae6d6156d6ae7f02b0c8b7cb0602f859561c5662c927471b7af9ce6 WHIRLPOOL 29b5834d991d2ef5cb46db7cdc985ebcbce4ca59ffefa9b682ff1b30585e564f47c336bc7a2a70195d5add93480fde15b5ad2e3808dd5c0481fa2d8b541194d9
+DIST e_dbus-1.7.4.tar.bz2 440334 SHA256 c95cd50cbdad1a82bbd993cb6ca431cae8ce918ef38bc1288504da45f5ad733c SHA512 e4761338e0b5a1fa5e657d595895767bcc74312da6f53d016e1a75fedf999429c7cfe2db70489dbe7fd3518a4941bfed655189ab307aef737a61a2fb229d9216 WHIRLPOOL ebf4bc0af9f0e3dd776fffda49f604a0925398170f747c9b79fe840b634f369927f50494fdad77675948ada155cf739a5faf6aa5c93fae80bfc5c7f22dd5f6a6
diff --git a/dev-libs/e_dbus/e_dbus-1.7.1.ebuild b/dev-libs/e_dbus/e_dbus-1.7.1.ebuild
deleted file mode 100644
index ae0c7f0fa230..000000000000
--- a/dev-libs/e_dbus/e_dbus-1.7.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/e_dbus/e_dbus-1.7.1.ebuild,v 1.1 2012/10/22 14:34:47 tommy Exp $
-
-EAPI="2"
-
-inherit enlightenment
-
-DESCRIPTION="Enlightenment's (Ecore) integration to DBus"
-SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bluetooth +connman +libnotify ofono static-libs test-binaries +udev"
-
-RDEPEND=">=dev-libs/eina-1.7.0
-	>=dev-libs/ecore-1.7.0
-	sys-apps/dbus
-	connman? ( >=net-misc/connman-0.75 )
-	libnotify? ( >=media-libs/evas-1.7.0 )
-	udev? ( sys-power/upower sys-fs/udisks:0 )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	MY_ECONF="
-		$(use_enable bluetooth ebluez)
-		$(use_enable connman econnman0_7x)
-		$(use_enable doc)
-		--disable-ehal
-		$(use_enable libnotify enotify)
-		$(use_enable ofono eofono)
-		$(use_enable test-binaries edbus-test)
-		$(use_enable test-binaries edbus-test-client)
-		$(use_enable udev eukit)"
-	if use test-binaries ; then
-		MY_ECONF+="
-			 $(use_enable bluetooth edbus-bluez-test)
-			$(use_enable connman edbus-connman0_7x-test)
-			$(use_enable libnotify edbus-notification-daemon-test)
-			$(use_enable libnotify edbus-notify-test)
-			$(use_enable ofono edbus-ofono-test)
-			$(use_enable udev edbus-ukit-test)"
-	else
-		MY_ECONF+="
-			 --disable-edbus-bluez-test
-			--disable-edbus-connman0_7x-test
-			--disable-edbus-notification-daemon-test
-			--disable-edbus-notify-test
-			--disable-edbus-ofono-test
-			--disable-edbus-ukit-test
-			--disable-edbus-async-test
-			--disable-edbus-performance-test"
-	fi
-	enlightenment_src_configure
-}
diff --git a/dev-libs/e_dbus/e_dbus-1.7.0.ebuild b/dev-libs/e_dbus/e_dbus-1.7.4.ebuild
similarity index 92%
rename from dev-libs/e_dbus/e_dbus-1.7.0.ebuild
rename to dev-libs/e_dbus/e_dbus-1.7.4.ebuild
index 1f7b206fd8f8..42fd96ba05b2 100644
--- a/dev-libs/e_dbus/e_dbus-1.7.0.ebuild
+++ b/dev-libs/e_dbus/e_dbus-1.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/e_dbus/e_dbus-1.7.0.ebuild,v 1.2 2012/09/10 23:30:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/e_dbus/e_dbus-1.7.4.ebuild,v 1.1 2012/12/21 20:22:28 tommy Exp $
 
 EAPI="2"
 
@@ -9,6 +9,7 @@ inherit enlightenment
 DESCRIPTION="Enlightenment's (Ecore) integration to DBus"
 SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
 
+LICENSE="BSD-2"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="bluetooth +connman +libnotify ofono static-libs test-binaries +udev"
 
diff --git a/dev-libs/ecore/Manifest b/dev-libs/ecore/Manifest
index 7272edc76017..0788439926be 100644
--- a/dev-libs/ecore/Manifest
+++ b/dev-libs/ecore/Manifest
@@ -1,2 +1 @@
-DIST ecore-1.7.1.tar.bz2 3419265 SHA256 fb5f547a0a6556b5f0e274b65cfbe42f4eb8371f20d00005cd4f5a78a6b6a5d8 SHA512 a63059cab63cf97a7407f92700261f04e1170106dbebfbf99770bce656e729b139195e3aa88d6b3f6c42865ae08ea2e1f21571ff8970522ea82c17949403101c WHIRLPOOL 87f5874d5f19bd73081676a893b98b31c2a8d7f07b19197e0362c46577daad5ded21f27299d13699087fee69cb3911bc918b0d176ec7cc41208b47b585ea1538
-DIST ecore-1.7.3.tar.bz2 3457305 SHA256 62dd56329e2d353070dcd8db2355cec85c0ea08733e76ed51a8e779dbf946c4f SHA512 b714497ee14d9bc0b4b0d9295a25e04089fd913d28a97ca357fc7b222967886eaf608851a1bcd616c7e6ac5bf5081cddeca9646e0735ab6ea5c64d4c3126d576 WHIRLPOOL 302d6cd980a48be8b4342177d4cd801fb07b42e5e5679ec78d87803dfae8c513c09de2ce7efe463f68e3f0caf6b16195b398ca02288538e4ca2b3ca1644c5847
+DIST ecore-1.7.4.tar.bz2 3421866 SHA256 4fa52dece3cfeeb61c89038391c5c25ff31911a6dd187229f8ddb0a1bd61a03d SHA512 a84943e5b74308b4a10393d48e0daa5cb043643fea2e47af6e9a6301911fb1019e7455ddbaf0dc9f8c111ac2ecab0a30fc30a946c05b53c246209571d412635b WHIRLPOOL c9d21a2cd98a159de15a734bff007e82731d1e1767fa570b3efb7ba9e5ff7a44273a69cbebc3813ae7a53b90dde90e5325844d0192855f1d1582ec9f1be766d2
diff --git a/dev-libs/ecore/ecore-1.7.1.ebuild b/dev-libs/ecore/ecore-1.7.1.ebuild
deleted file mode 100644
index 9057041f624d..000000000000
--- a/dev-libs/ecore/ecore-1.7.1.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ecore/ecore-1.7.1.ebuild,v 1.1 2012/10/22 13:43:20 tommy Exp $
-
-EAPI=2
-
-inherit virtualx enlightenment eutils
-
-DESCRIPTION="Enlightenment's core event abstraction layer and OS abstraction layer"
-SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="ares curl directfb +evas fbcon glib gnutls +inotify ipv6 opengl sdl ssl static-libs +threads tslib +X xcb xinerama xprint xscreensaver"
-
-RDEPEND=">=dev-libs/eina-1.7.0
-	ares? ( net-dns/c-ares )
-	glib? ( dev-libs/glib )
-	curl? ( net-misc/curl )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( ssl? ( dev-libs/openssl ) )
-	evas? (
-		>=media-libs/evas-1.7.0[directfb?,fbcon?,opengl?,X?,xcb?]
-		opengl? ( virtual/opengl )
-	)
-	directfb? ( >=dev-libs/DirectFB-0.9.16 )
-	tslib? ( x11-libs/tslib )
-	sdl? ( media-libs/libsdl )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXcursor
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-		xinerama? ( x11-libs/libXinerama x11-libs/libXrandr )
-		xprint? ( x11-libs/libXp )
-		xscreensaver? ( x11-libs/libXScrnSaver )
-	)
-	!X? ( xcb? ( x11-libs/xcb-util ) )"
-DEPEND="${RDEPEND}"
-
-#tests depend on temp data from eina WORKDIR
-RESTRICT=test
-
-src_configure() {
-	local SSL_FLAGS="" EVAS_FLAGS="" X_FLAGS=""
-
-	if use gnutls; then
-		if use ssl; then
-			einfo "You have enabled both 'ssl' and 'gnutls', so we will use"
-			einfo "gnutls and not openssl for ecore-con support"
-		fi
-		SSL_FLAGS="
-		  --disable-openssl
-		  --enable-gnutls
-		"
-	elif use ssl; then
-		SSL_FLAGS="
-		  --enable-openssl
-		  --disable-gnutls
-		"
-	else
-		SSL_FLAGS="
-		  --disable-openssl
-		  --disable-gnutls
-		"
-	fi
-
-	local x_or_xcb=""
-	if use X; then
-		x_or_xcb="X"
-	elif use xcb; then
-		x_or_xcb="xcb"
-	fi
-
-	if use evas; then
-
-		if use opengl && [[ -z "$x_or_xcb" ]]; then
-			ewarn "Ecore/Evas usage of OpenGL requires X11."
-			ewarn "Compile dev-libs/ecore with USE=X or xcb."
-			ewarn "Compiling without opengl support."
-			EVAS_FLAGS+="
-				--disable-ecore-evas-software-x11
-				--disable-ecore-evas-software-16-x11
-			"
-		else
-			EVAS_FLAGS+="
-				--enable-ecore-evas-software-x11
-				--enable-ecore-evas-software-16-x11
-			"
-		fi
-		EVAS_FLAGS+="
-			$(use_enable directfb ecore-evas-directfb)
-			$(use_enable fbcon ecore-evas-fb)
-			$(use_enable opengl ecore-evas-opengl-x11)
-		"
-	else
-		EVAS_FLAGS+="
-			--disable-ecore-evas-directfb
-			--disable-ecore-evas-fb
-			--disable-ecore-evas-software-x11
-			--disable-ecore-evas-software-16-x11
-			--disable-ecore-evas-opengl-x11
-		"
-		if use opengl; then
-			ewarn "Ecore usage of OpenGL is dependent on media-libs/evas."
-			ewarn "Compile dev-libs/ecore with USE=evas."
-		fi
-	fi
-
-	if use X; then
-		if use xcb; then
-			ewarn "You have enabled both 'X' and 'xcb', so we will use"
-			ewarn "X as it's considered the most stable for ecore-x"
-		fi
-		X_FLAGS="
-		  --enable-ecore-x
-		  --disable-ecore-x-xcb
-		"
-
-	elif use xcb; then
-		X_FLAGS="
-		  --enable-ecore-x
-		  --enable-ecore-x-xcb
-		"
-	else
-		X_FLAGS="
-		  --disable-ecore-x
-		  --disable-ecore-x-xcb
-		"
-	fi
-
-	if [[ ! -z "$x_or_xcb" ]]; then
-		X_FLAGS+="
-			$(use_enable xinerama ecore-x-xinerama)
-			$(use_enable xprint ecore-x-xprint)
-			$(use_enable xscreensaver ecore-x-screensaver)
-		"
-	else
-		X_FLAGS+="
-			--disable-ecore-x-xinerama
-			--disable-ecore-x-xprint
-			--disable-ecore-x-screensaver
-		"
-	fi
-
-	if use tslib && ! use fbcon; then
-		ewarn "Ecore just uses tslib for framebuffer input."
-		ewarn "Compile dev-libs/ecore with USE=fbcon."
-	fi
-
-	MY_ECONF="
-	--enable-ecore-con
-	--enable-ecore-ipc
-	--enable-ecore-file
-	--enable-ecore-imf
-	--enable-ecore-input
-	--disable-ecore-win32
-	--disable-ecore-wince
-	--disable-ecore-evas-software-gdi
-	--disable-ecore-evas-software-ddraw
-	--disable-ecore-evas-direct3d
-	--disable-ecore-evas-opengl-glew
-	--disable-ecore-evas-software-16-ddraw
-	--disable-ecore-evas-software-16-wince
-	$(use_enable ares cares)
-	$(use_enable curl)
-	$(use_enable directfb ecore-directfb)
-	$(use_enable doc)
-	$(use_enable evas ecore-evas)
-	$(use_enable evas ecore-input-evas)
-	$(use_enable evas ecore-imf-evas)
-	$(use_enable evas ecore-evas-software-buffer)
-	$(use_enable fbcon ecore-fb)
-	$(use_enable glib)
-	$(use_enable inotify)
-	$(use_enable ipv6)
-	$(use_enable sdl ecore-sdl)
-	$(use_enable test tests)
-	$(use_enable threads posix-threads)
-	$(use_enable tslib)
-	$(use_enable X xim)
-	${SSL_FLAGS}
-	${EVAS_FLAGS}
-	${X_FLAGS}
-	"
-	enlightenment_src_configure
-}
-
-src_test() {
-	Xemake check
-}
diff --git a/dev-libs/ecore/ecore-1.7.3.ebuild b/dev-libs/ecore/ecore-1.7.4.ebuild
similarity index 95%
rename from dev-libs/ecore/ecore-1.7.3.ebuild
rename to dev-libs/ecore/ecore-1.7.4.ebuild
index 1733186f26b2..c8fa88608d2b 100644
--- a/dev-libs/ecore/ecore-1.7.3.ebuild
+++ b/dev-libs/ecore/ecore-1.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ecore/ecore-1.7.3.ebuild,v 1.1 2012/12/09 10:53:32 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ecore/ecore-1.7.4.ebuild,v 1.1 2012/12/21 19:56:14 tommy Exp $
 
 EAPI=2
 
@@ -11,6 +11,7 @@ inherit enlightenment eutils
 DESCRIPTION="Enlightenment's core event abstraction layer and OS abstraction layer"
 SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
 
+LICENSE="BSD-2"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="ares curl directfb +evas examples fbcon glib gnutls +inotify ipv6 opengl sdl ssl static-libs +threads tslib +X xcb xinerama xprint xscreensaver"
 
@@ -47,12 +48,6 @@ DEPEND="${RDEPEND}"
 #tests depend on temp data from eina WORKDIR
 RESTRICT=test
 
-src_prepare() {
-	epatch "${FILESDIR}"/ecore-1.7_80526.patch
-
-	enlightenment_src_prepare
-}
-
 src_configure() {
 	local SSL_FLAGS="" EVAS_FLAGS="" X_FLAGS=""
 
diff --git a/dev-libs/ecore/files/ecore-1.7_80526.patch b/dev-libs/ecore/files/ecore-1.7_80526.patch
deleted file mode 100644
index d8b4c8a5d722..000000000000
--- a/dev-libs/ecore/files/ecore-1.7_80526.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: branches/ecore-1.7/ChangeLog
-===================================================================
---- branches/ecore-1.7/ChangeLog	(revision 80479)
-+++ branches/ecore-1.7/ChangeLog	(revision 80526)
-@@ -1008,3 +1008,6 @@
- 	* 1.7.3 release
- 
--
-+2012-12-09  Cedric Bail
-+
-+	* Fix build without IPv6.
-+
-Index: branches/ecore-1.7/src/lib/ecore_con/ecore_con_info.c
-===================================================================
---- branches/ecore-1.7/src/lib/ecore_con/ecore_con_info.c	(revision 80479)
-+++ branches/ecore-1.7/src/lib/ecore_con/ecore_con_info.c	(revision 80526)
-@@ -39,4 +39,5 @@
- #include <sys/types.h>
- #include <unistd.h>
-+#include <fcntl.h>
- #include <ctype.h>
- #ifdef __OpenBSD__
-Index: branches/ecore-1.7/NEWS
-===================================================================
---- branches/ecore-1.7/NEWS	(revision 80479)
-+++ branches/ecore-1.7/NEWS	(revision 80526)
-@@ -1,2 +1,10 @@
-+Ecore 1.7.4
-+
-+Changes since Ecore 1.7.3:
-+--------------------------
-+
-+Fixes:
-+    * Fix build without IPv6.
-+
- Ecore 1.7.3
- 
diff --git a/dev-libs/eet/Manifest b/dev-libs/eet/Manifest
index c645431fda8a..9ce59972e19e 100644
--- a/dev-libs/eet/Manifest
+++ b/dev-libs/eet/Manifest
@@ -1,2 +1 @@
-DIST eet-1.7.2.tar.bz2 577810 SHA256 e8ec6e02c3dbb050d23fa2e6985019c8e1005c7dde31a047ed193974d04bd86f SHA512 074b99d07f0e5326643390a8deded500ebd872ba73936247154b601b057c4ce577a543ebcb6dd2ec9fadfc13f76e62b106599b51efaef2a46687b8bc828d8f14 WHIRLPOOL f5d69cbaa065c07a163f9a739cbdab5b71f69cfddee8d6eab5c288b5ad4fc043df08251b2108fa59280c8d33f812fd3349b449fa495a889ad4b79c508478b241
-DIST eet-1.7.3.tar.bz2 576273 SHA256 30d90883131799cd33aa0328b496dea1c2412bf73c87e1840b31ae2ddf99a268 SHA512 d3a40ebe3ac01484d289f70ff928b6e3d8f6842b39a51d8c4457edbcc36dff03d42e83cd29616076b3b38d67876863b20b6a6afd73aa4269d8ab49df3a94e370 WHIRLPOOL 89400a0ed7e03f32824e4b2764bb01d67c36400d3ed09449deb58881a4d468b828d4617c4d6df01d31e04b20c43098dd9df545f3f2cdf97ca62b6bb5c0cd70b3
+DIST eet-1.7.4.tar.bz2 575676 SHA256 6fce549e89d5828fa70c7d67696932a0b40cf4061d0564eee84b6819f60650ef SHA512 ccf57b934aa6609d2696d4912fa3349fd3d3a144f5f8067d5aca910c7df11aa6753c1332fca17d2ca056c10b49b95a0637bb333baee0ebead23efaa698ede3d7 WHIRLPOOL bf8797e1224a543a18f31718136a88b2bd166821ce794bb456ab58fa558ea0918717b11092a2bf3156fce30fff8e31fdcb528cc59afcc58dc0adc515e23c63dc
diff --git a/dev-libs/eet/eet-1.7.2.ebuild b/dev-libs/eet/eet-1.7.2.ebuild
deleted file mode 100644
index 20e0f50b482c..000000000000
--- a/dev-libs/eet/eet-1.7.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/eet/eet-1.7.2.ebuild,v 1.1 2012/11/23 14:49:03 tommy Exp $
-
-EAPI=2
-
-inherit enlightenment
-
-DESCRIPTION="E file chunk reading/writing library"
-HOMEPAGE="http://trac.enlightenment.org/e/wiki/Eet"
-SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug examples gnutls ssl static-libs test"
-
-RDEPEND=">=dev-libs/eina-1.7.0
-	virtual/jpeg
-	sys-libs/zlib
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( ssl? ( dev-libs/openssl ) )"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check
-		dev-util/lcov )"
-
-src_configure() {
-	local SSL_FLAGS=""
-
-	if use gnutls; then
-		if use ssl; then
-			ewarn "You have enabled both 'ssl' and 'gnutls', so we will use"
-			ewarn "gnutls and not openssl for cipher and signature support"
-		fi
-		SSL_FLAGS="
-			--enable-cipher
-			--enable-signature
-			--disable-openssl
-			--enable-gnutls"
-	elif use ssl; then
-		SSL_FLAGS="
-			--enable-cipher
-			--enable-signature
-			--enable-openssl
-			--disable-gnutls"
-	else
-		SSL_FLAGS="
-			--disable-cipher
-			--disable-signature
-			--disable-openssl
-			--disable-gnutls"
-	fi
-
-	export MY_ECONF="
-		$(use_enable debug assert)
-		$(use_enable doc)
-		$(use_enable test tests)
-		${SSL_FLAGS}
-		${MY_ECONF}"
-
-	enlightenment_src_configure
-}
-
-src_install() {
-	enlightenment_src_install
-	rm -r src/examples/Makefile* || die
-	docinto examples
-	dodoc src/examples/* || die
-}
diff --git a/dev-libs/eet/eet-1.7.3.ebuild b/dev-libs/eet/eet-1.7.4.ebuild
similarity index 91%
rename from dev-libs/eet/eet-1.7.3.ebuild
rename to dev-libs/eet/eet-1.7.4.ebuild
index daa87ad8cabf..b76dfe24def8 100644
--- a/dev-libs/eet/eet-1.7.3.ebuild
+++ b/dev-libs/eet/eet-1.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/eet/eet-1.7.3.ebuild,v 1.1 2012/12/08 13:03:53 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/eet/eet-1.7.4.ebuild,v 1.1 2012/12/21 19:41:59 tommy Exp $
 
 EAPI=2
 
@@ -10,6 +10,7 @@ DESCRIPTION="E file chunk reading/writing library"
 HOMEPAGE="http://trac.enlightenment.org/e/wiki/Eet"
 SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
 
+LICENSE="BSD-2"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="debug examples gnutls ssl static-libs test"
 
diff --git a/dev-libs/eeze/Manifest b/dev-libs/eeze/Manifest
index a64d7a0fc8c4..726ef8581b19 100644
--- a/dev-libs/eeze/Manifest
+++ b/dev-libs/eeze/Manifest
@@ -1 +1 @@
-DIST eeze-1.7.1.tar.bz2 518296 SHA256 6a696e2fe1ad14983ca7555eed2c50dd39f9a084e04475f0d25fd31d32e3cd58 SHA512 5d3afc9cd7aeb1b3bbd14a7fae7a66bd43c482e732b7b005fd405ad278722d8e7906552be812b729b116e48e7f5c8c6cd3bbba2b284726ba181f86910977ae40 WHIRLPOOL 0fa57760cc3ddd3e9519cce054c9ab9ed4e870918922645ce194878629f8b258df3bb9e872ee0879fb3be92d7f0fc247555a074f797527a7ce7265b23af2549c
+DIST eeze-1.7.4.tar.bz2 550280 SHA256 0598688498fcbd59a7747cb29f583418dc2717b821fb3ad2b1739af26e468e4f SHA512 5f736a6a5809b4b870f6403d80e06cd8785deaa59164c5222b420099036d9ff6fc68ddcfc4b76a568d3dc8e1b02e3be42acb0753caebe2a3c84bf3537ce9f8f0 WHIRLPOOL e544ec9329e7b6e111addc78702c206da40fa40e3390d08f9157e5a0b5f4dbff8276ad2ec14c404fb13f6395d2db27123543320a532c0f8d575d2150c4582c2e
diff --git a/dev-libs/eeze/eeze-1.7.1.ebuild b/dev-libs/eeze/eeze-1.7.4.ebuild
similarity index 82%
rename from dev-libs/eeze/eeze-1.7.1.ebuild
rename to dev-libs/eeze/eeze-1.7.4.ebuild
index b86922b43879..363030ed231d 100644
--- a/dev-libs/eeze/eeze-1.7.1.ebuild
+++ b/dev-libs/eeze/eeze-1.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/eeze/eeze-1.7.1.ebuild,v 1.2 2012/11/23 22:12:13 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/eeze/eeze-1.7.4.ebuild,v 1.1 2012/12/21 20:19:07 tommy Exp $
 
 inherit enlightenment
 
@@ -8,6 +8,7 @@ DESCRIPTION="library to simplify the use of devices"
 HOMEPAGE="http://trac.enlightenment.org/e/wiki/Eeze"
 SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
 
+LICENSE="BSD-2"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="static-libs utilities"
 
@@ -17,6 +18,7 @@ RDEPEND=${DEPEND}
 
 src_configure() {
 	MY_ECONF="
+	$(use_enable doc)
 	$(use_enable utilities eeze-disk-ls)
 	$(use_enable utilities eeze-mount)
 	$(use_enable utilities eeze-umount)
diff --git a/dev-libs/efreet/Manifest b/dev-libs/efreet/Manifest
index 4e8990b96b2e..326951fe8c4c 100644
--- a/dev-libs/efreet/Manifest
+++ b/dev-libs/efreet/Manifest
@@ -1,2 +1 @@
-DIST efreet-1.7.1.tar.bz2 423750 SHA256 c844ed545f1c9438c73af4e4d037401a653babaab0a4e4b69377a2de49431eea SHA512 cd041ad72542a968a346feb4627b193e67c006e06a66815ada144c83bedc15d1b235b0f3ce68a238a7a604f03728c26334de2769e4efa24eace7b76fec7e21e0 WHIRLPOOL 51bdde6e67a5c3a48e567ee8299bc175eca8d30116ca65abaa9eea04488005b3e365f5a1ba8181a76b473eab81b47752e0c389a53d6f4f46d9139b01f7862acb
-DIST efreet-1.7.3.tar.bz2 449922 SHA256 6bd1e5ac87d9d22471b642badaeb3926511eb848048c64a90f64379784eb4624 SHA512 3a80d16dfd95e658dc0cb8376d48a37e7725c3e490e391cc51b3642bfb58b5997776d9d4f2e7da3c5a48f80353c69c9be7738152cddd50ed1093f6b017d4599b WHIRLPOOL 141ad7437f01bb6cfb9adc785924fc0c9f52f38fb38d9dc09d5cc48d16c38bc1a5dc7025d40dbd41f54222cc16ac5ab918304b967338f29995f01c7a0587b3e9
+DIST efreet-1.7.4.tar.bz2 448678 SHA256 2253863223aa5b628cb47f0a7674df97d7893bc490e4b1ba88f2d1ea421dbb2e SHA512 2a4fbbffffdcb914457c16a1f646a25f6e2b1168ce83e5bd5bee133a688734f7efb82cab275548eb767d6ffa297ba944133028cf85b05eb9e3504e1c4eb2ffe6 WHIRLPOOL a2d0de209219a69569cd75dbed0b5a03c80c7e6587393cc63f1c04dccc20f8ed2ccf3792ba130f96b2de56c12c4db94f44c626f897a2fbb33a7ccc812f146448
diff --git a/dev-libs/efreet/efreet-1.7.1.ebuild b/dev-libs/efreet/efreet-1.7.1.ebuild
deleted file mode 100644
index c99d3f521a59..000000000000
--- a/dev-libs/efreet/efreet-1.7.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/efreet/efreet-1.7.1.ebuild,v 1.1 2012/10/22 14:27:32 tommy Exp $
-
-EAPI=2
-
-inherit enlightenment
-
-DESCRIPTION="library for handling of freedesktop.org specs (desktop/icon/theme/etc...)"
-SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/ecore-1.7.0
-	>=dev-libs/eet-1.7.0
-	>=dev-libs/eina-1.7.0
-	x11-misc/xdg-utils"
-DEPEND="${RDEPEND}"
diff --git a/dev-libs/efreet/efreet-1.7.3.ebuild b/dev-libs/efreet/efreet-1.7.4.ebuild
similarity index 81%
rename from dev-libs/efreet/efreet-1.7.3.ebuild
rename to dev-libs/efreet/efreet-1.7.4.ebuild
index 93ceb2aded91..329de9f47ec9 100644
--- a/dev-libs/efreet/efreet-1.7.3.ebuild
+++ b/dev-libs/efreet/efreet-1.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/efreet/efreet-1.7.3.ebuild,v 1.1 2012/12/08 14:32:10 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/efreet/efreet-1.7.4.ebuild,v 1.1 2012/12/21 20:12:04 tommy Exp $
 
 EAPI=2
 
@@ -9,6 +9,7 @@ inherit enlightenment
 DESCRIPTION="library for handling of freedesktop.org specs (desktop/icon/theme/etc...)"
 SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
 
+LICENSE="BSD-2"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="static-libs"
 
diff --git a/dev-libs/eina/Manifest b/dev-libs/eina/Manifest
index f030c0853d8b..c41e1940c8ab 100644
--- a/dev-libs/eina/Manifest
+++ b/dev-libs/eina/Manifest
@@ -1,2 +1 @@
-DIST eina-1.7.1.tar.bz2 9749033 SHA256 af0b316734ba72d92fa7716005efd380f28677c76f0e0b6a3c5a9b524575a6ce SHA512 b0aafd2d278851b94384b81398b93f458965e9dc0c1ff344dd4c1a7ebf0d17bfa1551292e0172e367b9f781d3f71bf5086485885f3948a0799192a7e4cb82d67 WHIRLPOOL 599f29e5c16976ec60ea6f672922e9c2c52f6636f32cfad575ffe1db1cc62adb75f9e681a83fd2bdc8b49ee249246d5d8927a9e0ad9ac909b991d031d7ffc047
-DIST eina-1.7.3.tar.bz2 9805893 SHA256 638b57c4ff44ce2ce00b5be395d87deadc3810c5079ea4de608630363d6b54d7 SHA512 6a3c5ae63163fe1362b12133a4a68116c2a3081ff4b3847a52de10f4adc9c101647a2097976a1e3556287ade9045c4d6f374f599706d2f384b02a0f3425468cb WHIRLPOOL ddef4f32fa9771470c0cd95124b99039b1a9d95fdc8f41f7ccbcddf8dbc11a31a95983b5095e2ef4853365540fefae8de2131d4a0fe643b7a93b244ef8231255
+DIST eina-1.7.4.tar.bz2 9806158 SHA256 f16da871eabb9e2b34f1fa7d110a9040e07c458bc27ebc7b6b60f43801a78e54 SHA512 8bcc2a961050da9bffbb93483f653a7f633ce3f11b55b35084075f6482d9a95f8c8ed48204b8b6a75c0780fc7abac1c7fe028c1e5a37662b927392bbc5318d7c WHIRLPOOL 8f32707577cf1d14af9a2298966c911aa84dac00ee81876e540ce56cdea7e780ab19f1927b662392671ecaea8ce35cd1759c90945a013cba0e10e87ef3c0174f
diff --git a/dev-libs/eina/eina-1.7.3.ebuild b/dev-libs/eina/eina-1.7.3.ebuild
deleted file mode 100644
index dd61ff0d4f1f..000000000000
--- a/dev-libs/eina/eina-1.7.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/eina/eina-1.7.3.ebuild,v 1.1 2012/12/08 14:01:55 tommy Exp $
-
-EAPI="2"
-
-inherit enlightenment
-
-DESCRIPTION="Enlightenment's data types library (List, hash, etc) in C"
-
-SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-LICENSE="LGPL-2.1"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="altivec debug default-mempool mempool-buddy +mempool-chained
-	mempool-fixed-bitmap +mempool-pass-through
-	mmx sse sse2 static-libs test"
-
-RDEPEND="debug? ( dev-util/valgrind )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? (
-		dev-libs/check
-		dev-libs/glib
-		dev-util/lcov
-	)"
-
-src_prepare() {
-	cp "${FILESDIR}"/city.h src/tests/ || die
-
-	enlightenment_src_prepare
-}
-
-src_configure() {
-	local MODULE_ARGUMENT="static"
-	if use debug ; then
-		MODULE_ARGUMENT="yes"
-	fi
-
-	# Evas benchmark is broken!
-	MY_ECONF="
-	$(use_enable altivec cpu-altivec)
-	$(use_enable !debug amalgamation)
-	$(use_enable debug stringshare-usage)
-	$(use_enable debug assert)
-	$(use_enable debug valgrind)
-	$(use debug || echo " --with-internal-maximum-log-level=2")
-	$(use_enable default-mempool)
-	$(use_enable doc)
-	$(use_enable mempool-buddy mempool-buddy $MODULE_ARGUMENT)
-	$(use_enable mempool-chained mempool-chained-pool $MODULE_ARGUMENT)
-	$(use_enable mempool-fixed-bitmap mempool-fixed-bitmap $MODULE_ARGUMENT)
-	$(use_enable mempool-pass-through mempool-pass-through $MODULE_ARGUMENT)
-	$(use_enable mmx cpu-mmx)
-	$(use_enable sse cpu-sse)
-	$(use_enable sse2 cpu-sse2)
-	$(use test && echo " --disable-amalgamation")
-	$(use_enable test e17)
-	$(use_enable test tests)
-	$(use_enable test benchmark)
-	$(use test && echo " --with-internal-maximum-log-level=6")
-	--enable-magic-debug
-	--enable-safety-checks
-	"
-
-	enlightenment_src_configure
-}
diff --git a/dev-libs/eina/eina-1.7.1.ebuild b/dev-libs/eina/eina-1.7.4.ebuild
similarity index 89%
rename from dev-libs/eina/eina-1.7.1.ebuild
rename to dev-libs/eina/eina-1.7.4.ebuild
index 2a4a44b52182..98a87a6adc30 100644
--- a/dev-libs/eina/eina-1.7.1.ebuild
+++ b/dev-libs/eina/eina-1.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/eina/eina-1.7.1.ebuild,v 1.2 2012/10/25 11:41:40 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/eina/eina-1.7.4.ebuild,v 1.1 2012/12/21 19:27:50 tommy Exp $
 
 EAPI="2"
 
@@ -25,12 +25,6 @@ DEPEND="${RDEPEND}
 		dev-util/lcov
 	)"
 
-src_prepare() {
-	cp "${FILESDIR}"/city.h src/tests/ || die
-
-	enlightenment_src_prepare
-}
-
 src_configure() {
 	local MODULE_ARGUMENT="static"
 	if use debug ; then
diff --git a/dev-libs/eina/files/city.h b/dev-libs/eina/files/city.h
deleted file mode 100644
index a9c297fee7ec..000000000000
--- a/dev-libs/eina/files/city.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright (c) 2011 Google, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-// CityHash Version 1, by Geoff Pike and Jyrki Alakuijala
-//
-// This file provides a few functions for hashing strings. On x86-64
-// hardware in 2011, CityHash64() is faster than other high-quality
-// hash functions, such as Murmur.  This is largely due to higher
-// instruction-level parallelism.  CityHash64() and CityHash128() also perform
-// well on hash-quality tests.
-//
-// CityHash128() is optimized for relatively long strings and returns
-// a 128-bit hash.  For strings more than about 2000 bytes it can be
-// faster than CityHash64().
-//
-// Functions in the CityHash family are not suitable for cryptography.
-//
-// WARNING: This code has not been tested on big-endian platforms!
-// It is known to work well on little-endian platforms that have a small penalty
-// for unaligned reads, such as current Intel and AMD moderate-to-high-end CPUs.
-//
-// By the way, for some hash functions, given strings a and b, the hash
-// of a+b is easily derived from the hashes of a and b.  This property
-// doesn't hold for any hash functions in this file.
-
-#ifndef CITY_HASH_H_
-#define CITY_HASH_H_
-
-#include <stdlib.h>  // for size_t.
-#include <stdint.h>
-#include <utility>
-
-typedef uint8_t uint8;
-typedef uint32_t uint32;
-typedef uint64_t uint64;
-typedef std::pair<uint64, uint64> uint128;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-inline uint64 Uint128Low64(const uint128& x) { return x.first; }
-inline uint64 Uint128High64(const uint128& x) { return x.second; }
-
-// Hash function for a byte array.
-uint64 CityHash64(const char *buf, size_t len);
-// Hash function for a byte array.  For convenience, a 64-bit seed is also
-// hashed into the result.
-uint64 CityHash64WithSeed(const char *buf, size_t len, uint64 seed);
-
-// Hash function for a byte array.  For convenience, two seeds are also
-// hashed into the result.
-uint64 CityHash64WithSeeds(const char *buf, size_t len,
-                           uint64 seed0, uint64 seed1);
-
-// Hash function for a byte array.
-uint128 CityHash128(const char *s, size_t len);
-
-// Hash function for a byte array.  For convenience, a 128-bit seed is also
-// hashed into the result.
-uint128 CityHash128WithSeed(const char *s, size_t len, uint128 seed);
-
-// Hash 128 input bits down to 64 bits of output.
-// This is intended to be a reasonably good hash function.
-inline uint64 Hash128to64(const uint128& x) {
-  // Murmur-inspired hashing.
-  const uint64 kMul = 0x9ddfea08eb382d69ULL;
-  uint64 a = (Uint128Low64(x) ^ Uint128High64(x)) * kMul;
-  a ^= (a >> 47);
-  uint64 b = (Uint128High64(x) ^ a) * kMul;
-  b ^= (b >> 47);
-  b *= kMul;
-  return b;
-}
-
-#ifdef __cplusplus
-}
-#endif
-#endif  // CITY_HASH_H_
diff --git a/dev-libs/eio/Manifest b/dev-libs/eio/Manifest
index 58cda74f69c7..1ebf7b87879a 100644
--- a/dev-libs/eio/Manifest
+++ b/dev-libs/eio/Manifest
@@ -1,2 +1 @@
-DIST eio-1.7.1.tar.bz2 335047 SHA256 ec4bdc64b61d031cf6eb8762ee9e39031215e79c0839cd08ff446624e0cdf44b SHA512 4ec0c0f7c675d34490e452cc67c4f08ca0d8dd63e060d6dfb60dab6ba6d662d5b3d7fa0fcffaadb4c4102cf7562fb4f96cbfd1cabfe7f0cddecc8b6645a834ed WHIRLPOOL a1cbcf70db5b701e188e50a84613fda70e2d746f5aeb58ab7709c55deda0926b8ddb69e420298c3d64c963f3f5cbe68bc93338fc337a0d65c92e25bf1c2d8f35
-DIST eio-1.7.3.tar.bz2 356498 SHA256 dcdd9ff1b2e8a0f9ab7e8dc2f57d1f5ba6bb227062e6a81a41319b00a5b2b1eb SHA512 8fcf617a3d1ca073f6b8fecf0f95f730f5e2c1190422611ec8c6cc3dd0f4aaf319b011b5f7b6db82b5771c0455659104f566034ad95755b77e079e53b11826c0 WHIRLPOOL 52fbfb4dc6b6e16a2e995d6480005417247a83f9c7c175b85886fe6f02e6f78e34acd7e3f1996826da965ade9e9639a4128d26130903a24e635b444cb26c141b
+DIST eio-1.7.4.tar.bz2 355980 SHA256 ec762fdc27779e774b6144d8aaea0127694f43a3dfb9809130429e191c7b4063 SHA512 744414d8394063d57b5073e2e55324c9d6c98f3a88b3cef606f83d5819a979ea86a76c1787a0c9d9f2889be131df1d71112e80d05ea85c79912eea2dadb51a70 WHIRLPOOL 0ecd3165ead25d115f4822a9768d51d9a34ec46f90f430b67c579620b0c7fb338394f903838afc230467bb7a6554988bfdd0aad90a489966857b8e9b3424c726
diff --git a/dev-libs/eio/eio-1.7.3.ebuild b/dev-libs/eio/eio-1.7.3.ebuild
deleted file mode 100644
index 760ce329da9a..000000000000
--- a/dev-libs/eio/eio-1.7.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/eio/eio-1.7.3.ebuild,v 1.1 2012/12/08 14:04:29 tommy Exp $
-
-EAPI=2
-
-inherit enlightenment
-
-DESCRIPTION="Enlightenment's integration to IO"
-HOMEPAGE="http://trac.enlightenment.org/e/wiki/EIO"
-
-SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-LICENSE="BSD"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="examples static-libs"
-
-RDEPEND=">=dev-libs/ecore-1.7.0"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	MY_ECONF="--enable-posix-threads
-		$(use_enable doc)
-		$(use_enable examples build-examples)
-		$(use_enable examples install-examples)"
-	enlightenment_src_configure
-}
diff --git a/dev-libs/eio/eio-1.7.1.ebuild b/dev-libs/eio/eio-1.7.4.ebuild
similarity index 83%
rename from dev-libs/eio/eio-1.7.1.ebuild
rename to dev-libs/eio/eio-1.7.4.ebuild
index d5836a3027ba..c33c98bc9b6a 100644
--- a/dev-libs/eio/eio-1.7.1.ebuild
+++ b/dev-libs/eio/eio-1.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/eio/eio-1.7.1.ebuild,v 1.1 2012/11/09 16:44:48 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/eio/eio-1.7.4.ebuild,v 1.1 2012/12/21 20:15:57 tommy Exp $
 
 EAPI=2
 
@@ -10,7 +10,7 @@ DESCRIPTION="Enlightenment's integration to IO"
 HOMEPAGE="http://trac.enlightenment.org/e/wiki/EIO"
 
 SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-LICENSE="BSD"
+LICENSE="LGPL-2"
 
 KEYWORDS="~amd64 ~x86"
 IUSE="examples static-libs"
diff --git a/dev-libs/embryo/Manifest b/dev-libs/embryo/Manifest
index 230a90cdc0fc..a1257a642993 100644
--- a/dev-libs/embryo/Manifest
+++ b/dev-libs/embryo/Manifest
@@ -1,2 +1 @@
-DIST embryo-1.2.0.tar.bz2 440135 SHA256 cf530e703e812ab4444c516977b21dfc24212938d36ad587ec9b40056a52d583 SHA512 8d5164102a754f8bc40c4cef50bb4afe03f3d2a825cd515d139d3af262df740055ef6115962e1db0d92671c811d5ff1a8e45c65fa85b14ddcfaa5fd66b7e8a29 WHIRLPOOL 83b88b5da6913f9e4d2fa6181cd97f6257ddadb3e44ba446ae6b2b8681911462bb859635dd287133ace6970d29a3d836354abfc32ea3a811d3a5bbfff6ea9f4a
-DIST embryo-1.7.0.tar.bz2 440504 SHA256 95125651f1a3edbf0ef4fac40ecaec03d31cb383ae7dba7708b547a419f9e10e SHA512 be77ca7be44df8e4bc86ff7ecaf7d40b0b93ceba372404d310877debac40459c1c2ead133752fb0490116b4a6dd07e7a878e06c73cfcc00da60e35eb29e7ed55 WHIRLPOOL 4f0b7b1553dc2d2bf0062ffaa70295e7ac6fe664d602d8755c5d109c4995d4210bf940fb4791cdf6fbd01f4751476e1622ca481430145afc73beb767d5d7ff45
+DIST embryo-1.7.4.tar.bz2 459454 SHA256 c8886dd5df2948cdb1463f627c2ce92faf642f29e38f0692f80f51ad3495ee67 SHA512 31d13593e46d947f41d0973b6866ba2e0c8838f0391317aeccf9ffffd97b83978c4caa8f5f5c147cba70231ce742e691b985995e13bff2e9ba5bfb5daa8f1222 WHIRLPOOL d6d2951fd2dc901bb1fa3b5b117a0b712a354f8ecddf8ce3035f9c766cad156acdfdc4529aebb2d4e955896b78dfc29adf90004ca0ac1a9953a62c3d61f4cd42
diff --git a/dev-libs/embryo/embryo-1.2.0.ebuild b/dev-libs/embryo/embryo-1.2.0.ebuild
deleted file mode 100644
index 3e1224ddabb0..000000000000
--- a/dev-libs/embryo/embryo-1.2.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/embryo/embryo-1.2.0.ebuild,v 1.1 2012/06/23 17:56:19 tommy Exp $
-
-inherit enlightenment
-
-DESCRIPTION="load and control programs compiled in embryo language (small/pawn variant)"
-SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND=">=dev-libs/eina-1.2.0"
-RDEPEND=${DEPEND}
diff --git a/dev-libs/embryo/embryo-1.7.0.ebuild b/dev-libs/embryo/embryo-1.7.4.ebuild
similarity index 74%
rename from dev-libs/embryo/embryo-1.7.0.ebuild
rename to dev-libs/embryo/embryo-1.7.4.ebuild
index 8b013e5ec55b..aa33279e32dc 100644
--- a/dev-libs/embryo/embryo-1.7.0.ebuild
+++ b/dev-libs/embryo/embryo-1.7.4.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/embryo/embryo-1.7.0.ebuild,v 1.2 2012/09/10 23:30:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/embryo/embryo-1.7.4.ebuild,v 1.1 2012/12/21 20:01:52 tommy Exp $
 
 inherit enlightenment
 
 DESCRIPTION="load and control programs compiled in embryo language (small/pawn variant)"
 SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
 
+LICENSE="BSD-2 ZLIB"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="static-libs"
 
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 76e993f51d9a..f140e435e9bd 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -1,3 +1,4 @@
 DIST icu4c-49_1_2-docs.zip 4245617 SHA256 50fcc81a797b20ebaf12167479f24eac323bad21d012ca366701f62eccdabb94 SHA512 84ddc1e4cc3e4617e6a93c6ada3e7e5fa470fb34fed3ca4e3c57a741bbdd279d402d3fd313543230f2c73c3197300311eafd2d91c207ff64d3eca9833907a32b WHIRLPOOL 44fde7cfc560bb29e16f32ab4ca300c87469747719ba5a0e0622ed5eb64911e5f5969328a9cef71f0c4aee455093233d0a5c0f8719559d705c2698de2f457662
 DIST icu4c-49_1_2-src.tgz 19010646 SHA256 cce83cc88a2ff79d65c05426facbf30530bbe13a1cfda04b3ab81b55414cf5a3 SHA512 83997878222ada25be281c35b766906a9997da350068d4f7400874ea37133baeef0e8277dc117219c37ab486b643125b4b73ace956507d2237c1c9002173a140 WHIRLPOOL 68ff12ab0b3b5e471ced5d07c7170494e24526591587669b86a2a732ce3d0dda4abd74e2dcfdc3dd2e66a30b28d897836a6b0c1f1148101e1b51ffc87a87f080
 DIST icu4c-50_1-src.tgz 21181132 SHA256 68592b3c07d9b86100f41d0172eb1a81f3ffb2a8fef1104d7395099079ba7350 SHA512 01a3e42b6180641ae7569bba70c31509d2c65bc7cdd8e84a74444d5da1964486af001d0436c0e6b85ce8867d75bbdcf0b2ad2d18ed24196104db73fc469a301d WHIRLPOOL c7f958be4734d05cc0fcf1a541cc77618fbaabdeeda986b96de14e2a76ccf3eb2ed4b57548d9fb931f510f46207441e99f6f96217aa481bea3bb540b20b6d687
+DIST icu4c-50_1_1-src.tgz 21189084 SHA256 a6f426e3c04749c74bcb9d2ce229f905de88deda2353db2249f2e96fe604df8f SHA512 0af83f880eeacbd9e095c21a63312b94885f11f5c57826b2bbacbae49e589ccacfccccc0c95f37a186a55b5aed7cdb125dd98a0f8b39963b716687506dca3615 WHIRLPOOL b434902fc96e4f6f637813a766ac6989add7470800a6ae5927787e3cc1b5bd5a53556d48c880270c4aa50aae388b7aa65c6f186014e04eca86f4ca4c6d45be16
diff --git a/dev-libs/icu/icu-50.1.1.ebuild b/dev-libs/icu/icu-50.1.1.ebuild
new file mode 100644
index 000000000000..428c7152d013
--- /dev/null
+++ b/dev-libs/icu/icu-50.1.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/dev-libs/icu/icu-50.1.1.ebuild,v 1.1 2012/12/21 16:40:50 phajdan.jr Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs base autotools
+
+DESCRIPTION="International Components for Unicode"
+HOMEPAGE="http://www.icu-project.org/"
+SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="debug doc examples static-libs"
+
+RDEPEND="!dev-libs/icu:0/50"
+DEPEND="
+	doc? (
+		app-doc/doxygen[dot]
+	)
+"
+
+S="${WORKDIR}/${PN}/source"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.8.1-fix_binformat_fonts.patch"
+	"${FILESDIR}/${PN}-4.8.1.1-fix_ltr.patch"
+)
+
+src_prepare() {
+	local variable
+
+	base_src_prepare
+
+	# Do not hardcode flags in icu-config and icu-*.pc files.
+	# https://ssl.icu-project.org/trac/ticket/6102
+	for variable in CFLAGS CPPFLAGS CXXFLAGS FFLAGS LDFLAGS; do
+		sed \
+			-e "/^${variable} =.*/s: *@${variable}@\( *$\)\?::" \
+			-i config/icu.pc.in \
+			-i config/Makefile.inc.in \
+			|| die
+	done
+
+	# Disable renaming as it is stupind thing to do
+	sed -i \
+		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+		common/unicode/uconfig.h || die
+
+	# Fix linking of icudata
+	sed -i \
+		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+		config/mh-linux || die
+
+	# Append doxygen configuration to configure
+	sed -i \
+		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
+		configure.in || die
+	eautoreconf
+}
+
+src_configure() {
+	local cross_opts
+
+	# bootstrap for cross compilation
+	if tc-is-cross-compiler; then
+		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+		./configure --disable-renaming --disable-debug \
+			--disable-samples --enable-static || die
+		emake
+		mkdir -p "${WORKDIR}/host/"
+		cp -a {bin,lib,config,tools} "${WORKDIR}/host/"
+		emake clean
+
+		cross_opts="--with-cross-build=${WORKDIR}/host"
+	fi
+
+	econf \
+		--disable-renaming \
+		$(use_enable debug) \
+		$(use_enable examples samples) \
+		$(use_enable static-libs static) \
+		${cross_opts}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		doxygen -u Doxyfile || die
+		doxygen Doxyfile || die
+	fi
+}
+
+src_test() {
+	# INTLTEST_OPTS: intltest options
+	#   -e: Exhaustive testing
+	#   -l: Reporting of memory leaks
+	#   -v: Increased verbosity
+	# IOTEST_OPTS: iotest options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	# CINTLTST_OPTS: cintltst options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	emake -j1 VERBOSE="1" check
+}
+
+src_install() {
+	default
+
+	dohtml ../readme.html
+
+	use doc && dohtml -p api -r doc/html/
+}
diff --git a/dev-libs/libconfig/libconfig-1.4.9.ebuild b/dev-libs/libconfig/libconfig-1.4.9.ebuild
index 28451f271306..4ea36e03ecdb 100644
--- a/dev-libs/libconfig/libconfig-1.4.9.ebuild
+++ b/dev-libs/libconfig/libconfig-1.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libconfig/libconfig-1.4.9.ebuild,v 1.4 2012/12/19 09:37:16 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libconfig/libconfig-1.4.9.ebuild,v 1.5 2012/12/22 13:48:52 ago Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.hyperrealm.com/libconfig/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="amd64 ~mips ppc ~ppc64 ~sparc ~x86 ~x86-linux"
 IUSE="examples static-libs"
 
 DEPEND="
diff --git a/dev-libs/libxslt/libxslt-1.1.28.ebuild b/dev-libs/libxslt/libxslt-1.1.28.ebuild
index 38870d094dd0..4f75c7378a8e 100644
--- a/dev-libs/libxslt/libxslt-1.1.28.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.28.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/libxslt/libxslt-1.1.28.ebuild,v 1.4 2012/12/19 22:48:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.28.ebuild,v 1.5 2012/12/22 13:55:49 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-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="crypt debug python static-libs"
 
 RDEPEND=">=dev-libs/libxml2-2.8.0
diff --git a/dev-libs/mpfr/mpfr-3.1.1.ebuild b/dev-libs/mpfr/mpfr-3.1.1.ebuild
index de5a02fdf082..10a98ba94583 100644
--- a/dev-libs/mpfr/mpfr-3.1.1.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/mpfr-3.1.1.ebuild,v 1.2 2012/12/20 10:01:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/mpfr-3.1.1.ebuild,v 1.3 2012/12/22 13:50:04 ago Exp $
 
 EAPI="3"
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-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="static-libs"
 
 RDEPEND=">=dev-libs/gmp-4.1.4-r2[static-libs?]"
diff --git a/dev-libs/uthash/uthash-1.9.7.ebuild b/dev-libs/uthash/uthash-1.9.7.ebuild
index ca3415689090..e82c28f66896 100644
--- a/dev-libs/uthash/uthash-1.9.7.ebuild
+++ b/dev-libs/uthash/uthash-1.9.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/dev-libs/uthash/uthash-1.9.7.ebuild,v 1.1 2012/10/16 20:58:55 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/uthash/uthash-1.9.7.ebuild,v 1.3 2012/12/22 13:50:28 ago Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/uthash/${P}.tar.bz2"
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc ~sparc ~x86"
 IUSE="test"
 
 DEPEND="test? ( dev-lang/perl )"
diff --git a/dev-perl/Perl-Critic-Deprecated/Perl-Critic-Deprecated-1.108.0.ebuild b/dev-perl/Perl-Critic-Deprecated/Perl-Critic-Deprecated-1.108.0.ebuild
index 0c13d97e97dc..507477be92dc 100644
--- a/dev-perl/Perl-Critic-Deprecated/Perl-Critic-Deprecated-1.108.0.ebuild
+++ b/dev-perl/Perl-Critic-Deprecated/Perl-Critic-Deprecated-1.108.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/dev-perl/Perl-Critic-Deprecated/Perl-Critic-Deprecated-1.108.0.ebuild,v 1.1 2011/08/29 10:49:38 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Perl-Critic-Deprecated/Perl-Critic-Deprecated-1.108.0.ebuild,v 1.2 2012/12/22 18:25:32 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Policies that were formally included with Perl::Critic itself, but which have been superseded by others"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="dev-perl/Readonly
diff --git a/dev-perl/Perl-Critic-Dynamic/Perl-Critic-Dynamic-0.50.0.ebuild b/dev-perl/Perl-Critic-Dynamic/Perl-Critic-Dynamic-0.50.0.ebuild
index eca6d7f29abb..466d20933ec4 100644
--- a/dev-perl/Perl-Critic-Dynamic/Perl-Critic-Dynamic-0.50.0.ebuild
+++ b/dev-perl/Perl-Critic-Dynamic/Perl-Critic-Dynamic-0.50.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/dev-perl/Perl-Critic-Dynamic/Perl-Critic-Dynamic-0.50.0.ebuild,v 1.1 2011/08/29 10:48:54 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Perl-Critic-Dynamic/Perl-Critic-Dynamic-0.50.0.ebuild,v 1.2 2012/12/22 18:26:47 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Base class for dynamic Policies"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="dev-perl/Perl-Critic
diff --git a/dev-perl/Perl-Critic-Nits/Perl-Critic-Nits-1.0.0.ebuild b/dev-perl/Perl-Critic-Nits/Perl-Critic-Nits-1.0.0.ebuild
index dad75f16f6c4..ba930822fdee 100644
--- a/dev-perl/Perl-Critic-Nits/Perl-Critic-Nits-1.0.0.ebuild
+++ b/dev-perl/Perl-Critic-Nits/Perl-Critic-Nits-1.0.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/dev-perl/Perl-Critic-Nits/Perl-Critic-Nits-1.0.0.ebuild,v 1.1 2011/01/30 23:32:26 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Perl-Critic-Nits/Perl-Critic-Nits-1.0.0.ebuild,v 1.2 2012/12/22 18:25:47 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="policies of nits I like to pick"
 
 LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0.ebuild b/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0.ebuild
index 202747076a21..2d9242de6dfc 100644
--- a/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0.ebuild
+++ b/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.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/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0.ebuild,v 1.1 2011/08/30 18:26:10 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0.ebuild,v 1.2 2012/12/22 18:25:18 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl::Critic policy against indirect method calls"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-perl/indirect-0.250.0
diff --git a/dev-perl/Test-MockObject/Test-MockObject-1.201.203.10.ebuild b/dev-perl/Test-MockObject/Test-MockObject-1.201.203.10.ebuild
index d5e0158c4f3b..d6ea0a2db9f1 100644
--- a/dev-perl/Test-MockObject/Test-MockObject-1.201.203.10.ebuild
+++ b/dev-perl/Test-MockObject/Test-MockObject-1.201.203.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-MockObject/Test-MockObject-1.201.203.10.ebuild,v 1.2 2012/09/01 11:56:34 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-MockObject/Test-MockObject-1.201.203.10.ebuild,v 1.3 2012/12/22 17:25:29 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for emulating troublesome interfaces"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-aix"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-aix"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Test-Perl-Critic/Test-Perl-Critic-1.20.0.ebuild b/dev-perl/Test-Perl-Critic/Test-Perl-Critic-1.20.0.ebuild
index 083caf929531..f09165d859de 100644
--- a/dev-perl/Test-Perl-Critic/Test-Perl-Critic-1.20.0.ebuild
+++ b/dev-perl/Test-Perl-Critic/Test-Perl-Critic-1.20.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/dev-perl/Test-Perl-Critic/Test-Perl-Critic-1.20.0.ebuild,v 1.1 2011/08/28 13:42:19 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Perl-Critic/Test-Perl-Critic-1.20.0.ebuild,v 1.2 2012/12/22 18:25:04 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Use Perl::Critic in test programs"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-perl/Perl-Critic-1.105"
diff --git a/dev-perl/UNIVERSAL-can/UNIVERSAL-can-1.201.207.260.ebuild b/dev-perl/UNIVERSAL-can/UNIVERSAL-can-1.201.207.260.ebuild
index 1681091c1c63..d862204f5d93 100644
--- a/dev-perl/UNIVERSAL-can/UNIVERSAL-can-1.201.207.260.ebuild
+++ b/dev-perl/UNIVERSAL-can/UNIVERSAL-can-1.201.207.260.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/UNIVERSAL-can/UNIVERSAL-can-1.201.207.260.ebuild,v 1.2 2012/09/01 11:59:53 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/UNIVERSAL-can/UNIVERSAL-can-1.201.207.260.ebuild,v 1.3 2012/12/22 17:25:57 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Hack around people calling UNIVERSAL::can() as a function"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-aix"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-aix"
 IUSE="test"
 
 RDEPEND="virtual/perl-Scalar-List-Utils"
diff --git a/dev-perl/UNIVERSAL-isa/UNIVERSAL-isa-1.201.207.260.ebuild b/dev-perl/UNIVERSAL-isa/UNIVERSAL-isa-1.201.207.260.ebuild
index 049dcd340253..1fcb41886f59 100644
--- a/dev-perl/UNIVERSAL-isa/UNIVERSAL-isa-1.201.207.260.ebuild
+++ b/dev-perl/UNIVERSAL-isa/UNIVERSAL-isa-1.201.207.260.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/UNIVERSAL-isa/UNIVERSAL-isa-1.201.207.260.ebuild,v 1.2 2012/09/01 12:00:16 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/UNIVERSAL-isa/UNIVERSAL-isa-1.201.207.260.ebuild,v 1.3 2012/12/22 17:25:43 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Attempt to recover from people calling UNIVERSAL::isa as a function"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-aix"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-aix"
 IUSE=""
 
 RDEPEND="virtual/perl-Scalar-List-Utils"
diff --git a/dev-perl/indirect/indirect-0.260.0.ebuild b/dev-perl/indirect/indirect-0.260.0.ebuild
index f1f885393dee..eea951d0b7ff 100644
--- a/dev-perl/indirect/indirect-0.260.0.ebuild
+++ b/dev-perl/indirect/indirect-0.260.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/dev-perl/indirect/indirect-0.260.0.ebuild,v 1.1 2011/10/26 18:16:13 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/indirect/indirect-0.260.0.ebuild,v 1.2 2012/12/22 18:26:33 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Lexically warn about using the indirect object syntax"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/coverage/coverage-3.5.3-r1.ebuild b/dev-python/coverage/coverage-3.5.3-r1.ebuild
index 273da7657572..24affda26824 100644
--- a/dev-python/coverage/coverage-3.5.3-r1.ebuild
+++ b/dev-python/coverage/coverage-3.5.3-r1.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/dev-python/coverage/coverage-3.5.3-r1.ebuild,v 1.3 2012/12/17 19:56:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/coverage/coverage-3.5.3-r1.ebuild,v 1.4 2012/12/22 01:40:52 floppym Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9} )
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9,2_0} )
 inherit distutils-r1
 
 DESCRIPTION="Code coverage measurement for Python"
diff --git a/dev-python/httplib2/httplib2-0.7.6.ebuild b/dev-python/httplib2/httplib2-0.7.6.ebuild
index 4c5cb7a7d8e6..c1c26181e706 100644
--- a/dev-python/httplib2/httplib2-0.7.6.ebuild
+++ b/dev-python/httplib2/httplib2-0.7.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-python/httplib2/httplib2-0.7.6.ebuild,v 1.2 2012/12/20 19:02:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/httplib2/httplib2-0.7.6.ebuild,v 1.3 2012/12/22 13:53:13 ago Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2 3:3.2"
@@ -17,7 +17,7 @@ SRC_URI="http://httplib2.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 src_test() {
diff --git a/dev-python/nose/nose-1.1.2-r1.ebuild b/dev-python/nose/nose-1.1.2-r1.ebuild
index c4740dc78a51..933e6998034a 100644
--- a/dev-python/nose/nose-1.1.2-r1.ebuild
+++ b/dev-python/nose/nose-1.1.2-r1.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/dev-python/nose/nose-1.1.2-r1.ebuild,v 1.2 2012/12/17 19:58:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-1.1.2-r1.ebuild,v 1.3 2012/12/22 01:51:49 floppym Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_8,1_9} )
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_8,1_9,2_0} )
 inherit distutils-r1 eutils
 
 DESCRIPTION="A unittest extension offering automatic test suite discovery and easy test authoring"
diff --git a/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild b/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild
index eb5b4cb23684..1b530b5e11d7 100644
--- a/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild
+++ b/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild,v 1.1 2012/12/18 19:52:59 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild,v 1.2 2012/12/21 19:14:19 radhermit Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_5,2_6,2_7} )
@@ -21,7 +21,7 @@ IUSE=""
 
 RDEPEND="dev-libs/crypto++"
 DEPEND="${RDEPEND}
-	dev-python/setuptools"
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 DOCS="NEWS.rst"
 
diff --git a/dev-python/pyscard/pyscard-1.6.12.ebuild b/dev-python/pyscard/pyscard-1.6.12.ebuild
index d6d32416c778..d30b68b994a9 100644
--- a/dev-python/pyscard/pyscard-1.6.12.ebuild
+++ b/dev-python/pyscard/pyscard-1.6.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyscard/pyscard-1.6.12.ebuild,v 1.2 2012/02/21 03:22:20 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyscard/pyscard-1.6.12.ebuild,v 1.3 2012/12/21 23:06:33 alonbl Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -18,8 +18,9 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND="sys-apps/pcsc-lite"
-RDEPEND="${DEPEND}"
+RDEPEND="sys-apps/pcsc-lite"
+DEPEND="${RDEPEND}
+	dev-lang/swig"
 
 DOCS="smartcard/ACKS smartcard/ChangeLog smartcard/TODO"
 PYTHON_MODNAME="smartcard"
diff --git a/dev-python/pyxattr/Manifest b/dev-python/pyxattr/Manifest
index fcd19443c0bb..10e588984e6a 100644
--- a/dev-python/pyxattr/Manifest
+++ b/dev-python/pyxattr/Manifest
@@ -1 +1,2 @@
 DIST pyxattr-0.5.0.tar.gz 19578 SHA256 0d7bdf92cba5eb528f82f0e77af7db6a517c9fe615a46714c7c88ea44d33c2ea SHA512 f0c2ae061826204d7c1934fe18dd642c108360a25aa3762324d0d59dc4434622d756c3256e0ee31c5159d8289c4e6848c9fc9089e4d95f8add0cd597b9fca0aa WHIRLPOOL 5ca6f8ef3f42357105f9afafa444e08e7039719c5a1b1aca73086197f2d116616d28aa7db011bc8a779ee88e7ebb4c0045499a07940bcaf78a1a26a113432189
+DIST pyxattr-0.5.1.tar.gz 25103 SHA256 b8b5cecc689716d7b89e5ea6522d205109addf5bc530f4ecd1bf4133a373b34a SHA512 265cf65eaf0d72b3ccff74cc08833670f2fde1753b52fad9e0e56ff2187566c353193018d6f35b2fc92c8a85274fa381466aeb523a5751b9f06f8d596a979333 WHIRLPOOL 3c120d33e3953b60611550d551437b962d00bb34a537a4ee6da8cc38539953936f287c70af1c17de7e5520d2c0e24e4240c1fb0d6a5581ebc21eb87f935e8d1e
diff --git a/dev-python/pyxattr/files/pyxattr-0.5.1-test-bytes.patch b/dev-python/pyxattr/files/pyxattr-0.5.1-test-bytes.patch
new file mode 100644
index 000000000000..6ff4bd052218
--- /dev/null
+++ b/dev-python/pyxattr/files/pyxattr-0.5.1-test-bytes.patch
@@ -0,0 +1,19 @@
+commit ea7421018090b7099c5e0a6bd88180f41ebb7bce
+Author: Mike Gilbert <floppym@gentoo.org>
+Date:   Fri Dec 21 16:33:18 2012 -0500
+
+    Python 2.5 can't parse byte literals, so use bytes() instead.
+
+diff --git a/test/test_xattr.py b/test/test_xattr.py
+index 8df00b9..0bca576 100644
+--- a/test/test_xattr.py
++++ b/test/test_xattr.py
+@@ -12,7 +12,7 @@ from xattr import NS_USER, XATTR_CREATE, XATTR_REPLACE
+ 
+ if sys.hexversion >= 0x03000000:
+     PY3K = True
+-    EMPTY_NS = b''
++    EMPTY_NS = bytes()
+ else:
+     PY3K = False
+     EMPTY_NS = ''
diff --git a/dev-python/pyxattr/metadata.xml b/dev-python/pyxattr/metadata.xml
index d2d1aff2ef0f..ec3bef8d066b 100644
--- a/dev-python/pyxattr/metadata.xml
+++ b/dev-python/pyxattr/metadata.xml
@@ -10,4 +10,7 @@
 <maintainer>
   <email>robbat2@gentoo.org</email>
 </maintainer>
+<upstream>
+	<remote-id type="pypi">pyxattr</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyxattr/pyxattr-0.5.0-r1.ebuild b/dev-python/pyxattr/pyxattr-0.5.0-r1.ebuild
index 369172b9b3ea..1cb018c9ecda 100644
--- a/dev-python/pyxattr/pyxattr-0.5.0-r1.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.5.0-r1.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/dev-python/pyxattr/pyxattr-0.5.0-r1.ebuild,v 1.2 2012/12/21 15:38:51 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxattr/pyxattr-0.5.0-r1.ebuild,v 1.4 2012/12/21 20:59:42 floppym Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1} )
 
 inherit distutils-r1
 
@@ -18,7 +18,6 @@ IUSE="test"
 
 RDEPEND="sys-apps/attr"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
 src_test() {
diff --git a/dev-python/pyxattr/pyxattr-0.5.0.ebuild b/dev-python/pyxattr/pyxattr-0.5.0.ebuild
index c3d6578b8fa2..053201f384d1 100644
--- a/dev-python/pyxattr/pyxattr-0.5.0.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxattr/pyxattr-0.5.0.ebuild,v 1.12 2012/06/14 22:11:17 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxattr/pyxattr-0.5.0.ebuild,v 1.13 2012/12/21 18:03:25 floppym Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -19,5 +19,4 @@ KEYWORDS="alpha amd64 arm ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-lin
 IUSE=""
 
 RDEPEND="sys-apps/attr"
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/pyxattr/pyxattr-0.5.1.ebuild b/dev-python/pyxattr/pyxattr-0.5.1.ebuild
new file mode 100644
index 000000000000..c2f5df7da732
--- /dev/null
+++ b/dev-python/pyxattr/pyxattr-0.5.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxattr/pyxattr-0.5.1.ebuild,v 1.3 2012/12/22 08:47:37 zmedico Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy2_0 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python interface to xattr"
+HOMEPAGE="http://pyxattr.k1024.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="sys-apps/attr"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	epatch "${FILESDIR}"/${P}-test-bytes.patch
+}
+
+src_test() {
+	# Perform the tests in /var/tmp; that location is more likely
+	# to have xattr support than /tmp which is often tmpfs.
+	export TESTDIR=/var/tmp
+
+	einfo 'Please note that the tests fail if xattrs are not supported'
+	einfo 'by the filesystem used for /var/tmp.'
+	distutils-r1_src_test
+}
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/requests/requests-1.0.3.ebuild b/dev-python/requests/requests-1.0.3.ebuild
index 868b9b323320..f2f1c9d946a1 100644
--- a/dev-python/requests/requests-1.0.3.ebuild
+++ b/dev-python/requests/requests-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/dev-python/requests/requests-1.0.3.ebuild,v 1.1 2012/12/20 07:11:23 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-1.0.3.ebuild,v 1.2 2012/12/21 21:26:01 radhermit Exp $
 
 EAPI=5
 # 3.3 dropped due to bugs 438090 and 447084
@@ -18,10 +18,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RDEPEND="app-misc/ca-certificates
-	dev-python/charade
+	dev-python/charade[${PYTHON_USEDEP}]
 	dev-python/urllib3"
 DEPEND="${RDEPEND}
-	dev-python/setuptools
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
 # tests connect to various remote sites
diff --git a/dev-python/setuptools/setuptools-0.6.32.ebuild b/dev-python/setuptools/setuptools-0.6.32.ebuild
index 63ffc19b01c9..a4cf2dd05c62 100644
--- a/dev-python/setuptools/setuptools-0.6.32.ebuild
+++ b/dev-python/setuptools/setuptools-0.6.32.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/dev-python/setuptools/setuptools-0.6.32.ebuild,v 1.3 2012/12/15 11:02:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.32.ebuild,v 1.4 2012/12/22 01:29:29 floppym Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9} )
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9,2_0} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/skype4py/skype4py-1.0.32.1-r1.ebuild b/dev-python/skype4py/skype4py-1.0.32.1-r1.ebuild
new file mode 100644
index 000000000000..b808d38762a8
--- /dev/null
+++ b/dev-python/skype4py/skype4py-1.0.32.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/skype4py/skype4py-1.0.32.1-r1.ebuild,v 1.1 2012/12/22 06:37:57 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit distutils-r1
+
+MY_PN=Skype4Py
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python wrapper for the Skype API"
+HOMEPAGE="https://github.com/awahlig/skype4py http://pypi.python.org/pypi/Skype4Py/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="net-im/skype"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${P}-python.patch )
diff --git a/dev-python/wsgilog/Manifest b/dev-python/wsgilog/Manifest
new file mode 100644
index 000000000000..5db221edf902
--- /dev/null
+++ b/dev-python/wsgilog/Manifest
@@ -0,0 +1 @@
+DIST wsgilog-0.3.tar.gz 4299 SHA256 2193c7eadb7c341970c50b2607f48f12c8031cbd2ce19803c50c55d84417a68f SHA512 be6788c059f1901b21d272b53b6f9ba4096d1f02f244635c5661f75ce40b3f778ca1b72df76c070b50cab3c44a0cefe0044bae75541b20769da61c9d4fe0863b WHIRLPOOL 1f58cadb78746d4ac34ed3500276b7cbfffc90034b80e62eeb2c31bb78c9ebfe86aead7a4511b4982aaa7ce8c4df92cfbe7157cb65f04cfc0fe8cef905c9b133
diff --git a/dev-python/wsgilog/metadata.xml b/dev-python/wsgilog/metadata.xml
new file mode 100644
index 000000000000..528d5bbad5f4
--- /dev/null
+++ b/dev-python/wsgilog/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proxy-maintainers</herd>
+<maintainer>
+<email>jo@opteamax.de</email>
+<name>Jens Ott</name>
+</maintainer>
+<longdescription lang="en">
+</longdescription>
+</pkgmetadata>
+
diff --git a/dev-python/wsgilog/wsgilog-0.3.ebuild b/dev-python/wsgilog/wsgilog-0.3.ebuild
new file mode 100644
index 000000000000..2c54b0001013
--- /dev/null
+++ b/dev-python/wsgilog/wsgilog-0.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wsgilog/wsgilog-0.3.ebuild,v 1.1 2012/12/22 11:56:52 hwoarang Exp $
+
+EAPI="4"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="2:2.7"
+RESTRICT_PYTHON_ABIS="3.*"
+inherit eutils distutils
+
+DESCRIPTION="Class for logging in WSGI-applications"
+HOMEPAGE="http://pypi.python.org/pypi/wsgilog/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+DOCS="PKG-INFO"
+PYTHON_PACKAGE="wsgilog"
diff --git a/dev-ruby/ffi/ffi-1.1.5.ebuild b/dev-ruby/ffi/ffi-1.1.5.ebuild
index 063124bfc678..1c3c55408747 100644
--- a/dev-ruby/ffi/ffi-1.1.5.ebuild
+++ b/dev-ruby/ffi/ffi-1.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-ruby/ffi/ffi-1.1.5.ebuild,v 1.2 2012/10/28 17:17:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ffi/ffi-1.1.5.ebuild,v 1.4 2012/12/22 13:55:18 ago Exp $
 
 EAPI=4
 
@@ -25,7 +25,7 @@ RUBY_S="${PN}-${PN}-*"
 IUSE=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 
 RDEPEND="${RDEPEND} virtual/libffi"
 DEPEND="${DEPEND} virtual/libffi"
diff --git a/dev-ruby/flexmock/Manifest b/dev-ruby/flexmock/Manifest
index 5d4aa3c3f64f..5bd026c4e231 100644
--- a/dev-ruby/flexmock/Manifest
+++ b/dev-ruby/flexmock/Manifest
@@ -1,3 +1,4 @@
 DIST flexmock-0.9.0.gem 76800 SHA256 d8264facc436b02d8f535c67f41661656c620f6fb8e2a0817b4db28882204a27 SHA512 a0a259240482488958c656660303429ecf9a29c1769a3032e21f903628c6a6dbe7a72d5a345f42d54c5c92e19d3bcfdc3710526a5b796630078f86dbdd563472 WHIRLPOOL b7cc14e4ce3693af8d00424d722616e32aa57e253e421146a2535ee9e52d798cf7b250c14c09a57a560aa95d5ae05ade8c791127ab8d8f3289cd5c0d98acedc0
 DIST flexmock-1.0.3.gem 140800 SHA256 db0040b32aa39cd87c4cb69144e4c6937c02fb8219bf792ab358976ba3a8c4b6 SHA512 4c743a9b8e121fa14fa853ac1d1add6ca457fbc54dfd23b5e7f52e2a7fe563875a816cbe7f82fd0228ad0f505aa2bff530c21a5feb16689268ae936f2e4507da WHIRLPOOL c39d5835e64aeaee3ce6178fa6c32ebd4f52f8e11972ff71ffd587e6ce294a85da0d93883022fb4c820aa27fa80d3400154367a069d49508e4bbf1bdd06d55bc
 DIST flexmock-1.0.4.gem 142336 SHA256 341b263cc074ab46dd725b4256276ef9a6d7b26018733bd38535c44fb9e90f62 SHA512 150d673a20378791cfae97cfe8cd30e9f4e9121db0815275d256ed415fb18775b78138aa65c250e48229112044d17ff33730b7e35ceeb0fe7a1d2f554ffebaf4 WHIRLPOOL 11abd6a408abf1d038b16a47af3cf5a4900a9f3f0ac9349f0df2ec8f78892f5fda6d65d12f3add32a0e76113171dfff4e853461fd302a8fbcf90ef9160fe79f0
+DIST flexmock-1.2.0.gem 142848 SHA256 5dd13b50ae71704b19cbfa68835f76dc6ed9b3e39e355a0e297cdcabf224bb0c SHA512 6bc2b7eb6017f48274268d3926395d947de9a8c261d28b636f200ec1af24449dccdb168cc54377a4dee895eff9fd12043b975f5e1a2f29b30bfc94f9b24efe89 WHIRLPOOL 221887968d9f63d83f9e9c55323a92b93891ce16fad97622092b32edccd9c62aaf3eff243fc075cd5788cbf6988f24c09192f71422fbe14fed999651d8a863d7
diff --git a/dev-ruby/flexmock/flexmock-1.2.0.ebuild b/dev-ruby/flexmock/flexmock-1.2.0.ebuild
new file mode 100644
index 000000000000..da00661dae5d
--- /dev/null
+++ b/dev-ruby/flexmock/flexmock-1.2.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/flexmock/flexmock-1.2.0.ebuild,v 1.1 2012/12/22 07:30:18 graaff Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19 jruby ree18"
+
+RUBY_FAKEGEM_DOCDIR="html"
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc doc/*.rdoc doc/releases/*"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple mock object library for Ruby unit testing"
+HOMEPAGE="http://${PN}.rubyforge.org/"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:2 )"
+
+all_ruby_prepare() {
+	# Custom template not found in package
+	sed -i -e '/jamis/d' Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} -S testrb -Ilib:. test/*_test.rb || die
+	${RUBY} -S rspec test/rspec_integration || die
+}
diff --git a/dev-ruby/gettext_i18n_rails/Manifest b/dev-ruby/gettext_i18n_rails/Manifest
index 53267e38f6c0..7daccd82dc60 100644
--- a/dev-ruby/gettext_i18n_rails/Manifest
+++ b/dev-ruby/gettext_i18n_rails/Manifest
@@ -1,3 +1,4 @@
 DIST gettext_i18n_rails-0.4.6.gem 18432 SHA256 b027bfcfdf980a683d72460d809756dc189b9c3f114a93f0ca1cb90aefb1c681 SHA512 f75f6d8cbab830a75d73ec8e255739189852e4eac82dcc9b0e8a7a42e50b918c2e34e566e04e9a6c444c4d29de5a0b062ccf0a0f790f2b3df2f56e5817377e66 WHIRLPOOL ffba4ebc6d8ad92f18261ccdf746c0cb134bd176189f569ecd7f4daf7b5b935cf15ee4f0eb2f8c07b720a9b79cea13ef9f98f4b74021ab547139a007c1931d77
 DIST gettext_i18n_rails-0.6.6.gem 19456 SHA256 55c004e1b7382930bbf475c216027e6b492921115ce779a23a3fc84427998ce1 SHA512 00efd11d748e0cc07357d05ca4f21c2767803312a2ee92f98811a6ddcb001a60b9d7a948574897dfff9e464a6a07d27d252a3d5ae43a61fd9400066311546482 WHIRLPOOL aa006205617ecb1a7e45123270a1b0ecdc62ec99a9f35b9f95f82b2b3260b2a52c927bb447efc96bcf798ddc89fc2833a73a37915d188677be815f4c547cf4df
 DIST gettext_i18n_rails-0.7.1.gem 19968 SHA256 30984a7cf4b2db2938616d6fc65490d4f6640ae627ed679ff4fd39688142e615 SHA512 7db67841a52fe8b36d43bd4d263c561591bb0fda290ba6406596a93d13e0f96bf39174b3152d7352ea96a2c3bc89d364cc719e6ca4073926a1bc6efcec755c23 WHIRLPOOL 65520e7b0f7877c29be56f3407030e1e3ac51dc9a5028f1eed10890900585025aab81cea4b392ffd6f59d084eec81bd13f1d467b739fe6e4f9b787d05e2a932e
+DIST gettext_i18n_rails-0.8.0.gem 20992 SHA256 c614bb7e4d2f02ed1a48767674a5ac63d5bd46db5e830026cccdec59c63d80b3 SHA512 95e77be93269a332078b68a39796f8ff66710f9e80e38b5194c77ad0336722c869ecd9ccd80ad4490394f76a9b83fb080e6997f903f0e9a2b4e766dd57f8a349 WHIRLPOOL d82746b67d08a24af7dd4215c266470ec30880f21dd495e50cdd2a8d417232ca34dc9b9406981f323c77c212d301bba9d40202e41c9e5b4a39cdd5f2b7be8908
diff --git a/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-0.8.0.ebuild b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-0.8.0.ebuild
new file mode 100644
index 000000000000..7b5c959731d4
--- /dev/null
+++ b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-0.8.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-0.8.0.ebuild,v 1.1 2012/12/22 07:41:43 graaff Exp $
+
+EAPI="4"
+
+# jruby support requires sqlite3 support for jruby.
+USE_RUBY="ruby18 ruby19 ree18"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Readme.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
+
+inherit ruby-fakegem
+
+DESCRIPTION="FastGettext / Rails integration."
+HOMEPAGE="https://github.com/grosser/gettext_i18n_rails"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/activerecord[sqlite3] dev-ruby/temple )"
+ruby_add_rdepend ">=dev-ruby/fast_gettext-0.4.8"
+
+all_ruby_prepare() {
+	rm Gemfile Gemfile.lock || die
+
+	# Remove specs for slim and hamlet, template engines we don't package.
+	rm spec/gettext_i18n_rails/slim_parser_spec.rb spec/gettext_i18n_rails/haml_parser_spec.rb || die
+}
diff --git a/dev-ruby/highline/Manifest b/dev-ruby/highline/Manifest
index bba9c18b83fc..b6b9c1365ffa 100644
--- a/dev-ruby/highline/Manifest
+++ b/dev-ruby/highline/Manifest
@@ -1,2 +1,3 @@
 DIST highline-1.6.13.gem 219136 SHA256 7dcb2a3c99001fba6f7597682aef935db0ebf69f293d7604954763b135195c96 SHA512 390df34d5810fd640212706366a33dadeffbc2b689db20d8584827f93ce30395d32f382c8ccfc8947b8cf6bbfa693b3691d4e21d36d3850fc6aa72b3ca63fb45 WHIRLPOOL c9125bb170152842137a6fc75b18e867f90f5a22e3b5c9e8eff6ac6900498d22b5e283fef57da4b6cbef3dc1e43210fabc4a7c3a11fbf8bbd89e5df4fb25af98
+DIST highline-1.6.15.gem 218624 SHA256 a1925472c2395c897354e66334891b9347887886181a6e5b6a55a44dfda39cc6 SHA512 b8ce321f198a67806b09049f8ef9a9ae888ecff8e226d427c9e4fc68bf0c17c916003e5ee47bacf1799435a480d1cc79e35fa7cd71c67c8ea7f427b16c981861 WHIRLPOOL 694b2dc539a7aa8e9d9c8ed29790eb54ebc6683bba7261e22b5915cceb705310130d16ea73500bd7af31091fdf172a33578fe38e24a957b057d1404f49f4fd9d
 DIST highline-1.6.8.gem 66560 SHA256 5dd4f1219ec60683e262716f21fe9c2f113ed8119dfa820c7294ebbf5c7cd38c SHA512 17f663ce09e09bd0d36ea64b9d6e57c040887eed1d73ec04116596a2c7c2d0cfef1cca927f1833895535636d39ebbb18fae9f57c81161bedd4600d35c2f4026f WHIRLPOOL c769aa17f7ca5af5fbc748fd4924b4a458f5a4b4b55861995de620a9e5ff06e1be5b31ce84de221a25c8f825b004a9ab00b3bff0792291ce7e40485acfd1013f
diff --git a/dev-ruby/highline/highline-1.6.13.ebuild b/dev-ruby/highline/highline-1.6.13.ebuild
index 48cc57be504a..a77b917cfcde 100644
--- a/dev-ruby/highline/highline-1.6.13.ebuild
+++ b/dev-ruby/highline/highline-1.6.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/dev-ruby/highline/highline-1.6.13.ebuild,v 1.5 2012/12/19 16:14:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/highline/highline-1.6.13.ebuild,v 1.6 2012/12/22 14:05:35 ago Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://highline.rubyforge.org/"
 IUSE=""
 LICENSE="|| ( GPL-2 Ruby )"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 all_ruby_prepare() {
 	# fix up gemspec file not to call git
diff --git a/dev-ruby/highline/highline-1.6.15.ebuild b/dev-ruby/highline/highline-1.6.15.ebuild
new file mode 100644
index 000000000000..2cf4ba949d3c
--- /dev/null
+++ b/dev-ruby/highline/highline-1.6.15.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-ruby/highline/highline-1.6.15.ebuild,v 1.1 2012/12/22 08:11:15 graaff Exp $
+
+EAPI=4
+
+USE_RUBY="ruby18 ruby19 jruby ree18"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc TODO"
+RUBY_FAKEGEM_DOCDIR="doc/html"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Highline is a high-level command-line IO library for ruby."
+HOMEPAGE="http://highline.rubyforge.org/"
+
+IUSE=""
+LICENSE="|| ( GPL-2 Ruby )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+all_ruby_prepare() {
+	# fix up gemspec file not to call git
+	sed -i -e '/git ls-files/d' highline.gemspec || die
+
+	# Avoid tests that require a real console because we can't provide
+	# that when running tests through portage. These should pass when
+	# run in a console. We should probably narrow this down more to the
+	# specific tests.
+	sed -i -e '/\(tc_highline\|tc_menu\)/ s:^:#:' test/ts_all.rb || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*jruby)
+			ewarn "Skipping tests since they hang indefinitely."
+			;;
+		*)
+			${RUBY} -S rake test || die
+			;;
+	esac
+}
diff --git a/dev-ruby/hoe-seattlerb/Manifest b/dev-ruby/hoe-seattlerb/Manifest
index 993b1d37e5f3..84ebef97973f 100644
--- a/dev-ruby/hoe-seattlerb/Manifest
+++ b/dev-ruby/hoe-seattlerb/Manifest
@@ -1,2 +1,2 @@
-DIST hoe-seattlerb-1.2.4.gem 10752 SHA256 6999174d6322acc4d4aa5226deef9d36deb3599a8c09fd73534cf823f02212e6 SHA512 2beb2784854c2e3196d835ea3cf163086c031903c7e48fb0ed0156941f0c2a3a1847584e5430ecb0fdc7a0908eb32d4d92727448dc584350b3321c70fb2a4f44 WHIRLPOOL 4f20f4d8d5648a5277e216d7fa7d7f4275d2463460bfd9bae583dbe99b7dd185c38b4985c09bfc1ca003065f29a6e31c5b8786f9761de2b467195ce269b5d217
 DIST hoe-seattlerb-1.2.8.gem 11264 SHA256 f7a6d839551a4ef66a67c230666dd1d8cce945ee34527d8e9f6290d2eb56cf5b SHA512 e3aebdc8015d510cf0547fa9033be5c4cd07dedf71c20204d59b06bf0b79ee624d3a21a8a6af1de46a964899185c7c78661b9ec32d68bc2a8fbf9ce486dd216c WHIRLPOOL 6e3620f8d78c9bb29efe4056cac9e0d4f623985f6e4afe4ab623f5800cdd15a387e9213c76e599063b8b865d5e6bfee6229e091b45bc05bfc82a9f394a830a96
+DIST hoe-seattlerb-1.2.9.gem 11264 SHA256 9eef525bef0025819cbea2ebdeadee824f81b4556df52deb0265136296fc948d SHA512 6311ae24429ccffa119d7c5f6e634f650b48b92b9b4458a7e274e8cd6f70161a41d197ee918471621cbe0b99b0eabee68761d643fe1abe62646d8d2332900920 WHIRLPOOL 4a6314e4cdb9175977ae4b8b32af09f24faec57cd344271754e3e91c3446ffb706b89c521ab2178a82e678084109eab9c6697b38da428ee7050c94bed72761aa
diff --git a/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.2.4.ebuild b/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.2.9.ebuild
similarity index 59%
rename from dev-ruby/hoe-seattlerb/hoe-seattlerb-1.2.4.ebuild
rename to dev-ruby/hoe-seattlerb/hoe-seattlerb-1.2.9.ebuild
index 4bc2f3878aca..d4cc0ff0f921 100644
--- a/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.2.4.ebuild
+++ b/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.2.9.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/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.2.4.ebuild,v 1.11 2012/10/28 17:18:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.2.9.ebuild,v 1.1 2012/12/22 13:38:15 graaff Exp $
 
 EAPI=2
-USE_RUBY="ruby18 ree18 jruby"
+USE_RUBY="ruby18 ree18 ruby19 jruby"
 
 # no tests present
 RUBY_FAKEGEM_TASK_TEST=""
@@ -19,8 +19,7 @@ HOMEPAGE="http://seattlerb.rubyforge.org/hoe-seattlerb"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-ruby_add_rdepend '>=dev-ruby/hoe-2.8.0 >=dev-ruby/minitest-2.0.0'
-ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.2.3 )"
+ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.12 )"
diff --git a/dev-ruby/httparty/Manifest b/dev-ruby/httparty/Manifest
index 66c45ea9bf13..be9c2083a1f5 100644
--- a/dev-ruby/httparty/Manifest
+++ b/dev-ruby/httparty/Manifest
@@ -1,2 +1,3 @@
 DIST httparty-0.6.1.gem 50176 SHA256 c1b66d6de20f15a7ccf818669a256123ea92ba48df4f7d604678808638373ab7 SHA512 62e6d0a1ccd1854eaff320242a8deb29054053a16ecdfa5f9f3ff84732eb3ed4cbe9e0c840f220a7c024abe6e64f4fa17eca9ad8add3375a56d10ff87c1aebc4 WHIRLPOOL c34bd766f5bc61c0b61c39f48bd2caccb4c74e751d31b4d5d0142867b43eefee6d7c5e0d40cb6d67151ce6e4cec689f8a52689a60bc29a1228718671fa02512b
 DIST httparty-0.8.3.gem 62464 SHA256 30399280ad40626a48b5f5769f5bf1c36343ef64f22590ea3b8bbd8d8d9df80d SHA512 04ebe4cd47193cfe7a2d739f61b0762a86b764bc46d3a2539f43d8a69f1a20490f7c93afa6605a7a9372cd58347a8072396516112e7ab6cfb390db63cc7416c9 WHIRLPOOL 5ff717b9de8fb99d6309623d194816e660b5d3595b7237690fd0269f6c3c1e2bd76c17eefb3a402babc50c5957958b67d0d51866dee387be0418b31ede159842
+DIST httparty-0.9.0.gem 65024 SHA256 49eb0adb7ca0487f686384e855b672b1402924c337146cb6661957c94729d7ea SHA512 909cd787e8ef6a8acde71132fd0fa4cb681eee385e12692793088241bdee1fa2798b815d76279bcf06f00e31bcd997ad51d4aa1393ee8261059fb66c552b102f WHIRLPOOL e0fc2676132e8fb4e7dd82b31121d09dff288340fbab7c6e42ff7b0061bc6f93b745399dff638c82307767ee8110e0d99e2f28062dd2e5919ea3ec173490fdb6
diff --git a/dev-ruby/httparty/httparty-0.9.0.ebuild b/dev-ruby/httparty/httparty-0.9.0.ebuild
new file mode 100644
index 000000000000..9597fd7b7076
--- /dev/null
+++ b/dev-ruby/httparty/httparty-0.9.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/httparty/httparty-0.9.0.ebuild,v 1.1 2012/12/22 15:02:43 graaff Exp $
+
+EAPI=2
+
+# jruby → testsuite fails (seems like a testuite bug)
+USE_RUBY="ruby18 ruby19 ree18"
+
+# We have a custom test function, but don't null this out so that the
+# deps are still added
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md History"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Makes http fun! Also, makes consuming restful web services dead easy."
+HOMEPAGE="http://httparty.rubyforge.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+ruby_add_rdepend '=dev-ruby/multi_json-1* dev-ruby/multi_xml'
+
+ruby_add_bdepend 'dev-ruby/rspec:0 dev-ruby/fakeweb'
+
+USE_RUBY=ruby18 \
+	ruby_add_bdepend 'test? ( dev-util/cucumber www-servers/mongrel )'
+
+all_ruby_prepare() {
+	# Remove bundler
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die
+
+#	sed -i -e '/git ls-files/ s:^:#:' ${PN}.gemspec || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*ruby18)
+			# Cucumber-based tests only work on Ruby 1.8, as of today, so we only call them
+			${RUBY} -S rake spec features || die "cucumber tests failed"
+			;;
+		*)
+			${RUBY} -S rake spec || die "cucumber tests failed"
+			;;
+	esac
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/* || die
+}
diff --git a/dev-ruby/jruby-openssl/Manifest b/dev-ruby/jruby-openssl/Manifest
index 69a0a8ef9c31..6ad4e3486fc6 100644
--- a/dev-ruby/jruby-openssl/Manifest
+++ b/dev-ruby/jruby-openssl/Manifest
@@ -1,3 +1,2 @@
 DIST jruby-openssl-0.7.4.gem 623104 SHA256 b0d67db29038e9e7ceefbff28a96f72bdb989e53808bc3b62ee167707179260d SHA512 de569ecd9f20320040bfe843717e7c7bb79dc08bf9d32154244575029aaf850024a983f3e38eb55798c65752095b965ef1de2c4c45d614e122fd4c0eef6279bc WHIRLPOOL db696c523b8faf2a1a3aa5eedbedb95710cd1aab6ab7655dfacc8da59cea75c09d600990fe43f406a3f3c6e1cfc8b0fd419fc5dae9fbfdb5aae82bc8a6ecf797
-DIST jruby-openssl-0.7.6.1.gem 690688 SHA256 17c236725a4e3bbe04d1810fb3c08e6196ab2ff00ceb7d9b43860a6825a68bc4 SHA512 9cf3fea6038d3f0af8eced2afff10b6aea3eebd2cf75f37fca0a2ddcb78bd8a25f1aa9d0cf369d99fb17672c5e5c63ea385e13e0d2b195e29879789d4b74c0dc WHIRLPOOL 24216abd938a63e5005c62ad35f9f4cc01a94881e4a92e6aad6f47de311058131400f5c619b02051d53fe8211218622f3b44ba302ecc8bebd69f20bf33233ee2
 DIST jruby-openssl-0.7.7.gem 692736 SHA256 2ea826de1f16434e4e4d8c4506b93bdaa79489f2ddb326549fd9a5300bd7d65e SHA512 55056d955f59496500ca0ae0e3645dd844f88b89b6221065f809ffc33585acd1b489329bdef50878ec47bbae1500f6ffb69df1cd852f09e4b25b66824badb32c WHIRLPOOL df8fd894fcf3b41dd48cd8838d84516fc8025c12c1a8ba96506dd4aa7b37df866e0258b3feac412479e3741f46798307ddec433639e6e1c341b21c2ac9548fc0
diff --git a/dev-ruby/jruby-openssl/jruby-openssl-0.7.6.1.ebuild b/dev-ruby/jruby-openssl/jruby-openssl-0.7.6.1.ebuild
deleted file mode 100644
index 8375f77139c6..000000000000
--- a/dev-ruby/jruby-openssl/jruby-openssl-0.7.6.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jruby-openssl/jruby-openssl-0.7.6.1.ebuild,v 1.1 2012/05/13 06:02:50 graaff Exp $
-
-EAPI=2
-
-USE_RUBY=jruby
-
-RUBY_FAKEGEM_TASK_DOC="redocs"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby SSL library that works with JRuby"
-HOMEPAGE="http://rubyforge.org/projects/jruby-extras"
-
-LICENSE="MIT || ( CPL-1.0 GPL-2	LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="${RDEPEND} >=dev-java/jruby-1.5.6"
-DEPEND="${DEPEND} >=dev-java/jruby-1.5.6"
-
-ruby_add_bdepend "doc? ( dev-ruby/hoe )"
-ruby_add_bdepend "test? ( dev-ruby/hoe dev-ruby/mocha )"
-
-ruby_add_rdepend ">=dev-ruby/bouncy-castle-java-1.5.0146.1"
-
-all_ruby_prepare() {
-	# Remove a test that only works with JCE installed.
-	sed -i -e 's/OpenSSL::OPENSSL_VERSION_NUMBER > 0x00907000/false/' test/test_cipher.rb || die
-
-	# Remove tests depending on a build_lib that is not shipped
-	rm test/test_java.rb || die
-}
diff --git a/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.1.0-r1.ebuild b/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.1.0-r1.ebuild
index 83fef4440151..269bacd04e25 100644
--- a/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.1.0-r1.ebuild
+++ b/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.1.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/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.1.0-r1.ebuild,v 1.4 2012/12/18 16:04:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.1.0-r1.ebuild,v 1.5 2012/12/22 14:04:27 ago Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ruby19 ree18"
@@ -16,7 +16,7 @@ HOMEPAGE="http://net-ssh.rubyforge.org/gateway"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "dev-ruby/test-unit:2"
diff --git a/dev-ruby/rr/rr-1.0.4.ebuild b/dev-ruby/rr/rr-1.0.4.ebuild
index a323d58163e8..cd1ee5aa5087 100644
--- a/dev-ruby/rr/rr-1.0.4.ebuild
+++ b/dev-ruby/rr/rr-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/dev-ruby/rr/rr-1.0.4.ebuild,v 1.3 2012/05/01 18:24:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rr/rr-1.0.4.ebuild,v 1.4 2012/12/22 17:08:43 ago Exp $
 
 EAPI=4
 
@@ -21,7 +21,7 @@ RUBY_S="btakita-${PN}-*"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-2.3.3.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-2.3.3.ebuild
index d316928be908..92cb1882cfdf 100644
--- a/dev-ruby/ruby-gettext/ruby-gettext-2.3.3.ebuild
+++ b/dev-ruby/ruby-gettext/ruby-gettext-2.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/dev-ruby/ruby-gettext/ruby-gettext-2.3.3.ebuild,v 1.1 2012/11/29 10:42:36 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gettext/ruby-gettext-2.3.3.ebuild,v 1.5 2012/12/22 17:09:26 ago Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ inherit ruby-fakegem
 DESCRIPTION="Ruby GetText Package is Native Language Support Library and Tools modeled after GNU gettext package"
 HOMEPAGE="http://www.yotabanana.com/hiki/ruby-gettext.html"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="doc test"
 SLOT="0"
 LICENSE="Ruby"
diff --git a/dev-ruby/session/session-3.1.0-r1.ebuild b/dev-ruby/session/session-3.1.0-r1.ebuild
index bba2bc773215..6fc6b6db2003 100644
--- a/dev-ruby/session/session-3.1.0-r1.ebuild
+++ b/dev-ruby/session/session-3.1.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/dev-ruby/session/session-3.1.0-r1.ebuild,v 1.4 2012/05/01 18:24:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/session/session-3.1.0-r1.ebuild,v 1.5 2012/12/22 17:09:48 ago Exp $
 
 EAPI=2
 
@@ -21,7 +21,7 @@ HOMEPAGE="http://codeforpeople.com/lib/ruby/session/"
 # by author.
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( virtual/ruby-test-unit )"
diff --git a/dev-ruby/test-unit-rr/test-unit-rr-1.0.2.ebuild b/dev-ruby/test-unit-rr/test-unit-rr-1.0.2.ebuild
index d589db34b5b4..5054db0d820d 100644
--- a/dev-ruby/test-unit-rr/test-unit-rr-1.0.2.ebuild
+++ b/dev-ruby/test-unit-rr/test-unit-rr-1.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/dev-ruby/test-unit-rr/test-unit-rr-1.0.2.ebuild,v 1.1 2012/12/04 07:28:00 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit-rr/test-unit-rr-1.0.2.ebuild,v 1.5 2012/12/22 17:09:01 ago Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://rubyforge.org/projects/test-unit/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/rr-1.0.2 >=dev-ruby/test-unit-2.5.2"
diff --git a/dev-ruby/yard/yard-0.8.3.ebuild b/dev-ruby/yard/yard-0.8.3.ebuild
index 57fb56408cdd..d426a143e78f 100644
--- a/dev-ruby/yard/yard-0.8.3.ebuild
+++ b/dev-ruby/yard/yard-0.8.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-ruby/yard/yard-0.8.3.ebuild,v 1.4 2012/12/02 14:10:05 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/yard/yard-0.8.3.ebuild,v 1.5 2012/12/22 11:52:05 grobian Exp $
 
 EAPI=4
 
@@ -25,7 +25,7 @@ RUBY_S="lsegal-yard-*"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 #RUBY_PATCHES=( ${P}-test-failures.patch )
diff --git a/dev-util/cwdiff/Manifest b/dev-util/cwdiff/Manifest
index 13fe2b49ae5e..ac83137f1021 100644
--- a/dev-util/cwdiff/Manifest
+++ b/dev-util/cwdiff/Manifest
@@ -1 +1,2 @@
 DIST cwdiff-0.2.2.tar.gz 3487 SHA256 dc2a28dcb5cc3183de3c5c3db3e0161f4f44ccf8edb661856610e878dfc874c7 SHA512 8cf67cc14addf8a9833694f2289cebb6cc43039d66b75dd668047fd8afbdf10e7433fd03fd608e45ca2fd565035edc5bd5982d49736586f251f90415513ba24f WHIRLPOOL f7255b15f2acb5b123fbec99c9890a8d9d3d03013c52c8e45dc2cd396dbc132cd212f9be3e87eb739f27e32b7b4fc5335be7ee5bd23dea92fe2d4c397bff59b2
+DIST cwdiff-0.2.3.tar.gz 3597 SHA256 d0c959191d547488465a6d35e0c99917f478384ad680ac51a44d2a5b0ef1492a SHA512 4b1bfb5de60aac199f2a7b7427dadae628699b388f2a5d8b08db3836bbc1d3cd3ab83b8d3c3ec5d4d85fcdb16713d17646c60665632957b5f2a2046d31828f47 WHIRLPOOL 2df79638b2da299c4c66faa3a6c122aba6c0abfd18cdf1193f6fee049b065d0015006f08cd26e3f232254cb14cdc8ddfb732746151514fc4d43af0b20b776643
diff --git a/dev-util/cwdiff/cwdiff-0.2.3.ebuild b/dev-util/cwdiff/cwdiff-0.2.3.ebuild
new file mode 100644
index 000000000000..9c4e60bc933f
--- /dev/null
+++ b/dev-util/cwdiff/cwdiff-0.2.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cwdiff/cwdiff-0.2.3.ebuild,v 1.1 2012/12/22 00:29:07 ottxor Exp $
+
+EAPI=4
+
+DESCRIPTION="Colorizes output of (w)diff"
+HOMEPAGE="http://code.google.com/p/cj-overlay/source/browse/cwdiff?repo=evergreens"
+SRC_URI="http://cj-overlay.googlecode.com/files/${P}.tar.gz"
+RESTRICT="primaryuri"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-macos"
+IUSE="a2ps mercurial"
+
+DEPEND=""
+RDEPEND="
+	sys-apps/sed
+	app-shells/bash
+	app-text/wdiff
+	sys-apps/diffutils
+	a2ps? ( app-text/a2ps )
+	mercurial? ( dev-vcs/mercurial )
+	"
+
+src_install () {
+	dobin "${PN}"
+	if use mercurial ; then
+		insinto /etc/mercurial/hgrc.d
+		doins hgrc.d/"${PN}".rc
+	fi
+}
diff --git a/dev-util/debootstrap/debootstrap-1.0.44.ebuild b/dev-util/debootstrap/debootstrap-1.0.44.ebuild
index 1a1c2b07809f..d9f768a6b1b3 100644
--- a/dev-util/debootstrap/debootstrap-1.0.44.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.44.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/debootstrap/debootstrap-1.0.44.ebuild,v 1.2 2012/12/02 16:38:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debootstrap/debootstrap-1.0.44.ebuild,v 1.3 2012/12/22 09:25:38 ago Exp $
 
 EAPI=4
 inherit eutils
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/kdevelop-php-docs/Manifest b/dev-util/kdevelop-php-docs/Manifest
index 1861bfc5a1f6..96ba49f7c689 100644
--- a/dev-util/kdevelop-php-docs/Manifest
+++ b/dev-util/kdevelop-php-docs/Manifest
@@ -1,3 +1 @@
-DIST kdevelop-php-docs-1.3.1.tar.bz2 30644 SHA256 2180e22fa6697e90fce4027334c79ca982d8ecec853643473b7548193acf1c57 SHA512 e143b28ae348c6eb532c2d0c2b3c522b87e911b7ff3069ebbde00d2819ab15e112360d0316ae36fbb6ade299b2133b25ab8eb2023a453b9b78ca7b70cdae742d WHIRLPOOL 3d4acba120972b2791677a2263ce4bc5b4c0c5b095dbf681d7d4905bcea04a03e421760fe12b325a6dab22406729f48d4676ec0c5a67e690ba9e2ef6c26a73e4
-DIST kdevelop-php-docs-1.4.0.tar.bz2 32031 SHA256 7244bde140eb4a2e0ce245ec840a2d1c53887af658050c33314a192a12049e6b SHA512 14a084284e10aa38b781c7826b620faaae22f004439e1c87e1552daf7681eae8c2113890526f3101cb2689dbb757e711f10437b5c17ea9796e1e32aa06a28b7f WHIRLPOOL 0285f2e36a0588e7c09078ffb53c6bd1d391ec01791d7e59f6b4dae8d203e9adae952641dc9f9e6a4ccc09da5e585bf72adcb6dbe76db9473808a3b0b1abf649
 DIST kdevelop-php-docs-1.4.1.tar.bz2 32024 SHA256 24600e66ccd1298640106d02b02b71ddd27e14b6c013f78a6d2b2404c63d66c9 SHA512 ed6a2a4822f0109271bebb3eb7abb473273c7f25e41612510cca5a7776fb774c578a097a0edd40400442bf011305c55b62536f058cdbfd49a8665416bfe00101 WHIRLPOOL d81e38d97fba9d0a8161c013889eb658d118fc89a47e58273d336829bc47d5fee4a74349cc706f27591d2dd39ce7ccf147815e93a3547a6573b0a10311ad5871
diff --git a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.3.1.ebuild b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.3.1.ebuild
deleted file mode 100644
index fee769064acd..000000000000
--- a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.3.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.3.1.ebuild,v 1.3 2012/06/05 13:15:49 johu Exp $
-
-EAPI=4
-
-KDE_LINGUAS="ca ca@valencia da de en_GB es et fi fr gl it nb nds nl pl pt pt_BR
-ru sk sv uk zh_CN zh_TW"
-KMNAME="kdevelop"
-KDE_SCM="git"
-EGIT_REPONAME="kdev-php-docs"
-
-inherit kde4-base
-
-DESCRIPTION="PHP documentation plugin for KDevelop 4"
-LICENSE="GPL-2 LGPL-2"
-IUSE="debug"
-
-if [[ $PV == *9999* ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="amd64 x86"
-fi
-
-RDEPEND="
-	!=dev-util/kdevelop-plugins-1.0.0
-"
diff --git a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.4.0.ebuild b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.4.0.ebuild
deleted file mode 100644
index 8472a23a3cad..000000000000
--- a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.4.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.4.0.ebuild,v 1.1 2012/10/30 16:42:34 kensington Exp $
-
-EAPI=4
-
-KDE_LINGUAS="ca ca@valencia da de en_GB es et fi fr gl hu it nb nds nl pl pt
-pt_BR ru sk sv uk zh_CN zh_TW"
-KMNAME="kdevelop"
-EGIT_REPONAME="kdev-php-docs"
-
-inherit kde4-base
-
-DESCRIPTION="PHP documentation plugin for KDevelop 4"
-LICENSE="GPL-2 LGPL-2"
-IUSE="debug"
-
-if [[ $PV == *9999* ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-
-RDEPEND="
-	!=dev-util/kdevelop-plugins-1.0.0
-"
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index bac58a8116d7..9f71162c74bc 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,3 +1 @@
-DIST kdevelop-php-1.3.1.tar.bz2 672511 SHA256 22f65ae0eb6d9cbaee79220475a353bc63c218248affb1cb6be4aa05b8a33521 SHA512 bd2374e491b31da0b407d27efa31c21da1fe7a09c0e3938d1605f8e475d9d074dab566b30197760bf53667fc00df3c066a336bef747eca25693aa908ff72676d WHIRLPOOL 8ca68f72dc176ddc378ab1ab42af448ea878a979241e2b7a6f10d6075a2ef49b8c26cab1d906b35a8e8acf06a6604103bb56f89b94b9815aa75f25b3600b0b4e
-DIST kdevelop-php-1.4.0.tar.bz2 672948 SHA256 f9991a1151d1442e304266f9e42fe774ca97c6c9a856feac4832a530c67b7cff SHA512 0dc986649e86e5b491c0a782a82e753ef2933fe0954728e7abdf06b476bea63ffeadfdc96af37813561d0904af2ddf2d78328cef6b884ab256d7967b0b66f481 WHIRLPOOL e5800c3a3fefc65b6b79d255ecc19eae816465232681281c09e9070a7464eaf12779c79c713e19e9199ec5245c5d28dce53cf6345cae5eda356653290ebe9b8b
 DIST kdevelop-php-1.4.1.tar.bz2 672834 SHA256 40e52e7f52b11ed6196dadf5b181985e4a7dbc4027632632cfded326453b4bfe SHA512 dabfdf8960db1a50c79585dc20c10561de37b62e503a238b75d6fa81833ea382d5063e14de11941e8c40845c76635857a55f4ef08e22551862c2e80a9f5e7fe9 WHIRLPOOL a54bab5bdce2ec1545164badec35e9a5ff52d10c6d79870785b61ceb35f9c536d006576148a55f68b65a944faaa20877953c99556e065b50e6529df278124a4a
diff --git a/dev-util/kdevelop-php/kdevelop-php-1.3.1.ebuild b/dev-util/kdevelop-php/kdevelop-php-1.3.1.ebuild
deleted file mode 100644
index 8b14740dddd8..000000000000
--- a/dev-util/kdevelop-php/kdevelop-php-1.3.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php/kdevelop-php-1.3.1.ebuild,v 1.3 2012/06/05 13:16:28 johu Exp $
-
-EAPI=4
-
-KDE_LINGUAS="ca ca@valencia da de el en_GB es et fi fr gl it nb nds nl pl pt
-pt_BR sv th uk zh_CN zh_TW"
-VIRTUALX_REQUIRED=test
-KMNAME="kdevelop"
-KDE_SCM="git"
-EGIT_REPONAME="kdev-php"
-
-inherit kde4-base
-
-DESCRIPTION="PHP plugin for KDevelop 4"
-LICENSE="GPL-2 LGPL-2"
-IUSE="debug doc"
-
-if [[ $PV == *9999* ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="amd64 x86"
-fi
-
-DEPEND="
-	>=dev-util/kdevelop-pg-qt-1.0.0
-"
-RDEPEND="
-	dev-util/kdevelop
-	doc? ( >=dev-util/kdevelop-php-docs-${PV}:${SLOT} )
-"
-# Bug 330051
-# RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${PN}"-1.2.0-{dbustests,parmake}.patch )
diff --git a/dev-util/kdevelop-php/kdevelop-php-1.4.0.ebuild b/dev-util/kdevelop-php/kdevelop-php-1.4.0.ebuild
deleted file mode 100644
index 2ab802309c67..000000000000
--- a/dev-util/kdevelop-php/kdevelop-php-1.4.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php/kdevelop-php-1.4.0.ebuild,v 1.1 2012/10/30 16:44:10 kensington Exp $
-
-EAPI=4
-
-KDE_LINGUAS="ca ca@valencia da de el en_GB es et fi fr gl it nb nds nl pl pt
-pt_BR sv th uk zh_CN zh_TW"
-VIRTUALX_REQUIRED=test
-KMNAME="kdevelop"
-EGIT_REPONAME="kdev-php"
-
-inherit kde4-base
-
-DESCRIPTION="PHP plugin for KDevelop 4"
-LICENSE="GPL-2 LGPL-2"
-IUSE="debug doc"
-
-if [[ $PV == *9999* ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DEPEND="
-	>=dev-util/kdevelop-pg-qt-1.0.0
-"
-RDEPEND="
-	dev-util/kdevelop
-	doc? ( >=dev-util/kdevelop-php-docs-${PV}:${SLOT} )
-"
-# Bug 330051
-# RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${PN}"-1.2.0-{dbustests,parmake}.patch )
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index ed2e8689e604..a5094353c297 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,3 +1 @@
-DIST kdevelop-4.3.1.tar.bz2 6189139 SHA256 ba77977718a898a67f695b2ba106bb85124d4fa7c5706978c01ee29cc6862500 SHA512 822c7a58d88b3668364bf220a518fb4ab7b2d026b1162b08092f193c1c8968394dee651c7e03066daf878ea0e59d9c690c5e7853fea6aa5a3a145c67ae2f3556 WHIRLPOOL 8c10fada1c73c99eab45b6aced64bf04aeab7f40493e5534432a069b532f4f12ae5dc034ddb2214bfdec9f61355e733945b1ba27bfc860bfb93623589fb3e201
-DIST kdevelop-4.4.0.tar.bz2 6226191 SHA256 eb276293a67f934919319e7561344a23e1e6fb07d3dc1aedbb424d9dc11f5f91 SHA512 8b5574883b1b81cea363d21244567f72bd70698d1d3e9640a1f5994bb8d646ad85cbeb5944c35e87739be8690e86daa7bfb28725789d9a0e8bc21bf4c11b2332 WHIRLPOOL 0344125172a59b8ff27e3d3886418224b887103dfedb116e4adc10b08c5d029bd6738e54f9065d1c18226cf365ffc7115436b406fdc961230e6b08a25a1c47f8
 DIST kdevelop-4.4.1.tar.bz2 6228685 SHA256 7efac56e0390910247e8d3c4a80ce215a1dc4c75b0a1ecc5b594d8de35acde0c SHA512 790bf87b36402ebd0778a019f49d7161324e888d02e07e0d73c22755eea862f5699fc4190e3cdfd9c4055f3e5994bb2800fe3223caf144c801e4ac2105d41d0b WHIRLPOOL d41d68a50abbaf7406d8a359afbdefc43e4e01d41aa16eb9dc0092bb180296a71ef55f97dc5208f90ebd3cdef833f0f973238a14a37b668104d14445ec9c08d9
diff --git a/dev-util/kdevelop/files/kdevelop-4.3.1-fix-assert.patch b/dev-util/kdevelop/files/kdevelop-4.3.1-fix-assert.patch
deleted file mode 100644
index 52ba5fadff4b..000000000000
--- a/dev-util/kdevelop/files/kdevelop-4.3.1-fix-assert.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Michael Jansen <kde@michael-jansen.biz>
-Date: Sun, 08 Apr 2012 15:46:01 +0000
-Subject: addLineBatch(): Fix a crash if linesInBatch == 0
-X-Git-Url: http://quickgit.kde.org/?p=kdevelop.git&amp;a=commitdiff&amp;h=8a0b638c58dcfe261ce789963be2413300a65fc6
----
-addLineBatch(): Fix a crash if linesInBatch == 0
-
-[...]
-#6  0x00007fa986970708 in QAbstractItemModel::beginInsertRows (this=0x3699fb0, parent=..., first=11, last=10) at /home/mjansen/ws/src/qt/qt/src/corelib/kernel/qabstractitemmodel.cpp:2413
-#7  0x00007fa959b46571 in MakeOutputModel::addLineBatch (this=0x3699fb0) at /home/mjansen/ws/src/kdevelop/kdevelop/projectbuilders/makebuilder/makeoutputmodel.cpp:217
-[...]
----
-
-
---- a/projectbuilders/makebuilder/makeoutputmodel.cpp
-+++ b/projectbuilders/makebuilder/makeoutputmodel.cpp
-@@ -214,6 +214,10 @@ void MakeOutputModel::addLineBatch()
-     const int maxLines = 50;
-     const int linesInBatch = qMin(lineBuffer.count(), maxLines);
- 
-+    // If there is nothing to insert we are done.
-+    if ( linesInBatch == 0 )
-+            return;
-+
-     beginInsertRows( QModelIndex(), rowCount(), rowCount() + linesInBatch -  1);
- 
-     for(int i = 0; i < linesInBatch; ++i) {
-
diff --git a/dev-util/kdevelop/kdevelop-4.3.1-r1.ebuild b/dev-util/kdevelop/kdevelop-4.3.1-r1.ebuild
deleted file mode 100644
index 1bee5253c281..000000000000
--- a/dev-util/kdevelop/kdevelop-4.3.1-r1.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/dev-util/kdevelop/kdevelop-4.3.1-r1.ebuild,v 1.5 2012/12/10 15:55:02 kensington Exp $
-
-EAPI=4
-
-KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it nb nds nl pl pt
-pt_BR ru sl sv th uk zh_CN zh_TW"
-VIRTUALX_REQUIRED=test
-KDE_SCM="git"
-
-inherit kde4-base
-
-DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages."
-LICENSE="GPL-2 LGPL-2"
-IUSE="+cmake +cxx debug okteta qthelp"
-
-if [[ $PV == *9999* ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="amd64 ppc x86"
-fi
-
-DEPEND="
-	$(add_kdebase_dep ksysguard)
-	$(add_kdebase_dep libkworkspace)
-	okteta? ( $(add_kdebase_dep okteta) )
-	qthelp? ( >=x11-libs/qt-assistant-4.4:4 )
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kapptemplate)
-	cxx? ( >=sys-devel/gdb-7.0[python] )
-"
-RESTRICT="test"
-# see bug 366471
-
-PATCHES=( "${FILESDIR}/${P}-fix-assert.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build cmake)
-		$(cmake-utils_use_build cmake cmakebuilder)
-		$(cmake-utils_use_build cxx cpp)
-		$(cmake-utils_use_with okteta LibKasten)
-		$(cmake-utils_use_with okteta LibOkteta)
-		$(cmake-utils_use_with okteta LibOktetaKasten)
-		$(cmake-utils_use_build qthelp)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/dev-util/kdevelop/kdevelop-4.4.0.ebuild b/dev-util/kdevelop/kdevelop-4.4.0.ebuild
deleted file mode 100644
index 712c46ed130f..000000000000
--- a/dev-util/kdevelop/kdevelop-4.4.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-4.4.0.ebuild,v 1.2 2012/12/10 15:55:02 kensington Exp $
-
-EAPI=4
-
-KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it nb nds nl pl pt
-pt_BR ru sl sv th uk zh_CN zh_TW"
-VIRTUALX_REQUIRED=test
-
-inherit kde4-base
-
-DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages."
-LICENSE="GPL-2 LGPL-2"
-IUSE="+cmake +cxx debug okteta qthelp"
-
-if [[ $PV == *9999* ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~ppc ~x86"
-fi
-
-DEPEND="
-	$(add_kdebase_dep ksysguard)
-	$(add_kdebase_dep libkworkspace)
-	okteta? ( $(add_kdebase_dep okteta) )
-	qthelp? ( x11-libs/qt-assistant:4 )
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kapptemplate)
-	x11-libs/qt-declarative:4[webkit]
-	cxx? ( >=sys-devel/gdb-7.0[python] )
-"
-RESTRICT="test"
-# see bug 366471
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build cmake)
-		$(cmake-utils_use_build cmake cmakebuilder)
-		$(cmake-utils_use_build cxx cpp)
-		$(cmake-utils_use_with okteta LibKasten)
-		$(cmake-utils_use_with okteta LibOkteta)
-		$(cmake-utils_use_with okteta LibOktetaKasten)
-		$(cmake-utils_use_build qthelp)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/dev-util/kdevelop/kdevelop-4.4.1.ebuild b/dev-util/kdevelop/kdevelop-4.4.1.ebuild
index d5d3c76fa77b..bef11100d36d 100644
--- a/dev-util/kdevelop/kdevelop-4.4.1.ebuild
+++ b/dev-util/kdevelop/kdevelop-4.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-4.4.1.ebuild,v 1.4 2012/12/14 12:54:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-4.4.1.ebuild,v 1.5 2012/12/22 13:54:22 ago Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ IUSE="+cmake +cxx debug okteta qthelp"
 if [[ $PV == *9999* ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="amd64 ~ppc x86"
+	KEYWORDS="amd64 ppc x86"
 fi
 
 DEPEND="
diff --git a/dev-util/kdevplatform/Manifest b/dev-util/kdevplatform/Manifest
index 2fb8178559ed..62181e61378c 100644
--- a/dev-util/kdevplatform/Manifest
+++ b/dev-util/kdevplatform/Manifest
@@ -1,3 +1 @@
-DIST kdevplatform-1.3.1.tar.bz2 2029395 SHA256 8632fa7463d69ff2a1c2f40f9dfb1c5e84eadb2027efcd65e090c6c297e238ba SHA512 b1695bf7b1cfc485bf20a53b9558b5915d8ff384c29283c06a9fbd050a14ec3c98d7ce3c2653860a4d9f625095f62f4bb298450235e78f661741eea87be6df60 WHIRLPOOL 808f86337a3bc3b2075c01900cca3a8a3beb8c1a8ee6fdbf3670e1aad8e7c83520dc19980d19f3e2bb7c6d662935da4bb45688b10fb1873370be3e3cfa56cad0
-DIST kdevplatform-1.4.0.tar.bz2 2025903 SHA256 fd00aff21af14c07eca6e0dfbc0d4dd1edcc4ec3c50e6a5dd7e962214922c08e SHA512 c129e18a9f7e7f6a552eaac4a5b12cc5eb252b6f710434181a6b7fbe897476e18c43798f8cfa401716c1ab844d4d3ab6c3c8ae31156ac809b9fac133a05994ff WHIRLPOOL 5abd070d7d19fbb47f2d9a641b08092922642e7d35cfeb72fc2ed461b29208bb4abba3a38d03fee3de079f7572330c493510a35686247933381eb642503ac070
 DIST kdevplatform-1.4.1.tar.bz2 2029442 SHA256 d48dba12cc61e006d1ed63c664a1cfa0d6c86a241b633565cda034cd42a78033 SHA512 4858c8d1a76138abde6f060301979822de57c1c94888536ed536e4e5ce1a5aeb1cb1c8c5a651151df9eb2f632c48080be1170b00ca47d391f71df5aa22c57ee5 WHIRLPOOL 81b9aa0d01075de4b3a11d374a0f7308424cd21bcc9448ee778f989400489e119c743da741d9c74f43430466ccfd6ca6e21ca507df6ad3460076d7bb218f45f3
diff --git a/dev-util/kdevplatform/kdevplatform-1.3.1.ebuild b/dev-util/kdevplatform/kdevplatform-1.3.1.ebuild
deleted file mode 100644
index bae195184d95..000000000000
--- a/dev-util/kdevplatform/kdevplatform-1.3.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.3.1.ebuild,v 1.5 2012/12/10 15:56:59 kensington Exp $
-
-EAPI=4
-
-KMNAME="kdevelop"
-KDE_SCM="git"
-KDE_MINIMAL="4.7"
-VIRTUALX_REQUIRED=test
-KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it nb nds nl pl pt
-pt_BR ru sl sv th uk zh_CN zh_TW"
-EGIT_REPONAME="${PN}"
-
-inherit kde4-base
-
-DESCRIPTION="KDE development support libraries and apps"
-LICENSE="GPL-2 LGPL-2"
-IUSE="cvs debug git reviewboard subversion"
-
-if [[ $PV == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="amd64 ppc x86"
-fi
-
-# Moved to playground for now
-# bazaar? ( dev-vcs/bzr )
-# kompare? ( $(add_kdebase_dep kompare) )
-# mercurial? ( dev-vcs/mercurial )
-DEPEND="
-	dev-libs/boost
-"
-RDEPEND="${DEPEND}
-	!<dev-util/kdevelop-${KDEVELOP_VERSION}:4
-	$(add_kdebase_dep konsole)
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	reviewboard? ( dev-libs/qjson )
-	subversion? ( dev-vcs/subversion )
-"
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	# FindKDevPlatform.cmake is installed by kdelibs
-	sed -i \
-		-e '/cmakeFiles/s/^/#DONOTINSTALL/' \
-		cmake/modules/CMakeLists.txt || die
-}
-
-# Moved to playground for now
-# $(cmake-utils_use_build bazaar)
-# $(cmake-utils_use_with kompare)
-# $(cmake-utils_use_build mercurial)
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build cvs)
-		$(cmake-utils_use_build git)
-		$(cmake-utils_use_with reviewboard QJSON)
-		$(cmake-utils_use_build subversion)
-		$(cmake-utils_use_with subversion SubversionLibrary)
-	)
-
-	kde4-base_src_configure
-}
-
-# bug 276208
-src_test() { : ; }
diff --git a/dev-util/kdevplatform/kdevplatform-1.4.0.ebuild b/dev-util/kdevplatform/kdevplatform-1.4.0.ebuild
deleted file mode 100644
index 8c8e6071c9fd..000000000000
--- a/dev-util/kdevplatform/kdevplatform-1.4.0.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/dev-util/kdevplatform/kdevplatform-1.4.0.ebuild,v 1.2 2012/12/10 15:56:59 kensington Exp $
-
-EAPI=4
-
-KMNAME="kdevelop"
-KDE_MINIMAL="4.7"
-KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it nb nds nl pl pt
-pt_BR sl sv th uk zh_CN zh_TW"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-EGIT_REPONAME="${PN}"
-
-inherit kde4-base
-
-DESCRIPTION="KDE development support libraries and apps"
-LICENSE="GPL-2 LGPL-2"
-IUSE="cvs debug reviewboard subversion"
-
-if [[ $PV == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~ppc ~x86"
-fi
-
-DEPEND="
-	dev-libs/boost
-	reviewboard? ( dev-libs/qjson )
-	subversion? (
-		dev-libs/apr
-		dev-libs/apr-util
-		dev-vcs/subversion
-	)
-"
-RDEPEND="${DEPEND}
-	!<dev-util/kdevelop-${KDEVELOP_VERSION}:4
-	$(add_kdebase_dep konsole)
-	cvs? ( dev-vcs/cvs )
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build cvs)
-		$(cmake-utils_use_build reviewboard)
-		$(cmake-utils_use_build subversion)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/dev-util/kdevplatform/kdevplatform-1.4.1.ebuild b/dev-util/kdevplatform/kdevplatform-1.4.1.ebuild
index bb0dbbf16c1f..843b5e5aa134 100644
--- a/dev-util/kdevplatform/kdevplatform-1.4.1.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.4.1.ebuild,v 1.4 2012/12/14 12:54:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.4.1.ebuild,v 1.5 2012/12/22 13:54:43 ago Exp $
 
 EAPI=4
 
@@ -21,7 +21,7 @@ IUSE="cvs debug reviewboard subversion"
 if [[ $PV == *9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="amd64 ~ppc x86"
+	KEYWORDS="amd64 ppc x86"
 fi
 
 DEPEND="
diff --git a/dev-util/open-vcdiff/Manifest b/dev-util/open-vcdiff/Manifest
new file mode 100644
index 000000000000..9ce7201bbc70
--- /dev/null
+++ b/dev-util/open-vcdiff/Manifest
@@ -0,0 +1 @@
+DIST open-vcdiff-0.8.3.tar.gz 757271 SHA256 b7e47db78866082e9e8b5782f5491092c8414f0acc0440aea03b14c7d1d3c371 SHA512 7f0712aa9f08b19658fbc77f28e6dde9f4a45a4be8f97fb00db1ca78f5ee4e7b9f333dc3208e9ba85b5696a24fa30865397c096be1687d73048809cd30e12a55 WHIRLPOOL 90d75d62c7eceae74639c2105cae98bd148b02c7c83d169a71f094d8f30829ed736b8d8fb43ecef06657ce8b10b8dfaf0f98b439dd170a4a0259e9dd4f035977
diff --git a/dev-util/open-vcdiff/metadata.xml b/dev-util/open-vcdiff/metadata.xml
new file mode 100644
index 000000000000..af2678460755
--- /dev/null
+++ b/dev-util/open-vcdiff/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">open-vcdiff</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/open-vcdiff/open-vcdiff-0.8.3.ebuild b/dev-util/open-vcdiff/open-vcdiff-0.8.3.ebuild
new file mode 100644
index 000000000000..8fd697e7eaea
--- /dev/null
+++ b/dev-util/open-vcdiff/open-vcdiff-0.8.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/open-vcdiff/open-vcdiff-0.8.3.ebuild,v 1.2 2012/12/22 19:37:04 floppym Exp $
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="An encoder/decoder for the VCDIFF (RFC3284) format"
+HOMEPAGE="http://code.google.com/p/open-vcdiff/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		--disable-static
+	)
+	autotools-utils_src_configure
+}
diff --git a/dev-vcs/subversion/subversion-1.7.7.ebuild b/dev-vcs/subversion/subversion-1.7.7.ebuild
index b2fab41cebb2..3e84ff6407b3 100644
--- a/dev-vcs/subversion/subversion-1.7.7.ebuild
+++ b/dev-vcs/subversion/subversion-1.7.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/dev-vcs/subversion/subversion-1.7.7.ebuild,v 1.2 2012/11/09 16:58:00 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.7.ebuild,v 1.4 2012/12/22 13:59:27 ago Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Subversion GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf"
 
 CDEPEND=">=dev-db/sqlite-3.4
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 75891851f8cd..9dbac1d79368 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -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/eclass/qt4-build.eclass,v 1.139 2012/11/12 09:28:53 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.140 2012/12/22 03:57:14 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -274,7 +274,7 @@ qt4-build_src_prepare() {
 
 	# Respect CC, CXX, LINK and *FLAGS in config.tests
 	find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
-		sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \
+		sed -i -e "/bin\/qmake/ s: \"\$SRCDIR/: \
 			'QMAKE_CC=$(tc-getCC)'    'QMAKE_CXX=$(tc-getCXX)'      'QMAKE_LINK=$(tc-getCXX)' \
 			'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
 		|| die "sed config.tests failed"
diff --git a/games-fps/quake3-bin/Manifest b/games-fps/quake3-bin/Manifest
index 651642edc5cf..292675123b26 100644
--- a/games-fps/quake3-bin/Manifest
+++ b/games-fps/quake3-bin/Manifest
@@ -1,2 +1,2 @@
-DIST linuxq3apoint-1.32b-3.x86.run 30923961 RMD160 eb63177fc0a30cda4976d8b68e065efb6dc41e50 SHA1 802d84af0d515db50a496c4c55d1f1c4f40a9239 SHA256 c36132c5556b35e01950f1e9c646235033a5130f87ad776ba2bc7becf4f4f186
-DIST quake3-1.32c.zip 3056760 RMD160 d53f3b5a44e1b2871b0a6f1f6e93d9b0ad6d5d10 SHA1 82c52c12682aa4c47628ccfc067e07a56bc65da1 SHA256 643ac677892fb58689a86d71f08d6678393efe2939b82c436a5c92368eebb849
+DIST linuxq3apoint-1.32b-3.x86.run 30923961 SHA256 c36132c5556b35e01950f1e9c646235033a5130f87ad776ba2bc7becf4f4f186 SHA512 64cff7f8b689e6c801cd68b0f44406a60bd45f83b2544debb8bf1ef7480a1407184a67d2bdafe66e803c0c030b8df6766ce24e48c9e7c610ecf152ed326b7d78 WHIRLPOOL ad1250dbf53e0d5b03b753752e9fc66f361fe2473fc3bd74285a1357e3c1f9fded64806a46766f1bd666b567b8d0fc55a8780633f60af2554abaad9231873cf3
+DIST quake3-1.32c.zip 3056760 SHA256 643ac677892fb58689a86d71f08d6678393efe2939b82c436a5c92368eebb849 SHA512 8bc68d4a1e015e5d5abb88bee1e52cb6375c005d707147869d16383bdbfd37f092a75e8fb3f8678120621433d98de40dcda9dbdbd255a92399caec2c545ff689 WHIRLPOOL 8b55046d002a577087309961074f5b05997d512e6dd666335a38026f006481497a6bb94e5ee9869b0ecdf7767cc26be5f949e157c06e2e477143819d29347f42
diff --git a/games-fps/quake3-bin/quake3-bin-1.32c-r1.ebuild b/games-fps/quake3-bin/quake3-bin-1.32c-r1.ebuild
index 938aeda30425..9d9086a8a40e 100644
--- a/games-fps/quake3-bin/quake3-bin-1.32c-r1.ebuild
+++ b/games-fps/quake3-bin/quake3-bin-1.32c-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/quake3-bin-1.32c-r1.ebuild,v 1.14 2012/07/11 17:29:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/quake3-bin-1.32c-r1.ebuild,v 1.15 2012/12/22 11:00:19 ago Exp $
 
 EAPI=2
 inherit eutils unpacker games
@@ -12,7 +12,7 @@ SRC_URI="mirror://idsoftware/quake3/linux/linuxq3apoint-1.32b-3.x86.run
 
 LICENSE="Q3AEULA GPL-2" #gpl for init script bug #425942
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 IUSE="cdinstall dedicated opengl teamarena"
 RESTRICT="strip"
 
diff --git a/games-fps/rtcwmp-demo/Manifest b/games-fps/rtcwmp-demo/Manifest
index 25e1a7b80dbd..c0ab460b553b 100644
--- a/games-fps/rtcwmp-demo/Manifest
+++ b/games-fps/rtcwmp-demo/Manifest
@@ -1 +1 @@
-DIST wolfmpdemo-linux-1.1-MP.x86.run 69650634 RMD160 3d352a45eaf89d7908b8049194cbc330b29b2e21 SHA1 ba8811dcf39f7aa4cfb2a8f0b81e981c870ed145 SHA256 44638cf2d98db4ac583aa4878645e171a7c4b462b44961629aeb8d8d78188da8
+DIST wolfmpdemo-linux-1.1-MP.x86.run 69650634 SHA256 44638cf2d98db4ac583aa4878645e171a7c4b462b44961629aeb8d8d78188da8 SHA512 2e497ca8cb0552dfbc90bfd10544b44f0dca2b7dc74ad6428041fd9885926a03cfdae72d6e5ccbd61b0d0c5b051355c567a9101746838110ebeb0f3fdcaf3ad5 WHIRLPOOL 6087920c0d63f5060292adcb575fafb1113b82e9e8e1a557cf740c649dad7b54ae4fae44ce698ccdcfafa4749964ad174cd3731634235fa0f27ece375a67a5ca
diff --git a/games-fps/rtcwmp-demo/rtcwmp-demo-1.1.ebuild b/games-fps/rtcwmp-demo/rtcwmp-demo-1.1.ebuild
index 27924c7b55a1..d62df137d9af 100644
--- a/games-fps/rtcwmp-demo/rtcwmp-demo-1.1.ebuild
+++ b/games-fps/rtcwmp-demo/rtcwmp-demo-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/games-fps/rtcwmp-demo/rtcwmp-demo-1.1.ebuild,v 1.13 2012/07/11 17:25:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcwmp-demo/rtcwmp-demo-1.1.ebuild,v 1.14 2012/12/21 21:30:29 tupone Exp $
 
 inherit eutils unpacker games
 
@@ -35,6 +35,9 @@ RDEPEND="sys-libs/glibc
 	amd64? (
 		app-emulation/emul-linux-x86-xlibs )"
 
+QA_PREBUILT="${GAMES_PREFIX_OPT:1}/{PN}/*
+	${GAMES_PREFIX_OPT:1}/{PN}/demomain/*"
+
 S=${WORKDIR}
 
 dir=${GAMES_PREFIX_OPT}/${PN}
diff --git a/games-server/cyphesis/cyphesis-0.6.0.ebuild b/games-server/cyphesis/cyphesis-0.6.0.ebuild
index 35f1d5d1e267..90ddfdf1487f 100644
--- a/games-server/cyphesis/cyphesis-0.6.0.ebuild
+++ b/games-server/cyphesis/cyphesis-0.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/cyphesis/cyphesis-0.6.0.ebuild,v 1.2 2012/12/19 10:50:03 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/cyphesis/cyphesis-0.6.0.ebuild,v 1.3 2012/12/22 11:00:36 ago Exp $
 
 EAPI=5
 PYTHON_DEPEND=2
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/worldforge/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 RESTRICT="test"
 
diff --git a/games-strategy/widelands/widelands-0.17.ebuild b/games-strategy/widelands/widelands-0.17.ebuild
index b08b50fc2576..fda60e8feeb3 100644
--- a/games-strategy/widelands/widelands-0.17.ebuild
+++ b/games-strategy/widelands/widelands-0.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/games-strategy/widelands/widelands-0.17.ebuild,v 1.7 2012/12/14 21:14:26 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.17.ebuild,v 1.8 2012/12/22 13:59:50 ago Exp $
 
 EAPI=3
 inherit eutils versionator toolchain-funcs flag-o-matic cmake-utils games
@@ -13,7 +13,7 @@ SRC_URI="http://launchpad.net/widelands/${MY_PV}/build-$(get_version_component_r
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
 IUSE=""
 
 DEPEND="dev-lang/lua
diff --git a/kde-base/akonadiconsole/akonadiconsole-4.9.4.ebuild b/kde-base/akonadiconsole/akonadiconsole-4.9.4.ebuild
index c1ca8aa25e9d..828e8d16f5b3 100644
--- a/kde-base/akonadiconsole/akonadiconsole-4.9.4.ebuild
+++ b/kde-base/akonadiconsole/akonadiconsole-4.9.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/kde-base/akonadiconsole/akonadiconsole-4.9.4.ebuild,v 1.1 2012/12/05 16:58:24 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadiconsole/akonadiconsole-4.9.4.ebuild,v 1.2 2012/12/22 16:11:39 maekke Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ KMNAME="kdepim"
 inherit kde4-meta
 
 DESCRIPTION="Akonadi developer console"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/ark/ark-4.9.4.ebuild b/kde-base/ark/ark-4.9.4.ebuild
index 4f04e9011800..e325321644ec 100644
--- a/kde-base/ark/ark-4.9.4.ebuild
+++ b/kde-base/ark/ark-4.9.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/kde-base/ark/ark-4.9.4.ebuild,v 1.1 2012/12/05 16:57:56 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ark-4.9.4.ebuild,v 1.2 2012/12/22 16:56:20 maekke Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE Archiving tool"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+archive +bzip2 debug lzma"
 
 DEPEND="
diff --git a/kde-base/bomber/bomber-4.9.4.ebuild b/kde-base/bomber/bomber-4.9.4.ebuild
index 8e418ad52533..91d7584953fe 100644
--- a/kde-base/bomber/bomber-4.9.4.ebuild
+++ b/kde-base/bomber/bomber-4.9.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/kde-base/bomber/bomber-4.9.4.ebuild,v 1.1 2012/12/05 16:58:06 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/bomber/bomber-4.9.4.ebuild,v 1.2 2012/12/22 16:48:16 maekke Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ KDE_HANDBOOK="optional"
 inherit ${eclass}
 
 DESCRIPTION="KDE arcade bombing game"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/bovo/bovo-4.9.4.ebuild b/kde-base/bovo/bovo-4.9.4.ebuild
index eec9ceaef6be..e289078eb0e3 100644
--- a/kde-base/bovo/bovo-4.9.4.ebuild
+++ b/kde-base/bovo/bovo-4.9.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/kde-base/bovo/bovo-4.9.4.ebuild,v 1.1 2012/12/05 16:57:51 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/bovo/bovo-4.9.4.ebuild,v 1.2 2012/12/22 16:29:21 maekke Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ KDE_HANDBOOK="optional"
 inherit ${eclass}
 
 DESCRIPTION="Five-in-a-row Board Game"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/dragon/dragon-4.9.4.ebuild b/kde-base/dragon/dragon-4.9.4.ebuild
index f29ebd1553fa..100048a56087 100644
--- a/kde-base/dragon/dragon-4.9.4.ebuild
+++ b/kde-base/dragon/dragon-4.9.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/kde-base/dragon/dragon-4.9.4.ebuild,v 1.1 2012/12/05 16:57:40 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dragon/dragon-4.9.4.ebuild,v 1.2 2012/12/22 16:41:08 maekke Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ KMNAME="dragon"
 inherit kde4-base
 
 DESCRIPTION="Dragon Player is a simple video player for KDE 4"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug xine"
 
 RDEPEND="
diff --git a/kde-base/granatier/granatier-4.9.4.ebuild b/kde-base/granatier/granatier-4.9.4.ebuild
index a05482dbe75a..1c8c1331efa5 100644
--- a/kde-base/granatier/granatier-4.9.4.ebuild
+++ b/kde-base/granatier/granatier-4.9.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/kde-base/granatier/granatier-4.9.4.ebuild,v 1.1 2012/12/05 16:58:20 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/granatier/granatier-4.9.4.ebuild,v 1.2 2012/12/22 16:12:29 maekke Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ KDE_HANDBOOK="optional"
 inherit ${eclass}
 
 DESCRIPTION="KDE Bomberman game"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/gwenview/gwenview-4.9.4.ebuild b/kde-base/gwenview/gwenview-4.9.4.ebuild
index 7ad51b6cfffc..b3e03d5d78b1 100644
--- a/kde-base/gwenview/gwenview-4.9.4.ebuild
+++ b/kde-base/gwenview/gwenview-4.9.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/kde-base/gwenview/gwenview-4.9.4.ebuild,v 1.1 2012/12/05 16:57:57 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/gwenview/gwenview-4.9.4.ebuild,v 1.2 2012/12/22 16:38:37 maekke Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE image viewer"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug kipi semantic-desktop"
 
 # tests hang, last checked for 4.2.96
diff --git a/kde-base/kabcclient/kabcclient-4.9.4.ebuild b/kde-base/kabcclient/kabcclient-4.9.4.ebuild
index b3923b390b01..2099e0f1d237 100644
--- a/kde-base/kabcclient/kabcclient-4.9.4.ebuild
+++ b/kde-base/kabcclient/kabcclient-4.9.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/kde-base/kabcclient/kabcclient-4.9.4.ebuild,v 1.1 2012/12/05 16:57:53 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kabcclient/kabcclient-4.9.4.ebuild,v 1.2 2012/12/22 16:57:13 maekke Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ KMMODULE="console/${PN}"
 inherit kde4-meta
 
 DESCRIPTION="A command line client for accessing the KDE addressbook"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kate/kate-4.9.4.ebuild b/kde-base/kate/kate-4.9.4.ebuild
index c5efe6a0dfa5..2ad67187979a 100644
--- a/kde-base/kate/kate-4.9.4.ebuild
+++ b/kde-base/kate/kate-4.9.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/kde-base/kate/kate-4.9.4.ebuild,v 1.1 2012/12/05 16:58:09 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/kate-4.9.4.ebuild,v 1.2 2012/12/22 16:37:45 maekke Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ KMNAME="kate"
 inherit kde4-meta
 
 DESCRIPTION="Kate is an MDI texteditor."
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug +plasma"
 
 DEPEND="
diff --git a/kde-base/katomic/katomic-4.9.4.ebuild b/kde-base/katomic/katomic-4.9.4.ebuild
index d2bd9ed73739..1a10871aac24 100644
--- a/kde-base/katomic/katomic-4.9.4.ebuild
+++ b/kde-base/katomic/katomic-4.9.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/kde-base/katomic/katomic-4.9.4.ebuild,v 1.1 2012/12/05 16:58:02 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/katomic-4.9.4.ebuild,v 1.2 2012/12/22 16:10:47 maekke Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ KDE_SELINUX_MODULE="games"
 inherit ${eclass}
 
 DESCRIPTION="KDE Atomic Entertainment Game"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/kblackbox/kblackbox-4.9.4.ebuild b/kde-base/kblackbox/kblackbox-4.9.4.ebuild
index 567331f5ea98..75cac7af0e84 100644
--- a/kde-base/kblackbox/kblackbox-4.9.4.ebuild
+++ b/kde-base/kblackbox/kblackbox-4.9.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/kde-base/kblackbox/kblackbox-4.9.4.ebuild,v 1.1 2012/12/05 16:58:14 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/kblackbox-4.9.4.ebuild,v 1.2 2012/12/22 16:30:11 maekke Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ KDE_SELINUX_MODULE="games"
 inherit ${eclass}
 
 DESCRIPTION="KDE Blackbox Game"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/kbruch/kbruch-4.9.4.ebuild b/kde-base/kbruch/kbruch-4.9.4.ebuild
index 4633dcbe2224..c2fa4dee714e 100644
--- a/kde-base/kbruch/kbruch-4.9.4.ebuild
+++ b/kde-base/kbruch/kbruch-4.9.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/kde-base/kbruch/kbruch-4.9.4.ebuild,v 1.1 2012/12/05 16:57:37 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbruch/kbruch-4.9.4.ebuild,v 1.2 2012/12/22 16:51:42 maekke Exp $
 
 EAPI=4
 
@@ -8,5 +8,5 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE Educational: Learn calculating with fractions"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kcalc/kcalc-4.9.4.ebuild b/kde-base/kcalc/kcalc-4.9.4.ebuild
index d533306cec3c..b35ef291f429 100644
--- a/kde-base/kcalc/kcalc-4.9.4.ebuild
+++ b/kde-base/kcalc/kcalc-4.9.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/kde-base/kcalc/kcalc-4.9.4.ebuild,v 1.1 2012/12/05 16:57:41 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/kcalc-4.9.4.ebuild,v 1.2 2012/12/22 16:58:03 maekke Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ CPPUNIT_REQUIRED="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE calculator"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kcharselect/kcharselect-4.9.4.ebuild b/kde-base/kcharselect/kcharselect-4.9.4.ebuild
index 3a9aaeef08c3..c4069909c788 100644
--- a/kde-base/kcharselect/kcharselect-4.9.4.ebuild
+++ b/kde-base/kcharselect/kcharselect-4.9.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/kde-base/kcharselect/kcharselect-4.9.4.ebuild,v 1.1 2012/12/05 16:58:28 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcharselect/kcharselect-4.9.4.ebuild,v 1.2 2012/12/22 15:59:05 maekke Exp $
 
 EAPI=4
 
@@ -8,5 +8,5 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE character selection utility"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kfourinline/kfourinline-4.9.4.ebuild b/kde-base/kfourinline/kfourinline-4.9.4.ebuild
index b4dbf51e1c4f..16cc13df9a41 100644
--- a/kde-base/kfourinline/kfourinline-4.9.4.ebuild
+++ b/kde-base/kfourinline/kfourinline-4.9.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/kde-base/kfourinline/kfourinline-4.9.4.ebuild,v 1.1 2012/12/05 16:57:39 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfourinline/kfourinline-4.9.4.ebuild,v 1.2 2012/12/22 16:52:33 maekke Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ KDE_HANDBOOK="optional"
 inherit ${eclass}
 
 DESCRIPTION="KDE four-in-a-row game."
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/kgeography/kgeography-4.9.4.ebuild b/kde-base/kgeography/kgeography-4.9.4.ebuild
index 3e06d1ab6dfb..a91f84421c56 100644
--- a/kde-base/kgeography/kgeography-4.9.4.ebuild
+++ b/kde-base/kgeography/kgeography-4.9.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/kde-base/kgeography/kgeography-4.9.4.ebuild,v 1.1 2012/12/05 16:57:50 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgeography/kgeography-4.9.4.ebuild,v 1.2 2012/12/22 16:14:58 maekke Exp $
 
 EAPI=4
 
@@ -8,5 +8,5 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE: a geography learning tool"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kgpg/kgpg-4.9.4.ebuild b/kde-base/kgpg/kgpg-4.9.4.ebuild
index 2aa87c87435c..333575f5cdd0 100644
--- a/kde-base/kgpg/kgpg-4.9.4.ebuild
+++ b/kde-base/kgpg/kgpg-4.9.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/kde-base/kgpg/kgpg-4.9.4.ebuild,v 1.1 2012/12/05 16:57:56 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/kgpg-4.9.4.ebuild,v 1.2 2012/12/22 16:00:33 maekke Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ KDE_SELINUX_MODULE="gpg"
 inherit kde4-base
 
 DESCRIPTION="KDE gpg keyring manager"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/khangman/khangman-4.9.4.ebuild b/kde-base/khangman/khangman-4.9.4.ebuild
index f9c4f0c129fe..1952806bc52b 100644
--- a/kde-base/khangman/khangman-4.9.4.ebuild
+++ b/kde-base/khangman/khangman-4.9.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/kde-base/khangman/khangman-4.9.4.ebuild,v 1.1 2012/12/05 16:58:30 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/khangman-4.9.4.ebuild,v 1.2 2012/12/22 16:03:54 maekke Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="Classical hangman game for KDE"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kig/kig-4.9.4.ebuild b/kde-base/kig/kig-4.9.4.ebuild
index e87414df0e0d..45e5c96d33be 100644
--- a/kde-base/kig/kig-4.9.4.ebuild
+++ b/kde-base/kig/kig-4.9.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/kde-base/kig/kig-4.9.4.ebuild,v 1.1 2012/12/05 16:57:56 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-4.9.4.ebuild,v 1.2 2012/12/22 16:49:06 maekke Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE Interactive Geometry tool"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug scripting"
 
 DEPEND="
diff --git a/kde-base/kjumpingcube/kjumpingcube-4.9.4.ebuild b/kde-base/kjumpingcube/kjumpingcube-4.9.4.ebuild
index 3c7057f2b156..cb88ef7fbbd7 100644
--- a/kde-base/kjumpingcube/kjumpingcube-4.9.4.ebuild
+++ b/kde-base/kjumpingcube/kjumpingcube-4.9.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/kde-base/kjumpingcube/kjumpingcube-4.9.4.ebuild,v 1.1 2012/12/05 16:57:46 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/kjumpingcube-4.9.4.ebuild,v 1.2 2012/12/22 16:13:19 maekke Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ KDE_SELINUX_MODULE="games"
 inherit ${eclass}
 
 DESCRIPTION="KDE: Tactical one or two player game"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/kleopatra/kleopatra-4.9.4.ebuild b/kde-base/kleopatra/kleopatra-4.9.4.ebuild
index 2c3a7b6dd88a..f5fac065cdc8 100644
--- a/kde-base/kleopatra/kleopatra-4.9.4.ebuild
+++ b/kde-base/kleopatra/kleopatra-4.9.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/kde-base/kleopatra/kleopatra-4.9.4.ebuild,v 1.1 2012/12/05 16:57:54 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/kleopatra-4.9.4.ebuild,v 1.2 2012/12/22 16:50:02 maekke Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ KMNAME="kdepim"
 inherit kde4-meta
 
 DESCRIPTION="Kleopatra - KDE X.509 key manager"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/klettres/klettres-4.9.4.ebuild b/kde-base/klettres/klettres-4.9.4.ebuild
index 9a4bdf7a4475..8d81631e87b2 100644
--- a/kde-base/klettres/klettres-4.9.4.ebuild
+++ b/kde-base/klettres/klettres-4.9.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/kde-base/klettres/klettres-4.9.4.ebuild,v 1.1 2012/12/05 16:58:02 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/klettres-4.9.4.ebuild,v 1.2 2012/12/22 16:05:47 maekke Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE: KLettres helps a very young child or an adult learning "
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/kmahjongg/kmahjongg-4.9.4.ebuild b/kde-base/kmahjongg/kmahjongg-4.9.4.ebuild
index 756d1343ef0f..bfce3ce0ed1c 100644
--- a/kde-base/kmahjongg/kmahjongg-4.9.4.ebuild
+++ b/kde-base/kmahjongg/kmahjongg-4.9.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/kde-base/kmahjongg/kmahjongg-4.9.4.ebuild,v 1.1 2012/12/05 16:57:52 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/kmahjongg-4.9.4.ebuild,v 1.2 2012/12/22 16:17:45 maekke Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ KDE_SELINUX_MODULE="games"
 inherit ${eclass}
 
 DESCRIPTION="Mahjongg for KDE"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kmix/kmix-4.9.4.ebuild b/kde-base/kmix/kmix-4.9.4.ebuild
index 9356495bad9d..903094ab20e3 100644
--- a/kde-base/kmix/kmix-4.9.4.ebuild
+++ b/kde-base/kmix/kmix-4.9.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/kde-base/kmix/kmix-4.9.4.ebuild,v 1.1 2012/12/05 16:57:43 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/kmix-4.9.4.ebuild,v 1.2 2012/12/22 16:39:27 maekke Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE mixer gui"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="alsa debug canberra pulseaudio"
 
 DEPEND="
diff --git a/kde-base/knetwalk/knetwalk-4.9.4.ebuild b/kde-base/knetwalk/knetwalk-4.9.4.ebuild
index 1d5c1fdf0c29..b367ab26b303 100644
--- a/kde-base/knetwalk/knetwalk-4.9.4.ebuild
+++ b/kde-base/knetwalk/knetwalk-4.9.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/kde-base/knetwalk/knetwalk-4.9.4.ebuild,v 1.1 2012/12/05 16:58:21 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knetwalk/knetwalk-4.9.4.ebuild,v 1.2 2012/12/22 16:43:38 maekke Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ KDE_HANDBOOK="optional"
 inherit ${eclass}
 
 DESCRIPTION="KDE: Knetwalk is the kde version of the popular NetWalk game for system administrators"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/kreversi/kreversi-4.9.4.ebuild b/kde-base/kreversi/kreversi-4.9.4.ebuild
index 2c3fa88ffa84..03f91e9e7ebe 100644
--- a/kde-base/kreversi/kreversi-4.9.4.ebuild
+++ b/kde-base/kreversi/kreversi-4.9.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/kde-base/kreversi/kreversi-4.9.4.ebuild,v 1.1 2012/12/05 16:58:01 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/kreversi-4.9.4.ebuild,v 1.2 2012/12/22 16:47:24 maekke Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ KDE_SELINUX_MODULE="games"
 inherit ${eclass}
 
 DESCRIPTION="KDE Board Game"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/kscd/kscd-4.9.4.ebuild b/kde-base/kscd/kscd-4.9.4.ebuild
index 4767416636e0..029569ca5bae 100644
--- a/kde-base/kscd/kscd-4.9.4.ebuild
+++ b/kde-base/kscd/kscd-4.9.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/kde-base/kscd/kscd-4.9.4.ebuild,v 1.1 2012/12/05 16:57:42 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-4.9.4.ebuild,v 1.2 2012/12/22 16:27:41 maekke Exp $
 
 EAPI=4
 
 inherit kde4-base
 
 DESCRIPTION="KDE CD player"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/ksnakeduel/ksnakeduel-4.9.4.ebuild b/kde-base/ksnakeduel/ksnakeduel-4.9.4.ebuild
index 96b98e1a7e7c..d4f02c700e57 100644
--- a/kde-base/ksnakeduel/ksnakeduel-4.9.4.ebuild
+++ b/kde-base/ksnakeduel/ksnakeduel-4.9.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/kde-base/ksnakeduel/ksnakeduel-4.9.4.ebuild,v 1.1 2012/12/05 16:58:04 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnakeduel/ksnakeduel-4.9.4.ebuild,v 1.2 2012/12/22 16:41:58 maekke Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ KDE_SELINUX_MODULE="games"
 inherit ${eclass}
 
 DESCRIPTION="KDE Tron game"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/ksnapshot/ksnapshot-4.9.4.ebuild b/kde-base/ksnapshot/ksnapshot-4.9.4.ebuild
index 1c83fb30542d..61c90407a812 100644
--- a/kde-base/ksnapshot/ksnapshot-4.9.4.ebuild
+++ b/kde-base/ksnapshot/ksnapshot-4.9.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/kde-base/ksnapshot/ksnapshot-4.9.4.ebuild,v 1.1 2012/12/05 16:57:54 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ksnapshot-4.9.4.ebuild,v 1.2 2012/12/22 16:22:09 maekke Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE Screenshot Utility"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug kipi"
 
 DEPEND="
diff --git a/kde-base/kspaceduel/kspaceduel-4.9.4.ebuild b/kde-base/kspaceduel/kspaceduel-4.9.4.ebuild
index 730fd7b51e90..51f9e349506f 100644
--- a/kde-base/kspaceduel/kspaceduel-4.9.4.ebuild
+++ b/kde-base/kspaceduel/kspaceduel-4.9.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/kde-base/kspaceduel/kspaceduel-4.9.4.ebuild,v 1.1 2012/12/05 16:58:03 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/kspaceduel-4.9.4.ebuild,v 1.2 2012/12/22 16:50:52 maekke Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ KDE_SELINUX_MODULE="games"
 inherit ${eclass}
 
 DESCRIPTION="KDE Space Game"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/ksquares/ksquares-4.9.4.ebuild b/kde-base/ksquares/ksquares-4.9.4.ebuild
index 81658c711a99..d4dfb7e4670a 100644
--- a/kde-base/ksquares/ksquares-4.9.4.ebuild
+++ b/kde-base/ksquares/ksquares-4.9.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/kde-base/ksquares/ksquares-4.9.4.ebuild,v 1.1 2012/12/05 16:57:43 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksquares/ksquares-4.9.4.ebuild,v 1.2 2012/12/22 16:22:59 maekke Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ KDE_HANDBOOK="optional"
 inherit ${eclass}
 
 DESCRIPTION="KSquares is an implementation of the game squares for KDE4"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/kteatime/kteatime-4.9.4.ebuild b/kde-base/kteatime/kteatime-4.9.4.ebuild
index 88598f81dd08..52e899eab725 100644
--- a/kde-base/kteatime/kteatime-4.9.4.ebuild
+++ b/kde-base/kteatime/kteatime-4.9.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/kde-base/kteatime/kteatime-4.9.4.ebuild,v 1.1 2012/12/05 16:58:19 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kteatime/kteatime-4.9.4.ebuild,v 1.2 2012/12/22 16:14:08 maekke Exp $
 
 EAPI=4
 
@@ -10,5 +10,5 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="KDE utility for making a fine cup of tea"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/ktimer/ktimer-4.9.4.ebuild b/kde-base/ktimer/ktimer-4.9.4.ebuild
index 90e0f614c70e..2692f0612cf5 100644
--- a/kde-base/ktimer/ktimer-4.9.4.ebuild
+++ b/kde-base/ktimer/ktimer-4.9.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/kde-base/ktimer/ktimer-4.9.4.ebuild,v 1.1 2012/12/05 16:58:09 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimer/ktimer-4.9.4.ebuild,v 1.2 2012/12/22 16:26:50 maekke Exp $
 
 EAPI=4
 
@@ -8,5 +8,5 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE Timer"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/ktux/ktux-4.9.4.ebuild b/kde-base/ktux/ktux-4.9.4.ebuild
index b8e846fb9ef8..9a74dcb9e827 100644
--- a/kde-base/ktux/ktux-4.9.4.ebuild
+++ b/kde-base/ktux/ktux-4.9.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/kde-base/ktux/ktux-4.9.4.ebuild,v 1.1 2012/12/05 16:57:40 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ktux-4.9.4.ebuild,v 1.2 2012/12/22 16:44:29 maekke Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="KDE: screensaver featuring the Space-Faring Tux"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 # libkworkspace - only as a stub to provide KDE4Workspace config
diff --git a/kde-base/kuser/kuser-4.9.4.ebuild b/kde-base/kuser/kuser-4.9.4.ebuild
index 1ed43684929f..76d942727062 100644
--- a/kde-base/kuser/kuser-4.9.4.ebuild
+++ b/kde-base/kuser/kuser-4.9.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/kde-base/kuser/kuser-4.9.4.ebuild,v 1.1 2012/12/05 16:58:14 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/kuser-4.9.4.ebuild,v 1.2 2012/12/22 16:24:40 maekke Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="KDE application that helps you manage system users"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kwordquiz/kwordquiz-4.9.4.ebuild b/kde-base/kwordquiz/kwordquiz-4.9.4.ebuild
index 7aa45806a77e..945119fa737a 100644
--- a/kde-base/kwordquiz/kwordquiz-4.9.4.ebuild
+++ b/kde-base/kwordquiz/kwordquiz-4.9.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/kde-base/kwordquiz/kwordquiz-4.9.4.ebuild,v 1.1 2012/12/05 16:58:17 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/kwordquiz-4.9.4.ebuild,v 1.2 2012/12/22 16:23:49 maekke Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE: A powerful flashcard and vocabulary learning program"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/libkdcraw/libkdcraw-4.9.4.ebuild b/kde-base/libkdcraw/libkdcraw-4.9.4.ebuild
index ce2b17b9f20c..2be92de81488 100644
--- a/kde-base/libkdcraw/libkdcraw-4.9.4.ebuild
+++ b/kde-base/libkdcraw/libkdcraw-4.9.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/kde-base/libkdcraw/libkdcraw-4.9.4.ebuild,v 1.1 2012/12/05 16:58:28 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdcraw/libkdcraw-4.9.4.ebuild,v 1.2 2012/12/22 16:21:18 maekke Exp $
 
 EAPI=4
 
 inherit kde4-base
 
 DESCRIPTION="KDE digital camera raw image library wrapper"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/libkdeedu/libkdeedu-4.9.4.ebuild b/kde-base/libkdeedu/libkdeedu-4.9.4.ebuild
index 0dccb630e6cb..274d5b3f7cc0 100644
--- a/kde-base/libkdeedu/libkdeedu-4.9.4.ebuild
+++ b/kde-base/libkdeedu/libkdeedu-4.9.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/kde-base/libkdeedu/libkdeedu-4.9.4.ebuild,v 1.1 2012/12/05 16:57:46 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdeedu/libkdeedu-4.9.4.ebuild,v 1.2 2012/12/22 16:03:03 maekke Exp $
 
 EAPI=4
 
 inherit kde4-base
 
 DESCRIPTION="Common library for KDE educational apps"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 # 4 of 4 tests fail. Last checked for 4.6.1. Tests are fundamentally broken,
diff --git a/kde-base/libkdegames/libkdegames-4.9.4.ebuild b/kde-base/libkdegames/libkdegames-4.9.4.ebuild
index 2d904fbf6a3b..ee3336183320 100644
--- a/kde-base/libkdegames/libkdegames-4.9.4.ebuild
+++ b/kde-base/libkdegames/libkdegames-4.9.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/kde-base/libkdegames/libkdegames-4.9.4.ebuild,v 1.1 2012/12/05 16:58:01 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/libkdegames-4.9.4.ebuild,v 1.2 2012/12/22 16:09:57 maekke Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ fi
 inherit ${eclass}
 
 DESCRIPTION="Base library common to many KDE games."
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug openal"
 
 DEPEND="
diff --git a/kde-base/libkexiv2/libkexiv2-4.9.4.ebuild b/kde-base/libkexiv2/libkexiv2-4.9.4.ebuild
index c925a140fd48..a25058ece107 100644
--- a/kde-base/libkexiv2/libkexiv2-4.9.4.ebuild
+++ b/kde-base/libkexiv2/libkexiv2-4.9.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/kde-base/libkexiv2/libkexiv2-4.9.4.ebuild,v 1.1 2012/12/05 16:58:24 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkexiv2/libkexiv2-4.9.4.ebuild,v 1.2 2012/12/22 16:20:28 maekke Exp $
 
 EAPI=4
 
 inherit kde4-base
 
 DESCRIPTION="KDE Image Plugin Interface: an exiv2 library wrapper"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/libkipi/libkipi-4.9.4.ebuild b/kde-base/libkipi/libkipi-4.9.4.ebuild
index 7ebae91d64a3..83c0d60170a9 100644
--- a/kde-base/libkipi/libkipi-4.9.4.ebuild
+++ b/kde-base/libkipi/libkipi-4.9.4.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/kde-base/libkipi/libkipi-4.9.4.ebuild,v 1.1 2012/12/05 16:57:49 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkipi/libkipi-4.9.4.ebuild,v 1.2 2012/12/22 16:19:38 maekke Exp $
 
 EAPI=4
 
 inherit kde4-base
 
 DESCRIPTION="A library for image plugins accross KDE applications."
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/libkmahjongg/libkmahjongg-4.9.4.ebuild b/kde-base/libkmahjongg/libkmahjongg-4.9.4.ebuild
index 8b501903edb5..27f31befaa67 100644
--- a/kde-base/libkmahjongg/libkmahjongg-4.9.4.ebuild
+++ b/kde-base/libkmahjongg/libkmahjongg-4.9.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/kde-base/libkmahjongg/libkmahjongg-4.9.4.ebuild,v 1.1 2012/12/05 16:57:38 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmahjongg/libkmahjongg-4.9.4.ebuild,v 1.2 2012/12/22 16:16:54 maekke Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ fi
 inherit ${eclass}
 
 DESCRIPTION="LibKMahjongg for KDE"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 KMLOADLIBS="libkdegames"
diff --git a/kde-base/palapeli/palapeli-4.9.4.ebuild b/kde-base/palapeli/palapeli-4.9.4.ebuild
index 40405a6de4d5..26e2b768c8a6 100644
--- a/kde-base/palapeli/palapeli-4.9.4.ebuild
+++ b/kde-base/palapeli/palapeli-4.9.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/kde-base/palapeli/palapeli-4.9.4.ebuild,v 1.1 2012/12/05 16:57:38 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/palapeli/palapeli-4.9.4.ebuild,v 1.2 2012/12/22 16:40:17 maekke Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ KDE_HANDBOOK="optional"
 inherit ${eclass}
 
 DESCRIPTION="KDE jigsaw puzzle game"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/parley/parley-4.9.4.ebuild b/kde-base/parley/parley-4.9.4.ebuild
index 530ba4c49cdd..d7e98b8476d0 100644
--- a/kde-base/parley/parley-4.9.4.ebuild
+++ b/kde-base/parley/parley-4.9.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/kde-base/parley/parley-4.9.4.ebuild,v 1.1 2012/12/05 16:58:29 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/parley/parley-4.9.4.ebuild,v 1.2 2012/12/22 16:42:47 maekke Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE Educational: vocabulary trainer"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug +plasma"
 
 DEPEND="
diff --git a/kde-base/printer-applet/printer-applet-4.9.4.ebuild b/kde-base/printer-applet/printer-applet-4.9.4.ebuild
index b60c53f9941c..6f4e6e0d59f3 100644
--- a/kde-base/printer-applet/printer-applet-4.9.4.ebuild
+++ b/kde-base/printer-applet/printer-applet-4.9.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/kde-base/printer-applet/printer-applet-4.9.4.ebuild,v 1.1 2012/12/05 16:58:17 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/printer-applet/printer-applet-4.9.4.ebuild,v 1.2 2012/12/22 16:28:31 maekke Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ PYTHON_DEPEND="2"
 inherit python kde4-base
 
 DESCRIPTION="KDE printer system tray utility"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
diff --git a/kde-base/system-config-printer-kde/system-config-printer-kde-4.9.4.ebuild b/kde-base/system-config-printer-kde/system-config-printer-kde-4.9.4.ebuild
index 6b51de5d128d..69375d380594 100644
--- a/kde-base/system-config-printer-kde/system-config-printer-kde-4.9.4.ebuild
+++ b/kde-base/system-config-printer-kde/system-config-printer-kde-4.9.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/kde-base/system-config-printer-kde/system-config-printer-kde-4.9.4.ebuild,v 1.1 2012/12/05 16:58:12 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/system-config-printer-kde/system-config-printer-kde-4.9.4.ebuild,v 1.2 2012/12/22 16:31:02 maekke Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ PYTHON_DEPEND="2"
 inherit python kde4-meta
 
 DESCRIPTION="KDE port of Red Hat's Gnome system-config-printer"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
diff --git a/licenses/ISOC-rfc b/licenses/ISOC-rfc
index ea4a65bd3110..f33c3181d149 100644
--- a/licenses/ISOC-rfc
+++ b/licenses/ISOC-rfc
@@ -1,9 +1,9 @@
-Copyright (C) The Internet Society (1997).  All Rights Reserved.
+Copyright (C) The Internet Society (<year>).  All Rights Reserved.
 
 This document and translations of it may be copied and furnished to
 others, and derivative works that comment on or otherwise explain it
-or assist in its implmentation may be prepared, copied, published
-andand distributed, in whole or in part, without restriction of any
+or assist in its implementation may be prepared, copied, published
+and distributed, in whole or in part, without restriction of any
 kind, provided that the above copyright notice and this paragraph are
 included on all such copies and derivative works.  However, this
 document itself may not be modified in any way, such as by removing
diff --git a/licenses/PCRE b/licenses/PCRE
new file mode 100644
index 000000000000..8d680612c434
--- /dev/null
+++ b/licenses/PCRE
@@ -0,0 +1,54 @@
+PCRE LICENCE
+------------
+
+PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+Written by: Philip Hazel <ph10@cam.ac.uk>
+
+University of Cambridge Computing Service,
+Cambridge, England. Phone: +44 1223 334714.
+
+Copyright (c) 1997-2001 University of Cambridge
+
+Permission is granted to anyone to use this software for any purpose on any
+computer system, and to redistribute it freely, subject to the following
+restrictions:
+
+1. This software is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+2. The origin of this software must not be misrepresented, either by
+   explicit claim or by omission. In practice, this means that if you use
+   PCRE in software that you distribute to others, commercially or
+   otherwise, you must put a sentence like this
+
+     Regular expression support is provided by the PCRE library package,
+     which is open source software, written by Philip Hazel, and copyright
+     by the University of Cambridge, England.
+
+   somewhere reasonably visible in your documentation and in any relevant
+   files or online help data or similar. A reference to the ftp site for
+   the source, that is, to
+
+     ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
+
+   should also be given in the documentation. However, this condition is not
+   intended to apply to whole chains of software. If package A includes PCRE,
+   it must acknowledge it, but if package B is software that includes package
+   A, the condition is not imposed on package B (unless it uses PCRE
+   independently).
+
+3. Altered versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+
+4. If PCRE is embedded in any software that is released under the GNU
+   General Purpose Licence (GPL), or Lesser General Purpose Licence (LGPL),
+   then the terms of that licence shall supersede any condition above with
+   which it is incompatible.
+
+The documentation for PCRE, supplied in the "doc" directory, is distributed
+under the same terms as the software itself.
+
+End
diff --git a/licenses/bufexplorer.vim b/licenses/bufexplorer.vim
new file mode 100644
index 000000000000..445ee3b23d06
--- /dev/null
+++ b/licenses/bufexplorer.vim
@@ -0,0 +1,8 @@
+Copyright (C) <years> <author>
+Permission is hereby granted to use and distribute this code,
+with or without modifications, provided that this copyright
+notice is copied with it. Like anything else that's free,
+<program> is provided *as is* and comes with no warranty of
+any kind, either expressed or implied. In no event will the
+copyright holder be liable for any damages resulting from
+the use of this software.
diff --git a/licenses/feh b/licenses/feh
new file mode 100644
index 000000000000..6c615ea078ea
--- /dev/null
+++ b/licenses/feh
@@ -0,0 +1,22 @@
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies of the Software and its documentation and
+acknowledgment shall be given in the documentation and software
+packages that this Software was used.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git a/licenses/inner-net b/licenses/inner-net
new file mode 100644
index 000000000000..58c43070702c
--- /dev/null
+++ b/licenses/inner-net
@@ -0,0 +1,34 @@
+The Inner Net License, Version 2.00
+
+  The author(s) grant permission for redistribution and use in source and
+binary forms, with or without modification, of the software and documentation
+provided that the following conditions are met:
+
+0. If you receive a version of the software that is specifically labelled
+   as not being for redistribution (check the version message and/or README),
+   you are not permitted to redistribute that version of the software in any
+   way or form.
+1. All terms of the all other applicable copyrights and licenses must be
+   followed.
+2. Redistributions of source code must retain the authors' copyright
+   notice(s), this list of conditions, and the following disclaimer.
+3. Redistributions in binary form must reproduce the authors' copyright
+   notice(s), this list of conditions, and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+4. [The copyright holder has authorized the removal of this clause.]
+5. Neither the name(s) of the author(s) nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY ITS AUTHORS AND CONTRIBUTORS ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+  If these license terms cause you a real problem, contact the author.
diff --git a/lxde-base/lxde-meta/lxde-meta-0.5.5-r2.ebuild b/lxde-base/lxde-meta/lxde-meta-0.5.5-r2.ebuild
index e97fd1f37e3f..1bbd5a222d96 100644
--- a/lxde-base/lxde-meta/lxde-meta-0.5.5-r2.ebuild
+++ b/lxde-base/lxde-meta/lxde-meta-0.5.5-r2.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/lxde-base/lxde-meta/lxde-meta-0.5.5-r2.ebuild,v 1.6 2012/08/24 23:58:27 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-meta/lxde-meta-0.5.5-r2.ebuild,v 1.7 2012/12/22 18:19:53 hwoarang Exp $
 
 EAPI="2"
 
 DESCRIPTION="Meta ebuild for LXDE, the Lightweight X11 Desktop Environment"
 HOMEPAGE="http://lxde.sf.net/"
 
-LICENSE="GPL-2"
+LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ppc x86"
 IUSE=""
diff --git a/mail-filter/dcc/dcc-1.3.140-r1.ebuild b/mail-filter/dcc/dcc-1.3.140-r1.ebuild
index 270c729f2532..accb347ef207 100644
--- a/mail-filter/dcc/dcc-1.3.140-r1.ebuild
+++ b/mail-filter/dcc/dcc-1.3.140-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/dcc-1.3.140-r1.ebuild,v 1.4 2012/12/20 07:55:49 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/dcc-1.3.140-r1.ebuild,v 1.5 2012/12/22 14:05:04 ago Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.rhyolite.com/anti-spam/dcc/source/old/${P}.tar.Z"
 
 LICENSE="DCC"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="cgi ipv6 rrdtool milter"
 
 RDEPEND="dev-lang/perl
diff --git a/mail-filter/dovecot_deleted_to_trash/dovecot_deleted_to_trash-0.3.ebuild b/mail-filter/dovecot_deleted_to_trash/dovecot_deleted_to_trash-0.3.ebuild
index a3d48a0d5752..1a34647ebfce 100644
--- a/mail-filter/dovecot_deleted_to_trash/dovecot_deleted_to_trash-0.3.ebuild
+++ b/mail-filter/dovecot_deleted_to_trash/dovecot_deleted_to_trash-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/mail-filter/dovecot_deleted_to_trash/dovecot_deleted_to_trash-0.3.ebuild,v 1.5 2012/11/27 07:32:05 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dovecot_deleted_to_trash/dovecot_deleted_to_trash-0.3.ebuild,v 1.6 2012/12/22 17:48:02 ulm Exp $
 
 EAPI=4
 
@@ -10,11 +10,11 @@ DESCRIPTION="Deleted to trash IMAP plugin for Dovecot"
 HOMEPAGE="http://wiki.dovecot.org/Plugins/deleted-to-trash"
 SRC_URI="http://wiki2.dovecot.org/Plugins/deleted-to-trash?action=AttachFile&do=get&target=deleted-to-trash-plugin_${PV}_for_dovecot_2.tar -> ${P}.tar"
 
-LICENSE="as-is"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+LICENSE="ZLIB" # ZLIB without 3rd clause
 SLOT="0"
-
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
+
 RDEPEND="=net-mail/dovecot-2.0*"
 DEPEND="${RDEPEND}"
 
diff --git a/mail-filter/pypolicyd-spf/metadata.xml b/mail-filter/pypolicyd-spf/metadata.xml
index 04a2e9ab4f71..1076258a0ce8 100644
--- a/mail-filter/pypolicyd-spf/metadata.xml
+++ b/mail-filter/pypolicyd-spf/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
-  <email>nitro@legroom.net</email>
-  <name>Jared B.</name>
+  <email>maintainer-needed@gentoo.org</email>
 </maintainer>
 <longdescription></longdescription>
 </pkgmetadata>
diff --git a/media-gfx/gozer/Manifest b/media-gfx/gozer/Manifest
index a1df1d6a1fa3..a71bf60b2d2b 100644
--- a/media-gfx/gozer/Manifest
+++ b/media-gfx/gozer/Manifest
@@ -1 +1 @@
-DIST gozer-0.7.tar.gz 103545 SHA256 a99400630cb7f362717f08d650aff8c59624fdd5dd70cfa7c1efe17d3bf58fd9
+DIST gozer-0.7.tar.gz 103545 SHA256 a99400630cb7f362717f08d650aff8c59624fdd5dd70cfa7c1efe17d3bf58fd9 SHA512 ae39b74272f87d5e9bf71c9df7e6e9ac37a44a54dafba45aa5e8037657ba128e4e6c77a5624921fbca5c57791a0047f491013582cd9e5a6a5c8932a23233a29c WHIRLPOOL 78179c93e0a8e1bbac21910039de7651ce16fbb67330fe5c622707edbd8128773da23444f21ebabb25635a0f5c466fb7eaf53d036f55311ad28222c41b29dd93
diff --git a/media-gfx/gozer/gozer-0.7-r2.ebuild b/media-gfx/gozer/gozer-0.7-r2.ebuild
index 5f04cbe7f786..dd83c7e3930b 100644
--- a/media-gfx/gozer/gozer-0.7-r2.ebuild
+++ b/media-gfx/gozer/gozer-0.7-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/media-gfx/gozer/gozer-0.7-r2.ebuild,v 1.4 2012/05/29 19:32:57 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gozer/gozer-0.7-r2.ebuild,v 1.6 2012/12/22 13:50:31 ulm Exp $
 
 EAPI="2"
 
@@ -10,7 +10,7 @@ DESCRIPTION="tool for rendering arbitrary text as graphics, using ttfs and style
 HOMEPAGE="http://www.linuxbrit.co.uk/gozer/"
 SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="feh LGPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
@@ -30,6 +30,6 @@ src_prepare() {
 
 src_install() {
 	emake install DESTDIR="${D}" || die
-	rm -rf ${D}/usr/doc
+	rm -rf "${D}"/usr/doc
 	dodoc TODO README AUTHORS ChangeLog
 }
diff --git a/media-gfx/inkscape/inkscape-0.48.4.ebuild b/media-gfx/inkscape/inkscape-0.48.4.ebuild
index 389dec1f2dfd..a354d8974c6f 100644
--- a/media-gfx/inkscape/inkscape-0.48.4.ebuild
+++ b/media-gfx/inkscape/inkscape-0.48.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-gfx/inkscape/inkscape-0.48.4.ebuild,v 1.3 2012/12/20 19:36:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4.ebuild,v 1.4 2012/12/22 15:21:08 ago Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ HOMEPAGE="http://www.inkscape.org/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="dia gnome postscript inkjar lcms nls spell wmf"
 
 RESTRICT="test"
diff --git a/media-gfx/mandelbulber/metadata.xml b/media-gfx/mandelbulber/metadata.xml
index 596ec60e32fd..0657cf509406 100644
--- a/media-gfx/mandelbulber/metadata.xml
+++ b/media-gfx/mandelbulber/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>graphics</herd>
-	<maintainer>
-		<email>xarthisius@gentoo.org</email>
-		<name>Kacper Kowalik</name>
-	</maintainer>
 	<longdescription>
 		Mandelbulber is an easy to use, handy but experimental application 
 		designed to help you render 3D Mandelbrot fractals called Mandelbulb 
diff --git a/media-libs/edje/Manifest b/media-libs/edje/Manifest
index 7432724e87d5..196a0746bcb2 100644
--- a/media-libs/edje/Manifest
+++ b/media-libs/edje/Manifest
@@ -1,2 +1 @@
-DIST edje-1.7.2.tar.bz2 1105998 SHA256 c869ba2dbd0e26fd356292767a6029e1415d0f95f59f4f16fd2ca528dcba685e SHA512 8ce99c5a63fe6a2bf8e16592496744e5d87852d9afcf84a9bb42b784eacd3f1245d3f94f42d627566f09e98305ec6be553b17285e0fe8024df7c6afb24ed2571 WHIRLPOOL 941f68324e7f96267cdfda41aaacd09d8feaa5e66acadbe1e8669f3984d2b1ab573552a4e9ed1810911937ce7f0cd70b7b39282bed2fa03f2b99c3725f24416f
-DIST edje-1.7.3.tar.bz2 1100866 SHA256 084edd99677718403eb7c359fc09f877230d40b85681daf1d98b7ce754036d36 SHA512 98a306f150249bdf4a0748469de8b24a44ca1ff268482af8972ac9c6495713de7766b79b7df14383679c4fc735ac3e5febc6e43ca6367a57776b3cafb3f786c1 WHIRLPOOL c5b20b4c8d7bdb73387fa88a9aff251415528676723d4172b9c06643507e9760219f6b3b0e10d1ba474e8a43f827f899a5317612e70eab02009926428ab41c3b
+DIST edje-1.7.4.tar.bz2 1090395 SHA256 fed509fac974c1f831b796678a693cf319807c8b869505490d4e4cdc7b7d0b8b SHA512 65e11ef8cef3e893e528dbd62d79aaaa7630ff21d4de813f067160a634d0a2487e94edfe675f968cbec677707c4c0071d491566234467ee913a252965f30cb3b WHIRLPOOL cc2ac3d579482c07f716747d49500d05ecec6763f1cc91ae815a3f414d23f7a3bed3b6a21aa43d5fa9dcf6ced67d81d76e8ce367b8d5a1bb52a9e6ff4f74278c
diff --git a/media-libs/edje/edje-1.7.2.ebuild b/media-libs/edje/edje-1.7.2.ebuild
deleted file mode 100644
index b2cd8ec858e4..000000000000
--- a/media-libs/edje/edje-1.7.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/edje/edje-1.7.2.ebuild,v 1.1 2012/11/23 14:41:46 tommy Exp $
-
-EAPI=1
-
-inherit enlightenment
-
-DESCRIPTION="graphical layout and animation library"
-HOMEPAGE="http://www.enlightenment.org/pages/edje.html"
-SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug +cache static-libs vim-syntax"
-
-DEPEND="dev-lang/lua
-	>=dev-libs/eet-1.7.0
-	>=dev-libs/eina-1.7.0
-	>=dev-libs/embryo-1.7.0
-	>=media-libs/evas-1.7.0
-	>=dev-libs/ecore-1.7.0"
-RDEPEND=${DEPEND}
-
-src_compile() {
-	export MY_ECONF="
-		$(use_enable cache edje-program-cache)
-		$(use_enable cache edje-calc-cache)
-		$(use_enable !debug amalgamation)
-		$(use_with vim-syntax vim /usr/share/vim)
-	"
-	enlightenment_src_compile
-}
-
-src_install() {
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax/
-		doins data/edc.vim || die
-	fi
-	dodoc utils/{gimp-edje-export.py,inkscape2edc} || die
-	enlightenment_src_install
-}
diff --git a/media-libs/edje/edje-1.7.3.ebuild b/media-libs/edje/edje-1.7.4.ebuild
similarity index 88%
rename from media-libs/edje/edje-1.7.3.ebuild
rename to media-libs/edje/edje-1.7.4.ebuild
index a127f2dc5d05..1b3bbc5a8fe8 100644
--- a/media-libs/edje/edje-1.7.3.ebuild
+++ b/media-libs/edje/edje-1.7.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/edje/edje-1.7.3.ebuild,v 1.1 2012/12/08 13:59:02 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/edje/edje-1.7.4.ebuild,v 1.1 2012/12/21 20:07:52 tommy Exp $
 
 EAPI=1
 
@@ -10,6 +10,7 @@ DESCRIPTION="graphical layout and animation library"
 HOMEPAGE="http://www.enlightenment.org/pages/edje.html"
 SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
 
+LICENSE="BSD-2 GPL-2"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="debug +cache static-libs vim-syntax"
 
diff --git a/media-libs/elementary/Manifest b/media-libs/elementary/Manifest
index 0dab10025c9d..141264bcee28 100644
--- a/media-libs/elementary/Manifest
+++ b/media-libs/elementary/Manifest
@@ -1,2 +1 @@
-DIST elementary-1.7.1.tar.bz2 9303531 SHA256 54dd82ca156f024de91e375ae9f7ad9579cb0d8fb0bcbf9b16e5b4165d5ac483 SHA512 46c58c1f096e62332114b90d5c04bfa663aef1266db3a0793aa9daa1f20b580ebc905e0d825f05727b08708be6593ce9ba599ba99b88fac85d17c99e23c047e6 WHIRLPOOL c05e1611b93aa7929abc6560d910b2d6494d0d09dab5e80fdba619b1337799d7b65745d3351bf451c38c44d7e394fdb8f4d68fedc87f15b7dd746c83454feb1b
-DIST elementary-1.7.2.tar.bz2 9336500 SHA256 e1c3396dfd424b94086293a1528bc160e3fccaa8877ead428d0422bc6b9e871a SHA512 64dc532f9b9a51f5039cd7e20812093dd7962b2904c7eedba2934e09fe2b6e59b9acea999ce78bec1cc0723e970e7f0697df80b3d4c7830b23766767b53924f4 WHIRLPOOL ed48c38b1078fb4cdec003a889a0876ef55e97fac95bb3a69ad0d33cbe44bf76021eefbdce17a38943b4905a87139f42cfeb640916596710d3c643c7facb2775
+DIST elementary-1.7.4.tar.bz2 9374743 SHA256 3f792bbd1fe004eeb81b5f3fa58cfae5db7d7069e330503490f23e1aa0d4911c SHA512 9dc0a96fcf833df5170c714520a27a8ac2fc78b2db92904715e27cb74f73b94d2791fc78530476bb31b3b4d4bacdcf80eb96cc719074161525b5ebbffa9a6b79 WHIRLPOOL 12cff6b2cfb372d462eb526c38452087a05dba78588108fbb45beb9366ad842b3f2fa47e073843aa3610525b4048eadd271ae477d2db7c709ee67037a91280d3
diff --git a/media-libs/elementary/elementary-1.7.2.ebuild b/media-libs/elementary/elementary-1.7.2.ebuild
deleted file mode 100644
index 25df42c52197..000000000000
--- a/media-libs/elementary/elementary-1.7.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/elementary/elementary-1.7.2.ebuild,v 1.1 2012/11/23 21:39:27 tommy Exp $
-
-EAPI=2
-
-inherit enlightenment
-
-DESCRIPTION="Basic widget set, based on EFL for mobile touch-screen devices."
-HOMEPAGE="http://trac.enlightenment.org/e/wiki/Elementary"
-SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus debug examples fbcon opengl quicklaunch sdl X xcb xdg static-libs"
-
-DEPEND="
-	>=dev-libs/ecore-1.7.0[evas,fbcon?,opengl?,sdl?,X?,xcb?]
-	>=media-libs/evas-1.7.0[fbcon?,opengl?,X?,xcb?]
-	>=media-libs/edje-1.7.0
-	dbus? ( >=dev-libs/e_dbus-1.7.0 )
-	xdg? ( >=dev-libs/efreet-1.7.0 )
-	"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	MY_ECONF="$(use_enable dbus edbus)
-		$(use_enable debug)
-		$(use_enable doc)
-		--disable-ecore-cocoa
-		--disable-ecore-psl1ght
-		--disable-ecore-wayland
-		--disable-ecore-win32
-		--disable-ecore-wince
-		--disable-emap
-		--disable-emotion
-		--disable-ethumb
-		--disable-eweather
-		$(use_enable examples build-examples)
-		$(use_enable examples install-examples)
-		$(use_enable fbcon ecore-fb)
-		$(use_enable sdl ecore-sdl)
-		--disable-web
-		$(use_enable X ecore-x)
-		$(use_enable quicklaunch quick-launch)
-		$(use_enable xdg efreet)"
-
-	enlightenment_src_configure
-}
diff --git a/media-libs/elementary/elementary-1.7.1.ebuild b/media-libs/elementary/elementary-1.7.4.ebuild
similarity index 81%
rename from media-libs/elementary/elementary-1.7.1.ebuild
rename to media-libs/elementary/elementary-1.7.4.ebuild
index 61e6727d9cc2..fd998cea7374 100644
--- a/media-libs/elementary/elementary-1.7.1.ebuild
+++ b/media-libs/elementary/elementary-1.7.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/elementary/elementary-1.7.1.ebuild,v 1.1 2012/11/16 17:28:10 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/elementary/elementary-1.7.4.ebuild,v 1.1 2012/12/21 20:56:22 tommy Exp $
 
 EAPI=2
 
@@ -12,13 +12,15 @@ SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
-IUSE="dbus debug examples fbcon opengl quicklaunch sdl X xcb xdg static-libs"
+IUSE="dbus debug emotion ethumb examples fbcon opengl quicklaunch sdl X xcb xdg static-libs"
 
 DEPEND="
 	>=dev-libs/ecore-1.7.0[evas,fbcon?,opengl?,sdl?,X?,xcb?]
 	>=media-libs/evas-1.7.0[fbcon?,opengl?,X?,xcb?]
 	>=media-libs/edje-1.7.0
 	dbus? ( >=dev-libs/e_dbus-1.7.0 )
+	emotion? ( >=media-libs/emotion-1.7.0 )
+	ethumb? ( >=media-libs/ethumb-1.7.0 )
 	xdg? ( >=dev-libs/efreet-1.7.0 )
 	"
 RDEPEND="${DEPEND}"
@@ -33,8 +35,8 @@ src_configure() {
 		--disable-ecore-win32
 		--disable-ecore-wince
 		--disable-emap
-		--disable-emotion
-		--disable-ethumb
+		$(use_enable emotion)
+		$(use_enable ethumb)
 		--disable-eweather
 		$(use_enable examples build-examples)
 		$(use_enable examples install-examples)
diff --git a/media-libs/elementary/metadata.xml b/media-libs/elementary/metadata.xml
index 72ffcd59669a..91ff5b732db8 100644
--- a/media-libs/elementary/metadata.xml
+++ b/media-libs/elementary/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
- <email>enlightenment@gentoo.org</email>
-</maintainer>
+<herd>enlightenment</herd>
 <use>
  <flag name="dbus">Enable integration with <pkg>dev-libs/e_dbus</pkg>.</flag>
+ <flag name='emotion'>Add support for <pkg>media-libs/emotion</pkg></flag>
+ <flag name='ethumb'>Add support for <pkg>media-libs/ethumb</pkg></flag>
  <flag name="quicklaunch">Enable quick-launch support</flag>
  <flag name="xdg">Enable integration with <pkg>dev-libs/efreet</pkg> for cross-desktop standards (freedesktop.org).</flag>
 </use>
diff --git a/media-libs/emotion/Manifest b/media-libs/emotion/Manifest
index b7ce54211422..a7d09377af7f 100644
--- a/media-libs/emotion/Manifest
+++ b/media-libs/emotion/Manifest
@@ -1,2 +1 @@
-DIST emotion-1.7.1.tar.bz2 477199 SHA256 166d0ed484b4277d10c7d9467b5f4ded9bf4014355550712fca509f3c8ad3c46 SHA512 429cb4e059d1ef23aca2b8da3ab1cfa0f7c6348c6f87a8fd5545b398988b2388b9e0f68fb9d82426588f187504958da6f33094b613db2280f15bfb1227ee67d2 WHIRLPOOL 3486455caaa7144e6f188af4a1e9d437b018ec985a5a474803c1512ad13793c92b6d7bbe7f358aabd5afe58d73ec9d10742fe0044ba85701d63ea4b3d93ae7be
-DIST emotion-1.7.3.tar.bz2 497847 SHA256 3819bbac1b7a524be8ad2ab524ca75f5217bbe551ca518b85e0b6f395057a6f3 SHA512 5a429b8862f8440cf818d7496a3f15540fa12b9716e7a68a20c7ed1aab7b6dce8d03eebcab4a772477fd0cf9c620d6e0ea35f1a217c7c9ebf57401b2825ba0f1 WHIRLPOOL 6859fdd458e2359f7d627aa73bb01c8b2e8b33706a3e9a3f8c6bff9941fc5dc1bba3e22b2e09b907c417affae07b7dbee747f18a51ee2d57cacb1a4a9f7e608a
+DIST emotion-1.7.4.tar.bz2 499639 SHA256 44fd9061ffa0939a99e238044efefc0077ac0422781ea51be2d94a6735008111 SHA512 d5ebdc975c02d904764ff0d9d8defe6ab68f5f5d5cfa323567a5a78883f3bf0fb605e5998d22d98bc0f8b8cb8ab8c929a228cb40f7a845f4b05d7531c49420a8 WHIRLPOOL 15040bb34d68c3d4fe53a3a1b87b2b85edd63b960937af469e6d501c82f29b62d0fb8d3e44ca05682f9aee10f48eb55e9b3826feb7009bb5bd1d9d8d1af52eb8
diff --git a/media-libs/emotion/emotion-1.7.3.ebuild b/media-libs/emotion/emotion-1.7.3.ebuild
deleted file mode 100644
index 69e8af9ccce7..000000000000
--- a/media-libs/emotion/emotion-1.7.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/emotion/emotion-1.7.3.ebuild,v 1.1 2012/12/08 14:17:41 tommy Exp $
-
-inherit enlightenment
-
-DESCRIPTION="video libraries for e17"
-SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="gstreamer static-libs xine"
-
-DEPEND=">=media-libs/evas-1.7.0
-	>=media-libs/edje-1.7.0
-	>=dev-libs/ecore-1.7.0
-	>=dev-libs/eeze-1.7.0
-	xine? ( >=media-libs/xine-lib-1.1.1 )
-	!gstreamer? ( !xine? ( >=media-libs/xine-lib-1.1.1 ) )
-	gstreamer? (
-		=media-libs/gstreamer-0.10*
-		=media-libs/gst-plugins-good-0.10*
-		=media-plugins/gst-plugins-ffmpeg-0.10*
-	)"
-RDEPEND=${DEPEND}
-
-src_compile() {
-	if ! use xine && ! use gstreamer ; then
-		export MY_ECONF="--enable-xine --disable-gstreamer"
-	else
-		export MY_ECONF="
-			$(use_enable xine) \
-			$(use_enable gstreamer) \
-		"
-	fi
-
-	if use gstreamer ; then
-		addpredict "/root/.gconfd"
-		addpredict "/root/.gconf"
-	fi
-
-	enlightenment_src_compile
-}
diff --git a/media-libs/emotion/emotion-1.7.1.ebuild b/media-libs/emotion/emotion-1.7.4.ebuild
similarity index 71%
rename from media-libs/emotion/emotion-1.7.1.ebuild
rename to media-libs/emotion/emotion-1.7.4.ebuild
index df74fc97dd6b..470f99391f49 100644
--- a/media-libs/emotion/emotion-1.7.1.ebuild
+++ b/media-libs/emotion/emotion-1.7.4.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/emotion/emotion-1.7.1.ebuild,v 1.1 2012/11/18 18:39:41 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/emotion/emotion-1.7.4.ebuild,v 1.1 2012/12/21 20:42:58 tommy Exp $
 
 inherit enlightenment
 
 DESCRIPTION="video libraries for e17"
 SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
 
+LICENSE="BSD-2"
 KEYWORDS="~amd64 ~x86"
 IUSE="gstreamer static-libs xine"
 
@@ -33,6 +34,19 @@ src_compile() {
 		"
 	fi
 
+	MY_ECONF+="
+		$(use_enable doc doxygen-doc)
+		$(use_enable doc doxygen-dot)
+		$(use_enable doc doxygen-man)
+		$(use_enable doc doxygen-rtf)
+		$(use_enable doc doxygen-xml)
+		$(use_enable doc doxygen-chm)
+		$(use_enable doc doxygen-chi)
+		$(use_enable doc doxygen-html)
+		$(use_enable doc doxygen-ps)
+		$(use_enable doc doxygen-pdf)
+	"
+
 	if use gstreamer ; then
 		addpredict "/root/.gconfd"
 		addpredict "/root/.gconf"
diff --git a/media-libs/emotion/metadata.xml b/media-libs/emotion/metadata.xml
index 908f03930bff..99165add909f 100644
--- a/media-libs/emotion/metadata.xml
+++ b/media-libs/emotion/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
- <email>enlightenment@gentoo.org</email>
-</maintainer>
+<herd>enlightenment</herd>
 </pkgmetadata>
diff --git a/media-libs/ethumb/Manifest b/media-libs/ethumb/Manifest
new file mode 100644
index 000000000000..2fcb9c18abee
--- /dev/null
+++ b/media-libs/ethumb/Manifest
@@ -0,0 +1 @@
+DIST ethumb-1.7.4.tar.bz2 395385 SHA256 bb4938572518334f875b6efacbaa4a541ce61e67d63f56df166fc71a5a5b873b SHA512 c3731e69afca4e25a5e565ffb7e86a46fa7d166c75502ae3c3981f6bbf5125b8362e36fa8349ca27579ec4c2fb4aa6c9ca339208b2ccdac570419da12037f120 WHIRLPOOL 42dfabb97ef79eac20d04d53d46f8e7c4e3dc3004b0a1a055608d138e42780053e2c028eb5ec9fa2ab10c8fd7d920faa1b4a73b6a988ef71e3d2bc896c8ae647
diff --git a/media-libs/ethumb/ethumb-1.7.4.ebuild b/media-libs/ethumb/ethumb-1.7.4.ebuild
new file mode 100644
index 000000000000..2a5c5800bdb6
--- /dev/null
+++ b/media-libs/ethumb/ethumb-1.7.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ethumb/ethumb-1.7.4.ebuild,v 1.1 2012/12/21 20:48:30 tommy Exp $
+
+EAPI=2
+
+inherit enlightenment
+
+DESCRIPTION="Enlightenment thumbnailing library (meant to replace epsilon)"
+HOMEPAGE="http://trac.enlightenment.org/e/wiki/Ethumb"
+SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dbus emotion static-libs"
+
+DEPEND=">=dev-libs/eina-1.7
+	>=dev-libs/ecore-1.7
+	>=media-libs/edje-1.7
+	>=media-libs/evas-1.7
+	media-libs/libexif
+
+	dbus? ( >=dev-libs/e_dbus-1.7 )
+	emotion? ( >=media-libs/emotion-1.7 )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	MY_ECONF="$(use_enable dbus ethumbd)
+		$(use_enable emotion)
+		--disable-epdf"
+
+	enlightenment_src_configure
+}
diff --git a/media-libs/ethumb/metadata.xml b/media-libs/ethumb/metadata.xml
new file mode 100644
index 000000000000..031abb11daaf
--- /dev/null
+++ b/media-libs/ethumb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>enlightenment</herd>
+	<use>
+		<flag name='emotion'>Add support for <pkg>media-libs/emotion</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/media-libs/evas/Manifest b/media-libs/evas/Manifest
index af3e48555c73..c818414b54c4 100644
--- a/media-libs/evas/Manifest
+++ b/media-libs/evas/Manifest
@@ -1,2 +1 @@
-DIST evas-1.7.2.tar.bz2 9396462 SHA256 94a3aeb424b5cbd9e65dcbc936f2739559cab44de721aa2eab48ea9360e76a5a SHA512 968f72a58df253e57fede0288ff91533513104278591713fd39363f35b808c6f9026970af201e1e61d5b5a132817efe1e0cd3121eb0cb3fa304720d2f7f77e0a WHIRLPOOL ac333510fd5ee5e9a85638f4fb6ed691837e08465a59405922afde1ea0018a6f75796c5067fb5e9c6f9d95ce2731f17d2684aa4b5a5cb0c9c802a2d2a3cc1ead
-DIST evas-1.7.3.tar.bz2 9409696 SHA256 093de361dfd3d700592329d6559ea77a03350be97aa5fd7c575a8d97963bae7e SHA512 fbb14a91ff548d7c2c0a3a40bbbba63a9c012a3bf37ce3a1dcaba97f30f624e176df947ab5e04322e38ccd161906850bbecb8de0be132164366f73e154cab7c8 WHIRLPOOL 064c30c9a30e24959f6932e854c8c66426e200c2168847b16ecd10506262bbfd99e9ca596244e7d2157fabed1837059090c8ff976cddcccf0be4df8427329c21
+DIST evas-1.7.4.tar.bz2 9365979 SHA256 53f3e58c876c38a6de9aa65ae660e526bc4671d05397c2c347f11e5e61f50a8f SHA512 eac515d6756a6df27c3223283b6afea7b96c96466927c7e6358f1b4d0373d23a8e45ef4d9c623a51dcad09f047135c56e5d59dba9dc8295bac74cee7096787ef WHIRLPOOL 1e150eddbc48b26b83b4fe8686b12df5c13ac781ea87d6a41c35efa979fbe8281d5c71493ecb41a4500d71b1446dc6d58c0cb4acbedb39b549d77720d8f51b9b
diff --git a/media-libs/evas/evas-1.7.2.ebuild b/media-libs/evas/evas-1.7.2.ebuild
deleted file mode 100644
index cc1d4b246a44..000000000000
--- a/media-libs/evas/evas-1.7.2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/evas/evas-1.7.2.ebuild,v 1.2 2012/11/30 16:36:22 tommy Exp $
-
-EAPI=2
-
-inherit enlightenment
-
-DESCRIPTION="hardware-accelerated retained canvas API"
-HOMEPAGE="http://trac.enlightenment.org/e/wiki/Evas"
-SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="altivec bidi +bmp directfb +eet fbcon +fontconfig gles gif +ico +jpeg mmx opengl +png +ppm +psd sse sse3 static-libs tga +threads tiff X xcb xpm"
-
-RDEPEND=">=dev-libs/eina-1.7.0
-	>=media-libs/freetype-2.3.9
-	fontconfig? ( media-libs/fontconfig )
-	gles? ( media-libs/mesa[gallium,gles2] )
-	gif? ( media-libs/giflib )
-	jpeg? ( virtual/jpeg )
-	png? ( media-libs/libpng )
-	bidi? ( >=dev-libs/fribidi-0.19.1 )
-	directfb? ( >=dev-libs/DirectFB-0.9.16 )
-	tiff? ( media-libs/tiff )
-	xpm? ( x11-libs/libXpm )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrender
-		opengl? ( virtual/opengl )
-	)
-	!X? (
-		xcb? (
-			x11-libs/xcb-util
-		) )
-	eet? ( >=dev-libs/eet-1.7.0 )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	if use X ; then
-		if use xcb ; then
-			ewarn "You have enabled both 'X' and 'xcb', so we will use"
-			ewarn "X as it's considered the most stable for evas"
-		fi
-		MY_ECONF="
-			--disable-software-xcb
-			$(use_enable opengl gl-xlib)
-		"
-	elif use xcb ; then
-		MY_ECONF="
-			--disable-gl-xlib
-			--enable-software-xcb
-			$(use_enable opengl gl-xcb)
-		"
-	else
-		MY_ECONF="
-			--disable-gl-xlib
-			--disable-software-xcb
-			--disable-gl-xcb
-		"
-	fi
-
-	MY_ECONF+="
-		$(use_enable altivec cpu-altivec)
-		$(use_enable bidi fribidi)
-		$(use_enable bmp image-loader-bmp)
-		$(use_enable bmp image-loader-wbmp)
-		$(use_enable directfb)
-		$(use_enable doc)
-		$(use_enable eet font-loader-eet)
-		$(use_enable eet image-loader-eet)
-		$(use_enable fbcon fb)
-		$(use_enable fontconfig)
-		$(use_enable gles gl-flavor-gles)
-		$(use_enable gles gles-variety-sgx)
-		$(use_enable gif image-loader-gif)
-		$(use_enable ico image-loader-ico)
-		$(use_enable jpeg image-loader-jpeg)
-		$(use_enable mmx cpu-mmx)
-		$(use_enable png image-loader-png)
-		$(use_enable ppm image-loader-pmaps)
-		$(use_enable psd image-loader-psd)
-		$(use_enable sse cpu-sse)
-		$(use_enable sse3 cpu-sse3)
-		--disable-image-loader-svg
-		$(use_enable tga image-loader-tga)
-		$(use_enable tiff image-loader-tiff)
-		$(use_enable threads pthreads)
-		$(use_enable threads async-events)
-		$(use_enable threads async-preload)
-		$(use_enable X software-xlib)
-		$(use_enable xpm image-loader-xpm)
-		--enable-evas-magic-debug \
-		--enable-static-software-generic \
-		--enable-buffer \
-		--enable-cpu-c \
-		--enable-scale-sample \
-		--enable-scale-smooth \
-		--enable-convert-8-rgb-332 \
-		--enable-convert-8-rgb-666 \
-		--enable-convert-8-rgb-232 \
-		--enable-convert-8-rgb-222 \
-		--enable-convert-8-rgb-221 \
-		--enable-convert-8-rgb-121 \
-		--enable-convert-8-rgb-111 \
-		--enable-convert-16-rgb-565 \
-		--enable-convert-16-rgb-555 \
-		--enable-convert-16-rgb-444 \
-		--enable-convert-16-rgb-rot-0 \
-		--enable-convert-16-rgb-rot-270 \
-		--enable-convert-16-rgb-rot-90 \
-		--enable-convert-24-rgb-888 \
-		--enable-convert-24-bgr-888 \
-		--enable-convert-32-rgb-8888 \
-		--enable-convert-32-rgbx-8888 \
-		--enable-convert-32-bgr-8888 \
-		--enable-convert-32-bgrx-8888 \
-		--enable-convert-32-rgb-rot-0 \
-		--enable-convert-32-rgb-rot-270 \
-		--enable-convert-32-rgb-rot-90 \
-		--enable-image-loader-generic \
-		--disable-harfbuzz \
-		--disable-image-loader-edb \
-		--disable-static-software-16 \
-		--disable-software-16-x11"
-
-	enlightenment_src_configure
-}
-
-pkg_postinst() {
-	elog "for svg support install media-plugins/evas_generic_loaders[svg]"
-}
diff --git a/media-libs/evas/evas-1.7.3.ebuild b/media-libs/evas/evas-1.7.4.ebuild
similarity index 96%
rename from media-libs/evas/evas-1.7.3.ebuild
rename to media-libs/evas/evas-1.7.4.ebuild
index 07e9c91a6a19..4bb573f5a478 100644
--- a/media-libs/evas/evas-1.7.3.ebuild
+++ b/media-libs/evas/evas-1.7.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/evas/evas-1.7.3.ebuild,v 1.1 2012/12/08 13:13:11 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/evas/evas-1.7.4.ebuild,v 1.1 2012/12/21 19:50:46 tommy Exp $
 
 EAPI=2
 
@@ -10,6 +10,7 @@ DESCRIPTION="hardware-accelerated retained canvas API"
 HOMEPAGE="http://trac.enlightenment.org/e/wiki/Evas"
 SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
 
+LICENSE="BSD-2"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="altivec bidi +bmp directfb +eet fbcon +fontconfig gles gif +ico +jpeg mmx opengl +png +ppm +psd sse sse3 static-libs tga +threads tiff X xcb xpm"
 
diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index e0b4b84cd344..c331927955f2 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -1,4 +1 @@
-DIST libmediainfo_0.7.58.tar.bz2 939422 SHA256 b1df0cdf4ac7abf7efd32bafd0136a46998365e4c1228007d9a5a49cbaf09ae4 SHA512 08a44ba6fd0fddbd0e101571094a2b1d45f5d47ed4a64007adade488b6236c8e33265915b58b49e4e021f6ee959bbe7a6f7ec243c1ca40f56429cb15eaa6ab3c WHIRLPOOL e721238265bf9d4755b0f2dee4de7f4b229ea39a506c163f873717b32af66d2a7556844e7bb37da51fe028f1e40125ad9cf11fc2e1b649b693864291e30cf457
-DIST libmediainfo_0.7.59.tar.bz2 942753 SHA256 9aa0e6bec4f33eb63559795adf3a06adca4d65c039e100e06190b0e40bcd89a2 SHA512 020974608526c46fd62e15343ef5c7b8f7f5c01f554a4a45dedabbd355434123795b63b15a5ac3aaa51a1c52f7130447608907354c3b29bfe216284854923e13 WHIRLPOOL 8f9d1b2dbb0bc709c724c1aa27f40419e731704afe883c4d80027911d34202868bcd76f9ad1654d86be1554f39b94590b3f5c80d7a2a33e323091edc21349508
-DIST libmediainfo_0.7.60.tar.bz2 949390 SHA256 3972e72ec04f3fbb66fad760537f6b2c6ea5bee6f356aba47b84943aa173cc40 SHA512 f8f28aac9af981ff8e4590af74e918eb8d204305c9eac1871de09f73cb639c9e83d60b6750e622776527dfd1fa0a6ec95e6bb0bfc9c0241237c7e4880769ff20 WHIRLPOOL c740da8f8b7500247b463a2f5955cbdb97f5dc2be671f406893deb7c2ba1eb0941c559f614bd2185cad6beb4ab1d9b59ea686754707b442d30dd70534f48138f
 DIST libmediainfo_0.7.61.tar.bz2 975741 SHA256 8b9eaf0ea1c4e996d7b38d3a45c8fbb47b125be17637ca9e37be49896b4e7a9b SHA512 9587407b44b3c266636130109780f3c85c69c4c8c6c55c7919b7312255d957a2bbdf4cebc357309bfd6a25a692cedf821b266c3f39e65df65ba97e2852334e63 WHIRLPOOL 04b82d3d620ee447f93c97d0424696341902044075addb7d3fde136fc378810e3f5ef832e100d38e5f8e825c36e3b03029280054c952bb0744f1d035f5911172
diff --git a/media-libs/libmediainfo/libmediainfo-0.7.58.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.58.ebuild
deleted file mode 100644
index 2da90e84b708..000000000000
--- a/media-libs/libmediainfo/libmediainfo-0.7.58.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/media-libs/libmediainfo/libmediainfo-0.7.58.ebuild,v 1.5 2012/08/04 10:50:37 ago Exp $
-
-EAPI="4"
-
-inherit autotools eutils flag-o-matic multilib
-
-MY_PN="MediaInfo"
-DESCRIPTION="MediaInfo libraries"
-HOMEPAGE="http://mediainfo.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mediainfo/source/${PN}/${PV}/${PN}_${PV}.tar.bz2"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="curl doc mms static-libs"
-
-RDEPEND="sys-libs/zlib
-	dev-libs/tinyxml2
-	>=media-libs/libzen-0.4.27[static-libs=]
-	curl? ( net-misc/curl )
-	mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library
-
-src_prepare() {
-	# Don't force -O2 by default
-	sed -i -e "s:-O2::" configure.ac
-
-	append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--with-libtinyxml2 \
-		$(use_with curl libcurl) \
-		$(use_with mms libmms) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs staticlibs)
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		cd "${WORKDIR}/${MY_PN}Lib/Source/Doc"
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	default
-
-	edos2unix ${PN}.pc #414545
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
-	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
-		insinto /usr/include/${MY_PN}/${x}
-		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
-	done
-
-	insinto /usr/include/${MY_PN}DLL
-	doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
-
-	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
-	if use doc; then
-		dohtml -r "${WORKDIR}"/${MY_PN}Lib/Doc/*
-	fi
-
-	prune_libtool_files
-}
diff --git a/media-libs/libmediainfo/libmediainfo-0.7.59.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.59.ebuild
deleted file mode 100644
index 4d45599883fb..000000000000
--- a/media-libs/libmediainfo/libmediainfo-0.7.59.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/media-libs/libmediainfo/libmediainfo-0.7.59.ebuild,v 1.1 2012/08/09 09:38:57 radhermit Exp $
-
-EAPI="4"
-
-inherit autotools eutils flag-o-matic multilib
-
-MY_PN="MediaInfo"
-DESCRIPTION="MediaInfo libraries"
-HOMEPAGE="http://mediainfo.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mediainfo/source/${PN}/${PV}/${PN}_${PV}.tar.bz2"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl doc mms static-libs"
-
-RDEPEND="sys-libs/zlib
-	dev-libs/tinyxml2
-	>=media-libs/libzen-0.4.28[static-libs=]
-	curl? ( net-misc/curl )
-	mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library
-
-src_prepare() {
-	# Don't force -O2 by default
-	sed -i -e "s:-O2::" configure.ac
-
-	append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--with-libtinyxml2 \
-		$(use_with curl libcurl) \
-		$(use_with mms libmms) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs staticlibs)
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		cd "${WORKDIR}/${MY_PN}Lib/Source/Doc"
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	default
-
-	edos2unix ${PN}.pc #414545
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
-	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
-		insinto /usr/include/${MY_PN}/${x}
-		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
-	done
-
-	insinto /usr/include/${MY_PN}DLL
-	doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
-
-	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
-	if use doc; then
-		dohtml -r "${WORKDIR}"/${MY_PN}Lib/Doc/*
-	fi
-
-	prune_libtool_files
-}
diff --git a/media-libs/libmediainfo/libmediainfo-0.7.60.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.60.ebuild
deleted file mode 100644
index f446cd7ae9ff..000000000000
--- a/media-libs/libmediainfo/libmediainfo-0.7.60.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/media-libs/libmediainfo/libmediainfo-0.7.60.ebuild,v 1.1 2012/09/02 20:33:52 radhermit Exp $
-
-EAPI="4"
-
-inherit autotools eutils flag-o-matic multilib
-
-MY_PN="MediaInfo"
-DESCRIPTION="MediaInfo libraries"
-HOMEPAGE="http://mediainfo.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mediainfo/source/${PN}/${PV}/${PN}_${PV}.tar.bz2"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl doc mms static-libs"
-
-RDEPEND="sys-libs/zlib
-	dev-libs/tinyxml2
-	>=media-libs/libzen-0.4.28[static-libs=]
-	curl? ( net-misc/curl )
-	mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library
-
-src_prepare() {
-	# Don't force -O2 by default
-	sed -i -e "s:-O2::" configure.ac
-
-	append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--with-libtinyxml2 \
-		$(use_with curl libcurl) \
-		$(use_with mms libmms) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs staticlibs)
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		cd "${WORKDIR}/${MY_PN}Lib/Source/Doc"
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	default
-
-	edos2unix ${PN}.pc #414545
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
-	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
-		insinto /usr/include/${MY_PN}/${x}
-		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
-	done
-
-	insinto /usr/include/${MY_PN}DLL
-	doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
-
-	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
-	if use doc; then
-		dohtml -r "${WORKDIR}"/${MY_PN}Lib/Doc/*
-	fi
-
-	prune_libtool_files
-}
diff --git a/media-libs/libmediainfo/metadata.xml b/media-libs/libmediainfo/metadata.xml
index c572c7d9b478..d9df1878d8e2 100644
--- a/media-libs/libmediainfo/metadata.xml
+++ b/media-libs/libmediainfo/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
-  <maintainer>
-    <email>media-video@gentoo.org</email>
-  </maintainer>
+<herd>video</herd>
 </pkgmetadata>
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.4.9.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.4.9.ebuild
index 1d9a7539db68..0879ff2bb63d 100644
--- a/media-libs/libquvi-scripts/libquvi-scripts-0.4.9.ebuild
+++ b/media-libs/libquvi-scripts/libquvi-scripts-0.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquvi-scripts/libquvi-scripts-0.4.9.ebuild,v 1.3 2012/12/16 13:49:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquvi-scripts/libquvi-scripts-0.4.9.ebuild,v 1.4 2012/12/22 14:06:18 ago Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 x86"
 IUSE="offensive"
 
 DEPEND="app-arch/xz-utils"
diff --git a/media-libs/libquvi/libquvi-0.4.1.ebuild b/media-libs/libquvi/libquvi-0.4.1.ebuild
index e3c8d2a7ed78..0146447d0983 100644
--- a/media-libs/libquvi/libquvi-0.4.1.ebuild
+++ b/media-libs/libquvi/libquvi-0.4.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/libquvi/libquvi-0.4.1.ebuild,v 1.6 2012/09/18 14:48:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquvi/libquvi-0.4.1.ebuild,v 1.7 2012/12/22 14:06:02 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 x86"
 IUSE="examples static-libs"
 
 RDEPEND=">=net-misc/curl-7.18.2
diff --git a/media-libs/libzen/Manifest b/media-libs/libzen/Manifest
index fd6e08a0d8e7..585d6281a34d 100644
--- a/media-libs/libzen/Manifest
+++ b/media-libs/libzen/Manifest
@@ -1,2 +1 @@
-DIST libzen_0.4.27.tar.bz2 103597 SHA256 eee2940129eafe040b230df10e4899916b118bc59d0de2302d5332323481e9e5 SHA512 7450e1a6bab800ffdc7d289871bbb846d1d59067b264cbfddfb84a3553b114a6abb86a9146a95f10021e1ac97b6e669b27ec2e0bdbe0415334fd5ea485436e90 WHIRLPOOL 7185f70e2e340af11d29b4e199ac6bb2fc8760449ee278d0d0d1e4a5b91c5edc473a2f8d4196b4768ba0e155b8f2afad0d94c6fd746dceaf8698cd7a4ffd0e5d
 DIST libzen_0.4.28.tar.bz2 103380 SHA256 0649c10e1657f5a0c5447301c0c3c367343069159b3bb5452ae7ef344dc63805 SHA512 4dcf7a60bca9a90c6a0342af416d6fc9cac595b6952a0827a29b4a225359097a03ce36c4ace82363bea1a72ec69f8bff545755ff7c53ff4cca4c47ccad11ea76 WHIRLPOOL ccd27f968a3e5495ee0c006935d51a2a33d698737d968a7e61b68b22ae5636bd91746fbe392d68c51f67df1bb1fbd19361415aa58001b79ed4bfa9da55f4ffa9
diff --git a/media-libs/libzen/libzen-0.4.27.ebuild b/media-libs/libzen/libzen-0.4.27.ebuild
deleted file mode 100644
index cf3f363934a6..000000000000
--- a/media-libs/libzen/libzen-0.4.27.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libzen/libzen-0.4.27.ebuild,v 1.7 2012/12/04 02:41:53 radhermit Exp $
-
-EAPI="4"
-
-inherit autotools multilib eutils
-
-MY_PN="ZenLib"
-DESCRIPTION="Shared library for libmediainfo and mediainfo"
-HOMEPAGE="http://sourceforge.net/projects/zenlib"
-SRC_URI="mirror://sourceforge/zenlib/${MY_PN}%20-%20Sources/${PV}/${PN}_${PV}.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc static-libs"
-
-DEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/${MY_PN}/Project/GNU/Library
-
-src_prepare() {
-	sed -i -e "s:-O2::" configure.ac
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-unicode \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-
-	if use doc ; then
-		cd "${WORKDIR}"/${MY_PN}/Source/Doc
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	default
-
-	# remove since the pkgconfig file should be used instead
-	rm "${D}"/usr/bin/libzen-config
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
-	for x in ./ Format/Html Format/Http HTTP_Client ; do
-		insinto /usr/include/${MY_PN}/${x}
-		doins "${WORKDIR}"/${MY_PN}/Source/${MY_PN}/${x}/*.h
-	done
-
-	dodoc "${WORKDIR}"/${MY_PN}/History.txt
-	if use doc ; then
-		dohtml "${WORKDIR}"/${MY_PN}/Doc/*
-	fi
-
-	prune_libtool_files
-}
diff --git a/media-libs/libzen/metadata.xml b/media-libs/libzen/metadata.xml
index c572c7d9b478..d9df1878d8e2 100644
--- a/media-libs/libzen/metadata.xml
+++ b/media-libs/libzen/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
-  <maintainer>
-    <email>media-video@gentoo.org</email>
-  </maintainer>
+<herd>video</herd>
 </pkgmetadata>
diff --git a/media-libs/opencv/opencv-2.4.3.ebuild b/media-libs/opencv/opencv-2.4.3.ebuild
index 3124f0a5acf0..f4a39aa2e6ac 100644
--- a/media-libs/opencv/opencv-2.4.3.ebuild
+++ b/media-libs/opencv/opencv-2.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.3.ebuild,v 1.2 2012/11/07 20:55:03 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.3.ebuild,v 1.3 2012/12/22 14:08:04 blueness Exp $
 
 EAPI=4
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
 IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k opencl openexr opengl pch png qt4 testprograms threads tiff v4l xine"
 
 RDEPEND="
diff --git a/media-libs/quvi/Manifest b/media-libs/quvi/Manifest
index ab022e57a804..15ff5e9bd980 100644
--- a/media-libs/quvi/Manifest
+++ b/media-libs/quvi/Manifest
@@ -1,2 +1,2 @@
-DIST quvi-0.2.19.tar.xz 363120 SHA256 48bcdf2d58a7df8acd8c0562d3f485b2892902eb982a9d8eb279b273e722daeb
+DIST quvi-0.2.19.tar.xz 363120 SHA256 48bcdf2d58a7df8acd8c0562d3f485b2892902eb982a9d8eb279b273e722daeb SHA512 a013f3ffcbb8a970148e7a2a40c6994600c6430f10f604df57884205f25cb1dbb56608d5a48b4b8b1c280230cef4c35db89fbb7678834fefee524e9ee4146ffb WHIRLPOOL bac3fae5de038a6a278a82d5bf80718dec8971ac77bc4186f95e6cf88408ca73983debd213d864e6e3a451d20da8d014fc4030df9af4a4e87c13beaa4fd611e6
 DIST quvi-0.4.2.tar.xz 118756 SHA256 91a1396ce9a56ac3cfa3a5edabf8d214b3c6b2a35afad3b5f2f9feb29ba19026 SHA512 a0cd26711123bd61e91534e510dd96fe290eb19eacaabe52c36b0064dee1ce410e80eddbe5995392e3769ae3c602b93b5132507a2d43d765e2b98e8488ea8f86 WHIRLPOOL 4d94d6d6dada1f009e9c3557e2a50405db3ac7802a57f8c24092b619b208c049c4004ea9c043f88f703adfc7ad72368fcc82f9d1a08c26dde87a5d952b4ce9b5
diff --git a/media-libs/quvi/quvi-0.4.2.ebuild b/media-libs/quvi/quvi-0.4.2.ebuild
index 0cd3f2a358b8..92978563a5f3 100644
--- a/media-libs/quvi/quvi-0.4.2.ebuild
+++ b/media-libs/quvi/quvi-0.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/quvi/quvi-0.4.2.ebuild,v 1.4 2012/12/17 11:27:29 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/quvi/quvi-0.4.2.ebuild,v 1.5 2012/12/22 16:07:20 ago Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=net-misc/curl-7.18.2
diff --git a/media-libs/skstream/skstream-0.3.9.ebuild b/media-libs/skstream/skstream-0.3.9.ebuild
index f8155b5e0b1c..e5ebacaa9826 100644
--- a/media-libs/skstream/skstream-0.3.9.ebuild
+++ b/media-libs/skstream/skstream-0.3.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/skstream/skstream-0.3.9.ebuild,v 1.2 2012/12/16 10:35:30 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/skstream/skstream-0.3.9.ebuild,v 1.3 2012/12/22 14:06:39 ago Exp $
 
 EAPI=2
 inherit base eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/worldforge/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
 IUSE="test"
 
 DEPEND="test? ( dev-util/cppunit )"
diff --git a/media-plugins/evas_generic_loaders/Manifest b/media-plugins/evas_generic_loaders/Manifest
index 96413df2ed71..cbee9f34d47f 100644
--- a/media-plugins/evas_generic_loaders/Manifest
+++ b/media-plugins/evas_generic_loaders/Manifest
@@ -1 +1 @@
-DIST evas_generic_loaders-1.7.1.tar.bz2 190372 SHA256 149a6ab60c0ff1ace66628c21cd1adf702bfa7d125a0cf62b920c026391b13e1 SHA512 31c164db1cf874bce2f1f685644d1d105501661fd6e2975e56a42a7769d65087197353ff458cf56930ff4cc47843172a147a86846e116ef719cda9127bd08364 WHIRLPOOL 47a75cf6c61beb90975efd1a9c0928370b1538e53feeb7657ed6a8fffcd8b0251abe93486f73e3d02bc3bd27ae126876128d98a5b71dd7ff42767bf2f3dd0361
+DIST evas_generic_loaders-1.7.4.tar.bz2 200620 SHA256 85779f33e8ad483a9b849a74be8ca3aae22127138a325bae0f079133b2fe4e7c SHA512 831bc6ae1ae88b552e3377ccd39b112981983dffbca6b3048c187b15a119f5811e8e4e62a6886abff523fc4cdba5c8498f505c340b2f86e95d75a0c0eaf95a64 WHIRLPOOL 51bfb447f1179efe984b91264d2e37e0efdd61e33b6fc3251836a882e18382ed14f85c5b16a9f5a43d5218b009cbb2734933b4eebca1ce49c16239baa02ff2d7
diff --git a/media-plugins/evas_generic_loaders/evas_generic_loaders-1.7.1.ebuild b/media-plugins/evas_generic_loaders/evas_generic_loaders-1.7.4.ebuild
similarity index 90%
rename from media-plugins/evas_generic_loaders/evas_generic_loaders-1.7.1.ebuild
rename to media-plugins/evas_generic_loaders/evas_generic_loaders-1.7.4.ebuild
index 24baaac7e915..2fc1fab23a4a 100644
--- a/media-plugins/evas_generic_loaders/evas_generic_loaders-1.7.1.ebuild
+++ b/media-plugins/evas_generic_loaders/evas_generic_loaders-1.7.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-plugins/evas_generic_loaders/evas_generic_loaders-1.7.1.ebuild,v 1.2 2012/12/02 17:07:37 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/evas_generic_loaders/evas_generic_loaders-1.7.4.ebuild,v 1.1 2012/12/21 21:04:15 tommy Exp $
 
 EAPI=2
 
@@ -10,6 +10,7 @@ DESCRIPTION="Provides external applications as generic loaders for Evas"
 HOMEPAGE="http://www.enlightenment.org/"
 SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
 
+LOCENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE="gstreamer pdf postscript raw svg"
 
diff --git a/media-plugins/evas_generic_loaders/metadata.xml b/media-plugins/evas_generic_loaders/metadata.xml
index 908f03930bff..99165add909f 100644
--- a/media-plugins/evas_generic_loaders/metadata.xml
+++ b/media-plugins/evas_generic_loaders/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
- <email>enlightenment@gentoo.org</email>
-</maintainer>
+<herd>enlightenment</herd>
 </pkgmetadata>
diff --git a/media-plugins/vdr-duplicates/Manifest b/media-plugins/vdr-duplicates/Manifest
index f9e6f502ad51..5a69c3c237ff 100644
--- a/media-plugins/vdr-duplicates/Manifest
+++ b/media-plugins/vdr-duplicates/Manifest
@@ -1 +1,2 @@
-DIST vdr-duplicates-0.0.4.tgz 14618 RMD160 b26dea0f19d631dfaac50fa4928540f9ca4f01b1 SHA1 59b49111efe2d4c32e8c74d624b98e6ec34803ae SHA256 de53834d4b090da3ad8884f5908485ff587e3c7518f84129f61d16d4d17f1422
+DIST vdr-duplicates-0.0.4.tgz 14618 SHA256 de53834d4b090da3ad8884f5908485ff587e3c7518f84129f61d16d4d17f1422 SHA512 c0debdbbfeada4572f123931c919f6b78d246fd46d879543bfbb2b65778aa55d1b8d00b4cb55b455ad27e7fb3082d7dda2860fd6e3113e5113e43e55d1f3924e WHIRLPOOL 348c34387d3b8fc21d874739560c2415207bd11a0489b4461f591dcbd819bea714b6f639a522a56baff1db7384a849b0a53e8d9bc08aad69fc8d38a042f0e2df
+DIST vdr-duplicates-0.0.5.tgz 14745 SHA256 9ebe5efcf41a504f9bd3dbeb0cd709e101a31f2cac89f266e5cc1a6426c2cbb4 SHA512 9e8ec30cbf9b1447aa00152be48237a8688dcfd746b06774b3f5d87d7100037ee8f890507c06d203a81bc05b4b476e326a3c1f0fe84e222a876a7de534b2495d WHIRLPOOL a80b7d9247485bfe0de6cc07061b3906b629e332a4aea09ab5e3526cc35146522ff244f96be73e416deca70eaeb9e6ba1240c28437d7c7296911a870f7ad044f
diff --git a/media-plugins/vdr-duplicates/vdr-duplicates-0.0.5.ebuild b/media-plugins/vdr-duplicates/vdr-duplicates-0.0.5.ebuild
new file mode 100644
index 000000000000..5cdb8a8b7b92
--- /dev/null
+++ b/media-plugins/vdr-duplicates/vdr-duplicates-0.0.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-duplicates/vdr-duplicates-0.0.5.ebuild,v 1.1 2012/12/22 19:01:07 hd_brummy Exp $
+
+EAPI="5"
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Plugin: show duplicated records"
+HOMEPAGE="http://www.tolleri.net/vdr/"
+SRC_URI="http://www.tolleri.net/vdr/plugins/${P}.tgz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.6.0"
+RDEPEND="${DEPEND}"
diff --git a/media-sound/pnmixer/pnmixer-0.6_pre20111213.ebuild b/media-sound/pnmixer/pnmixer-0.6_pre20111213.ebuild
index 8d2d527180cf..caa3eeefd930 100644
--- a/media-sound/pnmixer/pnmixer-0.6_pre20111213.ebuild
+++ b/media-sound/pnmixer/pnmixer-0.6_pre20111213.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/pnmixer/pnmixer-0.6_pre20111213.ebuild,v 1.2 2012/12/21 09:52:15 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pnmixer/pnmixer-0.6_pre20111213.ebuild,v 1.3 2012/12/22 17:12:48 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="libnotify"
 
 RDEPEND="media-libs/alsa-lib
diff --git a/media-sound/pulseaudio/pulseaudio-3.0.ebuild b/media-sound/pulseaudio/pulseaudio-3.0.ebuild
index 399e1f2c2dda..5259c6d06da5 100644
--- a/media-sound/pulseaudio/pulseaudio-3.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-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/media-sound/pulseaudio/pulseaudio-3.0.ebuild,v 1.1 2012/12/18 08:06:46 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-3.0.ebuild,v 1.2 2012/12/21 16:55:32 maekke Exp $
 
 EAPI=4
 
@@ -18,7 +18,7 @@ SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
 LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib gtk test doc +udev ipv6 system-wide realtime +orc ssl +gdbm +webrtc-aec xen systemd"
+IUSE="+alsa avahi +caps equalizer jack lirc neon oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib gtk test doc +udev ipv6 system-wide realtime +orc ssl +gdbm +webrtc-aec xen systemd"
 
 RDEPEND=">=media-libs/libsndfile-1.0.20
 	X? (
@@ -117,9 +117,9 @@ src_configure() {
 		$(use_enable oss oss-output) \
 		$(use_enable alsa) \
 		$(use_enable lirc) \
+		$(use_enable neon neon-opt) \
 		$(use_enable tcpd tcpwrap) \
 		$(use_enable jack) \
-		$(use_enable lirc) \
 		$(use_enable avahi) \
 		$(use_enable dbus) \
 		$(use_enable gnome gconf) \
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index a4886dc310ca..4dad93905ea2 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,4 +1,2 @@
 DIST qmmp-0.6.0.tar.bz2 772882 SHA256 4e2c9cdfd630bb90b2c92cb3e2f95ac4239c7cf8f91c47ca4a5038dd519755fe SHA512 63897d7b93a071a1b51a18063f453044013bee91c68b186e52a48aa08c84180a8914dcaf1b20fdb8554430fd99511485d4529608f1ae61704c7c0a591356be98 WHIRLPOOL 24e8e834d64bec8aef259309829cce3f0a17193d72c25fb98e7afb9af5a831fa388e652e44bea43b49e966620d8a928231c9749f13c4f39cb0aad728a2d2ea29
-DIST qmmp-0.6.3.tar.bz2 775285 SHA256 98f5b8121d475ead81c788ec9d5346c8da537e342c0d99eaff08586af4c92ca8 SHA512 2e38a8cd4346af6b3cc4f6cefe4c78dc9a2f32e648b0f9e6b9d058a302787317744f5fa251c6572777851690c28825508291e45416e3cf7395350fd85f099258 WHIRLPOOL 88850bece4da6a1e24e95ada34176ee6fcbefc6071c1b480d5760b9c379e6d41b8865159753496a4351f6d3a656244c2fab510e7e198c02bbf2b78e0654b386f
-DIST qmmp-0.6.4.tar.bz2 786486 SHA256 3db8a38da74ed4a8551c9215f4984f83831d5a4602e1daaf42fcb48313a73372 SHA512 7b8a088db6477f35184c6105f94c68a3b06af14e20da18d293d784bab47051bdec009453b8a3272a8cc7e08f38155195bb5d7353d70ba3544c37ab48a13817ad WHIRLPOOL d9c3d52f0df41d0586b2fb1e977e91b838dce276a4e5d5536e5a0d404704a51ad93d4bec4aa1ce39e26b45358c4093ed7961c8d1738c49d85f27aeb559fdd73c
 DIST qmmp-0.6.5.tar.bz2 797215 SHA256 7a53af8228e0062eda5df5d34c00221587a1a3764e614b5d8b12541c2c75f080 SHA512 c58068d77a1d4d1a959ece872f077e865d7d56b155bcfe7bd53361dfc2dd49f7339e6019877842559e0032e6781a16b802101431631a0c09045cdd9d7f900e1c WHIRLPOOL 8cef20616a1578f497a89215726b7804f88f6530433200648ce90774faca334d35e2cbb4a9fc0c6e34c89ad01a132f2b7e703748d2a0ae735113706c171f7382
diff --git a/media-sound/qmmp/qmmp-0.6.3.ebuild b/media-sound/qmmp/qmmp-0.6.3.ebuild
deleted file mode 100644
index 500cf47cecc3..000000000000
--- a/media-sound/qmmp/qmmp-0.6.3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-0.6.3.ebuild,v 1.3 2012/11/04 11:14:10 hwoarang Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-[ "$PV" == "9999" ] && inherit subversion
-
-DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
-HOMEPAGE="http://qmmp.ylsoftware.com/index_en.php"
-if [ "$PV" != "9999" ]; then
-	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~x86"
-else
-	SRC_URI=""
-	ESVN_REPO_URI="http://qmmp.googlecode.com/svn/trunk/qmmp/"
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# KEYWORDS further up
-IUSE="aac +alsa +dbus bs2b cdda cover crossfade enca ffmpeg flac jack game kde ladspa
-libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier oss
-projectm pulseaudio scrobbler sndfile stereo tray udev +vorbis wavpack"
-
-RDEPEND="x11-libs/qt-qt3support:4
-	media-libs/taglib
-	alsa? ( media-libs/alsa-lib )
-	bs2b? ( media-libs/libbs2b )
-	cdda? ( dev-libs/libcdio )
-	dbus? ( sys-apps/dbus )
-	aac? ( media-libs/faad2 )
-	enca? ( app-i18n/enca )
-	flac? ( media-libs/flac )
-	game? ( media-libs/game-music-emu )
-	ladspa? ( media-libs/ladspa-cmt )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	midi? ( media-sound/wildmidi )
-	mms? ( media-libs/libmms )
-	mplayer? ( || ( media-video/mplayer
-		media-video/mplayer2 )
-	)
-	musepack? ( >=media-sound/musepack-tools-444 )
-	modplug? ( >=media-libs/libmodplug-0.8.4 )
-	vorbis? ( media-libs/libvorbis
-		media-libs/libogg )
-	jack? ( media-sound/jack-audio-connection-kit
-		media-libs/libsamplerate )
-	ffmpeg? ( virtual/ffmpeg )
-	projectm? ( media-libs/libprojectm
-		x11-libs/qt-opengl:4 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-	wavpack? ( media-sound/wavpack )
-	scrobbler? ( net-misc/curl )
-	sndfile? ( media-libs/libsndfile )
-	udev? ( sys-fs/udisks:0 )"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog README"
-
-CMAKE_IN_SOURCE_BUILD="1"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_use alsa)
-		$(cmake-utils_use_use aac)
-		$(cmake-utils_use_use bs2b)
-		$(cmake-utils_use_use cover)
-		$(cmake-utils_use_use cdda CDA)
-		$(cmake-utils_use_use crossfade)
-		$(cmake-utils_use_use dbus)
-		$(cmake-utils_use_use enca)
-		$(cmake-utils_use_use ffmpeg)
-		$(cmake-utils_use_use flac)
-		$(cmake-utils_use_use game GME)
-		-DUSE_HAL=OFF
-		$(cmake-utils_use_use jack)
-		$(cmake-utils_use_use kde KDENOTIFY)
-		$(cmake-utils_use_use ladspa)
-		$(cmake-utils_use_use lyrics)
-		$(cmake-utils_use_use mad)
-		$(cmake-utils_use_use midi MIDI_WILDMIDI)
-		$(cmake-utils_use_use mplayer)
-		$(cmake-utils_use_use mms)
-		$(cmake-utils_use_use modplug)
-		$(cmake-utils_use_use mpris)
-		$(cmake-utils_use_use musepack MPC)
-		$(cmake-utils_use_use notifier)
-		$(cmake-utils_use_use oss)
-		$(cmake-utils_use_use projectm)
-		$(cmake-utils_use_use pulseaudio PULSE)
-		$(cmake-utils_use_use scrobbler)
-		$(cmake-utils_use_use sndfile)
-		$(cmake-utils_use_use stereo)
-		$(cmake-utils_use_use tray STATICON)
-		$(cmake-utils_use_use udev UDISKS)
-		$(cmake-utils_use_use libsamplerate SRC)
-		$(cmake-utils_use_use vorbis)
-		$(cmake-utils_use_use wavpack)
-		)
-
-	cmake-utils_src_configure
-}
diff --git a/media-sound/qmmp/qmmp-0.6.4.ebuild b/media-sound/qmmp/qmmp-0.6.4.ebuild
deleted file mode 100644
index 9adee9cab040..000000000000
--- a/media-sound/qmmp/qmmp-0.6.4.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-0.6.4.ebuild,v 1.1 2012/11/05 21:59:18 hwoarang Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-[ "$PV" == "9999" ] && inherit subversion
-
-DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
-HOMEPAGE="http://qmmp.ylsoftware.com/index_en.php"
-if [ "$PV" != "9999" ]; then
-	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~x86"
-else
-	SRC_URI=""
-	ESVN_REPO_URI="http://qmmp.googlecode.com/svn/trunk/qmmp/"
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# KEYWORDS further up
-IUSE="aac +alsa +dbus bs2b cdda cover crossfade enca ffmpeg flac jack game kde ladspa
-libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier oss
-projectm pulseaudio scrobbler sndfile stereo tray udev +vorbis wavpack"
-
-RDEPEND="x11-libs/qt-qt3support:4
-	media-libs/taglib
-	alsa? ( media-libs/alsa-lib )
-	bs2b? ( media-libs/libbs2b )
-	cdda? ( dev-libs/libcdio )
-	dbus? ( sys-apps/dbus )
-	aac? ( media-libs/faad2 )
-	enca? ( app-i18n/enca )
-	flac? ( media-libs/flac )
-	game? ( media-libs/game-music-emu )
-	ladspa? ( media-libs/ladspa-cmt )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	midi? ( media-sound/wildmidi )
-	mms? ( media-libs/libmms )
-	mplayer? ( || ( media-video/mplayer
-		media-video/mplayer2 )
-	)
-	musepack? ( >=media-sound/musepack-tools-444 )
-	modplug? ( >=media-libs/libmodplug-0.8.4 )
-	vorbis? ( media-libs/libvorbis
-		media-libs/libogg )
-	jack? ( media-sound/jack-audio-connection-kit
-		media-libs/libsamplerate )
-	ffmpeg? ( virtual/ffmpeg )
-	projectm? ( media-libs/libprojectm
-		x11-libs/qt-opengl:4 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-	wavpack? ( media-sound/wavpack )
-	scrobbler? ( net-misc/curl )
-	sndfile? ( media-libs/libsndfile )
-	udev? ( sys-fs/udisks:0 )"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog README"
-
-CMAKE_IN_SOURCE_BUILD="1"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_use alsa)
-		$(cmake-utils_use_use aac)
-		$(cmake-utils_use_use bs2b)
-		$(cmake-utils_use_use cover)
-		$(cmake-utils_use_use cdda CDA)
-		$(cmake-utils_use_use crossfade)
-		$(cmake-utils_use_use dbus)
-		$(cmake-utils_use_use enca)
-		$(cmake-utils_use_use ffmpeg)
-		$(cmake-utils_use_use flac)
-		$(cmake-utils_use_use game GME)
-		-DUSE_HAL=OFF
-		$(cmake-utils_use_use jack)
-		$(cmake-utils_use_use kde KDENOTIFY)
-		$(cmake-utils_use_use ladspa)
-		$(cmake-utils_use_use lyrics)
-		$(cmake-utils_use_use mad)
-		$(cmake-utils_use_use midi MIDI_WILDMIDI)
-		$(cmake-utils_use_use mplayer)
-		$(cmake-utils_use_use mms)
-		$(cmake-utils_use_use modplug)
-		$(cmake-utils_use_use mpris)
-		$(cmake-utils_use_use musepack MPC)
-		$(cmake-utils_use_use notifier)
-		$(cmake-utils_use_use oss)
-		$(cmake-utils_use_use projectm)
-		$(cmake-utils_use_use pulseaudio PULSE)
-		$(cmake-utils_use_use scrobbler)
-		$(cmake-utils_use_use sndfile)
-		$(cmake-utils_use_use stereo)
-		$(cmake-utils_use_use tray STATICON)
-		$(cmake-utils_use_use udev UDISKS)
-		$(cmake-utils_use_use libsamplerate SRC)
-		$(cmake-utils_use_use vorbis)
-		$(cmake-utils_use_use wavpack)
-		)
-
-	cmake-utils_src_configure
-}
diff --git a/media-sound/rhythmbox/rhythmbox-2.97.ebuild b/media-sound/rhythmbox/rhythmbox-2.97.ebuild
index c0b93811b7df..c48ae8c55496 100644
--- a/media-sound/rhythmbox/rhythmbox-2.97.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-2.97.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/rhythmbox/rhythmbox-2.97.ebuild,v 1.7 2012/12/20 15:58:46 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.97.ebuild,v 1.8 2012/12/22 19:19:07 calchan Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -56,6 +56,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
 	libnotify? ( >=x11-libs/libnotify-0.7.0 )
 	lirc? ( app-misc/lirc )
 	musicbrainz? (
+		media-libs/libdiscid
 		|| ( >=media-libs/musicbrainz-4.0.0:4
 		     >=media-libs/musicbrainz-3.0.2:3 )
 		gnome-base/gconf:2 )
diff --git a/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc b/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc
index 6708494c4f76..a4a547aea474 100644
--- a/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc
+++ b/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc,v 1.5 2012/05/10 20:14:34 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc,v 1.6 2012/12/21 19:24:29 hwoarang Exp $
 
 depend() {
 	need net
@@ -17,6 +17,9 @@ start() {
 	# temporay fix for EPERM bug (we still leave it here to make sure it is *really* not there)
 	rm -f /dev/shm/7gbhujb54g8z9hu43jre8
 
+	[ -d /var/run/teamspeak3-server ] || mkdir /var/run/teamspeak3-server
+	chown teamspeak3:teamspeak3 /var/run/teamspeak3-server
+
 	start-stop-daemon --start --quiet --background \
 		--pidfile "/var/run/teamspeak3-server/server.pid" --make-pidfile \
 		--user "teamspeak3" --chdir "/opt/teamspeak3-server" \
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 8d21bf83b27a..33732abe3481 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,2 +1,3 @@
 DIST avidemux_2.5.6.tar.gz 14914123 SHA256 d6da7f2c4304368bd9c367a74a464b47d42fee9cada2960e70053d61c1ef9b8b SHA512 8a9dcfc61a396fc4f9f0a213269bcb574de0baa442d3165cfab0fe8e86309e7b0dd2ffe3e2d7ff8a8e6e3fd15da28699e8000367d92da0782fec6d5a38c1d77c WHIRLPOOL fecca87889b19a321a9fe13e734ca11a883c88152e5d59926ecd423b178bb26ef611ee00d8b2897f8a4a36a5c159d6c9f32733bc98fccced08532b8f060bd6ac
 DIST avidemux_2.6.0.tar.gz 16145705 SHA256 5ee2d898794141b47bc288e9b0fb770eff831125a586e7e7046f0e2506ea4580 SHA512 a2d6d440eb0168bd40b51f7ae5980621e5dbddc9c1a3dbd56a4158f7f4e6c3d951caf2fe091fa37a0bb3d4b40ec385fec904611b415cb37fe9df0c66906bcb9d WHIRLPOOL 09746c3217320ea26cb020eb0efdc7f0c376b2af49a293db26a2c44d2c2f01d4bdbabbccc4366980d61a9d80d87b3bf36d62df8c2629aee4b400e4bebf6374da
+DIST avidemux_2.6.1.tar.gz 16537020 SHA256 17ad853a306e6cfed9166ee36b014748ea7b24a62e035b489ed97fbd8d91afc2 SHA512 3a4e1ca21abe014c944549dbb51e1b8588fdd71b147191f01ee47a402ef45a35e8cf5cbf08924f7e1581f961a3ec3eaec570f9c8c3081abffa9752b11008c26f WHIRLPOOL addd80555f423253a46c02a75980e2b70bf03631a378daae86fc66efca4420ae1a2e07b04ba5c00e4e5a7ab7c522344540b3f6c36209233ce1a8d7cde09c1309
diff --git a/media-video/avidemux/avidemux-2.6.1.ebuild b/media-video/avidemux/avidemux-2.6.1.ebuild
new file mode 100644
index 000000000000..99aa98242a77
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.6.1.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.1.ebuild,v 1.1 2012/12/22 10:56:32 hwoarang Exp $
+
+EAPI=4
+PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
+inherit cmake-utils eutils flag-o-matic l10n toolchain-funcs
+
+MY_P=${PN}_${PV}
+
+DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
+HOMEPAGE="http://fixounet.free.fr/avidemux"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${MY_P}.tar.gz"
+
+# Multiple licenses because of all the bundled stuff
+LICENSE="GPL-2 MIT GPL-1 public-domain PSF-2"
+SLOT="2.6"
+KEYWORDS="~amd64 ~x86"
+IUSE="aften a52 alsa amr debug dts fontconfig gtk jack
+	lame libsamplerate mmx nls qt4 sdl vorbis truetype xvid xv oss x264"
+
+RDEPEND="
+	virtual/libiconv
+	dev-libs/libxml2
+	media-libs/libpng
+	>=dev-lang/spidermonkey-1.5-r2
+	gtk? ( >=x11-libs/gtk+-2.6.0:2 )
+	qt4? ( >=x11-libs/qt-gui-4.8.3:4 )
+	x264? ( media-libs/x264 )
+	xvid? ( media-libs/xvid )
+	aften? ( media-libs/aften )
+	amr? ( media-libs/opencore-amr )
+	lame? ( media-sound/lame )
+	dts? ( media-libs/libdca )
+	vorbis? ( media-libs/libvorbis )
+	alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 )
+	jack? (
+		media-sound/jack-audio-connection-kit
+		libsamplerate? ( media-libs/libsamplerate )
+	)
+	truetype? ( >=media-libs/freetype-2.1.5 )
+	fontconfig? ( media-libs/fontconfig )
+	sdl? ( media-libs/libsdl )
+	xv? ( x11-libs/libXv )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+"
+DEPEND="
+	$RDEPEND
+	oss? ( virtual/os-headers )
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+S=${WORKDIR}/${MY_P}
+BUILD_S=${WORKDIR}/${P}_build
+
+avidemux_build_process() {
+	local BUILDDIR="${1}"
+	local SOURCEDIR="${2}"
+	local mycmakeargs="${3}"
+	EXTRA="${mycmakeargs}"
+	BUILDER="Unix Makefiles"
+	FAKEROOT_DIR="${S}"/gentoo-install
+	SOURCEDIR="${2}"
+	mkdir ${BUILDDIR} && cd "${BUILDDIR}"
+	einfo "Configuring: ${BUILDDIR}"
+	cmake -DFAKEROOT="${FAKEROOT_DIR}" -DAVIDEMUX_SOURCE_DIR="${S}" \
+		-DCMAKE_INSTALL_PREFIX="/usr" \
+		${EXTRA} -G "${BUILDER}" ../"${SOURCEDIR}/"
+	# for some reason, core needs -j1. That's what they do in their
+	# script as well
+	if [[ ${BUILDDIR} == "buildCore" ]]; then
+		extra_opts="-j1"
+	else
+		unset extra_opts
+	fi
+	einfo "Building: ${BUILDDIR}"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${extra_opts}
+
+	einfo "Fake install: ${BUILDDIR}"
+	# pretend that you installed it somewhere
+	emake DESTDIR="${FAKEROOT_DIR}" ${extra_opts} install
+
+	cd ..
+}
+
+src_prepare() {
+	base_src_prepare
+
+	# TODO: convert to l10n.eclass usage
+	local lingua= po_files= qt_ts_files= avidemux_ts_files=
+	for lingua in ${LINGUAS}; do
+		if has ${lingua} ${AVIDEMUX_LANGS}; then
+			if [[ -e ${S}/po/${lingua}.po ]]; then
+				po_files+=" \${po_subdir}/${lingua}.po"
+			fi
+			if [[ -e ${S}/po/qt_${lingua}.ts ]]; then
+				qt_ts_files+=" \${ts_subdir}/qt_${lingua}.ts"
+			fi
+			if [[ -e ${S}/po/${PN}_${lingua}.ts ]]; then
+				avidemux_ts_files+=" \${ts_subdir}/${PN}_${lingua}.ts"
+			fi
+		fi
+	done
+
+	sed -i -e "s!FILE(GLOB po_files .*)!SET(po_files ${po_files})!" \
+		"${S}/cmake/Po.cmake" || die "sed failed"
+	sed -i -e "s!FILE(GLOB.*qt.*)!SET(ts_files ${qt_ts_files})!" \
+	    -e "s!FILE(GLOB.*avidemux.*)!SET(ts_files ${avidemux_ts_files})!" \
+		"${S}/cmake/Ts.cmake" || die "sed failed"
+
+	# Fix icon name -> avidemux-2.6.png
+	sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || die
+	# the desktop file is broken. It uses avidemux2 instead of avidemux3
+	# so it will actually launch avidemux-2.5 if it is installed
+	sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die
+	# Now rename to not collide with 2.5
+	mv ${PN}2.desktop ${PN}-2.6.desktop
+	# fix major issues in desktop files wrt bugs #291453, #316599, #430500
+	# duplicate desktop file
+	cp ${PN}-2.6.desktop ${PN}-2.6-gtk.desktop || die
+	# the desktop file is broken. It uses avidemux2 instead of avidemux3
+	# so it will actually launch avidemux-2.5 if it is installed
+	sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt4:' ${PN}-2.6.desktop || die
+}
+
+src_configure() {
+	true;
+}
+
+src_compile() {
+	# add lax vector typing for PowerPC
+	if use ppc || use ppc64; then
+		append-cflags -flax-vector-conversions
+	fi
+	# bug 432322
+	use x86 && replace-flags -O0 -O1
+
+	local x mycmakeargs
+	# default args
+	use debug \
+		&& POSTFIX="_debug" \
+		&& mycmakeargs+="-DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug"
+
+	mycmakeargs="
+		$(for x in ${IUSE}; do cmake-utils_use $x; done)
+		$(cmake-utils_use dts LIBDCA)
+		$(cmake-utils_use truetype FREETYPE2)
+		$(cmake-utils_use nls GETTEXT)
+		$(cmake-utils_use xv XVIDEO)
+		$(cmake-utils_use amr OPENCORE_AMRWB)
+		$(cmake-utils_use amr OPENCORE_AMRNB)
+	"
+
+	# Lets try to do all the s**t that bootStrap.bash is
+	# trying to do
+	use qt4 && with_qt4=1
+	use gtk && with_gtk=1
+
+	avidemux_build_process buildCore avidemux_core${POSTFIX} "${mycmakeargs}"
+	avidemux_build_process buildCli avidemux/cli${POSTFIX} "${mycmakeargs}"
+	mycmakeargs+="-DPLUGIN_UI=COMMON "
+	avidemux_build_process buildPluginsCommon avidemux_plugins${POSTFIX} "${mycmakeargs}"
+	mycmakeargs+="-DPLUGIN_UI=CLI "
+	avidemux_build_process buildPluginsCLI avidemux_plugins${POSTFIX} "${mycmakeargs}"
+
+	if use qt4; then
+		avidemux_build_process buildQt4 avidemux/qt4${POSTFIX} "${mycmakeargs}"
+		mycmakeargs+="-DPLUGIN_UI=QT4 "
+		avidemux_build_process buildPluginsQt4 avidemux_plugins${POSTFIX} "${mycmakeargs}"
+	fi
+	if use gtk; then
+		avidemux_build_process buildGtk avidemux/gtk${POSTFIX} "${mycmakeargs}"
+		mycmakeargs+="-DPLUGIN_UI=GTK "
+		avidemux_build_process buildPluginsGtk avidemux_plugins${POSTFIX} "${mycmakeargs}"
+	fi
+}
+
+src_install() {
+	# everything is installed(?) in ${S}/gentoo-install.
+	# Move it to ${D}.
+	insinto /
+	doins -r "${S}"/gentoo-install/*
+	# Mark executables with +x
+	find "${ED}"/usr/bin -exec chmod a+x {} \;
+
+	newicon ${PN}_icon.png ${PN}-2.6.png
+	use gtk && domenu ${PN}-2.6-gtk.desktop
+	use qt4 && domenu ${PN}-2.6.desktop
+	dodoc AUTHORS README
+}
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 448042c94641..c2973dd099b1 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -2,3 +2,4 @@ DIST fate-0.8.2.tar.xz 443503168 SHA256 4c16212e4d99194e670227ccf93d54c9bb4b6f27
 DIST fate-9_beta2.tar.xz 464771124 SHA256 67aec753f2d1dc34141cf147c4881425bb54c17648dbc1c0b810e9b9ddbe0eff SHA512 c1d8c3d9d415dc4e31bad6964e2e68a82bf90c3e573c41c94e48d0cf1e9bd5233a51ce890894fbd2fb2320270f3f7f84b5802e5f1e0c72695a4510c533a24d17 WHIRLPOOL 6c792382e51c19695d571211637f973933fd845f8cb4ada2871b02605d3892d069809e4f22aa295c87814d9808d04e4305dffaa46d8d117ebf62f3c54b73059a
 DIST libav-0.8.4.tar.xz 3797112 SHA256 a4a53410ed864848063628277eb94f1921a7edfef7cf2e8bc9ab69f4f659c754 SHA512 67f0a78c2cfa88c98a5d9b3a528a6190eb3b2e0c1885010fced6d46bcf1337bddc7473e2b078ebe656c32897603fd908cbb938e663cb1f2a4fa8d7b1db129bb8 WHIRLPOOL e4252c391454f8e70fed7aa5ba10a4ff8d92297d2966c9921f6360760e9749ded4f5f7fe71a9acbec47b557d1290314ca4aba7b62a75ac33a816132ba8043724
 DIST libav-9_beta2.tar.xz 4088108 SHA256 f3b98a1e930d26245855b310a15214021d73da213f6b6e412a480672ae19cdc6 SHA512 f79e5dd335cc520a8662d9fabda56ee803904214bb381d11bdaf61c2065afe4a5280445db7257f6b8aea1e784947bf62e314c91b46b664d24959d9194fdfa6f2 WHIRLPOOL af100826a8a73f64f501ff33729bbd0b2fafc80bb3292c93b3b4f9659c24809bb47c770ecf14742b56ebf0c59b97fd04573fc509659615f602506b5b3769c0b1
+DIST libav-9_beta3.tar.xz 4114360 SHA256 d0eae4720fe3eaf1e44cf84b4788dea6bd49b1bbbad596647b6c803b65bcc164 SHA512 d00dee60b3dd68de060c8a4eecc9d5b93f3282a8279bfc328649efd8badcf59686dab26e54ad5a80712e93714ea9ac3e4d6bbcce1b3da46aa060bf6301fbcaf6 WHIRLPOOL c45231ca613b6abb9c376e0eb2bdcf05ab20c0192289b302fc68ed586d30d33ffbb92380332cec3b4c760d06c9d32ac760291e5bdcab5b39d87e7ed22347e4a6
diff --git a/media-video/libav/libav-9_beta3.ebuild b/media-video/libav/libav-9_beta3.ebuild
new file mode 100644
index 000000000000..39bba926b018
--- /dev/null
+++ b/media-video/libav/libav-9_beta3.ebuild
@@ -0,0 +1,332 @@
+# 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-9_beta3.ebuild,v 1.1 2012/12/21 17:50:19 lu_zero Exp $
+
+EAPI=4
+
+if [[ ${PV} == *9999 ]] ; then
+	SCM="git-2"
+	EGIT_REPO_URI="git://git.libav.org/libav.git"
+	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
+fi
+
+inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video."
+HOMEPAGE="http://libav.org/"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
+	SRC_URI="http://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
+else # Official release
+	SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
+fi
+
+SRC_URI+=" test? ( http://dev.gentoo.org/~lu_zero/libav/fate-9_beta2.tar.xz )"
+
+LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
+SLOT="0"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${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="aac alsa amr bindist +bzip2 cdio cpudetection custom-cflags debug doc
+	+encode faac fdk 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 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 )
+	encode? (
+		aac? ( media-libs/vo-aacenc )
+		amr? ( media-libs/vo-amrwbenc )
+		faac? ( media-libs/faac )
+		fdk? ( media-libs/fdk-aac )
+		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 )
+"
+
+DEPEND="${RDEPEND}
+	>=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 )
+"
+
+# faac can't be binary distributed
+# openssl support marked as nonfree
+# faac and aac are concurent implementations
+# amr and aac require at least lgpl3
+# x264 requires gpl2
+REQUIRED_USE="bindist? ( !faac !openssl !fdk )
+	rtmp? ( network )
+	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl )
+	test? ( encode zlib )
+"
+
+src_prepare() {
+	# if we have snapshot then we need to hardcode the version
+	if [[ ${PV%_p*} != ${PV} ]]; then
+		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
+	fi
+}
+
+src_configure() {
+	local myconf="${EXTRA_LIBAV_CONF}"
+	local uses i
+
+	use zlib && TOOLS+=" cws2fws"
+
+	myconf+="
+		$(use_enable gpl)
+		$(use_enable gpl version3)
+		--enable-avfilter
+	"
+
+	# enabled by default
+	uses="debug doc network zlib"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use bzip2 || myconf+=" --disable-bzlib"
+	use sdl || myconf+=" --disable-avplay"
+
+	if use ssl; then
+		use openssl && myconf+=" --enable-openssl --enable-nonfree" \
+			|| myconf+=" --enable-gnutls"
+	fi
+
+	use custom-cflags && myconf+=" --disable-optimizations"
+	use cpudetection && myconf+=" --enable-runtime-cpudetect"
+
+	use vdpau || myconf+=" --disable-vdpau"
+
+	use vaapi && myconf+=" --enable-vaapi"
+
+	# Encoders
+	if use encode; then
+		use faac && myconf+=" --enable-nonfree"
+		use fdk && myconf+=" --enable-nonfree --enable-libfdk-aac"
+		use mp3 && myconf+=" --enable-libmp3lame"
+		use amr && myconf+=" --enable-libvo-amrwbenc"
+		use aac && myconf+=" --enable-libvo-aacenc"
+		uses="faac theora vorbis x264 xvid"
+		for i in ${uses}; do
+			use ${i} && myconf+=" --enable-lib${i}"
+		done
+	else
+		myconf+=" --disable-encoders"
+	fi
+
+	# libavdevice options
+	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"
+	use v4l || myconf+=" --disable-indev=v4l2"
+	for i in alsa oss jack; do
+		use ${i} || myconf+=" --disable-indev=${i}"
+	done
+	use X && myconf+=" --enable-x11grab"
+	# Outdevs
+	for i in alsa oss ; do
+		use ${i} || myconf+=" --disable-outdev=${i}"
+	done
+	# libavfilter options
+	use frei0r && myconf+=" --enable-frei0r"
+	use truetype &&  myconf+=" --enable-libfreetype"
+
+	# Threads; we only support pthread for now but ffmpeg supports more
+	use threads && myconf+=" --enable-pthreads"
+
+	# Decoders
+	use amr && myconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb"
+	uses="gsm rtmp schroedinger speex vpx"
+	for i in ${uses}; do
+		use ${i} && myconf+=" --enable-lib${i}"
+	done
+	use jpeg2k && myconf+=" --enable-libopenjpeg"
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf+=" --disable-${i#*:}"
+	done
+
+	# pass the right -mfpu as extra
+	use neon && myconf+=" --extra-cflags=-mfpu=neon"
+
+	# 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+=" --disable-mmx --disable-mmxext"
+	fi
+
+	# Option to force building pic
+	use pic && 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
+		myconf+=" --cpu=${i}"
+		break
+	done
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=" --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=" --target-os=freebsd"
+				;;
+			mingw32*)
+				myconf+=" --target-os=mingw32"
+				;;
+			*linux*)
+				myconf+=" --target-os=linux"
+				;;
+		esac
+	fi
+
+	# Misc stuff
+	use hardcoded-tables && 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="${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
+
+	MAKEOPTS+=" V=1"
+}
+
+src_compile() {
+	local i
+
+	emake
+
+	if use tools; then
+		tc-export CC
+
+		for i in ${TOOLS}; do
+			emake tools/${i}
+		done
+	fi
+}
+
+src_install() {
+	local i
+
+	emake DESTDIR="${D}" install install-man
+
+	dodoc Changelog README INSTALL
+	dodoc doc/*.txt
+	use doc && dodoc doc/*.html
+
+	if use tools; then
+		for i in ${TOOLS}; do
+			dobin tools/${i}
+		done
+	fi
+
+	for i in $(usex sdl avplay "") $(usex network avserver "") avprobe; do
+		dosym  ${i} /usr/bin/${i/av/ff}
+	done
+}
+
+pkg_postinst() {
+	elog "Please note that the programs formerly known as ffplay, ffserver"
+	elog "and ffprobe are now called avplay, avserver and avprobe."
+	elog
+	elog "ffmpeg had been replaced by the feature incompatible avconv"
+}
+
+src_test() {
+	echo ${WORKDIR}/fate
+	LD_LIBRARY_PATH="${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavresample:${S}/libavutil" \
+		emake -j1 fate SAMPLES="${WORKDIR}/fate"
+}
diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index 22ce0db3e440..c304b2dedf34 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -1,4 +1 @@
-DIST mediainfo_0.7.58.tar.bz2 1116945 SHA256 73348a449e830442817027a133346a36917bc4adfa3a3f275936adf37c75968b SHA512 84b62564ab444b0955f33bec0ff340972dfa7eafc5ead8a6d65d49c1f0eb0fc21f63a667929b83907271c084d3a4a731a75fec7169bb4f12399af038fd3557b0 WHIRLPOOL 579f2f7970eade90b381d0e25ad2e77737f11aa2d2955bbeb4d1b2297594d73537e60a76c77121a1ee5bdab90823f510ebbc718067e723e682ea07b3c177ef13
-DIST mediainfo_0.7.59.tar.bz2 1122408 SHA256 fec091085a15187b2b727f65209520f9dbd71c11e24a6ec553646f01b76af81f SHA512 9682b46f2f36ca52d7818214e8f511eaaa8d4632e426f67130e378f324b525d6dcfa30c2298df5105e9be9cd4306aa136a87c9aac2e4bb759cb2f30eb60e5f3d WHIRLPOOL 6ce2e101788bb4850a8cb7b18b5a90afd94f18f6acc181c770aa2bc32027bf6710573146cc1b7089744d62b3b8f5b953736c051d6ac1b638750abfbd5e3797a0
-DIST mediainfo_0.7.60.tar.bz2 1353329 SHA256 3f20b944beecf48071c6f75daa2ae938f4951c2c4603771673bc9c4f11ac1572 SHA512 280a0bc3eccf1e4c00cbbefa4d4c0edb2cbf7d349680b9aef45dc296db3d2b18e4008634fbff751dc83bebd75de87dd39203df6641d5595a080398ae7e86c32f WHIRLPOOL fc3dc371798bb4cc3ec2cc4df131c8e0bb6b7cd4def37b55991e4937eb84baaec50d72556b1735f9bc54d44db6bb607cc1eea014e0930e21cb01b550d0ccd529
 DIST mediainfo_0.7.61.tar.bz2 1363739 SHA256 538646d273d4438fb8e15d995aa301c65a0dce139457db9746984decfa8f9c58 SHA512 6c7c3d0c3f62b299b12eb574f3aa14a0c653d8df98419dbe29feca27904de1a813763051d604c51fca4a826d211da5f98a7840d70940ca904f43666ef39f011b WHIRLPOOL 4ac028ea11eb9061402342e5d79125c4fd7bf9facc1abdd858838409186f89b35a9ce272567dfacc6a7f9a95565c34e9a129d06d303d42b67ed3017fc9aaf53d
diff --git a/media-video/mediainfo/mediainfo-0.7.58.ebuild b/media-video/mediainfo/mediainfo-0.7.58.ebuild
deleted file mode 100644
index 659dc958689f..000000000000
--- a/media-video/mediainfo/mediainfo-0.7.58.ebuild
+++ /dev/null
@@ -1,70 +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/mediainfo/mediainfo-0.7.58.ebuild,v 1.5 2012/08/04 10:50:16 ago Exp $
-
-EAPI="4"
-WX_GTK_VER="2.8"
-
-inherit eutils autotools wxwidgets multilib
-
-DESCRIPTION="MediaInfo supplies technical and tag information about media files"
-HOMEPAGE="http://mediainfo.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/source/${PN}/${PV}/${PN}_${PV}.tar.bz2"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="curl mms wxwidgets"
-
-RDEPEND="sys-libs/zlib
-	media-libs/libzen
-	~media-libs/lib${P}[curl=,mms=]
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/MediaInfo
-
-pkg_setup() {
-	TARGETS="CLI"
-	use wxwidgets && TARGETS+=" GUI"
-}
-
-src_prepare() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		sed -i -e "s:-O2::" configure.ac
-		eautoreconf
-	done
-}
-
-src_configure() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		local args=""
-		[[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
-		econf ${args}
-	done
-}
-
-src_compile() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		default
-	done
-}
-src_install() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		default
-		dodoc "${S}"/History_${target}.txt
-		if [[ ${target} == "GUI" ]]; then
-			newicon "${S}"/Source/Resource/Image/MediaInfo.png ${PN}.png
-			make_desktop_entry ${PN}-gui MediaInfo ${PN} "AudioVideo;GTK"
-		fi
-	done
-}
diff --git a/media-video/mediainfo/mediainfo-0.7.59.ebuild b/media-video/mediainfo/mediainfo-0.7.59.ebuild
deleted file mode 100644
index 1ddaa4b30d1e..000000000000
--- a/media-video/mediainfo/mediainfo-0.7.59.ebuild
+++ /dev/null
@@ -1,70 +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/mediainfo/mediainfo-0.7.59.ebuild,v 1.1 2012/08/09 09:42:08 radhermit Exp $
-
-EAPI="4"
-WX_GTK_VER="2.8"
-
-inherit eutils autotools wxwidgets multilib
-
-DESCRIPTION="MediaInfo supplies technical and tag information about media files"
-HOMEPAGE="http://mediainfo.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/source/${PN}/${PV}/${PN}_${PV}.tar.bz2"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl mms wxwidgets"
-
-RDEPEND="sys-libs/zlib
-	media-libs/libzen
-	~media-libs/lib${P}[curl=,mms=]
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/MediaInfo
-
-pkg_setup() {
-	TARGETS="CLI"
-	use wxwidgets && TARGETS+=" GUI"
-}
-
-src_prepare() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		sed -i -e "s:-O2::" configure.ac
-		eautoreconf
-	done
-}
-
-src_configure() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		local args=""
-		[[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
-		econf ${args}
-	done
-}
-
-src_compile() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		default
-	done
-}
-src_install() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		default
-		dodoc "${S}"/History_${target}.txt
-		if [[ ${target} == "GUI" ]]; then
-			newicon "${S}"/Source/Resource/Image/MediaInfo.png ${PN}.png
-			make_desktop_entry ${PN}-gui MediaInfo ${PN} "AudioVideo;GTK"
-		fi
-	done
-}
diff --git a/media-video/mediainfo/mediainfo-0.7.60.ebuild b/media-video/mediainfo/mediainfo-0.7.60.ebuild
deleted file mode 100644
index 9fc4f9912241..000000000000
--- a/media-video/mediainfo/mediainfo-0.7.60.ebuild
+++ /dev/null
@@ -1,70 +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/mediainfo/mediainfo-0.7.60.ebuild,v 1.1 2012/09/02 20:37:17 radhermit Exp $
-
-EAPI="4"
-WX_GTK_VER="2.8"
-
-inherit eutils autotools wxwidgets multilib
-
-DESCRIPTION="MediaInfo supplies technical and tag information about media files"
-HOMEPAGE="http://mediainfo.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/source/${PN}/${PV}/${PN}_${PV}.tar.bz2"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl mms wxwidgets"
-
-RDEPEND="sys-libs/zlib
-	media-libs/libzen
-	~media-libs/lib${P}[curl=,mms=]
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/MediaInfo
-
-pkg_setup() {
-	TARGETS="CLI"
-	use wxwidgets && TARGETS+=" GUI"
-}
-
-src_prepare() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		sed -i -e "s:-O2::" configure.ac
-		eautoreconf
-	done
-}
-
-src_configure() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		local args=""
-		[[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
-		econf ${args}
-	done
-}
-
-src_compile() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		default
-	done
-}
-src_install() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		default
-		dodoc "${S}"/History_${target}.txt
-		if [[ ${target} == "GUI" ]]; then
-			newicon "${S}"/Source/Resource/Image/MediaInfo.png ${PN}.png
-			make_desktop_entry ${PN}-gui MediaInfo ${PN} "AudioVideo;GTK"
-		fi
-	done
-}
diff --git a/media-video/mediainfo/metadata.xml b/media-video/mediainfo/metadata.xml
index c572c7d9b478..d9df1878d8e2 100644
--- a/media-video/mediainfo/metadata.xml
+++ b/media-video/mediainfo/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
-  <maintainer>
-    <email>media-video@gentoo.org</email>
-  </maintainer>
+<herd>video</herd>
 </pkgmetadata>
diff --git a/media-video/minitube/Manifest b/media-video/minitube/Manifest
index ae634c12ab87..054e632566c3 100644
--- a/media-video/minitube/Manifest
+++ b/media-video/minitube/Manifest
@@ -1,2 +1 @@
-DIST minitube-1.8.tar.gz 592111 SHA256 afcbe98c48866f629e0564c1b55c29b76a6d1a97c50e73e094d52d77bf4fcdb2 SHA512 dd7ead290de6feb3abf980df14004ee4103c98e434072584858660dca0dd586d5f84dea034228e056431d3632572638ced22503f69d08c335b1df6e5543eb6dd WHIRLPOOL 1390d6f724bb1d5ae9c32174a3a1ded9e59f36cf15faaeae241b88b3a5387a3ce985b37a8219e241b2e8c9dfa4bb70d3b721715384acfd49a8ce0a9451a56482
 DIST minitube-1.9.tar.gz 608884 SHA256 8b9437b107b0d8aecbc8af4624be1263115d4679cc86ae3cf5c2ceb36ac91675 SHA512 bcf66703dc501204288bba2747fe63a42d85e63f658431d7bab237b1b51c83aa0ef8ca224382d130ff8c77836218eda425ff08c1dc5bb30ea1ecd4939c2eee67 WHIRLPOOL 8d944b0e783a874e527eca1e7f909f464cfc388230f86a1c385c98f2fd852c1941a40d46b39a7a35bbbd9144d277a2ccec9bcbbc5842bb4d8d9f01e24b54ccde
diff --git a/media-video/minitube/files/minitube-1.8-gcc4.7.patch b/media-video/minitube/files/minitube-1.8-gcc4.7.patch
deleted file mode 100644
index 1d2c05364229..000000000000
--- a/media-video/minitube/files/minitube-1.8-gcc4.7.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=422977
-
-From fa12613b0e2771fc634f6de64f234f731f40ae76 Mon Sep 17 00:00:00 2001
-From: Markos Chandras <hwoarang@gentoo.org>
-Date: Mon, 2 Jul 2012 19:43:44 +0100
-Subject: [PATCH] Fix compilation with gcc-4.7
-
----
- src/qtsingleapplication/qtlocalpeer.cpp |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/src/qtsingleapplication/qtlocalpeer.cpp b/src/qtsingleapplication/qtlocalpeer.cpp
-index 4c4382d..d8bf17d 100644
---- a/src/qtsingleapplication/qtlocalpeer.cpp
-+++ b/src/qtsingleapplication/qtlocalpeer.cpp
-@@ -58,6 +58,7 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0;
- #endif
- #if defined(Q_OS_UNIX)
- #include <time.h>
-+#include <unistd.h>
- #endif
- 
- namespace QtLP_Private {
--- 
-1.7.8.6
-
diff --git a/media-video/minitube/minitube-1.8.ebuild b/media-video/minitube/minitube-1.8.ebuild
deleted file mode 100644
index 85f333890c71..000000000000
--- a/media-video/minitube/minitube-1.8.ebuild
+++ /dev/null
@@ -1,56 +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/minitube/minitube-1.8.ebuild,v 1.7 2012/12/02 17:01:44 eva Exp $
-
-EAPI=4
-PLOCALES="ar ca ca_ES da de_DE el en es es_AR es_ES fi fi_FI fr gl he_IL hr hu
-ia id id_ID it jv ka_GE nb nl nn pl pl_PL pt pt_BR ro ru sk sl sq sr sv_SE te
-tr uk_UA zh_CN"
-
-inherit l10n qt4-r2
-
-DESCRIPTION="Qt4 YouTube Client"
-HOMEPAGE="http://flavio.tordini.org/minitube"
-SRC_URI="http://flavio.tordini.org/files/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug gstreamer kde"
-
-DEPEND=">=x11-libs/qt-gui-4.6:4[accessibility]
-	>=x11-libs/qt-dbus-4.6:4
-	kde? ( || ( media-libs/phonon[gstreamer?] >=x11-libs/qt-phonon-4.6:4 ) )
-	!kde? ( || ( >=x11-libs/qt-phonon-4.6:4 media-libs/phonon[gstreamer?] ) )
-	gstreamer? (
-		media-plugins/gst-plugins-soup:0.10
-		media-plugins/gst-plugins-ffmpeg:0.10
-		media-plugins/gst-plugins-faac:0.10
-		media-plugins/gst-plugins-faad:0.10
-	)
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}
-
-DOCS="AUTHORS CHANGES TODO"
-
-src_prepare() {
-	qt4-r2_src_prepare
-
-	# Remove unneeded translations
-	local trans=
-	for x in $(l10n_get_locales); do
-		trans+="${x}.ts "
-	done
-	if [[ -n ${trans} ]]; then
-		sed -i -e "/^TRANSLATIONS/s/+=.*/+=${trans}/" locale/locale.pri || die
-	fi
-	# gcc-4.7. Bug #422977
-	epatch "${FILESDIR}"/${P}-gcc4.7.patch
-}
-
-src_install() {
-	qt4-r2_src_install
-	newicon images/app.png minitube.png
-}
diff --git a/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild b/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild
index 864a400ae86c..0de2067561ba 100644
--- a/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild
+++ b/media-video/mplayer2/mplayer2-2.0_p20120828.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/mplayer2/mplayer2-2.0_p20120828.ebuild,v 1.6 2012/12/20 18:31:45 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild,v 1.7 2012/12/22 16:07:55 ago Exp $
 
 EAPI=4
 
@@ -30,7 +30,7 @@ SLOT="0"
 if [[ ${PV} == *9999* ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 fi
 IUSE="+a52 aalib +alsa aqua bidi bindist bl bluray bs2b cddb +cdio
 	cpudetection debug directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +faad
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index d1537f028bb4..1f0ea8a8818c 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 21 Dec 2012 16:36:52 +0000
+Sat, 22 Dec 2012 20:06:53 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index d1537f028bb4..1f0ea8a8818c 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 21 Dec 2012 16:36:52 +0000
+Sat, 22 Dec 2012 20:06:53 +0000
diff --git a/metadata/md5-cache/app-admin/gkrellm-2.3.5-r2 b/metadata/md5-cache/app-admin/gkrellm-2.3.5-r2
new file mode 100644
index 000000000000..9bf513f459f9
--- /dev/null
+++ b/metadata/md5-cache/app-admin/gkrellm-2.3.5-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare setup
+DEPEND=dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( dev-libs/openssl ) ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gtk+:2 ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=Single process stack of various system monitors
+EAPI=4
+HOMEPAGE=http://www.gkrellm.net/
+IUSE=hddtemp gnutls lm_sensors nls ssl ntlm X kernel_FreeBSD
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( dev-libs/openssl ) ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gtk+:2 )
+SLOT=2
+SRC_URI=http://members.dslextreme.com/users/billw/gkrellm/gkrellm-2.3.5.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=9ed0b3dfdebab7aac2cf8cb7b4b37f57
diff --git a/metadata/md5-cache/app-admin/logrotate-3.8.3 b/metadata/md5-cache/app-admin/logrotate-3.8.3
index 252c60b1b456..91411f1d7ece 100644
--- a/metadata/md5-cache/app-admin/logrotate-3.8.3
+++ b/metadata/md5-cache/app-admin/logrotate-3.8.3
@@ -4,10 +4,10 @@ DESCRIPTION=Rotates, compresses, and mails system logs
 EAPI=4
 HOMEPAGE=https://fedorahosted.org/logrotate/
 IUSE=acl selinux
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux sec-policy/selinux-logrotate ) acl? ( virtual/acl )
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.8.3.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=88282d4391ad4ac3ecba832d761ea388
+_md5_=b6e4dbbdf0790147d990e6d3b6f72c72
diff --git a/metadata/md5-cache/app-admin/webalizer-2.23.05 b/metadata/md5-cache/app-admin/webalizer-2.23.05
index 7e8fb55b3859..594b21da3f58 100644
--- a/metadata/md5-cache/app-admin/webalizer-2.23.05
+++ b/metadata/md5-cache/app-admin/webalizer-2.23.05
@@ -4,10 +4,10 @@ DESCRIPTION=Webserver log file analyzer
 EAPI=2
 HOMEPAGE=http://www.webalizer.org/
 IUSE=geoip nls xtended vhosts
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/db-4.2 >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=media-libs/gd-1.8.3 dev-libs/geoip >=app-admin/webapp-config-1.50.15
 SLOT=0
 SRC_URI=ftp://ftp.mrunix.net/pub/webalizer/webalizer-2.23-05-src.tar.bz2 xtended? ( http://patrickfrei.ch/webalizer/rb29/webalizer-2.23-05-RB29-patch.tar.gz ) ftp://ftp.mrunix.net/pub/webalizer/webalizer-geodb-latest.tgz mirror://gentoo/webalizer.conf.gz
 _eclasses_=confutils	2ab69b52fa6ea0c0669a47fb94b354b4	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=d28acf9c58b9dfddbccafb659d41346c
+_md5_=a10864e4d726999f14c2e5f0754309b7
diff --git a/metadata/md5-cache/app-backup/bacula-5.0.3-r3 b/metadata/md5-cache/app-backup/bacula-5.0.3-r3
index 6f9daf262e3c..c0814c9f377f 100644
--- a/metadata/md5-cache/app-backup/bacula-5.0.3-r3
+++ b/metadata/md5-cache/app-backup/bacula-5.0.3-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Featureful client/server network backup suite
 EAPI=5
 HOMEPAGE=http://www.bacula.org/
 IUSE=acl bacula-clientonly bacula-nodir bacula-nosd ipv6 logwatch mysql postgres python qt4 readline +sqlite3 ssl static tcpd vim-syntax X
-KEYWORDS=amd64 hppa ~ppc ~sparc ~x86
+KEYWORDS=amd64 hppa ppc ~sparc ~x86
 LICENSE=AGPL-3
 RDEPEND=>=sys-libs/zlib-1.1.4 dev-libs/gmp !bacula-clientonly? ( postgres? ( dev-db/postgresql-base[threads] ) mysql? ( virtual/mysql ) sqlite3? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) ) qt4? ( x11-libs/qt-svg:4 x11-libs/qwt:5 ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) readline? ( >=sys-libs/readline-4.1 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] sys-libs/ncurses[static-libs] ssl? ( dev-libs/openssl[static-libs] ) ) !static? ( acl? ( virtual/acl ) sys-libs/zlib sys-libs/ncurses ssl? ( dev-libs/openssl ) ) !bacula-clientonly? ( !bacula-nosd? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] )
 REQUIRED_USE=|| ( ^^ ( mysql postgres sqlite3 ) bacula-clientonly ) static? ( bacula-clientonly )
 SLOT=0
 SRC_URI=mirror://sourceforge/bacula/bacula-5.0.3.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	qt4-r2	19af9102ca9b827213997cc636e7e33c	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b77aa8b0348701430654759c7120e3ae
+_md5_=44cbc79ee502a9630accdaedc230fd99
diff --git a/metadata/md5-cache/app-benchmarks/expedite-1.7.4 b/metadata/md5-cache/app-benchmarks/expedite-1.7.4
new file mode 100644
index 000000000000..cd9ee0f1e43e
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/expedite-1.7.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=dev-libs/eina media-libs/evas[directfb?,fbcon?,opengl?,X?,xcb?] virtual/pkgconfig doc? ( app-doc/doxygen )
+DESCRIPTION=Performance and correctness test suite for Evas
+EAPI=2
+HOMEPAGE=http://www.enlightenment.org/
+IUSE=directfb fbcon opengl X xcb nls doc
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-libs/eina media-libs/evas[directfb?,fbcon?,opengl?,X?,xcb?] nls? ( sys-devel/gettext )
+SLOT=0
+SRC_URI=http://download.enlightenment.org/releases/expedite-1.7.4.tar.bz2
+_eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d31250e4ac269ba74cd54e1a5413f49a
diff --git a/metadata/md5-cache/app-crypt/coolkey-1.1.0-r5 b/metadata/md5-cache/app-crypt/coolkey-1.1.0-r5
new file mode 100644
index 000000000000..c5cf67c9df9b
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/coolkey-1.1.0-r5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=>=sys-apps/pcsc-lite-1.6.4 dev-libs/nss[utils] sys-libs/zlib >=app-crypt/ccid-1.4.0 virtual/pkgconfig
+DESCRIPTION=Linux Driver support for the CoolKey and CAC products
+EAPI=3
+HOMEPAGE=http://directory.fedora.redhat.com/wiki/CoolKey
+IUSE=debug
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=sys-apps/pcsc-lite-1.6.4 dev-libs/nss[utils] sys-libs/zlib
+SLOT=0
+SRC_URI=http://directory.fedora.redhat.com/download/coolkey/coolkey-1.1.0.tar.gz mirror://gentoo/coolkey-1.1.0-patches-001.tar.gz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=36ae32d7a06ec32123c259df61b26059
diff --git a/metadata/md5-cache/app-crypt/pkcrack-1.2.2-r1 b/metadata/md5-cache/app-crypt/pkcrack-1.2.2-r1
new file mode 100644
index 000000000000..c86cfe5b38eb
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/pkcrack-1.2.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare test
+DEPEND=test? ( app-arch/zip[crypt] )
+DESCRIPTION=PkZip cipher breaker
+EAPI=4
+HOMEPAGE=http://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack.html
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=pkcrack
+RDEPEND=!<app-text/html-xml-utils-5.3
+SLOT=0
+SRC_URI=http://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack/pkcrack-1.2.2.tar.gz
+_eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
+_md5_=805bce065d59bde2da1623e82dfe5cee
diff --git a/metadata/md5-cache/app-crypt/truecrypt-7.1a b/metadata/md5-cache/app-crypt/truecrypt-7.1a
index 6c064827eaf6..e3128a16e18f 100644
--- a/metadata/md5-cache/app-crypt/truecrypt-7.1a
+++ b/metadata/md5-cache/app-crypt/truecrypt-7.1a
@@ -3,7 +3,7 @@ DEPEND=|| ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) sys-fs/fuse x11-libs/wx
 DESCRIPTION=Free open-source disk encryption software
 EAPI=4
 HOMEPAGE=http://www.truecrypt.org/
-IUSE=X
+IUSE=X +asm
 KEYWORDS=-* ~amd64 ~ppc ~x86
 LICENSE=truecrypt-3.0
 RDEPEND=|| ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) sys-fs/fuse x11-libs/wxGTK:2.8[X?] app-admin/sudo
@@ -11,4 +11,4 @@ RESTRICT=mirror fetch bindist
 SLOT=0
 SRC_URI=truecrypt-7.1a.tar.gz truecrypt-7.1a-pkcs11.h
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	linux-info	f01ffb28843e2de3ea571f80f07e5078	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
-_md5_=f812b06f1f06ba2ef4f42ab0a6693a11
+_md5_=a5245dc79d3c15f9f569954044d6f87c
diff --git a/metadata/md5-cache/app-editors/hteditor-2.0.21 b/metadata/md5-cache/app-editors/hteditor-2.0.21
new file mode 100644
index 000000000000..dd80bab14a3c
--- /dev/null
+++ b/metadata/md5-cache/app-editors/hteditor-2.0.21
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DEPEND=sys-libs/ncurses X? ( x11-libs/libX11 ) >=dev-libs/lzo-2 virtual/yacc sys-devel/flex
+DESCRIPTION=A file viewer, editor and analyzer for text, binary, and executable files
+EAPI=5
+HOMEPAGE=http://hte.sourceforge.net/
+IUSE=X
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses X? ( x11-libs/libX11 ) >=dev-libs/lzo-2
+SLOT=0
+SRC_URI=mirror://sourceforge/hte/ht-2.0.21.tar.bz2
+_eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
+_md5_=0267a5eac85f154455057dc29aa69fbe
diff --git a/metadata/md5-cache/app-emulation/virtualbox-4.1.24 b/metadata/md5-cache/app-emulation/virtualbox-4.1.24
new file mode 100644
index 000000000000..0380a8a94532
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-4.1.24
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.24 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) ) >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-power/iasl media-libs/libpng pam? ( sys-libs/pam ) sys-libs/libcap doc? ( dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( || ( virtual/jdk:1.7 virtual/jdk:1.6 ) ) virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama ) pulseaudio? ( media-sound/pulseaudio ) vboxwebsrv? ( >=net-libs/gsoap-2.7.13 ) java? ( >=dev-java/java-config-2.1.9-r1 ) virtual/pkgconfig
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise as well as home use
+EAPI=4
+HOMEPAGE=http://www.virtualbox.org/
+IUSE=+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=additions? ( ~app-emulation/virtualbox-additions-4.1.24 ) extensions? ( ~app-emulation/virtualbox-extpack-oracle-4.1.24 )
+RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.24 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java )
+SLOT=0
+SRC_URI=http://download.virtualbox.org/virtualbox/4.1.24/VirtualBox-4.1.24.tar.bz2 http://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.1.22-patches-01.tar.xz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2d9eb3508fa5d6759e39354b74545567	linux-info	f01ffb28843e2de3ea571f80f07e5078	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	e5b3412fa9f03670a666c8a137bd1060	qt4-r2	19af9102ca9b827213997cc636e7e33c	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	udev	4f764d2b1e34e4ef12b9b0d6e680c0ee	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=6a54656679eafc31ab932e6e83cb3e19
diff --git a/metadata/md5-cache/app-emulation/virtualbox-4.2.2-r1 b/metadata/md5-cache/app-emulation/virtualbox-4.2.6
similarity index 83%
rename from metadata/md5-cache/app-emulation/virtualbox-4.2.2-r1
rename to metadata/md5-cache/app-emulation/virtualbox-4.2.6
index f2cb300c60dc..e2a361872cbd 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-4.2.2-r1
+++ b/metadata/md5-cache/app-emulation/virtualbox-4.2.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.2.2 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib >=virtual/udev-171 !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) ) >=dev-util/kbuild-0.1.9998_pre20120806 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-power/iasl media-libs/libpng pam? ( sys-libs/pam ) sys-libs/libcap doc? ( dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( || ( virtual/jdk:1.7 virtual/jdk:1.6 ) ) virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama ) pulseaudio? ( media-sound/pulseaudio ) vboxwebsrv? ( >=net-libs/gsoap-2.7.13 ) java? ( >=dev-java/java-config-2.1.9-r1 ) virtual/pkgconfig
+DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.2.6 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib >=virtual/udev-171 !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) ) >=dev-util/kbuild-0.1.9998_pre20120806 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-power/iasl media-libs/libpng pam? ( sys-libs/pam ) sys-libs/libcap doc? ( dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( || ( virtual/jdk:1.7 virtual/jdk:1.6 ) ) virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama ) pulseaudio? ( media-sound/pulseaudio ) vboxwebsrv? ( >=net-libs/gsoap-2.7.13 ) java? ( >=dev-java/java-config-2.1.9-r1 ) virtual/pkgconfig
 DESCRIPTION=Family of powerful x86 virtualization products for enterprise as well as home use
 EAPI=4
 HOMEPAGE=http://www.virtualbox.org/
 IUSE=+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc elibc_FreeBSD java
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-PDEPEND=additions? ( ~app-emulation/virtualbox-additions-4.2.2 ) extensions? ( ~app-emulation/virtualbox-extpack-oracle-4.2.2 )
-RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.2.2 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib >=virtual/udev-171 !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
+PDEPEND=additions? ( ~app-emulation/virtualbox-additions-4.2.6 ) extensions? ( ~app-emulation/virtualbox-extpack-oracle-4.2.6 )
+RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.2.6 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib >=virtual/udev-171 !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java )
 SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.2.2/VirtualBox-4.2.2.tar.bz2 http://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.2.2-patches-01.tar.xz http://dev.gentoo.org/~patrick/qt_fa_IR.ts http://dev.gentoo.org/~patrick/VirtualBox_fa_IR.ts
+SRC_URI=http://download.virtualbox.org/virtualbox/4.2.6/VirtualBox-4.2.6.tar.bz2 http://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.2.6-patches-01.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2d9eb3508fa5d6759e39354b74545567	linux-info	f01ffb28843e2de3ea571f80f07e5078	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	e5b3412fa9f03670a666c8a137bd1060	qt4-r2	19af9102ca9b827213997cc636e7e33c	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	udev	4f764d2b1e34e4ef12b9b0d6e680c0ee	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a55b83c026e66c756d5c5b82b8838a8c
+_md5_=8e0b3f33c92ecbe45680586fbfa8a69f
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-4.1.24 b/metadata/md5-cache/app-emulation/virtualbox-additions-4.1.24
new file mode 100644
index 000000000000..6d27b4f7f77f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-4.1.24
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=CD image containing guest additions for VirtualBox
+EAPI=2
+HOMEPAGE=http://www.virtualbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=PUEL
+RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://download.virtualbox.org/virtualbox/4.1.24/VBoxGuestAdditions_4.1.24.iso
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=8194b9be266f6f890a9268ad89cb6eb9
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-4.2.2 b/metadata/md5-cache/app-emulation/virtualbox-additions-4.2.6
similarity index 78%
rename from metadata/md5-cache/app-emulation/virtualbox-additions-4.2.2
rename to metadata/md5-cache/app-emulation/virtualbox-additions-4.2.6
index ff0bf3aa2d62..c31768426ff6 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-4.2.2
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-4.2.6
@@ -7,6 +7,6 @@ LICENSE=PUEL
 RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
 RESTRICT=mirror
 SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.2.2/VBoxGuestAdditions_4.2.2.iso
+SRC_URI=http://download.virtualbox.org/virtualbox/4.2.6/VBoxGuestAdditions_4.2.6.iso
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=896dd93517daaea09b64ff9228213421
+_md5_=edb6167d0f11a51b3e3da724e3fed7a1
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-4.1.24 b/metadata/md5-cache/app-emulation/virtualbox-bin-4.1.24
new file mode 100644
index 000000000000..59e5b4b18d22
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-4.1.24
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise as well as home use
+EAPI=2
+HOMEPAGE=http://www.virtualbox.org/
+IUSE=+additions +chm headless python sdk vboxwebsrv rdesktop-vrdp debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 PUEL
+RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-4.1.24 !headless? ( x11-libs/libXcursor media-libs/libsdl[X] x11-libs/libXrender x11-libs/libXfixes media-libs/libpng x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-libs/libXft media-libs/freetype media-libs/fontconfig x11-libs/libXext dev-libs/glib chm? ( dev-libs/expat ) ) x11-libs/libXt dev-libs/libxml2 x11-libs/libXau x11-libs/libX11 x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 ) )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=amd64? ( http://download.virtualbox.org/virtualbox/4.1.24/VirtualBox-4.1.24-82872-Linux_amd64.run ) x86? ( http://download.virtualbox.org/virtualbox/4.1.24/VirtualBox-4.1.24-82872-Linux_x86.run ) sdk? ( http://download.virtualbox.org/virtualbox/4.1.24/VirtualBoxSDK-4.1.24-82872.zip ) http://download.virtualbox.org/virtualbox/4.1.24/Oracle_VM_VirtualBox_Extension_Pack-4.1.24-82872.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.1.24-82872.tar.gz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	18cda077fa5f661f96aa70c192b4b4a5	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	unpacker	50e1227854e96469a19a63f053496328	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=4a3ce200f3616a9db925ef7c71841988
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-4.2.2 b/metadata/md5-cache/app-emulation/virtualbox-bin-4.2.6
similarity index 73%
rename from metadata/md5-cache/app-emulation/virtualbox-bin-4.2.2
rename to metadata/md5-cache/app-emulation/virtualbox-bin-4.2.6
index a2d9a51310e4..3ba3f9f6fe2f 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-4.2.2
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-4.2.6
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.virtualbox.org/
 IUSE=+additions +chm headless python sdk vboxwebsrv rdesktop-vrdp debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 PUEL
-RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-4.2.2 !headless? ( x11-libs/libXcursor media-libs/libsdl[X] x11-libs/libXrender x11-libs/libXfixes media-libs/libpng x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-libs/libXft media-libs/freetype media-libs/fontconfig x11-libs/libXext dev-libs/glib chm? ( dev-libs/expat ) ) x11-libs/libXt dev-libs/libxml2 x11-libs/libXau x11-libs/libX11 x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 ) )
+RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-4.2.6 !headless? ( x11-libs/libXcursor media-libs/libsdl[X] x11-libs/libXrender x11-libs/libXfixes media-libs/libpng x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-libs/libXft media-libs/freetype media-libs/fontconfig x11-libs/libXext dev-libs/glib chm? ( dev-libs/expat ) ) x11-libs/libXt dev-libs/libxml2 x11-libs/libXau x11-libs/libX11 x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 ) )
 RESTRICT=mirror
 SLOT=0
-SRC_URI=amd64? ( http://download.virtualbox.org/virtualbox/4.2.2/VirtualBox-4.2.2-81494-Linux_amd64.run ) x86? ( http://download.virtualbox.org/virtualbox/4.2.2/VirtualBox-4.2.2-81494-Linux_x86.run ) sdk? ( http://download.virtualbox.org/virtualbox/4.2.2/VirtualBoxSDK-4.2.2-81494.zip ) http://download.virtualbox.org/virtualbox/4.2.2/Oracle_VM_VirtualBox_Extension_Pack-4.2.2-81494.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.2.2-81494.tar.gz
+SRC_URI=amd64? ( http://download.virtualbox.org/virtualbox/4.2.6/VirtualBox-4.2.6-82870-Linux_amd64.run ) x86? ( http://download.virtualbox.org/virtualbox/4.2.6/VirtualBox-4.2.6-82870-Linux_x86.run ) sdk? ( http://download.virtualbox.org/virtualbox/4.2.6/VirtualBoxSDK-4.2.6-82870.zip ) http://download.virtualbox.org/virtualbox/4.2.6/Oracle_VM_VirtualBox_Extension_Pack-4.2.6-82870.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.2.6-82870.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	18cda077fa5f661f96aa70c192b4b4a5	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	udev	4f764d2b1e34e4ef12b9b0d6e680c0ee	unpacker	50e1227854e96469a19a63f053496328	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=2e02b2f88f419d2208a52c543e081b76
+_md5_=5d0637997409f0e350d10f16d2b538c5
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.1.24 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.1.24
new file mode 100644
index 000000000000..92b2d2668a04
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.1.24
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=PUEL extensions for VirtualBox
+EAPI=2
+HOMEPAGE=http://www.virtualbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=PUEL
+RDEPEND=~app-emulation/virtualbox-4.1.24
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://download.virtualbox.org/virtualbox/4.1.24/Oracle_VM_VirtualBox_Extension_Pack-4.1.24-82872.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.1.24-82872.tar.gz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=1d26aaab7c3c022f856e3374901ebbcc
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.2.2 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.2.6
similarity index 58%
rename from metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.2.2
rename to metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.2.6
index bab3ab8907e1..da5084e78c4b 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.2.2
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.2.6
@@ -4,9 +4,9 @@ EAPI=2
 HOMEPAGE=http://www.virtualbox.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=PUEL
-RDEPEND=~app-emulation/virtualbox-4.2.2
+RDEPEND=~app-emulation/virtualbox-4.2.6
 RESTRICT=mirror strip
 SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.2.2/Oracle_VM_VirtualBox_Extension_Pack-4.2.2-81494.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.2.2-81494.tar.gz
+SRC_URI=http://download.virtualbox.org/virtualbox/4.2.6/Oracle_VM_VirtualBox_Extension_Pack-4.2.6-82870.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.2.6-82870.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6ad77d3ed2a2f6fa0708a1f4dee8cd7d
+_md5_=ac34f201ef9c7bf33a6a3838858466c5
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.22 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.22
index 1be47f5fd8e3..43ad078b897b 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.22
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.22
@@ -10,4 +10,4 @@ RDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.1.22 x11-apps/xrandr x11-apps/
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.1.22/VirtualBox-4.1.22.tar.bz2
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	linux-info	f01ffb28843e2de3ea571f80f07e5078	linux-mod	dbc722ed035721476f23ab7b0572985e	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=5a7fe2ced3620c8a4ce4232a9f2f0158
+_md5_=b717a7a511296b7895cf1ed77d2a17b7
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.24 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.24
new file mode 100644
index 000000000000..2d031186050c
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.24
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.1.24 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DESCRIPTION=VirtualBox kernel modules and user-space tools for Linux guests
+EAPI=2
+HOMEPAGE=http://www.virtualbox.org/
+IUSE=X kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.1.24 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=http://download.virtualbox.org/virtualbox/4.1.24/VirtualBox-4.1.24.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	linux-info	f01ffb28843e2de3ea571f80f07e5078	linux-mod	dbc722ed035721476f23ab7b0572985e	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=abfb41eb4e50cbea4ae9b8e1fbee8c6f
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.2.4 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.2.4
index 1b3175348ba4..9179aecaa2d2 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.2.4
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.2.4
@@ -10,4 +10,4 @@ RDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.2.4 x11-apps/xrandr x11-apps/x
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.2.4/VirtualBox-4.2.4.tar.bz2
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	linux-info	f01ffb28843e2de3ea571f80f07e5078	linux-mod	dbc722ed035721476f23ab7b0572985e	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=dfb3907d9b29822dcd26123d8a1cfbc5
+_md5_=929d8943f6341ab045d0b60f441fa9b0
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.2.2 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.2.6
similarity index 83%
rename from metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.2.2
rename to metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.2.6
index d04e8431dbe5..c2f5abeb187f 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.2.2
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.2.6
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.2.2 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.9998_pre20120806 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.2.6 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.9998_pre20120806 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 DESCRIPTION=VirtualBox kernel modules and user-space tools for Linux guests
 EAPI=2
 HOMEPAGE=http://www.virtualbox.org/
 IUSE=X kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.2.2 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
+RDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.2.6 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
 SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.2.2/VirtualBox-4.2.2.tar.bz2
+SRC_URI=http://download.virtualbox.org/virtualbox/4.2.6/VirtualBox-4.2.6.tar.bz2
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	linux-info	f01ffb28843e2de3ea571f80f07e5078	linux-mod	dbc722ed035721476f23ab7b0572985e	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c679e7017c1f3906de450eb5290a3fe0
+_md5_=7c2eea85d54ac62e0beaaf5296687ae9
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-4.1.24 b/metadata/md5-cache/app-emulation/virtualbox-modules-4.1.24
new file mode 100644
index 000000000000..ec78a8ce93f9
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-4.1.24
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DESCRIPTION=Kernel Modules for Virtualbox
+EAPI=4
+HOMEPAGE=http://www.virtualbox.org/
+IUSE=pax_kernel kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-4.1.24.tar.xz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	linux-info	f01ffb28843e2de3ea571f80f07e5078	linux-mod	dbc722ed035721476f23ab7b0572985e	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=45bdc45bf3cf204cf9630dfbf69f2ad0
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-4.2.2 b/metadata/md5-cache/app-emulation/virtualbox-modules-4.2.6
similarity index 92%
rename from metadata/md5-cache/app-emulation/virtualbox-modules-4.2.2
rename to metadata/md5-cache/app-emulation/virtualbox-modules-4.2.6
index 4db03257f87d..54ef5b152ae9 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-4.2.2
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-4.2.6
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
 SLOT=0
-SRC_URI=http://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-4.2.2.tar.xz
+SRC_URI=http://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-4.2.6.tar.xz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	linux-info	f01ffb28843e2de3ea571f80f07e5078	linux-mod	dbc722ed035721476f23ab7b0572985e	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=59254799e3ef8b81ec673415b35a08e2
+_md5_=5674857a87692540da6293c454e7a2d1
diff --git a/metadata/md5-cache/app-emulation/vmware-modules-271.1-r1 b/metadata/md5-cache/app-emulation/vmware-modules-271.1-r1
index 5accbdda4322..773090550ca3 100644
--- a/metadata/md5-cache/app-emulation/vmware-modules-271.1-r1
+++ b/metadata/md5-cache/app-emulation/vmware-modules-271.1-r1
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	linux-info	f01ffb28843e2de3ea571f80f07e5078	linux-mod	dbc722ed035721476f23ab7b0572985e	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	udev	4f764d2b1e34e4ef12b9b0d6e680c0ee	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=07bb37300fb78eb5ce3b8079728217bf
+_md5_=3a43eb6aae60f8f0a99e190b6fdf41fc
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.20 b/metadata/md5-cache/app-emulation/wine-1.5.20
new file mode 100644
index 000000000000..7a20a8474488
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-1.5.20
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) udisks? ( sys-apps/dbus sys-fs/udisks:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( dev-libs/openssl:= ) png? ( media-libs/libpng:= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DESCRIPTION=Free implementation of Windows(tm) on Unix
+EAPI=5
+HOMEPAGE=http://www.winehq.org/
+IUSE=alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png pulseaudio samba scanner selinux ssl test +threads +truetype udisks vanilla v4l +win32 +win64 +X xcomposite xinerama xml
+KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) udisks? ( sys-apps/dbus sys-fs/udisks:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( dev-libs/openssl:= ) png? ( media-libs/libpng:= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
+REQUIRED_USE=elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) ) osmesa? ( opengl ) vanilla? ( !pulseaudio )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.20.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.8/wine_gecko-1.8-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.8/wine_gecko-1.8-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.5.20_pre20121207.tar.bz2 http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2012.11.24.tar.bz2
+_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=0b5bb5db9bf730dd7096a9775e855513
diff --git a/metadata/md5-cache/app-emulation/wine-9999 b/metadata/md5-cache/app-emulation/wine-9999
index 03c0b19df4da..c5af81708f19 100644
--- a/metadata/md5-cache/app-emulation/wine-9999
+++ b/metadata/md5-cache/app-emulation/wine-9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks:2 ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 dev-vcs/git
+DEPEND=truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) udisks? ( sys-apps/dbus sys-fs/udisks:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( dev-libs/openssl:= ) png? ( media-libs/libpng:= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 dev-vcs/git
 DESCRIPTION=Free implementation of Windows(tm) on Unix
-EAPI=4
+EAPI=5
 HOMEPAGE=http://www.winehq.org/
-IUSE=alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png pulseaudio samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml
+IUSE=alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png pulseaudio samba scanner selinux ssl test +threads +truetype udisks vanilla v4l +win32 +win64 +X xcomposite xinerama xml
 LICENSE=LGPL-2.1
-RDEPEND=truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks:2 ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
-REQUIRED_USE=elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) ) osmesa? ( opengl )
+RDEPEND=truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) udisks? ( sys-apps/dbus sys-fs/udisks:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( dev-libs/openssl:= ) png? ( media-libs/libpng:= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
+REQUIRED_USE=elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) ) osmesa? ( opengl ) vanilla? ( !pulseaudio )
 RESTRICT=test
 SLOT=0
-SRC_URI=gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.8/wine_gecko-1.8-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.8/wine_gecko-1.8-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.5.19.tar.bz2 http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2012.11.24.tar.bz2
+SRC_URI=gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.8/wine_gecko-1.8-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.8/wine_gecko-1.8-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.5.20_pre20121207.tar.bz2 http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2012.11.24.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	git-2	15733ab6a6feb34af9837b41623c2bad	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a27d8bc4dd252c8fa59875a470306f54
+_md5_=d47035d239ef9c8a0a7f9dbcc1c51443
diff --git a/metadata/md5-cache/app-i18n/ibus-chewing-1.4.3 b/metadata/md5-cache/app-i18n/ibus-chewing-1.4.3
new file mode 100644
index 000000000000..76b7f94c9c52
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-chewing-1.4.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=x11-libs/libXtst >=app-i18n/ibus-1.3 >=dev-libs/libchewing-0.3.3 x11-libs/gtk+:2 dev-util/gob:2 virtual/pkgconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=The Chewing IMEngine for IBus Framework
+EAPI=4
+HOMEPAGE=http://code.google.com/p/ibus/
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libXtst >=app-i18n/ibus-1.3 >=dev-libs/libchewing-0.3.3 x11-libs/gtk+:2 dev-util/gob:2
+SLOT=0
+SRC_URI=http://ibus.googlecode.com/files/ibus-chewing-1.4.3-Source.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4ba8879c2857de4369e8f57b37b09b16
diff --git a/metadata/md5-cache/app-misc/abook-0.6.0_pre2 b/metadata/md5-cache/app-misc/abook-0.6.0_pre2
index e420873c9d9e..88f16bb66e61 100644
--- a/metadata/md5-cache/app-misc/abook-0.6.0_pre2
+++ b/metadata/md5-cache/app-misc/abook-0.6.0_pre2
@@ -4,10 +4,10 @@ DESCRIPTION=Abook is a text-based addressbook program designed to use with mutt
 EAPI=3
 HOMEPAGE=http://abook.sourceforge.net/
 IUSE=nls
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl )
+RDEPEND=sys-libs/ncurses sys-libs/readline nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=http://abook.sourceforge.net/devel/abook-0.6.0pre2.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=42fbd921f6d41798287e0761336e1ace
+_md5_=a86a700ffc1f7f15a510470146beab82
diff --git a/metadata/md5-cache/app-misc/anki-2.0.3-r1 b/metadata/md5-cache/app-misc/anki-2.0.3-r1
new file mode 100644
index 000000000000..7d65602a38ab
--- /dev/null
+++ b/metadata/md5-cache/app-misc/anki-2.0.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[sqlite] =dev-lang/python-2.6*[sqlite] )
+DESCRIPTION=A spaced-repetition memory training program (flash cards)
+EAPI=4
+HOMEPAGE=http://ichi2.net/anki/
+IUSE=latex +recording +sound
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/PyQt4[X,svg,webkit] >=dev-python/httplib2-0.7.4 dev-python/beautifulsoup:python-2 recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4 ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[sqlite] =dev-lang/python-2.6*[sqlite] )
+SLOT=0
+SRC_URI=http://ankisrs.net/download/mirror/anki-2.0.3.tgz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=489d9b76136cb588a01cd00a9040bdb8
diff --git a/metadata/md5-cache/app-misc/basenji-1.0.0 b/metadata/md5-cache/app-misc/basenji-1.0.0
new file mode 100644
index 000000000000..410fcc2f9387
--- /dev/null
+++ b/metadata/md5-cache/app-misc/basenji-1.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib dev-dotnet/gio-sharp dev-dotnet/gtk-sharp dev-dotnet/gnome-sharp dev-dotnet/taglib-sharp media-libs/libextractor
+DESCRIPTION=Basenji is a volume indexing tool designed for easy and fast indexing of volume collections.
+EAPI=4
+HOMEPAGE=http://launchpad.net/basenji
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib dev-dotnet/gio-sharp dev-dotnet/gtk-sharp dev-dotnet/gnome-sharp dev-dotnet/taglib-sharp media-libs/libextractor dev-dotnet/gnome-desktop-sharp sys-fs/udisks
+SLOT=0
+SRC_URI=http://launchpad.net/basenji/trunk/1.0/+download/basenji-1.0.0.tar.gz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=ef9feb216f52272056991b9e0448c2b8
diff --git a/metadata/md5-cache/app-misc/realpath-1.17 b/metadata/md5-cache/app-misc/realpath-1.17
index 0ca0e0dd6ce5..bbeb9f176e97 100644
--- a/metadata/md5-cache/app-misc/realpath-1.17
+++ b/metadata/md5-cache/app-misc/realpath-1.17
@@ -4,10 +4,10 @@ DESCRIPTION=Return the canonicalized absolute pathname
 EAPI=4
 HOMEPAGE=http://packages.debian.org/unstable/utils/realpath
 IUSE=nls
-KEYWORDS=~alpha amd64 arm hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!sys-freebsd/freebsd-bin nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/r/realpath/realpath_1.17.tar.gz nls? ( mirror://debian/pool/main/r/realpath/realpath_1.17_i386.deb )
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c8bf33c4758b334de37e3655003fa59f
+_md5_=32b3764afefc4424cef802c700c99e61
diff --git a/metadata/md5-cache/app-misc/screen-4.0.3-r8 b/metadata/md5-cache/app-misc/screen-4.0.3-r8
new file mode 100644
index 000000000000..16663e5510cc
--- /dev/null
+++ b/metadata/md5-cache/app-misc/screen-4.0.3-r8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=>=sys-libs/ncurses-5.2 pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Full-screen window manager that multiplexes physical terminals between several processes
+EAPI=4
+HOMEPAGE=http://www.gnu.org/software/screen/
+IUSE=debug nethack pam selinux multiuser
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/ncurses-5.2 pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen ) >=sys-apps/openrc-0.11.6
+SLOT=0
+SRC_URI=ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-4.0.3.tar.gz
+_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7466880f6b2af2226e7b91bd259e0d10
diff --git a/metadata/md5-cache/app-misc/screen-9999 b/metadata/md5-cache/app-misc/screen-9999
index e09633c67c35..59361db6fba7 100644
--- a/metadata/md5-cache/app-misc/screen-9999
+++ b/metadata/md5-cache/app-misc/screen-9999
@@ -5,7 +5,7 @@ EAPI=4
 HOMEPAGE=http://www.gnu.org/software/screen/
 IUSE=debug nethack pam selinux multiuser
 LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.2 pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen )
+RDEPEND=>=sys-libs/ncurses-5.2 pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen ) >=sys-apps/openrc-0.11.6
 SLOT=0
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0fd0bc4f9cbcda8283425b033874ff6d
+_md5_=77b22fe2c0d0834cf55c881cceb70152
diff --git a/metadata/md5-cache/app-portage/eix-0.27.6 b/metadata/md5-cache/app-portage/eix-0.27.6
index 77efde2945e5..62f0b27e318b 100644
--- a/metadata/md5-cache/app-portage/eix-0.27.6
+++ b/metadata/md5-cache/app-portage/eix-0.27.6
@@ -4,10 +4,10 @@ DESCRIPTION=Search and query ebuilds, portage incl. local settings, ext. overlay
 EAPI=5
 HOMEPAGE=http://eix.berlios.de
 IUSE=clang debug +dep doc nls optimization security strong-optimization sqlite tools zsh-completion linguas_de linguas_ru
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-shells/push sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://berlios/eix/eix-0.27.6.tar.xz
 _eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	d40dc948067bd3db1c8ebf7d51897313	l10n	33bde4fb0cfd3a21a277b66bfd837e19	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=62ec6f063ba312cd708d49f089ee73c3
+_md5_=0a5b4c583c65fcff8e7abdb869f609a4
diff --git a/metadata/md5-cache/app-shells/zsh-4.3.15 b/metadata/md5-cache/app-shells/zsh-5.0.2
similarity index 69%
rename from metadata/md5-cache/app-shells/zsh-4.3.15
rename to metadata/md5-cache/app-shells/zsh-5.0.2
index 443bce04d5f0..92f96d9a552a 100644
--- a/metadata/md5-cache/app-shells/zsh-4.3.15
+++ b/metadata/md5-cache/app-shells/zsh-5.0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst prepare test
 DEPEND=sys-apps/groff >=sys-libs/ncurses-5.1 static? ( >=sys-libs/ncurses-5.7-r4[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm )
 DESCRIPTION=UNIX Shell similar to the Korn shell
-EAPI=4
+EAPI=5
 HOMEPAGE=http://www.zsh.org/
 IUSE=caps debug doc examples gdbm maildir pcre static unicode
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ZSH gdbm? ( GPL-2 )
 PDEPEND=examples? ( app-doc/zsh-lovers )
 RDEPEND=>=sys-libs/ncurses-5.1 static? ( >=sys-libs/ncurses-5.7-r4[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm )
 SLOT=0
-SRC_URI=mirror://sourceforge/zsh/zsh-4.3.15.tar.bz2 ftp://ftp.zsh.org/pub/zsh-4.3.15.tar.bz2 doc? ( ftp://ftp.zsh.org/pub/zsh-4.3.15-doc.tar.bz2 )
+SRC_URI=mirror://sourceforge/zsh/zsh-5.0.2.tar.bz2 ftp://ftp.zsh.org/pub/zsh-5.0.2.tar.bz2 doc? ( ftp://ftp.zsh.org/pub/zsh-5.0.2-doc.tar.bz2 )
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=dbfaeebfaf15e136ec57f1b5cfbf5d97
+_md5_=962a5c54a156d8c9079ab3b875c38f00
diff --git a/metadata/md5-cache/app-text/calibre-0.9.9 b/metadata/md5-cache/app-text/calibre-0.9.11
similarity index 94%
rename from metadata/md5-cache/app-text/calibre-0.9.9
rename to metadata/md5-cache/app-text/calibre-0.9.11
index b03c897936ec..8f13263d75d1 100644
--- a/metadata/md5-cache/app-text/calibre-0.9.9
+++ b/metadata/md5-cache/app-text/calibre-0.9.11
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/podofo-0.8.2 >=app-text/poppler-0.12.3-r3[qt4,xpdf-headers(+)] >=dev-libs/chmlib-0.40 >=dev-libs/icu-4.4 >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssselect-0.7.1 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/imaging-1.1.6 >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.1[X,svg,webkit] media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/freetype-2 >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.4 virtual/libusb:1 x11-libs/qt-dbus:4 x11-libs/qt-svg:4 >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) ) =dev-lang/python-2.7* =dev-lang/python-2.7*[ssl,sqlite]
 SLOT=0
-SRC_URI=http://sourceforge.net/projects/calibre/files/0.9.9/calibre-0.9.9.tar.xz
+SRC_URI=http://sourceforge.net/projects/calibre/files/0.9.11/calibre-0.9.11.tar.xz
 _eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3323c970e2426c627f192388f77d326a
+_md5_=727d7c779ed5c5efd833ef44a449c2a9
diff --git a/metadata/md5-cache/app-text/iso-codes-3.40 b/metadata/md5-cache/app-text/iso-codes-3.40
new file mode 100644
index 000000000000..74c4d1e1077d
--- /dev/null
+++ b/metadata/md5-cache/app-text/iso-codes-3.40
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare
+DEPEND=sys-devel/gettext
+DESCRIPTION=Provides the list of country and language names
+EAPI=5
+HOMEPAGE=http://alioth.debian.org/projects/pkg-isocodes/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=LGPL-2.1
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-3.40.tar.xz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a727b313031fb36f69ee7ae8b73e1b38
diff --git a/metadata/md5-cache/app-vim/bufferexplorer-7.2.7 b/metadata/md5-cache/app-vim/bufferexplorer-7.2.7
index 4796cfde7645..7ee7748e1256 100644
--- a/metadata/md5-cache/app-vim/bufferexplorer-7.2.7
+++ b/metadata/md5-cache/app-vim/bufferexplorer-7.2.7
@@ -4,9 +4,9 @@ DESCRIPTION=vim plugin: easily browse vim buffers
 EAPI=2
 HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=42
 KEYWORDS=~amd64 ~x86
-LICENSE=as-is
+LICENSE=bufexplorer.vim
 RDEPEND=|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
 SLOT=0
 SRC_URI=http://www.vim.org/scripts/download_script.php?src_id=12904 -> bufferexplorer-7.2.7.zip
 _eclasses_=vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	0a9f94c8f498d61aecc18fdc8ad711dd
-_md5_=98fba69bd1d197d94f52a0d6b2752e1e
+_md5_=d94fa2f00e64f9f72d0c513418f2b001
diff --git a/metadata/md5-cache/app-vim/bufferexplorer-7.2.8 b/metadata/md5-cache/app-vim/bufferexplorer-7.2.8
index 2f13c887ddf6..2103b93c22e3 100644
--- a/metadata/md5-cache/app-vim/bufferexplorer-7.2.8
+++ b/metadata/md5-cache/app-vim/bufferexplorer-7.2.8
@@ -4,9 +4,9 @@ DESCRIPTION=vim plugin: easily browse vim buffers
 EAPI=2
 HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=42
 KEYWORDS=~amd64 ~x86
-LICENSE=as-is
+LICENSE=bufexplorer.vim
 RDEPEND=|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
 SLOT=0
 SRC_URI=http://www.vim.org/scripts/download_script.php?src_id=14208 -> bufferexplorer-7.2.8.zip
 _eclasses_=vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	0a9f94c8f498d61aecc18fdc8ad711dd
-_md5_=0a493591d8a4cf4a774c8c3d7d32a6ff
+_md5_=6d02483643f520876b4b1674b26e48ee
diff --git a/metadata/md5-cache/app-vim/cctree-1.60 b/metadata/md5-cache/app-vim/cctree-1.60
index ca0331b4f6ea..8e4549c5d5ef 100644
--- a/metadata/md5-cache/app-vim/cctree-1.60
+++ b/metadata/md5-cache/app-vim/cctree-1.60
@@ -4,9 +4,9 @@ DESCRIPTION=vim plugin: Cscope based source-code browser and code flow analysis
 EAPI=4
 HOMEPAGE=http://sites.google.com/site/vimcctree/
 KEYWORDS=~amd64 ~x86
-LICENSE=as-is
+LICENSE=bufexplorer.vim
 RDEPEND=dev-util/cscope || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/CCTree/tarball/1.60 -> cctree-1.60.tar.gz
 _eclasses_=vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	0a9f94c8f498d61aecc18fdc8ad711dd
-_md5_=0589b48d30a0c6c18d44f92224ce3c63
+_md5_=c42ccce6410e867629974f9db49f87cd
diff --git a/metadata/md5-cache/app-vim/cctree-1.61 b/metadata/md5-cache/app-vim/cctree-1.61
index b44402b71961..fbd9c8fe117a 100644
--- a/metadata/md5-cache/app-vim/cctree-1.61
+++ b/metadata/md5-cache/app-vim/cctree-1.61
@@ -4,9 +4,9 @@ DESCRIPTION=vim plugin: Cscope based source-code browser and code flow analysis
 EAPI=4
 HOMEPAGE=http://sites.google.com/site/vimcctree/
 KEYWORDS=~amd64 ~x86
-LICENSE=as-is
+LICENSE=bufexplorer.vim
 RDEPEND=dev-util/cscope || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
 SLOT=0
 SRC_URI=mirror://gentoo/cctree-1.61.tar.bz2 http://dev.gentoo.org/~radhermit/vim/cctree-1.61.tar.bz2
 _eclasses_=vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	0a9f94c8f498d61aecc18fdc8ad711dd
-_md5_=f85e73a5f4f81ac8e872118f153bcd65
+_md5_=03c9cc589f9e7e0d48896f7118ce0544
diff --git a/metadata/md5-cache/app-vim/lustyexplorer-4.1 b/metadata/md5-cache/app-vim/lustyexplorer-4.1
index f1836c774ddb..4fb5eece4d17 100644
--- a/metadata/md5-cache/app-vim/lustyexplorer-4.1
+++ b/metadata/md5-cache/app-vim/lustyexplorer-4.1
@@ -4,9 +4,9 @@ DESCRIPTION=vim plugin: dynamic filesystem and buffer explorer
 EAPI=4
 HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=1890
 KEYWORDS=~amd64 ~x86
-LICENSE=as-is
+LICENSE=bufexplorer.vim
 RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
 SLOT=0
 SRC_URI=mirror://gentoo/lustyexplorer-4.1.tar.bz2 http://dev.gentoo.org/~radhermit/vim/lustyexplorer-4.1.tar.bz2
 _eclasses_=vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	0a9f94c8f498d61aecc18fdc8ad711dd
-_md5_=bdccd3e86392415aaeb90509d9529722
+_md5_=bb54e49d0b1b2defee555e0fd43ef6df
diff --git a/metadata/md5-cache/app-vim/lustyexplorer-4.3 b/metadata/md5-cache/app-vim/lustyexplorer-4.3
index bca87e361c11..62f167cdb2b7 100644
--- a/metadata/md5-cache/app-vim/lustyexplorer-4.3
+++ b/metadata/md5-cache/app-vim/lustyexplorer-4.3
@@ -4,9 +4,9 @@ DESCRIPTION=vim plugin: dynamic filesystem and buffer explorer
 EAPI=4
 HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=1890
 KEYWORDS=~amd64 ~x86
-LICENSE=as-is
+LICENSE=bufexplorer.vim
 RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
 SLOT=0
 SRC_URI=mirror://gentoo/lustyexplorer-4.3.tar.bz2 http://dev.gentoo.org/~radhermit/vim/lustyexplorer-4.3.tar.bz2
 _eclasses_=vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	0a9f94c8f498d61aecc18fdc8ad711dd
-_md5_=5c96419cd45643f760ad468990c6f572
+_md5_=00fbac4d002ee81e554fae63400c6d82
diff --git a/metadata/md5-cache/app-vim/minibufexpl-6.4.3 b/metadata/md5-cache/app-vim/minibufexpl-6.4.3
index 2c04b84d2d73..464fbb21a15b 100644
--- a/metadata/md5-cache/app-vim/minibufexpl-6.4.3
+++ b/metadata/md5-cache/app-vim/minibufexpl-6.4.3
@@ -4,9 +4,9 @@ DESCRIPTION=vim plugin: easily switch between buffers
 EAPI=4
 HOMEPAGE=https://github.com/fholgado/minibufexpl.vim
 KEYWORDS=amd64 ~mips ppc x86
-LICENSE=as-is
+LICENSE=bufexplorer.vim
 RDEPEND=|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
 SLOT=0
 SRC_URI=https://github.com/fholgado/minibufexpl.vim/tarball/6.4.3 -> minibufexpl-6.4.3.tar.gz
 _eclasses_=vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	0a9f94c8f498d61aecc18fdc8ad711dd
-_md5_=305f2c15d87da1ba0514d30a43985718
+_md5_=e587897d53a1126c0e156e2cdfcbe615
diff --git a/metadata/md5-cache/app-vim/minibufexpl-6.4.4 b/metadata/md5-cache/app-vim/minibufexpl-6.4.4
index f29754548193..c11274cae108 100644
--- a/metadata/md5-cache/app-vim/minibufexpl-6.4.4
+++ b/metadata/md5-cache/app-vim/minibufexpl-6.4.4
@@ -4,9 +4,9 @@ DESCRIPTION=vim plugin: easily switch between buffers
 EAPI=4
 HOMEPAGE=https://github.com/fholgado/minibufexpl.vim
 KEYWORDS=amd64 ~mips ppc x86
-LICENSE=as-is
+LICENSE=bufexplorer.vim
 RDEPEND=|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
 SLOT=0
 SRC_URI=https://github.com/fholgado/minibufexpl.vim/tarball/6.4.4 -> minibufexpl-6.4.4.tar.gz
 _eclasses_=vcs-snapshot	d7572a392e0bd8e207deae5414f6a887	vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	0a9f94c8f498d61aecc18fdc8ad711dd
-_md5_=9a81a9b195f7d9f50b9c2aefd79e6640
+_md5_=a6675291d5b18c1694752f4c35387531
diff --git a/metadata/md5-cache/dev-cpp/tbb-4.1.20121003 b/metadata/md5-cache/dev-cpp/tbb-4.1.20121003
index 908d19d3cd6c..35fcc97bf624 100644
--- a/metadata/md5-cache/dev-cpp/tbb-4.1.20121003
+++ b/metadata/md5-cache/dev-cpp/tbb-4.1.20121003
@@ -3,9 +3,9 @@ DESCRIPTION=High level abstract threading library
 EAPI=4
 HOMEPAGE=http://www.threadingbuildingblocks.org/
 IUSE=debug doc examples
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2-with-exceptions
 SLOT=0
 SRC_URI=http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb41_20121003oss_src.tgz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=47e18090eebf4b83ac76b89935987b28
+_md5_=56a9f95800a10698c181efa68e109f5d
diff --git a/metadata/md5-cache/dev-db/sqldeveloper-3.2.20.09.87 b/metadata/md5-cache/dev-db/sqldeveloper-3.2.20.09.87
new file mode 100644
index 000000000000..4f214827e484
--- /dev/null
+++ b/metadata/md5-cache/dev-db/sqldeveloper-3.2.20.09.87
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install nofetch postinst preinst prepare setup
+DEPEND=mssql? ( dev-java/jtds:1.2 ) mysql? ( dev-java/jdbc-mysql:0 ) sybase? ( dev-java/jtds:1.2 ) >=dev-java/java-config-2.1.9-r1
+DESCRIPTION=Oracle SQL Developer is a graphical tool for database development
+EAPI=2
+HOMEPAGE=http://www.oracle.com/technology/products/database/sql_developer/
+IUSE=mssql mysql sybase elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=OTN
+RDEPEND=>=virtual/jdk-1.6.0 mssql? ( dev-java/jtds:1.2 ) mysql? ( dev-java/jdbc-mysql:0 ) sybase? ( dev-java/jtds:1.2 ) >=dev-java/java-config-2.1.9-r1
+RESTRICT=fetch
+SLOT=0
+SRC_URI=sqldeveloper-3.2.20.09.87-no-jre.zip
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=1df1518538ead539ee70cb14bac03c65
diff --git a/metadata/md5-cache/dev-games/etrophy-0.5.1 b/metadata/md5-cache/dev-games/etrophy-0.5.1
index 60f7836bc528..a0b88c17e642 100644
--- a/metadata/md5-cache/dev-games/etrophy-0.5.1
+++ b/metadata/md5-cache/dev-games/etrophy-0.5.1
@@ -5,9 +5,9 @@ EAPI=2
 HOMEPAGE=http://www.enlightenment.org/
 IUSE=doc static-libs nls doc
 KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
+LICENSE=BSD-2
 RDEPEND=>=dev-libs/ecore-1.7.0 >=dev-libs/eet-1.7.0 >=dev-libs/eina-1.7.0 >=media-libs/elementary-1.7.0 >=media-libs/evas-1.7.0 nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=http://download.enlightenment.org/releases/etrophy-0.5.1.tar.bz2
 _eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f601af4e2831772965d34199976ffe3a
+_md5_=efa0505e678545101c80405fcd09ec02
diff --git a/metadata/md5-cache/dev-java/jnr-x86asm-0.1 b/metadata/md5-cache/dev-java/jnr-x86asm-0.1
index 45b2c7fc37f2..1deb4b221a1c 100644
--- a/metadata/md5-cache/dev-java/jnr-x86asm-0.1
+++ b/metadata/md5-cache/dev-java/jnr-x86asm-0.1
@@ -4,10 +4,10 @@ DESCRIPTION=A pure-java port of asmjit.
 EAPI=3
 HOMEPAGE=http://github.com/wmeissner/jnr-x86asm/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://github.com/wmeissner/jnr-x86asm/tarball/0.1 -> jnr-x86asm-0.1.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-ant-2	daa6d2d0a12ebb700a69d9f1d2f02c5c	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=1eb748111469ea8405546f4780e13ec6
+_md5_=0b26a816036506522c8cd1e815d4d3af
diff --git a/metadata/md5-cache/dev-java/maven-bin-1.1-r3 b/metadata/md5-cache/dev-java/maven-bin-1.1-r3
index ed76ef1239a1..ea123becdae6 100644
--- a/metadata/md5-cache/dev-java/maven-bin-1.1-r3
+++ b/metadata/md5-cache/dev-java/maven-bin-1.1-r3
@@ -3,9 +3,9 @@ DEPEND=|| ( app-admin/eselect-java app-admin/eselect-maven )
 DESCRIPTION=Project Management and Comprehension Tool for Java
 EAPI=4
 HOMEPAGE=http://maven.apache.org/
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 || ( app-admin/eselect-java app-admin/eselect-maven )
 SLOT=1.1
 SRC_URI=mirror://apache/maven/maven-1/1.1/binaries/maven-1.1.tar.gz
-_md5_=ef842970093aee549b5f53e8de6b3704
+_md5_=db3be4270e89019270223be4aaa1f28c
diff --git a/metadata/md5-cache/dev-java/maven-bin-2.0.11-r2 b/metadata/md5-cache/dev-java/maven-bin-2.0.11-r2
index 675b6a2eb8a6..4ede63b042cb 100644
--- a/metadata/md5-cache/dev-java/maven-bin-2.0.11-r2
+++ b/metadata/md5-cache/dev-java/maven-bin-2.0.11-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Project Management and Comprehension Tool for Java
 EAPI=4
 HOMEPAGE=http://maven.apache.org/
 IUSE=elibc_FreeBSD
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 || ( app-admin/eselect-java app-admin/eselect-maven ) >=dev-java/java-config-2.1.9-r1
 SLOT=2.0
 SRC_URI=mirror://apache/maven/maven-2/2.0.11/binaries/apache-maven-2.0.11-bin.tar.bz2
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=394e2909d64569978b16610da25bb75b
+_md5_=8e55c3cf27567c758946843f72e4cd6d
diff --git a/metadata/md5-cache/dev-java/maven-bin-2.2.1-r2 b/metadata/md5-cache/dev-java/maven-bin-2.2.1-r2
index d26185f44f5f..3db0c1250067 100644
--- a/metadata/md5-cache/dev-java/maven-bin-2.2.1-r2
+++ b/metadata/md5-cache/dev-java/maven-bin-2.2.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Project Management and Comprehension Tool for Java
 EAPI=4
 HOMEPAGE=http://maven.apache.org/
 IUSE=elibc_FreeBSD
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 || ( app-admin/eselect-java app-admin/eselect-maven ) >=dev-java/java-config-2.1.9-r1
 SLOT=2.2
 SRC_URI=mirror://apache/maven/maven-2/2.2.1/binaries/apache-maven-2.2.1-bin.tar.bz2
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=50897f17c9b3e9d7f9d2fb2f5bdf3a84
+_md5_=18094ce73c3325dc56ecea05c0cedc2f
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.0.4-r1 b/metadata/md5-cache/dev-java/maven-bin-3.0.4-r1
index 71043346b373..f5716209322e 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.0.4-r1
+++ b/metadata/md5-cache/dev-java/maven-bin-3.0.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Project Management and Comprehension Tool for Java
 EAPI=4
 HOMEPAGE=http://maven.apache.org/
 IUSE=elibc_FreeBSD
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 || ( app-admin/eselect-java app-admin/eselect-maven ) >=dev-java/java-config-2.1.9-r1
 SLOT=3.0
 SRC_URI=mirror://apache/maven/maven-3/3.0.4/binaries/apache-maven-3.0.4-bin.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ca4e63a24b45f923ee20c39c998baeb7
+_md5_=43262037968f89c5baebdcc7b583ba2d
diff --git a/metadata/md5-cache/dev-lang/php-5.3.18 b/metadata/md5-cache/dev-lang/php-5.3.18
index 81faa706d25e..67a69a2c5bc4 100644
--- a/metadata/md5-cache/dev-lang/php-5.3.18
+++ b/metadata/md5-cache/dev-lang/php-5.3.18
@@ -4,7 +4,7 @@ DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and
 EAPI=4
 HOMEPAGE=http://php.net/
 IUSE=kolab embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl curlwrappers debug doc enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql mysqlnd mysqli nls oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite2 sqlite3 ssl sybase-ct sysvipc tidy +tokenizer truetype unicode wddx +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib apache2
-KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd
 LICENSE=PHP-3
 PDEPEND=doc? ( app-doc/php-docs )
 RDEPEND=!dev-lang/php:5 >=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) kolab? ( >=net-libs/c-client-2004g-r1 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite2? ( =dev-db/sqlite-2* ) sqlite3? ( >=dev-db/sqlite-3.7.7.1 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng sys-libs/zlib ) xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) ) apache2? ( =www-servers/apache-2* )
@@ -12,4 +12,4 @@ REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib )
 SLOT=5.3
 SRC_URI=http://www.php.net/distributions/php-5.3.18.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.3.18-r0.tar.bz2
 _eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	f4bee52a728da1f76470f4b8d246c50f	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=7741336c53e5d3130ff8570cdb975d98
+_md5_=cf5aea0d14009df2b93063c87101012b
diff --git a/metadata/md5-cache/dev-lang/php-5.4.8 b/metadata/md5-cache/dev-lang/php-5.4.8
index 991e62f621d2..79cc1a7bf3a5 100644
--- a/metadata/md5-cache/dev-lang/php-5.4.8
+++ b/metadata/md5-cache/dev-lang/php-5.4.8
@@ -4,7 +4,7 @@ DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and
 EAPI=4
 HOMEPAGE=http://php.net/
 IUSE=kolab embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl curlwrappers debug doc enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql mysqlnd mysqli nls oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite3 ssl sybase-ct sysvipc tidy +tokenizer truetype unicode wddx +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib apache2
-KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3
 PDEPEND=doc? ( app-doc/php-docs )
 RDEPEND=>=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) kolab? ( >=net-libs/c-client-2004g-r1 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite3? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng sys-libs/zlib ) xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) ) apache2? ( =www-servers/apache-2* )
@@ -12,4 +12,4 @@ REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib )
 SLOT=5.4
 SRC_URI=http://www.php.net/distributions/php-5.4.8.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.4-2.tar.bz2
 _eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	f4bee52a728da1f76470f4b8d246c50f	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=16291324596c1bec6ed7e08fdeb67501
+_md5_=da8a6b6211b06106b9982ad3a24c43c5
diff --git a/metadata/md5-cache/dev-libs/e_dbus-1.7.1 b/metadata/md5-cache/dev-libs/e_dbus-1.7.1
deleted file mode 100644
index 87cd7332713b..000000000000
--- a/metadata/md5-cache/dev-libs/e_dbus-1.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-libs/eina-1.7.0 >=dev-libs/ecore-1.7.0 sys-apps/dbus connman? ( >=net-misc/connman-0.75 ) libnotify? ( >=media-libs/evas-1.7.0 ) udev? ( sys-power/upower sys-fs/udisks:0 ) doc? ( app-doc/doxygen )
-DESCRIPTION=Enlightenment's (Ecore) integration to DBus
-EAPI=2
-HOMEPAGE=http://www.enlightenment.org/
-IUSE=bluetooth +connman +libnotify ofono static-libs test-binaries +udev nls doc
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/eina-1.7.0 >=dev-libs/ecore-1.7.0 sys-apps/dbus connman? ( >=net-misc/connman-0.75 ) libnotify? ( >=media-libs/evas-1.7.0 ) udev? ( sys-power/upower sys-fs/udisks:0 ) nls? ( sys-devel/gettext )
-SLOT=0
-SRC_URI=http://download.enlightenment.org/releases/e_dbus-1.7.1.tar.bz2
-_eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5967741c7ce651139dff88a7e7867c93
diff --git a/metadata/md5-cache/dev-libs/e_dbus-1.7.0 b/metadata/md5-cache/dev-libs/e_dbus-1.7.4
similarity index 89%
rename from metadata/md5-cache/dev-libs/e_dbus-1.7.0
rename to metadata/md5-cache/dev-libs/e_dbus-1.7.4
index a425fb8d8501..3bed237ad9c0 100644
--- a/metadata/md5-cache/dev-libs/e_dbus-1.7.0
+++ b/metadata/md5-cache/dev-libs/e_dbus-1.7.4
@@ -5,9 +5,9 @@ EAPI=2
 HOMEPAGE=http://www.enlightenment.org/
 IUSE=bluetooth +connman +libnotify ofono static-libs test-binaries +udev nls doc
 KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
+LICENSE=BSD-2
 RDEPEND=>=dev-libs/eina-1.7.0 >=dev-libs/ecore-1.7.0 sys-apps/dbus connman? ( >=net-misc/connman-0.75 ) libnotify? ( >=media-libs/evas-1.7.0 ) udev? ( sys-power/upower sys-fs/udisks:0 ) nls? ( sys-devel/gettext )
 SLOT=0
-SRC_URI=http://download.enlightenment.org/releases/e_dbus-1.7.0.tar.bz2
+SRC_URI=http://download.enlightenment.org/releases/e_dbus-1.7.4.tar.bz2
 _eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=489a5026617fe6193d5050337a9dccb5
+_md5_=b9d88c3fe1c7d7f2d4d3684dec78ac40
diff --git a/metadata/md5-cache/dev-libs/ecore-1.7.1 b/metadata/md5-cache/dev-libs/ecore-1.7.1
deleted file mode 100644
index 6f0b3162b586..000000000000
--- a/metadata/md5-cache/dev-libs/ecore-1.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/eina-1.7.0 ares? ( net-dns/c-ares ) glib? ( dev-libs/glib ) curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( dev-libs/openssl ) ) evas? ( >=media-libs/evas-1.7.0[directfb?,fbcon?,opengl?,X?,xcb?] opengl? ( virtual/opengl ) ) directfb? ( >=dev-libs/DirectFB-0.9.16 ) tslib? ( x11-libs/tslib ) sdl? ( media-libs/libsdl ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libXtst xinerama? ( x11-libs/libXinerama x11-libs/libXrandr ) xprint? ( x11-libs/libXp ) xscreensaver? ( x11-libs/libXScrnSaver ) ) !X? ( xcb? ( x11-libs/xcb-util ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( app-doc/doxygen )
-DESCRIPTION=Enlightenment's core event abstraction layer and OS abstraction layer
-EAPI=2
-HOMEPAGE=http://www.enlightenment.org/
-IUSE=ares curl directfb +evas fbcon glib gnutls +inotify ipv6 opengl sdl ssl static-libs +threads tslib +X xcb xinerama xprint xscreensaver test nls doc
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/eina-1.7.0 ares? ( net-dns/c-ares ) glib? ( dev-libs/glib ) curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( dev-libs/openssl ) ) evas? ( >=media-libs/evas-1.7.0[directfb?,fbcon?,opengl?,X?,xcb?] opengl? ( virtual/opengl ) ) directfb? ( >=dev-libs/DirectFB-0.9.16 ) tslib? ( x11-libs/tslib ) sdl? ( media-libs/libsdl ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libXtst xinerama? ( x11-libs/libXinerama x11-libs/libXrandr ) xprint? ( x11-libs/libXp ) xscreensaver? ( x11-libs/libXScrnSaver ) ) !X? ( xcb? ( x11-libs/xcb-util ) ) nls? ( sys-devel/gettext )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://download.enlightenment.org/releases/ecore-1.7.1.tar.bz2
-_eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e73d407f6d09864a93a935bb5b198834
diff --git a/metadata/md5-cache/dev-libs/ecore-1.7.3 b/metadata/md5-cache/dev-libs/ecore-1.7.4
similarity index 94%
rename from metadata/md5-cache/dev-libs/ecore-1.7.3
rename to metadata/md5-cache/dev-libs/ecore-1.7.4
index 7ab822677a88..5c93f5d9b398 100644
--- a/metadata/md5-cache/dev-libs/ecore-1.7.3
+++ b/metadata/md5-cache/dev-libs/ecore-1.7.4
@@ -5,10 +5,10 @@ EAPI=2
 HOMEPAGE=http://www.enlightenment.org/
 IUSE=ares curl directfb +evas examples fbcon glib gnutls +inotify ipv6 opengl sdl ssl static-libs +threads tslib +X xcb xinerama xprint xscreensaver nls doc
 KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
+LICENSE=BSD-2
 RDEPEND=>=dev-libs/eina-1.7.0 ares? ( net-dns/c-ares ) glib? ( dev-libs/glib ) curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( dev-libs/openssl ) ) evas? ( >=media-libs/evas-1.7.0[directfb?,fbcon?,opengl?,X?,xcb?] opengl? ( virtual/opengl ) ) directfb? ( >=dev-libs/DirectFB-0.9.16 ) tslib? ( x11-libs/tslib ) sdl? ( media-libs/libsdl ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libXtst xinerama? ( x11-libs/libXinerama x11-libs/libXrandr ) xprint? ( x11-libs/libXp ) xscreensaver? ( x11-libs/libXScrnSaver ) ) !X? ( xcb? ( x11-libs/xcb-util ) ) nls? ( sys-devel/gettext )
 RESTRICT=test
 SLOT=0
-SRC_URI=http://download.enlightenment.org/releases/ecore-1.7.3.tar.bz2
+SRC_URI=http://download.enlightenment.org/releases/ecore-1.7.4.tar.bz2
 _eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=198d3712224c3e29a01c7456256f86fa
+_md5_=f8707341706e005cf00d517d551e56c0
diff --git a/metadata/md5-cache/dev-libs/eet-1.7.3 b/metadata/md5-cache/dev-libs/eet-1.7.3
deleted file mode 100644
index 4f06a8f0d0a6..000000000000
--- a/metadata/md5-cache/dev-libs/eet-1.7.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-libs/eina-1.7.0 virtual/jpeg sys-libs/zlib gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( dev-libs/openssl ) ) test? ( dev-libs/check dev-util/lcov ) doc? ( app-doc/doxygen )
-DESCRIPTION=E file chunk reading/writing library
-EAPI=2
-HOMEPAGE=http://trac.enlightenment.org/e/wiki/Eet
-IUSE=debug examples gnutls ssl static-libs test nls doc
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/eina-1.7.0 virtual/jpeg sys-libs/zlib gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( dev-libs/openssl ) ) nls? ( sys-devel/gettext )
-SLOT=0
-SRC_URI=http://download.enlightenment.org/releases/eet-1.7.3.tar.bz2
-_eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6c5e7943b03149911e416f294e3ecd0a
diff --git a/metadata/md5-cache/dev-libs/eet-1.7.2 b/metadata/md5-cache/dev-libs/eet-1.7.4
similarity index 88%
rename from metadata/md5-cache/dev-libs/eet-1.7.2
rename to metadata/md5-cache/dev-libs/eet-1.7.4
index 93a6d977cdf0..e097dadb9b37 100644
--- a/metadata/md5-cache/dev-libs/eet-1.7.2
+++ b/metadata/md5-cache/dev-libs/eet-1.7.4
@@ -5,9 +5,9 @@ EAPI=2
 HOMEPAGE=http://trac.enlightenment.org/e/wiki/Eet
 IUSE=debug examples gnutls ssl static-libs test nls doc
 KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
+LICENSE=BSD-2
 RDEPEND=>=dev-libs/eina-1.7.0 virtual/jpeg sys-libs/zlib gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( dev-libs/openssl ) ) nls? ( sys-devel/gettext )
 SLOT=0
-SRC_URI=http://download.enlightenment.org/releases/eet-1.7.2.tar.bz2
+SRC_URI=http://download.enlightenment.org/releases/eet-1.7.4.tar.bz2
 _eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=66b316554c923033047dda0b1690b662
+_md5_=c5805491045303d8f10241f49cdd514b
diff --git a/metadata/md5-cache/dev-libs/eeze-1.7.1 b/metadata/md5-cache/dev-libs/eeze-1.7.4
similarity index 84%
rename from metadata/md5-cache/dev-libs/eeze-1.7.1
rename to metadata/md5-cache/dev-libs/eeze-1.7.4
index 3a80e9eddaf9..bfaf09ff502b 100644
--- a/metadata/md5-cache/dev-libs/eeze-1.7.1
+++ b/metadata/md5-cache/dev-libs/eeze-1.7.4
@@ -4,9 +4,9 @@ DESCRIPTION=library to simplify the use of devices
 HOMEPAGE=http://trac.enlightenment.org/e/wiki/Eeze
 IUSE=static-libs utilities nls doc
 KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
+LICENSE=BSD-2
 RDEPEND=>=dev-libs/ecore-1.7.0 >=dev-libs/eina-1.7.0 nls? ( sys-devel/gettext )
 SLOT=0
-SRC_URI=http://download.enlightenment.org/releases/eeze-1.7.1.tar.bz2
+SRC_URI=http://download.enlightenment.org/releases/eeze-1.7.4.tar.bz2
 _eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=87e4ec4aaee98221833c0662b22c7a08
+_md5_=5dce737b721811aca1ee037e4b840739
diff --git a/metadata/md5-cache/dev-libs/efreet-1.7.3 b/metadata/md5-cache/dev-libs/efreet-1.7.3
deleted file mode 100644
index 27d9fdec7171..000000000000
--- a/metadata/md5-cache/dev-libs/efreet-1.7.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-libs/ecore-1.7.0 >=dev-libs/eet-1.7.0 >=dev-libs/eina-1.7.0 x11-misc/xdg-utils doc? ( app-doc/doxygen )
-DESCRIPTION=library for handling of freedesktop.org specs (desktop/icon/theme/etc...)
-EAPI=2
-HOMEPAGE=http://www.enlightenment.org/
-IUSE=static-libs nls doc
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/ecore-1.7.0 >=dev-libs/eet-1.7.0 >=dev-libs/eina-1.7.0 x11-misc/xdg-utils nls? ( sys-devel/gettext )
-SLOT=0
-SRC_URI=http://download.enlightenment.org/releases/efreet-1.7.3.tar.bz2
-_eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bc8831c54d85b425788ac1a6d7c60efd
diff --git a/metadata/md5-cache/dev-libs/efreet-1.7.1 b/metadata/md5-cache/dev-libs/efreet-1.7.4
similarity index 86%
rename from metadata/md5-cache/dev-libs/efreet-1.7.1
rename to metadata/md5-cache/dev-libs/efreet-1.7.4
index 57c646d80ad8..0e737584bf92 100644
--- a/metadata/md5-cache/dev-libs/efreet-1.7.1
+++ b/metadata/md5-cache/dev-libs/efreet-1.7.4
@@ -5,9 +5,9 @@ EAPI=2
 HOMEPAGE=http://www.enlightenment.org/
 IUSE=static-libs nls doc
 KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
+LICENSE=BSD-2
 RDEPEND=>=dev-libs/ecore-1.7.0 >=dev-libs/eet-1.7.0 >=dev-libs/eina-1.7.0 x11-misc/xdg-utils nls? ( sys-devel/gettext )
 SLOT=0
-SRC_URI=http://download.enlightenment.org/releases/efreet-1.7.1.tar.bz2
+SRC_URI=http://download.enlightenment.org/releases/efreet-1.7.4.tar.bz2
 _eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c7f21ec1e578da208ca44233f0111df5
+_md5_=0af65ea8a762926d5babdd3dc19ccfce
diff --git a/metadata/md5-cache/dev-libs/eina-1.7.3 b/metadata/md5-cache/dev-libs/eina-1.7.3
deleted file mode 100644
index 8175faa18c97..000000000000
--- a/metadata/md5-cache/dev-libs/eina-1.7.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=debug? ( dev-util/valgrind ) virtual/pkgconfig test? ( dev-libs/check dev-libs/glib dev-util/lcov ) doc? ( app-doc/doxygen )
-DESCRIPTION=Enlightenment's data types library (List, hash, etc) in C
-EAPI=2
-HOMEPAGE=http://www.enlightenment.org/
-IUSE=altivec debug default-mempool mempool-buddy +mempool-chained mempool-fixed-bitmap +mempool-pass-through mmx sse sse2 static-libs test nls doc
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1
-RDEPEND=debug? ( dev-util/valgrind ) nls? ( sys-devel/gettext )
-SLOT=0
-SRC_URI=http://download.enlightenment.org/releases/eina-1.7.3.tar.bz2
-_eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4255fcd4cbf838c44c34405bc2182c62
diff --git a/metadata/md5-cache/dev-libs/eina-1.7.1 b/metadata/md5-cache/dev-libs/eina-1.7.4
similarity index 89%
rename from metadata/md5-cache/dev-libs/eina-1.7.1
rename to metadata/md5-cache/dev-libs/eina-1.7.4
index 57a58e6f24eb..ae07cd451e3d 100644
--- a/metadata/md5-cache/dev-libs/eina-1.7.1
+++ b/metadata/md5-cache/dev-libs/eina-1.7.4
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=LGPL-2.1
 RDEPEND=debug? ( dev-util/valgrind ) nls? ( sys-devel/gettext )
 SLOT=0
-SRC_URI=http://download.enlightenment.org/releases/eina-1.7.1.tar.bz2
+SRC_URI=http://download.enlightenment.org/releases/eina-1.7.4.tar.bz2
 _eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7030dcc6b2a1e96a165bc9831c3aa883
+_md5_=263b739638624f47ed78337f681873e7
diff --git a/metadata/md5-cache/dev-libs/eio-1.7.3 b/metadata/md5-cache/dev-libs/eio-1.7.3
deleted file mode 100644
index 819988b810fb..000000000000
--- a/metadata/md5-cache/dev-libs/eio-1.7.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-libs/ecore-1.7.0 doc? ( app-doc/doxygen )
-DESCRIPTION=Enlightenment's integration to IO
-EAPI=2
-HOMEPAGE=http://trac.enlightenment.org/e/wiki/EIO
-IUSE=examples static-libs nls doc
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/ecore-1.7.0 nls? ( sys-devel/gettext )
-SLOT=0
-SRC_URI=http://download.enlightenment.org/releases/eio-1.7.3.tar.bz2
-_eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c51791f68ced6e534d2fac8623a9753e
diff --git a/metadata/md5-cache/dev-libs/eio-1.7.1 b/metadata/md5-cache/dev-libs/eio-1.7.4
similarity index 83%
rename from metadata/md5-cache/dev-libs/eio-1.7.1
rename to metadata/md5-cache/dev-libs/eio-1.7.4
index dd9f6c3bcf78..1958b38c8579 100644
--- a/metadata/md5-cache/dev-libs/eio-1.7.1
+++ b/metadata/md5-cache/dev-libs/eio-1.7.4
@@ -5,9 +5,9 @@ EAPI=2
 HOMEPAGE=http://trac.enlightenment.org/e/wiki/EIO
 IUSE=examples static-libs nls doc
 KEYWORDS=~amd64 ~x86
-LICENSE=BSD
+LICENSE=LGPL-2
 RDEPEND=>=dev-libs/ecore-1.7.0 nls? ( sys-devel/gettext )
 SLOT=0
-SRC_URI=http://download.enlightenment.org/releases/eio-1.7.1.tar.bz2
+SRC_URI=http://download.enlightenment.org/releases/eio-1.7.4.tar.bz2
 _eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4b863c15363a7e893b161878c9ef2754
+_md5_=48734d8950d5979092fb18cbbb3602f5
diff --git a/metadata/md5-cache/dev-libs/embryo-1.2.0 b/metadata/md5-cache/dev-libs/embryo-1.2.0
deleted file mode 100644
index be63be6c1f77..000000000000
--- a/metadata/md5-cache/dev-libs/embryo-1.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-libs/eina-1.2.0 doc? ( app-doc/doxygen )
-DESCRIPTION=load and control programs compiled in embryo language (small/pawn variant)
-HOMEPAGE=http://www.enlightenment.org/
-IUSE=static-libs nls doc
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/eina-1.2.0 nls? ( sys-devel/gettext )
-SLOT=0
-SRC_URI=http://download.enlightenment.org/releases/embryo-1.2.0.tar.bz2
-_eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e49c062d3fc04267e6070b0ef4a6cb82
diff --git a/metadata/md5-cache/dev-libs/embryo-1.7.0 b/metadata/md5-cache/dev-libs/embryo-1.7.4
similarity index 83%
rename from metadata/md5-cache/dev-libs/embryo-1.7.0
rename to metadata/md5-cache/dev-libs/embryo-1.7.4
index f541770f10a0..5cf02743e895 100644
--- a/metadata/md5-cache/dev-libs/embryo-1.7.0
+++ b/metadata/md5-cache/dev-libs/embryo-1.7.4
@@ -4,9 +4,9 @@ DESCRIPTION=load and control programs compiled in embryo language (small/pawn va
 HOMEPAGE=http://www.enlightenment.org/
 IUSE=static-libs nls doc
 KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
+LICENSE=BSD-2 ZLIB
 RDEPEND=>=dev-libs/eina-1.7.0 nls? ( sys-devel/gettext )
 SLOT=0
-SRC_URI=http://download.enlightenment.org/releases/embryo-1.7.0.tar.bz2
+SRC_URI=http://download.enlightenment.org/releases/embryo-1.7.4.tar.bz2
 _eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=90d016b7c5d01b80fee000ccdc09dac1
+_md5_=990599c555351ab4da10764a122df05e
diff --git a/metadata/md5-cache/dev-libs/icu-50.1.1 b/metadata/md5-cache/dev-libs/icu-50.1.1
new file mode 100644
index 000000000000..6790cd0f55d7
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/icu-50.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=doc? ( app-doc/doxygen[dot] ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=International Components for Unicode
+EAPI=5
+HOMEPAGE=http://www.icu-project.org/
+IUSE=debug doc examples static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=BSD
+RDEPEND=!dev-libs/icu:0/50
+SLOT=0
+SRC_URI=http://download.icu-project.org/files/icu4c/50.1.1/icu4c-50_1_1-src.tgz
+_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=271851d41289c39086b46a34c3fee3bd
diff --git a/metadata/md5-cache/dev-libs/libconfig-1.4.9 b/metadata/md5-cache/dev-libs/libconfig-1.4.9
index f9d6f9b65f7e..948fb8b2515b 100644
--- a/metadata/md5-cache/dev-libs/libconfig-1.4.9
+++ b/metadata/md5-cache/dev-libs/libconfig-1.4.9
@@ -4,9 +4,9 @@ DESCRIPTION=Libconfig is a simple library for manipulating structured configurat
 EAPI=4
 HOMEPAGE=http://www.hyperrealm.com/libconfig/libconfig.html
 IUSE=examples static-libs
-KEYWORDS=amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux
+KEYWORDS=amd64 ~mips ppc ~ppc64 ~sparc ~x86 ~x86-linux
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.hyperrealm.com/libconfig/libconfig-1.4.9.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fc01697c22b7c2f5658c8fc16671b077
+_md5_=6883252e27c21bb780a243f87351b9c4
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.28 b/metadata/md5-cache/dev-libs/libxslt-1.1.28
index 88799aca42bd..9fb270a930b0 100644
--- a/metadata/md5-cache/dev-libs/libxslt-1.1.28
+++ b/metadata/md5-cache/dev-libs/libxslt-1.1.28
@@ -4,10 +4,10 @@ DESCRIPTION=XSLT libraries and tools
 EAPI=5
 HOMEPAGE=http://www.xmlsoft.org/
 IUSE=crypt debug python static-libs
-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=MIT
 RDEPEND=>=dev-libs/libxml2-2.8.0 crypt? ( >=dev-libs/libgcrypt-1.1.42:= ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 SLOT=0
 SRC_URI=ftp://xmlsoft.org/libxslt/libxslt-1.1.28.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9a137f9e907a2eeaf647341b835e82af
+_md5_=6b8f3b4ddee2fd6764120e5aeff61564
diff --git a/metadata/md5-cache/dev-libs/mpfr-3.1.1 b/metadata/md5-cache/dev-libs/mpfr-3.1.1
index eebd6ce75b5a..20b060f2ec0f 100644
--- a/metadata/md5-cache/dev-libs/mpfr-3.1.1
+++ b/metadata/md5-cache/dev-libs/mpfr-3.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=library for multiple-precision floating-point computations with exac
 EAPI=3
 HOMEPAGE=http://www.mpfr.org/
 IUSE=static-libs
-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=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-4.1.4-r2[static-libs?]
 SLOT=0
 SRC_URI=http://www.mpfr.org/mpfr-3.1.1/mpfr-3.1.1.tar.xz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7bfbb04e693da028e1caf3566be1e683
+_md5_=019bce1ba72799d3c84999ad2127cbc0
diff --git a/metadata/md5-cache/dev-libs/uthash-1.9.7 b/metadata/md5-cache/dev-libs/uthash-1.9.7
index 5fda1d0e1612..de274599520d 100644
--- a/metadata/md5-cache/dev-libs/uthash-1.9.7
+++ b/metadata/md5-cache/dev-libs/uthash-1.9.7
@@ -4,9 +4,9 @@ DESCRIPTION=An easy-to-use hash implementation for C programmers
 EAPI=4
 HOMEPAGE=http://uthash.sourceforge.net
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ppc ~sparc ~x86
 LICENSE=BSD-1
 SLOT=0
 SRC_URI=mirror://sourceforge/uthash/uthash-1.9.7.tar.bz2
 _eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
-_md5_=39165768f68d871bbb995bbb9da9f610
+_md5_=2168623ceed836c638ed591cc416b29c
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-Deprecated-1.108.0 b/metadata/md5-cache/dev-perl/Perl-Critic-Deprecated-1.108.0
index f19ac94ab261..f9a21eb390f8 100644
--- a/metadata/md5-cache/dev-perl/Perl-Critic-Deprecated-1.108.0
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-Deprecated-1.108.0
@@ -3,10 +3,10 @@ DEPEND=dev-perl/Readonly dev-perl/Perl-Critic virtual/perl-Module-Build dev-lang
 DESCRIPTION=Policies that were formally included with Perl::Critic itself, but which have been superseded by others
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Perl-Critic-Deprecated/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-perl/Readonly dev-perl/Perl-Critic dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EL/ELLIOTJS/Perl-Critic-Deprecated-1.108.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3c6c15c568612c416b03ffbe7753e0d1
+_md5_=348352973443792a82859da0319c81a9
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-Dynamic-0.50.0 b/metadata/md5-cache/dev-perl/Perl-Critic-Dynamic-0.50.0
index d5c09c054ebf..f6b8fdd09116 100644
--- a/metadata/md5-cache/dev-perl/Perl-Critic-Dynamic-0.50.0
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-Dynamic-0.50.0
@@ -3,10 +3,10 @@ DEPEND=dev-perl/Perl-Critic >=dev-perl/Devel-Symdump-2.08 dev-perl/Readonly virt
 DESCRIPTION=Base class for dynamic Policies
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Perl-Critic-Dynamic/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-perl/Perl-Critic >=dev-perl/Devel-Symdump-2.08 dev-perl/Readonly dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TH/THALJEF/Perl-Critic-Dynamic-0.05.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=aa0774b1f9ba79ac02f5dc5fcd878f24
+_md5_=b1c9414a929683d3c216afb574a6df02
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0 b/metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0
index ed0152703cf8..45f1ddf912dd 100644
--- a/metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl dev-lang/perl[-build]
 DESCRIPTION=policies of nits I like to pick
 EAPI=3
 HOMEPAGE=http://search.cpan.org/dist/Perl-Critic-Nits/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl dev-perl/Perl-Critic dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KC/KCOWGILL/Perl-Critic-Nits-v1.0.0.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0dd5a826afd72f65823621ddb3b6152d
+_md5_=e0d2ad47d2bdf23ca2a1839b3bdfedaf
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0 b/metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0
index 87325ff9f0ad..afc13851f7ba 100644
--- a/metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl::Critic policy against indirect method calls
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Perl-Critic-Policy-Dynamic-NoIndirect/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=dev-perl/indirect-0.250.0 dev-perl/Perl-Critic-Dynamic dev-perl/Perl-Critic dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VP/VPIT/Perl-Critic-Policy-Dynamic-NoIndirect-0.06.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=80a7191b806502cc7836ea58d9543fe2
+_md5_=55e1600a4d415272c1c8ab8e37f3b358
diff --git a/metadata/md5-cache/dev-perl/Test-MockObject-1.201.203.10 b/metadata/md5-cache/dev-perl/Test-MockObject-1.201.203.10
index 48350fd981e6..bf98d8a60ace 100644
--- a/metadata/md5-cache/dev-perl/Test-MockObject-1.201.203.10
+++ b/metadata/md5-cache/dev-perl/Test-MockObject-1.201.203.10
@@ -4,10 +4,10 @@ DESCRIPTION=Perl extension for emulating troublesome interfaces
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Test-MockObject/
 IUSE=test
-KEYWORDS=~amd64 ~x86 ~ppc-aix
+KEYWORDS=~amd64 ~ppc ~x86 ~ppc-aix
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=dev-perl/UNIVERSAL-isa-1.201.106.140 >=dev-perl/UNIVERSAL-can-1.201.106.170 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHROMATIC/Test-MockObject-1.20120301.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=022a27d2ba3a1520d1d7e6147402b738
+_md5_=9720b936b0d4d2842880e54770618edd
diff --git a/metadata/md5-cache/dev-perl/Test-Perl-Critic-1.20.0 b/metadata/md5-cache/dev-perl/Test-Perl-Critic-1.20.0
index beda7fff4f00..c3d217a1ed71 100644
--- a/metadata/md5-cache/dev-perl/Test-Perl-Critic-1.20.0
+++ b/metadata/md5-cache/dev-perl/Test-Perl-Critic-1.20.0
@@ -4,10 +4,10 @@ DESCRIPTION=Use Perl::Critic in test programs
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Test-Perl-Critic/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=dev-perl/Perl-Critic-1.105 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TH/THALJEF/Test-Perl-Critic-1.02.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=70a2e1e6b4d2ac3cb6cebaa6201c5c81
+_md5_=ba957f368357a17e793ce2c2bb5d21b6
diff --git a/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.207.260 b/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.207.260
index 8e37d8508174..208869437273 100644
--- a/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.207.260
+++ b/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.207.260
@@ -4,10 +4,10 @@ DESCRIPTION=Hack around people calling UNIVERSAL::can() as a function
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/UNIVERSAL-can/
 IUSE=test
-KEYWORDS=~amd64 ~x86 ~ppc-aix
+KEYWORDS=~amd64 ~ppc ~x86 ~ppc-aix
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHROMATIC/UNIVERSAL-can-1.20120726.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ad2c620aa9ca470be4df538f98f8f7b1
+_md5_=64c1d7997ecb275899985245a0a8726e
diff --git a/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.207.260 b/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.207.260
index d17cef953d9b..f5806e4bfc3b 100644
--- a/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.207.260
+++ b/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.207.260
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl[-build]
 DESCRIPTION=Attempt to recover from people calling UNIVERSAL::isa as a function
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/UNIVERSAL-isa/
-KEYWORDS=~amd64 ~x86 ~ppc-aix
+KEYWORDS=~amd64 ~ppc ~x86 ~ppc-aix
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHROMATIC/UNIVERSAL-isa-1.20120726.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ae568a59b0029fcf8f8af0e17ac12a4c
+_md5_=c18acd37e0112ddb31d7599e0f54f7b8
diff --git a/metadata/md5-cache/dev-perl/indirect-0.260.0 b/metadata/md5-cache/dev-perl/indirect-0.260.0
index 35c3c1beaeab..e04d61d40525 100644
--- a/metadata/md5-cache/dev-perl/indirect-0.260.0
+++ b/metadata/md5-cache/dev-perl/indirect-0.260.0
@@ -4,10 +4,10 @@ DESCRIPTION=Lexically warn about using the indirect object syntax
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/indirect/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VP/VPIT/indirect-0.26.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1f4b6738dc39ff8fe05f9ae2bf7ffae5
+_md5_=b2b5092f99d19ab1678158f8e51d2f58
diff --git a/metadata/md5-cache/dev-python/coverage-3.5.3-r1 b/metadata/md5-cache/dev-python/coverage-3.5.3-r1
index 6397b8a07427..811cc917dc62 100644
--- a/metadata/md5-cache/dev-python/coverage-3.5.3-r1
+++ b/metadata/md5-cache/dev-python/coverage-3.5.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_python3_3?,python_targets_pypy1_8?,python_targets_pypy1_9?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_8(-),-python_single_target_pypy1_9(-)] dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_python3_3?,python_targets_pypy1_8?,python_targets_pypy1_9?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_8(-),-python_single_target_pypy1_9(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_8? ( dev-python/pypy:1.8 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 )
+DEPEND=dev-python/setuptools[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_python3_3?,python_targets_pypy1_8?,python_targets_pypy1_9?,python_targets_pypy2_0?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_8(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_python3_3?,python_targets_pypy1_8?,python_targets_pypy1_9?,python_targets_pypy2_0?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_8(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_8? ( dev-python/pypy:1.8 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 )
 DESCRIPTION=Code coverage measurement for Python
 EAPI=5
 HOMEPAGE=http://nedbatchelder.com/code/coverage/ http://pypi.python.org/pypi/coverage
-IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_8 python_targets_pypy1_9
+IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_8 python_targets_pypy1_9 python_targets_pypy2_0
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_python3_3?,python_targets_pypy1_8?,python_targets_pypy1_9?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_8(-),-python_single_target_pypy1_9(-)] dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_python3_3?,python_targets_pypy1_8?,python_targets_pypy1_9?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_8(-),-python_single_target_pypy1_9(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_8? ( dev-python/pypy:1.8 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 )
-REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_8 python_targets_pypy1_9 )
+RDEPEND=dev-python/setuptools[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_python3_3?,python_targets_pypy1_8?,python_targets_pypy1_9?,python_targets_pypy2_0?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_8(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_python3_3?,python_targets_pypy1_8?,python_targets_pypy1_9?,python_targets_pypy2_0?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_8(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_8? ( dev-python/pypy:1.8 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 )
+REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_8 python_targets_pypy1_9 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=mirror://pypi/c/coverage/coverage-3.5.3.tar.gz
 _eclasses_=distutils-r1	628c91ff6d8520cc946d8e6b37709935	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	cdb57e63096bf34e3390d45726a76258	python-utils-r1	dcd8a7e28a2e90a45fc1875429811c73	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=25652cf98c76c59c7f40d55f2e48c5a2
+_md5_=85e01fd369e7ec926cd7fe8aa034b596
diff --git a/metadata/md5-cache/dev-python/httplib2-0.7.6 b/metadata/md5-cache/dev-python/httplib2-0.7.6
index b487ae1ca560..3a345e5f8dae 100644
--- a/metadata/md5-cache/dev-python/httplib2-0.7.6
+++ b/metadata/md5-cache/dev-python/httplib2-0.7.6
@@ -3,11 +3,11 @@ DEPEND=|| ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-2* )
 DESCRIPTION=A comprehensive HTTP client library
 EAPI=4
 HOMEPAGE=http://code.google.com/p/httplib2/ http://pypi.python.org/pypi/httplib2
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=|| ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-2* )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://httplib2.googlecode.com/files/httplib2-0.7.6.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
-_md5_=13bd7994be725e499cbfad81896210e5
+_md5_=b64d1bbe7d77edde64282e6d074e775b
diff --git a/metadata/md5-cache/dev-python/nose-1.1.2-r1 b/metadata/md5-cache/dev-python/nose-1.1.2-r1
index 81eba0be4904..a21131e80286 100644
--- a/metadata/md5-cache/dev-python/nose-1.1.2-r1
+++ b/metadata/md5-cache/dev-python/nose-1.1.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=coverage? ( dev-python/coverage[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_pypy1_8?,python_targets_pypy1_9?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy1_8(-),-python_single_target_pypy1_9(-)] ) dev-python/setuptools[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_pypy1_8?,python_targets_pypy1_9?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy1_8(-),-python_single_target_pypy1_9(-)] doc? ( >=dev-python/sphinx-0.6 ) test? ( dev-python/twisted ) dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_pypy1_8?,python_targets_pypy1_9?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy1_8(-),-python_single_target_pypy1_9(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_pypy1_8? ( dev-python/pypy:1.8 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 )
+DEPEND=coverage? ( dev-python/coverage[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_pypy1_8?,python_targets_pypy1_9?,python_targets_pypy2_0?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy1_8(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] ) dev-python/setuptools[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_pypy1_8?,python_targets_pypy1_9?,python_targets_pypy2_0?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy1_8(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] doc? ( >=dev-python/sphinx-0.6 ) test? ( dev-python/twisted ) dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_pypy1_8?,python_targets_pypy1_9?,python_targets_pypy2_0?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy1_8(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_pypy1_8? ( dev-python/pypy:1.8 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 )
 DESCRIPTION=A unittest extension offering automatic test suite discovery and easy test authoring
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/nose http://readthedocs.org/docs/nose/ https://bitbucket.org/jpellerin/nose
-IUSE=coverage doc examples test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_pypy1_8 python_targets_pypy1_9
+IUSE=coverage doc examples test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_pypy1_8 python_targets_pypy1_9 python_targets_pypy2_0
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
-RDEPEND=coverage? ( dev-python/coverage[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_pypy1_8?,python_targets_pypy1_9?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy1_8(-),-python_single_target_pypy1_9(-)] ) dev-python/setuptools[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_pypy1_8?,python_targets_pypy1_9?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy1_8(-),-python_single_target_pypy1_9(-)] dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_pypy1_8?,python_targets_pypy1_9?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy1_8(-),-python_single_target_pypy1_9(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_pypy1_8? ( dev-python/pypy:1.8 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 )
-REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_pypy1_8 python_targets_pypy1_9 )
+RDEPEND=coverage? ( dev-python/coverage[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_pypy1_8?,python_targets_pypy1_9?,python_targets_pypy2_0?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy1_8(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] ) dev-python/setuptools[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_pypy1_8?,python_targets_pypy1_9?,python_targets_pypy2_0?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy1_8(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_pypy1_8?,python_targets_pypy1_9?,python_targets_pypy2_0?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy1_8(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_pypy1_8? ( dev-python/pypy:1.8 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 )
+REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_pypy1_8 python_targets_pypy1_9 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose/nose-1.1.2.tar.gz
 _eclasses_=distutils-r1	628c91ff6d8520cc946d8e6b37709935	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	cdb57e63096bf34e3390d45726a76258	python-utils-r1	dcd8a7e28a2e90a45fc1875429811c73	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=07fc94877b72d7478584ecb153133867
+_md5_=e8f189b0ad72e9a75853511296e1b69a
diff --git a/metadata/md5-cache/dev-python/pycryptopp-0.6.0 b/metadata/md5-cache/dev-python/pycryptopp-0.6.0
index 4a91ce336b88..49b83a79df29 100644
--- a/metadata/md5-cache/dev-python/pycryptopp-0.6.0
+++ b/metadata/md5-cache/dev-python/pycryptopp-0.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/crypto++ dev-python/setuptools dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 )
+DEPEND=dev-libs/crypto++ dev-python/setuptools[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 )
 DESCRIPTION=Python wrappers for a few algorithms from the Crypto++ library
 EAPI=5
 HOMEPAGE=http://tahoe-lafs.org/trac/pycryptopp http://pypi.python.org/pypi/pycryptopp
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pycryptopp/pycryptopp-0.6.0.1206569328141510525648634803928199668821045408958.tar.gz
 _eclasses_=distutils-r1	628c91ff6d8520cc946d8e6b37709935	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	cdb57e63096bf34e3390d45726a76258	python-utils-r1	dcd8a7e28a2e90a45fc1875429811c73	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	d7572a392e0bd8e207deae5414f6a887
-_md5_=17383a068be2b38d900a4c3ae2366807
+_md5_=5307cdd648efa7e28193d2cc737a9072
diff --git a/metadata/md5-cache/dev-python/pyscard-1.6.12 b/metadata/md5-cache/dev-python/pyscard-1.6.12
index e66038fa4d04..00548d1dffff 100644
--- a/metadata/md5-cache/dev-python/pyscard-1.6.12
+++ b/metadata/md5-cache/dev-python/pyscard-1.6.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=sys-apps/pcsc-lite =dev-lang/python-2*
+DEPEND=sys-apps/pcsc-lite dev-lang/swig =dev-lang/python-2*
 DESCRIPTION=pyscard is a python module adding smart cards support to python.
 EAPI=3
 HOMEPAGE=http://pyscard.sourceforge.net/ http://pypi.python.org/pypi/pyscard
@@ -9,4 +9,4 @@ RDEPEND=sys-apps/pcsc-lite =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://sourceforge/pyscard/pyscard-1.6.12.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
-_md5_=af6bf0655e79c7b43d89f8dc598e3bd6
+_md5_=747ed71fb998f962a6a2d8591e915913
diff --git a/metadata/md5-cache/dev-python/pyxattr-0.5.0 b/metadata/md5-cache/dev-python/pyxattr-0.5.0
index 16b3e7f3edd4..dc315def3a72 100644
--- a/metadata/md5-cache/dev-python/pyxattr-0.5.0
+++ b/metadata/md5-cache/dev-python/pyxattr-0.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=sys-apps/attr dev-python/setuptools dev-lang/python test? ( dev-python/nose )
+DEPEND=sys-apps/attr dev-lang/python test? ( dev-python/nose )
 DESCRIPTION=Python interface to xattr
 EAPI=3
 HOMEPAGE=http://sourceforge.net/projects/pyxattr/
@@ -10,4 +10,4 @@ RDEPEND=sys-apps/attr dev-lang/python
 SLOT=0
 SRC_URI=mirror://sourceforge/pyxattr/pyxattr-0.5.0.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
-_md5_=646fc26babf8dff5b82dcbee4597d5c3
+_md5_=5f73c723a8b86c1dc2c5d3b9f1f56bdf
diff --git a/metadata/md5-cache/dev-python/pyxattr-0.5.0-r1 b/metadata/md5-cache/dev-python/pyxattr-0.5.0-r1
index 599952e970d5..ad32c565f20a 100644
--- a/metadata/md5-cache/dev-python/pyxattr-0.5.0-r1
+++ b/metadata/md5-cache/dev-python/pyxattr-0.5.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-apps/attr dev-python/setuptools[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] test? ( dev-python/nose[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] ) dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 )
+DEPEND=sys-apps/attr test? ( dev-python/nose[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-)] ) dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 )
 DESCRIPTION=Python interface to xattr
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/pyxattr/
-IUSE=test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2
+IUSE=test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
-RDEPEND=sys-apps/attr dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 )
-REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 )
+RDEPEND=sys-apps/attr dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 )
+REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyxattr/pyxattr-0.5.0.tar.gz
 _eclasses_=distutils-r1	628c91ff6d8520cc946d8e6b37709935	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	cdb57e63096bf34e3390d45726a76258	python-utils-r1	dcd8a7e28a2e90a45fc1875429811c73	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c67f74b68ba60b1889a46d8cb6ae3646
+_md5_=ec0fba74a5e9bbbe3409bc6bdf387437
diff --git a/metadata/md5-cache/dev-python/pyxattr-0.5.1 b/metadata/md5-cache/dev-python/pyxattr-0.5.1
new file mode 100644
index 000000000000..63161404e7d0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyxattr-0.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-apps/attr dev-python/setuptools[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_pypy2_0?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy2_0(-)] test? ( dev-python/nose[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_pypy2_0?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy2_0(-)] ) dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_pypy2_0?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 )
+DESCRIPTION=Python interface to xattr
+EAPI=5
+HOMEPAGE=http://pyxattr.k1024.org/
+IUSE=test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_pypy2_0
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=sys-apps/attr dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_pypy2_0?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 )
+REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_pypy2_0 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pyxattr/pyxattr-0.5.1.tar.gz
+_eclasses_=distutils-r1	628c91ff6d8520cc946d8e6b37709935	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	cdb57e63096bf34e3390d45726a76258	python-utils-r1	dcd8a7e28a2e90a45fc1875429811c73	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=274b68793de22aa793f5c3d1fb3f5c6d
diff --git a/metadata/md5-cache/dev-python/requests-1.0.3 b/metadata/md5-cache/dev-python/requests-1.0.3
index 0266422c499c..9a4d60f65354 100644
--- a/metadata/md5-cache/dev-python/requests-1.0.3
+++ b/metadata/md5-cache/dev-python/requests-1.0.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-misc/ca-certificates dev-python/charade dev-python/urllib3 dev-python/setuptools test? ( dev-python/nose[python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] ) dev-python/python-exec[python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 )
+DEPEND=app-misc/ca-certificates dev-python/charade[python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] dev-python/urllib3 dev-python/setuptools[python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] test? ( dev-python/nose[python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] ) dev-python/python-exec[python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 )
 DESCRIPTION=HTTP library for human beings
 EAPI=5
 HOMEPAGE=http://python-requests.org/ http://pypi.python.org/pypi/requests
 IUSE=test python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=app-misc/ca-certificates dev-python/charade dev-python/urllib3 dev-python/python-exec[python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 )
+RDEPEND=app-misc/ca-certificates dev-python/charade[python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] dev-python/urllib3 dev-python/python-exec[python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 )
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-1.0.3.tar.gz
 _eclasses_=distutils-r1	628c91ff6d8520cc946d8e6b37709935	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	cdb57e63096bf34e3390d45726a76258	python-utils-r1	dcd8a7e28a2e90a45fc1875429811c73	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6d4fab744bfaeebd8cda0272f20ab05a
+_md5_=bc100a1f0c91a0945251edec307a7c5d
diff --git a/metadata/md5-cache/dev-python/setuptools-0.6.32 b/metadata/md5-cache/dev-python/setuptools-0.6.32
index abead43a63fc..af169b353f8a 100644
--- a/metadata/md5-cache/dev-python/setuptools-0.6.32
+++ b/metadata/md5-cache/dev-python/setuptools-0.6.32
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_python3_3?,python_targets_pypy1_8?,python_targets_pypy1_9?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_8(-),-python_single_target_pypy1_9(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_8? ( dev-python/pypy:1.8 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 )
+DEPEND=dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_python3_3?,python_targets_pypy1_8?,python_targets_pypy1_9?,python_targets_pypy2_0?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_8(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_8? ( dev-python/pypy:1.8 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 )
 DESCRIPTION=Distribute (fork of Setuptools) is a collection of extensions to Distutils
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/distribute
-IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_8 python_targets_pypy1_9
+IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_8 python_targets_pypy1_9 python_targets_pypy2_0
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=PSF-2
-RDEPEND=dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_python3_3?,python_targets_pypy1_8?,python_targets_pypy1_9?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_8(-),-python_single_target_pypy1_9(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_8? ( dev-python/pypy:1.8 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 )
-REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_8 python_targets_pypy1_9 )
+RDEPEND=dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_python3_3?,python_targets_pypy1_8?,python_targets_pypy1_9?,python_targets_pypy2_0?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_8(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_8? ( dev-python/pypy:1.8 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 )
+REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_8 python_targets_pypy1_9 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=mirror://pypi/d/distribute/distribute-0.6.32.tar.gz
 _eclasses_=distutils-r1	628c91ff6d8520cc946d8e6b37709935	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	cdb57e63096bf34e3390d45726a76258	python-utils-r1	dcd8a7e28a2e90a45fc1875429811c73	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b4a0f0ac32e2836b93e3750e0cff619e
+_md5_=7a1178a2b5f438b044b8e42c681b8005
diff --git a/metadata/md5-cache/dev-python/skype4py-1.0.32.1-r1 b/metadata/md5-cache/dev-python/skype4py-1.0.32.1-r1
new file mode 100644
index 000000000000..76eaf5b0e818
--- /dev/null
+++ b/metadata/md5-cache/dev-python/skype4py-1.0.32.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 )
+DESCRIPTION=Python wrapper for the Skype API
+EAPI=5
+HOMEPAGE=https://github.com/awahlig/skype4py http://pypi.python.org/pypi/Skype4Py/
+IUSE=doc python_targets_python2_5 python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=net-im/skype dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 )
+REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/S/Skype4Py/Skype4Py-1.0.32.1.tar.gz
+_eclasses_=distutils-r1	628c91ff6d8520cc946d8e6b37709935	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	cdb57e63096bf34e3390d45726a76258	python-utils-r1	dcd8a7e28a2e90a45fc1875429811c73	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3e86d6836a8bc89606c8138809705254
diff --git a/metadata/md5-cache/dev-python/wsgilog-0.3 b/metadata/md5-cache/dev-python/wsgilog-0.3
new file mode 100644
index 000000000000..2b541ff4e198
--- /dev/null
+++ b/metadata/md5-cache/dev-python/wsgilog-0.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup
+DEPEND==dev-lang/python-2.7*
+DESCRIPTION=Class for logging in WSGI-applications
+EAPI=4
+HOMEPAGE=http://pypi.python.org/pypi/wsgilog/
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND==dev-lang/python-2.7*
+SLOT=0
+SRC_URI=mirror://pypi/w/wsgilog/wsgilog-0.3.tar.gz
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=45b540f96d702d0dbcbda136f4e01021
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.1.5 b/metadata/md5-cache/dev-ruby/ffi-1.1.5
index cda6998161c9..058f9e142238 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.1.5
+++ b/metadata/md5-cache/dev-ruby/ffi-1.1.5
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby extension for programmatically loading dynamic libraries
 EAPI=4
 HOMEPAGE=http://wiki.github.com/ffi/ffi
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 doc test test
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=virtual/libffi ruby_targets_ruby18? ( virtual/ruby-threads[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/ruby-threads[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/ruby-threads[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
 SLOT=0
 SRC_URI=http://github.com/ffi/ffi/tarball/1.1.5 -> ffi-git-1.1.5.tgz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	ruby-fakegem	2785c639b173dd603e95bd60b8d6c4c0	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b7c896cce01006a7b9c747290cf20aa7
+_md5_=6992bc91b55d3b6611645de0b7596bc8
diff --git a/metadata/md5-cache/dev-ruby/flexmock-1.2.0 b/metadata/md5-cache/dev-ruby/flexmock-1.2.0
new file mode 100644
index 000000000000..7bfa220d7c50
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/flexmock-1.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rspec:2[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+DESCRIPTION=Simple mock object library for Ruby unit testing
+EAPI=4
+HOMEPAGE=http://flexmock.rubyforge.org/
+IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ree18 doc test test
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=as-is
+RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ree18 )
+SLOT=0
+SRC_URI=mirror://rubygems/flexmock-1.2.0.gem
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	ruby-fakegem	2785c639b173dd603e95bd60b8d6c4c0	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=87c78392e0662c8a48c6988207185c51
diff --git a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-0.8.0 b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-0.8.0
new file mode 100644
index 000000000000..40fbc0ee2f67
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-0.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/activerecord[ruby_targets_ruby18,sqlite3] dev-ruby/temple[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/activerecord[ruby_targets_ruby19,sqlite3] dev-ruby/temple[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/activerecord[ruby_targets_ree18,sqlite3] dev-ruby/temple[ruby_targets_ree18] ) ) test? ( ruby_targets_ruby18? ( >=dev-ruby/fast_gettext-0.4.8[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/fast_gettext-0.4.8[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/fast_gettext-0.4.8[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rspec:2[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+DESCRIPTION=FastGettext / Rails integration.
+EAPI=4
+HOMEPAGE=https://github.com/grosser/gettext_i18n_rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test test
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/fast_gettext-0.4.8[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/fast_gettext-0.4.8[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/fast_gettext-0.4.8[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
+SLOT=0
+SRC_URI=mirror://rubygems/gettext_i18n_rails-0.8.0.gem
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	ruby-fakegem	2785c639b173dd603e95bd60b8d6c4c0	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=a77d3895cb1e9feacc09ea746747a4a6
diff --git a/metadata/md5-cache/dev-ruby/highline-1.6.13 b/metadata/md5-cache/dev-ruby/highline-1.6.13
index 043a7d7c88ce..1550417c16c8 100644
--- a/metadata/md5-cache/dev-ruby/highline-1.6.13
+++ b/metadata/md5-cache/dev-ruby/highline-1.6.13
@@ -4,11 +4,11 @@ DESCRIPTION=Highline is a high-level command-line IO library for ruby.
 EAPI=4
 HOMEPAGE=http://highline.rubyforge.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ree18 doc test test
-KEYWORDS=~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-2 Ruby )
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ree18 )
 SLOT=0
 SRC_URI=mirror://rubygems/highline-1.6.13.gem
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	ruby-fakegem	2785c639b173dd603e95bd60b8d6c4c0	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=eba7f4318f02f05d621b9bf9a741b4fe
+_md5_=2042fa1bd540c7138cad8418012e1eb9
diff --git a/metadata/md5-cache/dev-ruby/highline-1.6.15 b/metadata/md5-cache/dev-ruby/highline-1.6.15
new file mode 100644
index 000000000000..5cf2c6e61de1
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/highline-1.6.15
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+DESCRIPTION=Highline is a high-level command-line IO library for ruby.
+EAPI=4
+HOMEPAGE=http://highline.rubyforge.org/
+IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ree18 doc test test
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=|| ( GPL-2 Ruby )
+RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ree18 )
+SLOT=0
+SRC_URI=mirror://rubygems/highline-1.6.15.gem
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	ruby-fakegem	2785c639b173dd603e95bd60b8d6c4c0	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=7a15652b015086811db7dd708f35f535
diff --git a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.2.4 b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.2.4
deleted file mode 100644
index 4fb039ddb4e2..000000000000
--- a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby18] >=dev-ruby/minitest-2.0.0[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ree18] >=dev-ruby/minitest-2.0.0[ruby_targets_ree18] ) ruby_targets_jruby? ( >=dev-ruby/hoe-2.8.0[ruby_targets_jruby] >=dev-ruby/minitest-2.0.0[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( doc? ( >=dev-ruby/hoe-2.2.3[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( >=dev-ruby/hoe-2.2.3[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( >=dev-ruby/hoe-2.2.3[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-DESCRIPTION=Hoe plugins providing tasks used by seattle.rb
-EAPI=2
-HOMEPAGE=http://seattlerb.rubyforge.org/hoe-seattlerb
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby doc test
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby18] >=dev-ruby/minitest-2.0.0[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ree18] >=dev-ruby/minitest-2.0.0[ruby_targets_ree18] ) ruby_targets_jruby? ( >=dev-ruby/hoe-2.8.0[ruby_targets_jruby] >=dev-ruby/minitest-2.0.0[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-SLOT=0
-SRC_URI=mirror://rubygems/hoe-seattlerb-1.2.4.gem
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	ruby-fakegem	2785c639b173dd603e95bd60b8d6c4c0	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=fac193fd10c9edae87150572553048f2
diff --git a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.2.9 b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.2.9
new file mode 100644
index 000000000000..afd9a82140a1
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.2.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby18? ( doc? ( >=dev-ruby/hoe-2.12[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( >=dev-ruby/hoe-2.12[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( doc? ( >=dev-ruby/hoe-2.12[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( >=dev-ruby/hoe-2.12[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DESCRIPTION=Hoe plugins providing tasks used by seattle.rb
+EAPI=2
+HOMEPAGE=http://seattlerb.rubyforge.org/hoe-seattlerb
+IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc test
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+SLOT=0
+SRC_URI=mirror://rubygems/hoe-seattlerb-1.2.9.gem
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	ruby-fakegem	2785c639b173dd603e95bd60b8d6c4c0	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=5099ad5027e1031fd5f72b8fc622f711
diff --git a/metadata/md5-cache/dev-ruby/httparty-0.9.0 b/metadata/md5-cache/dev-ruby/httparty-0.9.0
new file mode 100644
index 000000000000..6b49a44698f9
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/httparty-0.9.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( =dev-ruby/multi_json-1*[ruby_targets_ruby18] dev-ruby/multi_xml[ruby_targets_ruby18] ) ruby_targets_ruby19? ( =dev-ruby/multi_json-1*[ruby_targets_ruby19] dev-ruby/multi_xml[ruby_targets_ruby19] ) ruby_targets_ree18? ( =dev-ruby/multi_json-1*[ruby_targets_ree18] dev-ruby/multi_xml[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-ruby/rspec:0[ruby_targets_ruby18] dev-ruby/fakeweb[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/rspec:0[ruby_targets_ruby19] dev-ruby/fakeweb[ruby_targets_ruby19] ) ruby_targets_ree18? ( dev-ruby/rspec:0[ruby_targets_ree18] dev-ruby/fakeweb[ruby_targets_ree18] ) ruby_targets_ruby18? ( test? ( dev-util/cucumber[ruby_targets_ruby18] www-servers/mongrel[ruby_targets_ruby18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+DESCRIPTION=Makes http fun! Also, makes consuming restful web services dead easy.
+EAPI=2
+HOMEPAGE=http://httparty.rubyforge.org/
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( =dev-ruby/multi_json-1*[ruby_targets_ruby18] dev-ruby/multi_xml[ruby_targets_ruby18] ) ruby_targets_ruby19? ( =dev-ruby/multi_json-1*[ruby_targets_ruby19] dev-ruby/multi_xml[ruby_targets_ruby19] ) ruby_targets_ree18? ( =dev-ruby/multi_json-1*[ruby_targets_ree18] dev-ruby/multi_xml[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+SLOT=0
+SRC_URI=mirror://rubygems/httparty-0.9.0.gem
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	ruby-fakegem	2785c639b173dd603e95bd60b8d6c4c0	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=b9b27551e2a97bdfc248679b676c4af3
diff --git a/metadata/md5-cache/dev-ruby/jruby-openssl-0.7.6.1 b/metadata/md5-cache/dev-ruby/jruby-openssl-0.7.6.1
deleted file mode 100644
index 0f1ac4d7f738..000000000000
--- a/metadata/md5-cache/dev-ruby/jruby-openssl-0.7.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-java/jruby-1.5.6 ruby_targets_jruby? ( doc? ( dev-ruby/hoe[ruby_targets_jruby] ) ) ruby_targets_jruby? ( test? ( dev-ruby/hoe[ruby_targets_jruby] dev-ruby/mocha[ruby_targets_jruby] ) ) test? ( ruby_targets_jruby? ( >=dev-ruby/bouncy-castle-java-1.5.0146.1[ruby_targets_jruby] ) ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-DESCRIPTION=A Ruby SSL library that works with JRuby
-EAPI=2
-HOMEPAGE=http://rubyforge.org/projects/jruby-extras
-IUSE=test elibc_FreeBSD ruby_targets_jruby doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT || ( CPL-1.0 GPL-2 LGPL-2.1 )
-RDEPEND=>=dev-java/jruby-1.5.6 ruby_targets_jruby? ( >=dev-ruby/bouncy-castle-java-1.5.0146.1[ruby_targets_jruby] ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-SLOT=0
-SRC_URI=mirror://rubygems/jruby-openssl-0.7.6.1.gem
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	ruby-fakegem	2785c639b173dd603e95bd60b8d6c4c0	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a4ec86a56a356af2291523cffdfa05ac
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.1.0-r1 b/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.1.0-r1
index d469472db3a1..fe00ee6008a0 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.1.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A simple library to assist in enabling tunneled Net::SSH connections
 EAPI=4
 HOMEPAGE=http://net-ssh.rubyforge.org/gateway
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 doc test test
-KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/net-ssh-2.0.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.0.0[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/net-ssh-2.0.0[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
 SLOT=2
 SRC_URI=mirror://rubygems/net-ssh-gateway-1.1.0.gem
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	ruby-fakegem	2785c639b173dd603e95bd60b8d6c4c0	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3fd773a8a6f68272294e8518b69792fe
+_md5_=a65f2372e2d10878837339b7b58a5f10
diff --git a/metadata/md5-cache/dev-ruby/rr-1.0.4 b/metadata/md5-cache/dev-ruby/rr-1.0.4
index 37e24b98609d..cb35f41fc7e3 100644
--- a/metadata/md5-cache/dev-ruby/rr-1.0.4
+++ b/metadata/md5-cache/dev-ruby/rr-1.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=A double framework that features a rich selection of double techniqu
 EAPI=4
 HOMEPAGE=http://pivotallabs.com/
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ree18 test test
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ree18 )
 SLOT=0
 SRC_URI=http://github.com/btakita/rr/tarball/v1.0.4 -> rr-1.0.4.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	ruby-fakegem	2785c639b173dd603e95bd60b8d6c4c0	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b4f0a9b09925c546b1292d21b38277b1
+_md5_=2c051a0b9756cab3f13c2cca375714d2
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-2.3.3 b/metadata/md5-cache/dev-ruby/ruby-gettext-2.3.3
index 6d0505100dc1..a7f3efad76df 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-2.3.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-2.3.3
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby GetText Package is Native Language Support Library and Tools mo
 EAPI=4
 HOMEPAGE=http://www.yotabanana.com/hiki/ruby-gettext.html
 IUSE=doc test test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ree18 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/locale-2.0.5[ruby_targets_jruby] ) ruby_targets_ree18? ( >=dev-ruby/locale-2.0.5[ruby_targets_ree18] ) sys-devel/gettext ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ree18 )
 SLOT=0
 SRC_URI=mirror://rubygems/gettext-2.3.3.gem
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	ruby-fakegem	2785c639b173dd603e95bd60b8d6c4c0	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=8c1dfdcdb94e4bd30ffb400a0733733f
+_md5_=30074219dd8e53303e6fdcbe3ab5fe64
diff --git a/metadata/md5-cache/dev-ruby/session-3.1.0-r1 b/metadata/md5-cache/dev-ruby/session-3.1.0-r1
index 89f42b0a0af2..8eb6cae420be 100644
--- a/metadata/md5-cache/dev-ruby/session-3.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/session-3.1.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A set of classes to drive external programs via pipe
 EAPI=2
 HOMEPAGE=http://codeforpeople.com/lib/ruby/session/
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ree18 test
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
 SLOT=0
 SRC_URI=mirror://rubygems/session-3.1.0.gem
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	ruby-fakegem	2785c639b173dd603e95bd60b8d6c4c0	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b02a49296fb8fd06b774939b873e0473
+_md5_=7acee281fdf8524bbd60d15e333d1b9f
diff --git a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.2 b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.2
index 79864c5a692b..149c9573a87a 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.2
+++ b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=RR adapter for Test::Unit.
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/test-unit/
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ree18 test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/rr-1.0.2[ruby_targets_ruby18] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/rr-1.0.2[ruby_targets_ruby19] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/rr-1.0.2[ruby_targets_jruby] >=dev-ruby/test-unit-2.5.2[ruby_targets_jruby] ) ruby_targets_ree18? ( >=dev-ruby/rr-1.0.2[ruby_targets_ree18] >=dev-ruby/test-unit-2.5.2[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ree18 )
 SLOT=0
 SRC_URI=mirror://rubygems/test-unit-rr-1.0.2.gem
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	ruby-fakegem	2785c639b173dd603e95bd60b8d6c4c0	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=2293f0778cef37c5b490bf686e728d61
+_md5_=c54bcddc27f8169c4a1323884196bf1a
diff --git a/metadata/md5-cache/dev-ruby/yard-0.8.3 b/metadata/md5-cache/dev-ruby/yard-0.8.3
index 47e517063076..2aa821e3b314 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.8.3
+++ b/metadata/md5-cache/dev-ruby/yard-0.8.3
@@ -4,11 +4,11 @@ DESCRIPTION=Documentation generation tool for the Ruby programming language
 EAPI=4
 HOMEPAGE=http://yardoc.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc test test
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/tarball/0.8.3 -> yard-0.8.3-git.tgz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	ruby-fakegem	2785c639b173dd603e95bd60b8d6c4c0	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0c750c89dc24c0cbd10a6648c1721842
+_md5_=846f48048c1381fca60c2022e66f027b
diff --git a/metadata/md5-cache/dev-util/cwdiff-0.2.3 b/metadata/md5-cache/dev-util/cwdiff-0.2.3
new file mode 100644
index 000000000000..ca1847d1af3e
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cwdiff-0.2.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=Colorizes output of (w)diff
+EAPI=4
+HOMEPAGE=http://code.google.com/p/cj-overlay/source/browse/cwdiff?repo=evergreens
+IUSE=a2ps mercurial
+KEYWORDS=~amd64 ~x86 ~x86-macos
+LICENSE=GPL-2
+RDEPEND=sys-apps/sed app-shells/bash app-text/wdiff sys-apps/diffutils a2ps? ( app-text/a2ps ) mercurial? ( dev-vcs/mercurial )
+RESTRICT=primaryuri
+SLOT=0
+SRC_URI=http://cj-overlay.googlecode.com/files/cwdiff-0.2.3.tar.gz
+_md5_=4b99a63b155f7a15d5cc8997c6112673
diff --git a/metadata/md5-cache/dev-util/debootstrap-1.0.44 b/metadata/md5-cache/dev-util/debootstrap-1.0.44
index f3636edb09a3..d48c94b1204c 100644
--- a/metadata/md5-cache/dev-util/debootstrap-1.0.44
+++ b/metadata/md5-cache/dev-util/debootstrap-1.0.44
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=Debian/Ubuntu bootstrap scripts
 EAPI=4
 HOMEPAGE=http://packages.qa.debian.org/d/debootstrap.html
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
 LICENSE=MIT
 RDEPEND=app-arch/dpkg net-misc/wget sys-devel/binutils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.44.tar.gz mirror://gentoo/devices.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=82ac9b03d27d6b223ce66596a03ad4af
+_md5_=027dfca0eef5ce63275e16c0dc409269
diff --git a/metadata/md5-cache/dev-util/kdevelop-4.3.1-r1 b/metadata/md5-cache/dev-util/kdevelop-4.3.1-r1
deleted file mode 100644
index 3e5482cc008d..000000000000
--- a/metadata/md5-cache/dev-util/kdevelop-4.3.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/ksysguard-4.4:4[aqua=] >=kde-base/libkworkspace-4.4:4[aqua=] okteta? ( >=kde-base/okteta-4.4:4[aqua=] ) qthelp? ( >=x11-libs/qt-assistant-4.4:4 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=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 ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4: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-util/kdevplatform-1.3.1
-DESCRIPTION=Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages.
-EAPI=4
-HOMEPAGE=http://www.kdevelop.org/
-IUSE=+cmake +cxx debug okteta qthelp linguas_bs linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_it linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_sv linguas_th linguas_uk linguas_zh_CN linguas_zh_TW test aqua
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-base/ksysguard-4.4:4[aqua=] >=kde-base/libkworkspace-4.4:4[aqua=] okteta? ( >=kde-base/okteta-4.4:4[aqua=] ) qthelp? ( >=x11-libs/qt-assistant-4.4:4 ) >=kde-base/kapptemplate-4.4:4[aqua=] cxx? ( >=sys-devel/gdb-7.0[python] ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) 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_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) 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_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) 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_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_th(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) 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(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4: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-util/kdevplatform-1.3.1
-RESTRICT=test
-SLOT=4
-SRC_URI=mirror://kde/stable/kdevelop/4.3.1/src/kdevelop-4.3.1.tar.bz2
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f3bb0f8e6b2cfc500e86d1e4c45648d4
diff --git a/metadata/md5-cache/dev-util/kdevelop-4.4.0 b/metadata/md5-cache/dev-util/kdevelop-4.4.0
deleted file mode 100644
index dfc76b4cb971..000000000000
--- a/metadata/md5-cache/dev-util/kdevelop-4.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/ksysguard-4.4:4[aqua=] >=kde-base/libkworkspace-4.4:4[aqua=] okteta? ( >=kde-base/okteta-4.4:4[aqua=] ) qthelp? ( x11-libs/qt-assistant:4 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=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 ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4: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-util/kdevplatform-1.4.0
-DESCRIPTION=Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages.
-EAPI=4
-HOMEPAGE=http://www.kdevelop.org/
-IUSE=+cmake +cxx debug okteta qthelp linguas_bs linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_it linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_sv linguas_th linguas_uk linguas_zh_CN linguas_zh_TW test aqua
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-base/ksysguard-4.4:4[aqua=] >=kde-base/libkworkspace-4.4:4[aqua=] okteta? ( >=kde-base/okteta-4.4:4[aqua=] ) qthelp? ( x11-libs/qt-assistant:4 ) >=kde-base/kapptemplate-4.4:4[aqua=] x11-libs/qt-declarative:4[webkit] cxx? ( >=sys-devel/gdb-7.0[python] ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) 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_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) 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_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) 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_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_th(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) 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(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4: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-util/kdevplatform-1.4.0
-RESTRICT=test
-SLOT=4
-SRC_URI=mirror://kde/stable/kdevelop/4.4.0/src/kdevelop-4.4.0.tar.bz2
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=5943eac6be0c3156e4cb03f96e784484
diff --git a/metadata/md5-cache/dev-util/kdevelop-4.4.1 b/metadata/md5-cache/dev-util/kdevelop-4.4.1
index cffb4a20071e..3067005e8989 100644
--- a/metadata/md5-cache/dev-util/kdevelop-4.4.1
+++ b/metadata/md5-cache/dev-util/kdevelop-4.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=Integrated Development Environment for Unix, supporting KDE/Qt, C/C+
 EAPI=4
 HOMEPAGE=http://www.kdevelop.org/
 IUSE=+cmake +cxx debug okteta qthelp linguas_bs linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_it linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_sv linguas_th linguas_uk linguas_zh_CN linguas_zh_TW test aqua
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-base/ksysguard-4.4:4[aqua=] >=kde-base/libkworkspace-4.4:4[aqua=] okteta? ( >=kde-base/okteta-4.4:4[aqua=] ) qthelp? ( x11-libs/qt-assistant:4 ) >=kde-base/kapptemplate-4.4:4[aqua=] x11-libs/qt-declarative:4[webkit] cxx? ( >=sys-devel/gdb-7.0[python] ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) 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_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) 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_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) 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_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_th(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) 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(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4: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-util/kdevplatform-1.4.1
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/kdevelop/4.4.1/src/kdevelop-4.4.1.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a579fe6d689773e367f95f3cf5969492
+_md5_=0697076b8a4c825960e0a23728b1c0ba
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-1.3.1 b/metadata/md5-cache/dev-util/kdevelop-php-1.3.1
deleted file mode 100644
index 736bd98cc4e2..000000000000
--- a/metadata/md5-cache/dev-util/kdevelop-php-1.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-util/kdevelop-pg-qt-1.0.0 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=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 ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4: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-util/kdevplatform-1.3.1
-DESCRIPTION=PHP plugin for KDevelop 4
-EAPI=4
-HOMEPAGE=http://www.kdevelop.org/
-IUSE=debug doc linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_it linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_sv linguas_th linguas_uk linguas_zh_CN linguas_zh_TW test aqua
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=dev-util/kdevelop doc? ( >=dev-util/kdevelop-php-docs-1.3.1:4 ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) 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_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) 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_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) 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_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_th(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) 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(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4: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-util/kdevplatform-1.3.1
-SLOT=4
-SRC_URI=mirror://kde/stable/kdevelop/4.3.1/src/kdevelop-php-1.3.1.tar.bz2
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2e7643f30fa041e47ed013481e0da1df
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-1.4.0 b/metadata/md5-cache/dev-util/kdevelop-php-1.4.0
deleted file mode 100644
index fc11b7b0b741..000000000000
--- a/metadata/md5-cache/dev-util/kdevelop-php-1.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-util/kdevelop-pg-qt-1.0.0 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=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 ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4: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-util/kdevplatform-1.4.0
-DESCRIPTION=PHP plugin for KDevelop 4
-EAPI=4
-HOMEPAGE=http://www.kdevelop.org/
-IUSE=debug doc linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_it linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_sv linguas_th linguas_uk linguas_zh_CN linguas_zh_TW test aqua
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=dev-util/kdevelop doc? ( >=dev-util/kdevelop-php-docs-1.4.0:4 ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) 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_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) 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_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) 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_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_th(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) 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(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4: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-util/kdevplatform-1.4.0
-SLOT=4
-SRC_URI=mirror://kde/stable/kdevelop/4.4.0/src/kdevelop-php-1.4.0.tar.bz2
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3e51b1737e9d83c04b506118052b683c
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-docs-1.3.1 b/metadata/md5-cache/dev-util/kdevelop-php-docs-1.3.1
deleted file mode 100644
index 6f29be77693b..000000000000
--- a/metadata/md5-cache/dev-util/kdevelop-php-docs-1.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4: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-util/kdevplatform-1.3.1
-DESCRIPTION=PHP documentation plugin for KDevelop 4
-EAPI=4
-HOMEPAGE=http://www.kdevelop.org/
-IUSE=debug linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_it linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW aqua
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=!=dev-util/kdevelop-plugins-1.0.0 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) 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_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) 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_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) 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_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) 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(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4: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-util/kdevplatform-1.3.1
-SLOT=4
-SRC_URI=mirror://kde/stable/kdevelop/4.3.1/src/kdevelop-php-docs-1.3.1.tar.bz2
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=634dbb05f995a722fe8fd146ee6897b4
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-docs-1.4.0 b/metadata/md5-cache/dev-util/kdevelop-php-docs-1.4.0
deleted file mode 100644
index ea0b6e14db44..000000000000
--- a/metadata/md5-cache/dev-util/kdevelop-php-docs-1.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4: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-util/kdevplatform-1.4.0
-DESCRIPTION=PHP documentation plugin for KDevelop 4
-EAPI=4
-HOMEPAGE=http://www.kdevelop.org/
-IUSE=debug linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_hu linguas_it linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW aqua
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=!=dev-util/kdevelop-plugins-1.0.0 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) 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_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) 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_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) 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_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_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) 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(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4: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-util/kdevplatform-1.4.0
-SLOT=4
-SRC_URI=mirror://kde/stable/kdevelop/4.4.0/src/kdevelop-php-docs-1.4.0.tar.bz2
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=86ea0c530c605974b356cd706cd2d443
diff --git a/metadata/md5-cache/dev-util/kdevplatform-1.3.1 b/metadata/md5-cache/dev-util/kdevplatform-1.3.1
deleted file mode 100644
index 25d6cf74b9aa..000000000000
--- a/metadata/md5-cache/dev-util/kdevplatform-1.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/boost >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=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 ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7:4[aqua=]
-DESCRIPTION=KDE development support libraries and apps
-EAPI=4
-HOMEPAGE=http://www.kdevelop.org/
-IUSE=cvs debug git reviewboard subversion linguas_bs linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_it linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_sv linguas_th linguas_uk linguas_zh_CN linguas_zh_TW test aqua
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=dev-libs/boost !<dev-util/kdevelop-4.3.1:4 >=kde-base/konsole-4.7:4[aqua=] cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) reviewboard? ( dev-libs/qjson ) subversion? ( dev-vcs/subversion ) >=kde-base/oxygen-icons-4.7:4[aqua=] linguas_bs? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ca@valencia(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fr(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_gl(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_it(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ru(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_th(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7:4[aqua=]
-SLOT=4
-SRC_URI=mirror://kde/stable/kdevelop/4.3.1/src/kdevplatform-1.3.1.tar.bz2
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3ac1b110807e2e372d7a6a719e27df7e
diff --git a/metadata/md5-cache/dev-util/kdevplatform-1.4.0 b/metadata/md5-cache/dev-util/kdevplatform-1.4.0
deleted file mode 100644
index c748240d16ad..000000000000
--- a/metadata/md5-cache/dev-util/kdevplatform-1.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/boost reviewboard? ( dev-libs/qjson ) subversion? ( dev-libs/apr dev-libs/apr-util dev-vcs/subversion ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=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 ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7:4[aqua=]
-DESCRIPTION=KDE development support libraries and apps
-EAPI=4
-HOMEPAGE=http://www.kdevelop.org/
-IUSE=cvs debug reviewboard subversion linguas_bs linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_it linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_sl linguas_sv linguas_th linguas_uk linguas_zh_CN linguas_zh_TW test aqua
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=dev-libs/boost reviewboard? ( dev-libs/qjson ) subversion? ( dev-libs/apr dev-libs/apr-util dev-vcs/subversion ) !<dev-util/kdevelop-4.4.0:4 >=kde-base/konsole-4.7:4[aqua=] cvs? ( dev-vcs/cvs ) >=kde-base/oxygen-icons-4.7:4[aqua=] linguas_bs? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ca@valencia(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fr(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_gl(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_it(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt_BR(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_th(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7:4[aqua=]
-SLOT=4
-SRC_URI=mirror://kde/stable/kdevelop/4.4.0/src/kdevplatform-1.4.0.tar.bz2
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2fff4e0a160131b0e282a916dad2157b
diff --git a/metadata/md5-cache/dev-util/kdevplatform-1.4.1 b/metadata/md5-cache/dev-util/kdevplatform-1.4.1
index 215d0ca9aa88..7c7a923b7372 100644
--- a/metadata/md5-cache/dev-util/kdevplatform-1.4.1
+++ b/metadata/md5-cache/dev-util/kdevplatform-1.4.1
@@ -4,10 +4,10 @@ DESCRIPTION=KDE development support libraries and apps
 EAPI=4
 HOMEPAGE=http://www.kdevelop.org/
 IUSE=cvs debug reviewboard subversion linguas_bs linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_it linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_sl linguas_sv linguas_th linguas_uk linguas_zh_CN linguas_zh_TW test aqua
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-libs/boost reviewboard? ( dev-libs/qjson ) subversion? ( dev-libs/apr dev-libs/apr-util dev-vcs/subversion ) !<dev-util/kdevelop-4.4.1:4 >=kde-base/konsole-4.7:4[aqua=] cvs? ( dev-vcs/cvs ) >=kde-base/oxygen-icons-4.7:4[aqua=] linguas_bs? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ca@valencia(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fr(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_gl(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_it(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt_BR(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_th(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/kdevelop/4.4.1/src/kdevplatform-1.4.1.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8016a399e6cd85dee4644d1b9b4dc506
+_md5_=0e43a86c9de0fd91ed777d1e0a05d729
diff --git a/metadata/md5-cache/dev-util/open-vcdiff-0.8.3 b/metadata/md5-cache/dev-util/open-vcdiff-0.8.3
new file mode 100644
index 000000000000..5dbe468faa53
--- /dev/null
+++ b/metadata/md5-cache/dev-util/open-vcdiff-0.8.3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An encoder/decoder for the VCDIFF (RFC3284) format
+EAPI=5
+HOMEPAGE=http://code.google.com/p/open-vcdiff/
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+SLOT=0/0
+SRC_URI=http://open-vcdiff.googlecode.com/files/open-vcdiff-0.8.3.tar.gz
+_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=9f588adb7c90cb5b7fdb4797ab55f598
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.7.7 b/metadata/md5-cache/dev-vcs/subversion-1.7.7
index b5825de43749..b4ef9bf4ce77 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.7.7
+++ b/metadata/md5-cache/dev-vcs/subversion-1.7.7
@@ -4,10 +4,10 @@ DESCRIPTION=Advanced version control system
 EAPI=3
 HOMEPAGE=http://subversion.apache.org/
 IUSE=apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf apache2 elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Subversion GPL-2
 RDEPEND=>=dev-db/sqlite-3.4 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14 ) ctypes-python? ( =dev-lang/python-2* ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) kde? ( sys-apps/dbus x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 >=kde-base/kdelibs-4:4 ) perl? ( dev-lang/perl ) python? ( =dev-lang/python-2* ) ruby? ( >=dev-lang/ruby-1.8.2:1.8 ) sasl? ( dev-libs/cyrus-sasl ) webdav-neon? ( >=net-libs/neon-0.28 ) webdav-serf? ( >=net-libs/serf-0.3.0 ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) kde? ( kde-base/kwalletd ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.1.9-r1 ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.7.7.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	elisp-common	cdb887d0e278ea6e82ea2a5d4792c52a	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2d9eb3508fa5d6759e39354b74545567	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c363d6fb99cc85f8b04d893f3e3f045c
+_md5_=8e9100321734c185f4e53d6c4cd710e3
diff --git a/metadata/md5-cache/games-fps/quake3-bin-1.32c-r1 b/metadata/md5-cache/games-fps/quake3-bin-1.32c-r1
index 345a6f310544..2de47e8c75d5 100644
--- a/metadata/md5-cache/games-fps/quake3-bin-1.32c-r1
+++ b/metadata/md5-cache/games-fps/quake3-bin-1.32c-r1
@@ -4,11 +4,11 @@ DESCRIPTION=3rd installment of the classic id 3D first-person shooter
 EAPI=2
 HOMEPAGE=http://www.idsoftware.com/
 IUSE=cdinstall dedicated opengl teamarena
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 ~x86
 LICENSE=Q3AEULA GPL-2
 RDEPEND=sys-libs/glibc dedicated? ( app-misc/screen ) amd64? ( app-emulation/emul-linux-x86-baselibs ) opengl? ( virtual/opengl x86? ( x11-libs/libXext x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp ) amd64? ( app-emulation/emul-linux-x86-xlibs || ( >=app-emulation/emul-linux-x86-xlibs-7.0 x11-drivers/nvidia-drivers >=x11-drivers/ati-drivers-8.8.25-r1 ) ) ) cdinstall? ( games-fps/quake3-data[cdinstall] teamarena? ( games-fps/quake3-teamarena ) ) !dedicated? ( !opengl? ( virtual/opengl x86? ( x11-libs/libXext x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp ) amd64? ( app-emulation/emul-linux-x86-xlibs || ( >=app-emulation/emul-linux-x86-xlibs-7.0 x11-drivers/nvidia-drivers >=x11-drivers/ati-drivers-8.8.25-r1 ) ) ) )
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://idsoftware/quake3/linux/linuxq3apoint-1.32b-3.x86.run mirror://idsoftware/quake3/quake3-1.32c.zip
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	games	e0a83e3f3f024b8c8ef7a8217d716cbf	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	unpacker	50e1227854e96469a19a63f053496328	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7c4799b42cd28b35fa33bd8af9eea2a5
+_md5_=338388a3068604b8d298914c342b0607
diff --git a/metadata/md5-cache/games-fps/rtcwmp-demo-1.1 b/metadata/md5-cache/games-fps/rtcwmp-demo-1.1
index 5dc4ca59220d..0dad82457b6d 100644
--- a/metadata/md5-cache/games-fps/rtcwmp-demo-1.1
+++ b/metadata/md5-cache/games-fps/rtcwmp-demo-1.1
@@ -9,4 +9,4 @@ RESTRICT=strip mirror
 SLOT=0
 SRC_URI=mirror://idsoftware/wolf/linux/old/wolfmpdemo-linux-1.1-MP.x86.run mirror://3dgamers/returnwolfenstein/wolfmpdemo-linux-1.1-MP.x86.run
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	games	e0a83e3f3f024b8c8ef7a8217d716cbf	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	unpacker	50e1227854e96469a19a63f053496328	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ebdce42021988c58121f6fc6894e693e
+_md5_=2987fc19cf651fb2b2eda70a35ca6cdf
diff --git a/metadata/md5-cache/games-server/cyphesis-0.6.0 b/metadata/md5-cache/games-server/cyphesis-0.6.0
index 67bc2229fd3d..824b577bdc74 100644
--- a/metadata/md5-cache/games-server/cyphesis-0.6.0
+++ b/metadata/md5-cache/games-server/cyphesis-0.6.0
@@ -3,11 +3,11 @@ DEPEND=>=media-libs/skstream-0.3.9 >=dev-games/wfmath-1.0.1 >=dev-games/mercator
 DESCRIPTION=WorldForge server running small games
 EAPI=5
 HOMEPAGE=http://worldforge.org/dev/eng/servers/cyphesis
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/skstream-0.3.9 >=dev-games/wfmath-1.0.1 >=dev-games/mercator-0.3.1 dev-libs/libgcrypt dev-libs/libsigc++:2 sys-libs/ncurses sys-libs/readline =media-libs/atlas-c++-0.6* >=media-libs/varconf-0.6.4 dev-db/postgresql-base =dev-lang/python-2*
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/worldforge/cyphesis-0.6.0.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	games	e0a83e3f3f024b8c8ef7a8217d716cbf	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4403c7cf6c2955fcadfc23ea4248179b
+_md5_=c510b22a9446199a71f69015273d7a14
diff --git a/metadata/md5-cache/games-strategy/widelands-0.17 b/metadata/md5-cache/games-strategy/widelands-0.17
index 5b0ce85528ee..de3b97672f78 100644
--- a/metadata/md5-cache/games-strategy/widelands-0.17
+++ b/metadata/md5-cache/games-strategy/widelands-0.17
@@ -3,10 +3,10 @@ DEPEND=dev-lang/lua media-libs/libsdl[video] media-libs/sdl-image[jpeg,png] medi
 DESCRIPTION=A game similar to Settlers 2
 EAPI=3
 HOMEPAGE=http://www.widelands.org/
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/lua 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/libpng sys-libs/zlib media-libs/glew media-libs/sdl-ttf >=dev-libs/boost-1.37
 SLOT=0
 SRC_URI=http://launchpad.net/widelands/build17/build-17/+download/widelands-build17-src.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	games	e0a83e3f3f024b8c8ef7a8217d716cbf	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=19bb7538d5acba98ef54a54c47d859b9
+_md5_=919fbb80a04f08b512efe11204cb5fbc
diff --git a/metadata/md5-cache/kde-base/akonadiconsole-4.9.4 b/metadata/md5-cache/kde-base/akonadiconsole-4.9.4
index ed60c1860e59..dbd5bb07c499 100644
--- a/metadata/md5-cache/kde-base/akonadiconsole-4.9.4
+++ b/metadata/md5-cache/kde-base/akonadiconsole-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=Akonadi developer console
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.9.4:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.9.4:4[aqua=] >=kde-base/oxygen-icons-4.9.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kdepim-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	kde4-meta	74063838ddcd8177a6a4b3e19354ee3b	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e97911486249c17a71cd442f88925483
+_md5_=e423e4e71d566645a614ba9b8dd9f323
diff --git a/metadata/md5-cache/kde-base/ark-4.9.4 b/metadata/md5-cache/kde-base/ark-4.9.4
index 06141a42cfde..050f5f37c4ef 100644
--- a/metadata/md5-cache/kde-base/ark-4.9.4
+++ b/metadata/md5-cache/kde-base/ark-4.9.4
@@ -4,11 +4,11 @@ DESCRIPTION=KDE Archiving tool
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=+archive +bzip2 debug lzma +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.9.4:4[aqua=] sys-libs/zlib archive? ( >=app-arch/libarchive-2.6.1[bzip2?,lzma?,zlib] ) >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/ark-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e622f83e0facee397ce57fea34ecc95b
+_md5_=544b8f62dde8f08fed8733d6d14c1f42
diff --git a/metadata/md5-cache/kde-base/bomber-4.9.4 b/metadata/md5-cache/kde-base/bomber-4.9.4
index 8d0ed3558ba2..5d2d8432dddc 100644
--- a/metadata/md5-cache/kde-base/bomber-4.9.4
+++ b/metadata/md5-cache/kde-base/bomber-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE arcade bombing game
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.9.4:4[aqua=] >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=] >=kde-base/libkdegames-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kdegames-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	kde4-meta	74063838ddcd8177a6a4b3e19354ee3b	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4c8b6f1b9e586f3f5539b0330b0ce34c
+_md5_=82cbb47965eb9360e1d39b2443fa926a
diff --git a/metadata/md5-cache/kde-base/bovo-4.9.4 b/metadata/md5-cache/kde-base/bovo-4.9.4
index 090d22dc5363..dd96dc79ca65 100644
--- a/metadata/md5-cache/kde-base/bovo-4.9.4
+++ b/metadata/md5-cache/kde-base/bovo-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=Five-in-a-row Board Game
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.9.4:4[aqua=] >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=] >=kde-base/libkdegames-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kdegames-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	kde4-meta	74063838ddcd8177a6a4b3e19354ee3b	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e5a75ec1eeabae15334fd3b749d901fa
+_md5_=71e618e12068d7a9dbf9d183f9661a61
diff --git a/metadata/md5-cache/kde-base/dragon-4.9.4 b/metadata/md5-cache/kde-base/dragon-4.9.4
index c28d847a0f1e..fb86106b47a9 100644
--- a/metadata/md5-cache/kde-base/dragon-4.9.4
+++ b/metadata/md5-cache/kde-base/dragon-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=Dragon Player is a simple video player for KDE 4
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug xine +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=media-libs/phonon-4.4.3 !kde-base/dragonplayer:4 >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/dragon-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=267dcf8cd33e4acaab19d608ed23fab6
+_md5_=6667fbc1d5f0f034c55c3369a1fadb6a
diff --git a/metadata/md5-cache/kde-base/granatier-4.9.4 b/metadata/md5-cache/kde-base/granatier-4.9.4
index c78661dad397..59698c14961d 100644
--- a/metadata/md5-cache/kde-base/granatier-4.9.4
+++ b/metadata/md5-cache/kde-base/granatier-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Bomberman game
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.9.4:4[aqua=] media-libs/libsndfile media-libs/openal >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=] >=kde-base/libkdegames-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kdegames-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	kde4-meta	74063838ddcd8177a6a4b3e19354ee3b	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6686c9a6da838b5471cfa0295b78f6cd
+_md5_=90510cb22b60f47678699de09eb5cc8e
diff --git a/metadata/md5-cache/kde-base/gwenview-4.9.4 b/metadata/md5-cache/kde-base/gwenview-4.9.4
index 9a72430bc14e..9af82ae1a011 100644
--- a/metadata/md5-cache/kde-base/gwenview-4.9.4
+++ b/metadata/md5-cache/kde-base/gwenview-4.9.4
@@ -4,11 +4,11 @@ DESCRIPTION=KDE image viewer
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug kipi semantic-desktop +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdelibs-4.9.4:4[aqua=,semantic-desktop=] >=kde-base/libkonq-4.9.4:4[aqua=] >=media-gfx/exiv2-0.19 virtual/jpeg kipi? ( >=kde-base/libkipi-4.9.4:4[aqua=] ) >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/gwenview-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0e6250ed832b4b43965ed65d0cfa86ff
+_md5_=17b567abb1b0a5cc997a706c62fa366c
diff --git a/metadata/md5-cache/kde-base/kabcclient-4.9.4 b/metadata/md5-cache/kde-base/kabcclient-4.9.4
index d0842e94a3a7..3c0cea12bb89 100644
--- a/metadata/md5-cache/kde-base/kabcclient-4.9.4
+++ b/metadata/md5-cache/kde-base/kabcclient-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=A command line client for accessing the KDE addressbook
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.9.4:4[aqua=] >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kdepim-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	kde4-meta	74063838ddcd8177a6a4b3e19354ee3b	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d48f8ec07bd1f737b42fa3dd2d08d66a
+_md5_=5e54e7798bbef91833a32a2469595d72
diff --git a/metadata/md5-cache/kde-base/kate-4.9.4 b/metadata/md5-cache/kde-base/kate-4.9.4
index 5f3ef80cd3c4..e95dfc921435 100644
--- a/metadata/md5-cache/kde-base/kate-4.9.4
+++ b/metadata/md5-cache/kde-base/kate-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=Kate is an MDI texteditor.
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +plasma +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=kde-base/katepart-4.9.4:4[aqua=] >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kate-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	kde4-meta	74063838ddcd8177a6a4b3e19354ee3b	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=50a79990481aac09e99fc2bc5b1afb74
+_md5_=32163e758ba519c309d411455883a37f
diff --git a/metadata/md5-cache/kde-base/katomic-4.9.4 b/metadata/md5-cache/kde-base/katomic-4.9.4
index 3d35a8428268..49fdba028fb4 100644
--- a/metadata/md5-cache/kde-base/katomic-4.9.4
+++ b/metadata/md5-cache/kde-base/katomic-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Atomic Entertainment Game
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook selinux aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.9.4:4[aqua=] >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kdegames-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	kde4-meta	74063838ddcd8177a6a4b3e19354ee3b	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=70365c180ec8ff05ff63a189210297c9
+_md5_=c427a37629749383a85104082e546e73
diff --git a/metadata/md5-cache/kde-base/kblackbox-4.9.4 b/metadata/md5-cache/kde-base/kblackbox-4.9.4
index 5df913c886a5..177212af9009 100644
--- a/metadata/md5-cache/kde-base/kblackbox-4.9.4
+++ b/metadata/md5-cache/kde-base/kblackbox-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Blackbox Game
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook selinux aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.9.4:4[aqua=] >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kdegames-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	kde4-meta	74063838ddcd8177a6a4b3e19354ee3b	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=43e1a44b2192d24d6caa12e81bddd77b
+_md5_=06ace28f3bd88a84cd1f91779b0f78a5
diff --git a/metadata/md5-cache/kde-base/kbruch-4.9.4 b/metadata/md5-cache/kde-base/kbruch-4.9.4
index 445e07591244..74148bf89de9 100644
--- a/metadata/md5-cache/kde-base/kbruch-4.9.4
+++ b/metadata/md5-cache/kde-base/kbruch-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Educational: Learn calculating with fractions
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kbruch-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=78e543fcec01272d1dddb9dcd6e3fe33
+_md5_=dcb5c8705076cef833d658db38d77969
diff --git a/metadata/md5-cache/kde-base/kcalc-4.9.4 b/metadata/md5-cache/kde-base/kcalc-4.9.4
index cf136015e6c5..582e851b164f 100644
--- a/metadata/md5-cache/kde-base/kcalc-4.9.4
+++ b/metadata/md5-cache/kde-base/kcalc-4.9.4
@@ -4,11 +4,11 @@ DESCRIPTION=KDE calculator
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug test +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kcalc-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d5062ae7d6d9e3dd0fff8d4f0d6973d4
+_md5_=6478d24da90235dac9fe5f69ec52b227
diff --git a/metadata/md5-cache/kde-base/kcharselect-4.9.4 b/metadata/md5-cache/kde-base/kcharselect-4.9.4
index 0d5988929bfa..35966bda9d08 100644
--- a/metadata/md5-cache/kde-base/kcharselect-4.9.4
+++ b/metadata/md5-cache/kde-base/kcharselect-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE character selection utility
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kcharselect-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=5752def95ea83c0ac7304b4c05c17f89
+_md5_=ad9c1dd2911c8879ae143493c7324855
diff --git a/metadata/md5-cache/kde-base/kfourinline-4.9.4 b/metadata/md5-cache/kde-base/kfourinline-4.9.4
index 2111e9a6a60c..21b2d771e1eb 100644
--- a/metadata/md5-cache/kde-base/kfourinline-4.9.4
+++ b/metadata/md5-cache/kde-base/kfourinline-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE four-in-a-row game.
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.9.4:4[aqua=] >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=] >=kde-base/libkdegames-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kdegames-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	kde4-meta	74063838ddcd8177a6a4b3e19354ee3b	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ca25bb27eb1b5c6c061fcf2f21410d52
+_md5_=8ae6d0a8f41573073d739f00e818f8ea
diff --git a/metadata/md5-cache/kde-base/kgeography-4.9.4 b/metadata/md5-cache/kde-base/kgeography-4.9.4
index 9b6e811222e6..e100f15db4d9 100644
--- a/metadata/md5-cache/kde-base/kgeography-4.9.4
+++ b/metadata/md5-cache/kde-base/kgeography-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: a geography learning tool
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kgeography-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=56d76a1e5cb20ccec24bc9935c58d28b
+_md5_=51781e19e418636bc0a6bbdd62405cc2
diff --git a/metadata/md5-cache/kde-base/kgpg-4.9.4 b/metadata/md5-cache/kde-base/kgpg-4.9.4
index c5a95e1b6762..17f75bf05231 100644
--- a/metadata/md5-cache/kde-base/kgpg-4.9.4
+++ b/metadata/md5-cache/kde-base/kgpg-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE gpg keyring manager
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook selinux aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.9.4:4[aqua=] app-crypt/gnupg >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=] selinux? ( sec-policy/selinux-gpg )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kgpg-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=1bd03cbc37c7a5f36e85b18fb0bbf2a1
+_md5_=e3248753a51d42a874f38a3f6a2cdf7f
diff --git a/metadata/md5-cache/kde-base/khangman-4.9.4 b/metadata/md5-cache/kde-base/khangman-4.9.4
index 66435cf2f357..eaa072d1d0ea 100644
--- a/metadata/md5-cache/kde-base/khangman-4.9.4
+++ b/metadata/md5-cache/kde-base/khangman-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=Classical hangman game for KDE
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdeedu-4.9.4:4[aqua=] >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/khangman-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f5600c69215c5be62276cc1a82383cec
+_md5_=0b0daaf205d8ffdc67e0de96933d7b14
diff --git a/metadata/md5-cache/kde-base/kig-4.9.4 b/metadata/md5-cache/kde-base/kig-4.9.4
index 96c2e0ad8d53..c60728b997b1 100644
--- a/metadata/md5-cache/kde-base/kig-4.9.4
+++ b/metadata/md5-cache/kde-base/kig-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Interactive Geometry tool
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug scripting +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=scripting? ( >=dev-libs/boost-1.48[python] ) >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kig-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d171caa3d14c6e50e371ae4d8b8bbdab
+_md5_=9044ed322e1551993df03e645c5f8fcf
diff --git a/metadata/md5-cache/kde-base/kjumpingcube-4.9.4 b/metadata/md5-cache/kde-base/kjumpingcube-4.9.4
index 163dfda63abd..02be42314f64 100644
--- a/metadata/md5-cache/kde-base/kjumpingcube-4.9.4
+++ b/metadata/md5-cache/kde-base/kjumpingcube-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: Tactical one or two player game
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook selinux aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.9.4:4[aqua=] >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kdegames-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	kde4-meta	74063838ddcd8177a6a4b3e19354ee3b	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=afecae424ab666cc21348d2e66002192
+_md5_=c6e6585bf4b4b4d29da041290f63d11c
diff --git a/metadata/md5-cache/kde-base/kleopatra-4.9.4 b/metadata/md5-cache/kde-base/kleopatra-4.9.4
index 62058239fd82..508e912c66b4 100644
--- a/metadata/md5-cache/kde-base/kleopatra-4.9.4
+++ b/metadata/md5-cache/kde-base/kleopatra-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=Kleopatra - KDE X.509 key manager
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=app-crypt/gpgme-1.3.2 dev-libs/boost dev-libs/libassuan dev-libs/libgpg-error >=kde-base/kdepimlibs-4.9.4:4[aqua=] >=kde-base/kdepim-common-libs-4.9.4:4[aqua=] app-crypt/gnupg >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kdepim-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	kde4-meta	74063838ddcd8177a6a4b3e19354ee3b	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=57e84e764477fb8f164f706aa51856fb
+_md5_=f619b75e42fc3ceba3d5ba0b489e9cf6
diff --git a/metadata/md5-cache/kde-base/klettres-4.9.4 b/metadata/md5-cache/kde-base/klettres-4.9.4
index b8076898beff..859f65a34073 100644
--- a/metadata/md5-cache/kde-base/klettres-4.9.4
+++ b/metadata/md5-cache/kde-base/klettres-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: KLettres helps a very young child or an adult learning
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/knotify-4.9.4:4[aqua=] >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/klettres-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=50c3d69819a004c8214079fcb33ccb93
+_md5_=97724f390d4172b2101450984f6bc537
diff --git a/metadata/md5-cache/kde-base/kmahjongg-4.9.4 b/metadata/md5-cache/kde-base/kmahjongg-4.9.4
index 34185ae9da10..5ddba0e200e7 100644
--- a/metadata/md5-cache/kde-base/kmahjongg-4.9.4
+++ b/metadata/md5-cache/kde-base/kmahjongg-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=Mahjongg for KDE
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook selinux aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.9.4:4[aqua=] >=kde-base/libkmahjongg-4.9.4:4[aqua=] >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kdegames-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	kde4-meta	74063838ddcd8177a6a4b3e19354ee3b	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=61999938b9adcfca8a6e48f8029a731b
+_md5_=ce669e57e2c6dfbd25c2c4cffbaf522a
diff --git a/metadata/md5-cache/kde-base/kmix-4.9.4 b/metadata/md5-cache/kde-base/kmix-4.9.4
index 8972db11278c..5e4665089e27 100644
--- a/metadata/md5-cache/kde-base/kmix-4.9.4
+++ b/metadata/md5-cache/kde-base/kmix-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE mixer gui
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=alsa debug canberra pulseaudio +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.14a ) canberra? ( media-libs/libcanberra ) pulseaudio? ( >=media-sound/pulseaudio-0.9.12 ) >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kmix-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f75c4b1f41b9556109ae199757da2459
+_md5_=eb1b39f00c9aa238defbf5f05296004d
diff --git a/metadata/md5-cache/kde-base/knetwalk-4.9.4 b/metadata/md5-cache/kde-base/knetwalk-4.9.4
index 3bf3e387a4b8..499f12b43461 100644
--- a/metadata/md5-cache/kde-base/knetwalk-4.9.4
+++ b/metadata/md5-cache/kde-base/knetwalk-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: Knetwalk is the kde version of the popular NetWalk game for sys
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.9.4:4[aqua=] >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=] >=kde-base/libkdegames-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kdegames-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	kde4-meta	74063838ddcd8177a6a4b3e19354ee3b	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=620b2fa319bb4f525b3c3f4f841de800
+_md5_=f74950b9073da59f939fc01046e03a8a
diff --git a/metadata/md5-cache/kde-base/kreversi-4.9.4 b/metadata/md5-cache/kde-base/kreversi-4.9.4
index 80915c7cb61d..681ca8a3197d 100644
--- a/metadata/md5-cache/kde-base/kreversi-4.9.4
+++ b/metadata/md5-cache/kde-base/kreversi-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Board Game
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook selinux aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.9.4:4[aqua=] >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kdegames-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	kde4-meta	74063838ddcd8177a6a4b3e19354ee3b	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=eaa6f4b01ce07ebacc38cad3a99752f0
+_md5_=64957f4cb2f0f27f9ac52c4da73043fc
diff --git a/metadata/md5-cache/kde-base/kscd-4.9.4 b/metadata/md5-cache/kde-base/kscd-4.9.4
index 62855fbe8a01..0e97f0ba8e67 100644
--- a/metadata/md5-cache/kde-base/kscd-4.9.4
+++ b/metadata/md5-cache/kde-base/kscd-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE CD player
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkcddb-4.9.4:4[aqua=] >=kde-base/libkcompactdisc-4.9.4:4[aqua=] media-libs/musicbrainz:3 >=kde-base/oxygen-icons-4.9.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kscd-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=cfbbb80fb88575d42e8a80a9d07b7f1f
+_md5_=f2d1f28449fb84e3f20fa731926f4eec
diff --git a/metadata/md5-cache/kde-base/ksnakeduel-4.9.4 b/metadata/md5-cache/kde-base/ksnakeduel-4.9.4
index c787bf297aca..5332bfe1d4b8 100644
--- a/metadata/md5-cache/kde-base/ksnakeduel-4.9.4
+++ b/metadata/md5-cache/kde-base/ksnakeduel-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Tron game
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook selinux aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.9.4:4[aqua=] !kde-base/ktron:4 >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kdegames-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	kde4-meta	74063838ddcd8177a6a4b3e19354ee3b	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e23349c6b1110a952ee2b9109d18c6dd
+_md5_=bbcd8a07a41bf616a2da2dbe4e9528e5
diff --git a/metadata/md5-cache/kde-base/ksnapshot-4.9.4 b/metadata/md5-cache/kde-base/ksnapshot-4.9.4
index 586760a961fc..8c9e12a4ed91 100644
--- a/metadata/md5-cache/kde-base/ksnapshot-4.9.4
+++ b/metadata/md5-cache/kde-base/ksnapshot-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Screenshot Utility
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug kipi +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=kipi? ( >=kde-base/libkipi-4.9.4:4[aqua=] ) >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/ksnapshot-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=35b240a2d2dfa5b37873b1831455a701
+_md5_=080fa44309370febbd8eafa7d6c5d50f
diff --git a/metadata/md5-cache/kde-base/kspaceduel-4.9.4 b/metadata/md5-cache/kde-base/kspaceduel-4.9.4
index 82c0c4eddb3f..706411e0e53e 100644
--- a/metadata/md5-cache/kde-base/kspaceduel-4.9.4
+++ b/metadata/md5-cache/kde-base/kspaceduel-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Space Game
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook selinux aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.9.4:4[aqua=] >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kdegames-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	kde4-meta	74063838ddcd8177a6a4b3e19354ee3b	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a2a1b69934de36acb6603f61350c8fad
+_md5_=210d59b779131d650facf3c294bcb6af
diff --git a/metadata/md5-cache/kde-base/ksquares-4.9.4 b/metadata/md5-cache/kde-base/ksquares-4.9.4
index 3dbb16adf04d..7720f1c9305f 100644
--- a/metadata/md5-cache/kde-base/ksquares-4.9.4
+++ b/metadata/md5-cache/kde-base/ksquares-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KSquares is an implementation of the game squares for KDE4
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.9.4:4[aqua=] >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=] >=kde-base/libkdegames-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kdegames-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	kde4-meta	74063838ddcd8177a6a4b3e19354ee3b	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=172c5279097577e0c96dd85f8d3f2c5e
+_md5_=3e0d9866dc1f84b43d48faa613bfe32b
diff --git a/metadata/md5-cache/kde-base/kteatime-4.9.4 b/metadata/md5-cache/kde-base/kteatime-4.9.4
index b4fd06e56ed0..70f3f9b07f71 100644
--- a/metadata/md5-cache/kde-base/kteatime-4.9.4
+++ b/metadata/md5-cache/kde-base/kteatime-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE utility for making a fine cup of tea
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kdetoys-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	kde4-meta	74063838ddcd8177a6a4b3e19354ee3b	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4095a42343bb928120e6d2e45d38d5ab
+_md5_=4ce8e8575190d8f166fd6cf25edc7aaf
diff --git a/metadata/md5-cache/kde-base/ktimer-4.9.4 b/metadata/md5-cache/kde-base/ktimer-4.9.4
index 283c10721244..41f30fb8c4d2 100644
--- a/metadata/md5-cache/kde-base/ktimer-4.9.4
+++ b/metadata/md5-cache/kde-base/ktimer-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Timer
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/ktimer-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=fb041eefa0f342af20e2d0f112d106cf
+_md5_=79a1b5e0a3d1389f58e3adeef3ad19ea
diff --git a/metadata/md5-cache/kde-base/ktux-4.9.4 b/metadata/md5-cache/kde-base/ktux-4.9.4
index 8e92df38b1e4..9e4fc568daa4 100644
--- a/metadata/md5-cache/kde-base/ktux-4.9.4
+++ b/metadata/md5-cache/kde-base/ktux-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: screensaver featuring the Space-Faring Tux
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kscreensaver-4.9.4:4[aqua=] >=kde-base/libkworkspace-4.9.4:4[aqua=] >=kde-base/oxygen-icons-4.9.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kdetoys-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	kde4-meta	74063838ddcd8177a6a4b3e19354ee3b	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=22dc108c6663aea266edba867f504cb4
+_md5_=a0ee206e8c89d72998d63885cd4ee0f8
diff --git a/metadata/md5-cache/kde-base/kuser-4.9.4 b/metadata/md5-cache/kde-base/kuser-4.9.4
index 41bad338af49..bc8b878a7138 100644
--- a/metadata/md5-cache/kde-base/kuser-4.9.4
+++ b/metadata/md5-cache/kde-base/kuser-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE application that helps you manage system users
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.9.4:4[aqua=] >=kde-base/knotify-4.9.4:4[aqua=] >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kdeadmin-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	kde4-meta	74063838ddcd8177a6a4b3e19354ee3b	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6d58c4a32ec01c12dec7dd04f4594373
+_md5_=19bba46241bb639d7363dabe1a0ea7d7
diff --git a/metadata/md5-cache/kde-base/kwordquiz-4.9.4 b/metadata/md5-cache/kde-base/kwordquiz-4.9.4
index f83ab82a0a19..51292e1ca327 100644
--- a/metadata/md5-cache/kde-base/kwordquiz-4.9.4
+++ b/metadata/md5-cache/kde-base/kwordquiz-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: A powerful flashcard and vocabulary learning program
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdeedu-4.9.4:4[aqua=] >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kwordquiz-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8097455adb2be0c25b60c691db3f6acc
+_md5_=3faaa62b2be3ad56cfdd5a16b6fc6dce
diff --git a/metadata/md5-cache/kde-base/libkdcraw-4.9.4 b/metadata/md5-cache/kde-base/libkdcraw-4.9.4
index 365d737a3196..e1bc8b2ec08e 100644
--- a/metadata/md5-cache/kde-base/libkdcraw-4.9.4
+++ b/metadata/md5-cache/kde-base/libkdcraw-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE digital camera raw image library wrapper
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=media-libs/lcms:0 virtual/jpeg >=kde-base/oxygen-icons-4.9.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/libkdcraw-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=02e39c7cef7a687a9eee3afec3d24168
+_md5_=1556b7ea7945bf4c679c0ab7aef7c5e6
diff --git a/metadata/md5-cache/kde-base/libkdeedu-4.9.4 b/metadata/md5-cache/kde-base/libkdeedu-4.9.4
index 18125d7606cf..d74437223477 100644
--- a/metadata/md5-cache/kde-base/libkdeedu-4.9.4
+++ b/metadata/md5-cache/kde-base/libkdeedu-4.9.4
@@ -4,11 +4,11 @@ DESCRIPTION=Common library for KDE educational apps
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!kde-base/kvtml-data:4 >=kde-base/oxygen-icons-4.9.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/libkdeedu-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=047df013bb0a92af0d9199abcc574dc3
+_md5_=63b00e1c71619c683cff538b624aa72a
diff --git a/metadata/md5-cache/kde-base/libkdegames-4.9.4 b/metadata/md5-cache/kde-base/libkdegames-4.9.4
index 1c8036510bd3..c8df1951d1a0 100644
--- a/metadata/md5-cache/kde-base/libkdegames-4.9.4
+++ b/metadata/md5-cache/kde-base/libkdegames-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=Base library common to many KDE games.
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug openal aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=openal? ( media-libs/libsndfile media-libs/openal ) >=kde-base/oxygen-icons-4.9.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kdegames-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	kde4-meta	74063838ddcd8177a6a4b3e19354ee3b	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=84de8ff1f7a3523a8215fe286e5c6a09
+_md5_=334acbd515eed9b2cb93ecb344f19a9d
diff --git a/metadata/md5-cache/kde-base/libkexiv2-4.9.4 b/metadata/md5-cache/kde-base/libkexiv2-4.9.4
index 43b4e423326f..8365e89cdd9b 100644
--- a/metadata/md5-cache/kde-base/libkexiv2-4.9.4
+++ b/metadata/md5-cache/kde-base/libkexiv2-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Image Plugin Interface: an exiv2 library wrapper
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=media-gfx/exiv2-0.20 media-libs/lcms:0 virtual/jpeg >=kde-base/oxygen-icons-4.9.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/libkexiv2-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e75677e573b410ac65186cac4cbe62cb
+_md5_=1095bba7621b6c77ddbc2e6254496a98
diff --git a/metadata/md5-cache/kde-base/libkipi-4.9.4 b/metadata/md5-cache/kde-base/libkipi-4.9.4
index e020d602e123..7ac5683f8dc0 100644
--- a/metadata/md5-cache/kde-base/libkipi-4.9.4
+++ b/metadata/md5-cache/kde-base/libkipi-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=A library for image plugins accross KDE applications.
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.9.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/libkipi-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=5c7a4aba27019d322fa3a990792bd6d3
+_md5_=0275010be5dbf0a42aef627fb85c555f
diff --git a/metadata/md5-cache/kde-base/libkmahjongg-4.9.4 b/metadata/md5-cache/kde-base/libkmahjongg-4.9.4
index c2e3c626451e..228aff0e8cde 100644
--- a/metadata/md5-cache/kde-base/libkmahjongg-4.9.4
+++ b/metadata/md5-cache/kde-base/libkmahjongg-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=LibKMahjongg for KDE
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.9.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=] >=kde-base/libkdegames-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kdegames-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	kde4-meta	74063838ddcd8177a6a4b3e19354ee3b	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d44bb05800e57e11584bf4fa044fa1c5
+_md5_=eb6013ec573284dcfe9b393887319c98
diff --git a/metadata/md5-cache/kde-base/palapeli-4.9.4 b/metadata/md5-cache/kde-base/palapeli-4.9.4
index 47c5db5cf98b..50c3cddb8072 100644
--- a/metadata/md5-cache/kde-base/palapeli-4.9.4
+++ b/metadata/md5-cache/kde-base/palapeli-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE jigsaw puzzle game
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.9.4:4[aqua=] >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=] >=kde-base/libkdegames-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kdegames-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	kde4-meta	74063838ddcd8177a6a4b3e19354ee3b	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=bc4e26bbbc571f37e33a7734ce727487
+_md5_=940a6a0188f8fb1b08e66321cbb4ba96
diff --git a/metadata/md5-cache/kde-base/parley-4.9.4 b/metadata/md5-cache/kde-base/parley-4.9.4
index 3bf772a7c086..c1cc44ad6393 100644
--- a/metadata/md5-cache/kde-base/parley-4.9.4
+++ b/metadata/md5-cache/kde-base/parley-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Educational: vocabulary trainer
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +plasma +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdeedu-4.9.4:4[aqua=] >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/parley-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=59bfcb2ee76baea04846b5388293188a
+_md5_=e71cd43d82b361c175a3f251a3ecc358
diff --git a/metadata/md5-cache/kde-base/printer-applet-4.9.4 b/metadata/md5-cache/kde-base/printer-applet-4.9.4
index badfb22edbe8..97bbf48ae329 100644
--- a/metadata/md5-cache/kde-base/printer-applet-4.9.4
+++ b/metadata/md5-cache/kde-base/printer-applet-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE printer system tray utility
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=+handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=app-admin/system-config-printer-common-1.2.2 >=kde-base/pykde4-4.9.4:4[aqua=] =dev-lang/python-2* >=kde-base/oxygen-icons-4.9.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.9.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/printer-applet-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3fa6da4f81e747ccf302960db25a3979
+_md5_=69230d336fffbf3dd5042baed9de3585
diff --git a/metadata/md5-cache/kde-base/system-config-printer-kde-4.9.4 b/metadata/md5-cache/kde-base/system-config-printer-kde-4.9.4
index b686cbfc382e..df462b23cf9a 100644
--- a/metadata/md5-cache/kde-base/system-config-printer-kde-4.9.4
+++ b/metadata/md5-cache/kde-base/system-config-printer-kde-4.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=KDE port of Red Hat's Gnome system-config-printer
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=aqua
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=app-admin/system-config-printer-common-1.2.2 >=dev-python/pycups-1.9.49 >=kde-base/pykde4-4.9.4:4[aqua=] net-print/cups[dbus] =dev-lang/python-2* >=kde-base/oxygen-icons-4.9.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.9.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.9.4/src/kdeadmin-4.9.4.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	kde4-meta	74063838ddcd8177a6a4b3e19354ee3b	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8a5d632b24fd56195a57d546a76b7799
+_md5_=817a9367f6b9be23b17291fd238fc9f1
diff --git a/metadata/md5-cache/lxde-base/lxde-meta-0.5.5-r2 b/metadata/md5-cache/lxde-base/lxde-meta-0.5.5-r2
index c9970525c203..7ee8a7b4b93f 100644
--- a/metadata/md5-cache/lxde-base/lxde-meta-0.5.5-r2
+++ b/metadata/md5-cache/lxde-base/lxde-meta-0.5.5-r2
@@ -3,7 +3,7 @@ DESCRIPTION=Meta ebuild for LXDE, the Lightweight X11 Desktop Environment
 EAPI=2
 HOMEPAGE=http://lxde.sf.net/
 KEYWORDS=~alpha amd64 arm ppc x86
-LICENSE=GPL-2
+LICENSE=metapackage
 RDEPEND=>=lxde-base/menu-cache-0.3.3 =lxde-base/lxappearance-0.5* =lxde-base/lxde-icon-theme-0.5* =lxde-base/lxde-common-0.5.5* =lxde-base/lxmenu-data-0.1* =lxde-base/lxinput-0.3* =lxde-base/lxpanel-0.5.10* =lxde-base/lxrandr-0.1* >=lxde-base/lxsession-0.4.6.1 =lxde-base/lxsession-edit-0.2* =lxde-base/lxshortcut-0.1* =lxde-base/lxtask-0.1* =lxde-base/lxterminal-0.1.11* media-gfx/gpicview x11-misc/pcmanfm x11-wm/openbox >=x11-misc/obconf-2.0.3_p20111019
 SLOT=0
-_md5_=1e16fd2eb33106a7147069da799a796a
+_md5_=333844e99105236835fef40a27aba143
diff --git a/metadata/md5-cache/mail-filter/dcc-1.3.140-r1 b/metadata/md5-cache/mail-filter/dcc-1.3.140-r1
index f0a4c45be55a..25634cb1377f 100644
--- a/metadata/md5-cache/mail-filter/dcc-1.3.140-r1
+++ b/metadata/md5-cache/mail-filter/dcc-1.3.140-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Distributed Checksum Clearinghouse
 EAPI=2
 HOMEPAGE=http://www.rhyolite.com/anti-spam/dcc/
 IUSE=cgi ipv6 rrdtool milter
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86
 LICENSE=DCC
 RDEPEND=dev-lang/perl rrdtool? ( net-analyzer/rrdtool ) || ( net-misc/wget www-client/fetch net-misc/curl net-ftp/ftp ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
 SLOT=0
 SRC_URI=http://www.rhyolite.com/anti-spam/dcc/source/old/dcc-1.3.140.tar.Z
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=593522f6e59cb77df71bf331a5b4d528
+_md5_=386448e2357aae9e12e35d8305df8295
diff --git a/metadata/md5-cache/mail-filter/dovecot_deleted_to_trash-0.3 b/metadata/md5-cache/mail-filter/dovecot_deleted_to_trash-0.3
index 3937d218ab9d..f6a93f15c639 100644
--- a/metadata/md5-cache/mail-filter/dovecot_deleted_to_trash-0.3
+++ b/metadata/md5-cache/mail-filter/dovecot_deleted_to_trash-0.3
@@ -4,9 +4,9 @@ DESCRIPTION=Deleted to trash IMAP plugin for Dovecot
 EAPI=4
 HOMEPAGE=http://wiki.dovecot.org/Plugins/deleted-to-trash
 KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=as-is
+LICENSE=ZLIB
 RDEPEND==net-mail/dovecot-2.0*
 SLOT=0
 SRC_URI=http://wiki2.dovecot.org/Plugins/deleted-to-trash?action=AttachFile&do=get&target=deleted-to-trash-plugin_0.3_for_dovecot_2.tar -> dovecot_deleted_to_trash-0.3.tar
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8ee4e435498525a8002dd7bda3ff764b
+_md5_=51fc7d4f46214c2e04e09aa092099287
diff --git a/metadata/md5-cache/media-gfx/gozer-0.7-r2 b/metadata/md5-cache/media-gfx/gozer-0.7-r2
index a94ebe9b96de..af236cb6ba90 100644
--- a/metadata/md5-cache/media-gfx/gozer-0.7-r2
+++ b/metadata/md5-cache/media-gfx/gozer-0.7-r2
@@ -4,9 +4,9 @@ DESCRIPTION=tool for rendering arbitrary text as graphics, using ttfs and styles
 EAPI=2
 HOMEPAGE=http://www.linuxbrit.co.uk/gozer/
 KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
+LICENSE=feh LGPL-2+
 RDEPEND=>=media-libs/giblib-1.2.1 media-libs/imlib2
 SLOT=0
 SRC_URI=http://www.linuxbrit.co.uk/downloads/gozer-0.7.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
-_md5_=5fbad77e09666b66be793602b83bb857
+_md5_=c8932c616b9e38a2556565f69bf5579f
diff --git a/metadata/md5-cache/media-gfx/inkscape-0.48.4 b/metadata/md5-cache/media-gfx/inkscape-0.48.4
index 2fd215124ffe..5bde6ac16621 100644
--- a/metadata/md5-cache/media-gfx/inkscape-0.48.4
+++ b/metadata/md5-cache/media-gfx/inkscape-0.48.4
@@ -4,11 +4,11 @@ DESCRIPTION=A SVG based generic vector-drawing program
 EAPI=5
 HOMEPAGE=http://www.inkscape.org/
 IUSE=dia gnome postscript inkjar lcms nls spell wmf
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~hppa ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=app-text/poppler-0.12.3-r3[cairo,xpdf-headers(+)] dev-cpp/glibmm >=dev-cpp/gtkmm-2.18.0:2.4 >=dev-libs/boehm-gc-6.4 >=dev-libs/glib-2.6.5 >=dev-libs/libsigc++-2.0.12 >=dev-libs/libxml2-2.6.20 >=dev-libs/libxslt-1.0.15 dev-libs/popt dev-python/lxml media-gfx/imagemagick[cxx] media-libs/fontconfig media-libs/freetype:2 >=media-libs/libpng-1.2 app-text/libwpd:0.9 app-text/libwpg:0.2 sci-libs/gsl x11-libs/libX11 >=x11-libs/gtk+-2.10.7:2 >=x11-libs/pango-1.4.0 gnome? ( >=gnome-base/gnome-vfs-2.0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:2 ) dev-python/numpy media-gfx/uniconvertor dia? ( app-office/dia ) postscript? ( app-text/ghostscript-gpl ) wmf? ( media-libs/libwmf ) =dev-lang/python-2* =dev-lang/python-2*[xml]
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/inkscape/inkscape-0.48.4.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	18cda077fa5f661f96aa70c192b4b4a5	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=1bfcf479bc4618c9860bbc55c5660948
+_md5_=6bce5b1b27df351c6c7ed8539fc3598a
diff --git a/metadata/md5-cache/media-libs/edje-1.7.2 b/metadata/md5-cache/media-libs/edje-1.7.2
deleted file mode 100644
index f7155364e752..000000000000
--- a/metadata/md5-cache/media-libs/edje-1.7.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=dev-lang/lua >=dev-libs/eet-1.7.0 >=dev-libs/eina-1.7.0 >=dev-libs/embryo-1.7.0 >=media-libs/evas-1.7.0 >=dev-libs/ecore-1.7.0 doc? ( app-doc/doxygen )
-DESCRIPTION=graphical layout and animation library
-EAPI=1
-HOMEPAGE=http://www.enlightenment.org/pages/edje.html
-IUSE=debug +cache static-libs vim-syntax nls doc
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/lua >=dev-libs/eet-1.7.0 >=dev-libs/eina-1.7.0 >=dev-libs/embryo-1.7.0 >=media-libs/evas-1.7.0 >=dev-libs/ecore-1.7.0 nls? ( sys-devel/gettext )
-SLOT=0
-SRC_URI=http://download.enlightenment.org/releases/edje-1.7.2.tar.bz2
-_eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f577864f7419aa770f035736c67cd695
diff --git a/metadata/md5-cache/media-libs/edje-1.7.3 b/metadata/md5-cache/media-libs/edje-1.7.4
similarity index 87%
rename from metadata/md5-cache/media-libs/edje-1.7.3
rename to metadata/md5-cache/media-libs/edje-1.7.4
index 43f43f19d9c6..0db9bfcc11a7 100644
--- a/metadata/md5-cache/media-libs/edje-1.7.3
+++ b/metadata/md5-cache/media-libs/edje-1.7.4
@@ -5,9 +5,9 @@ EAPI=1
 HOMEPAGE=http://www.enlightenment.org/pages/edje.html
 IUSE=debug +cache static-libs vim-syntax nls doc
 KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
+LICENSE=BSD-2 GPL-2
 RDEPEND=dev-lang/lua >=dev-libs/eet-1.7.0 >=dev-libs/eina-1.7.0 >=dev-libs/embryo-1.7.0 >=media-libs/evas-1.7.0 >=dev-libs/ecore-1.7.0 nls? ( sys-devel/gettext )
 SLOT=0
-SRC_URI=http://download.enlightenment.org/releases/edje-1.7.3.tar.bz2
+SRC_URI=http://download.enlightenment.org/releases/edje-1.7.4.tar.bz2
 _eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3fc88184e6ad4411e671ad4d8e4f069d
+_md5_=2d95dcfe25cc62ebff0f9077c0187814
diff --git a/metadata/md5-cache/media-libs/elementary-1.7.2 b/metadata/md5-cache/media-libs/elementary-1.7.2
deleted file mode 100644
index f2e35306fb1a..000000000000
--- a/metadata/md5-cache/media-libs/elementary-1.7.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-libs/ecore-1.7.0[evas,fbcon?,opengl?,sdl?,X?,xcb?] >=media-libs/evas-1.7.0[fbcon?,opengl?,X?,xcb?] >=media-libs/edje-1.7.0 dbus? ( >=dev-libs/e_dbus-1.7.0 ) xdg? ( >=dev-libs/efreet-1.7.0 ) doc? ( app-doc/doxygen )
-DESCRIPTION=Basic widget set, based on EFL for mobile touch-screen devices.
-EAPI=2
-HOMEPAGE=http://trac.enlightenment.org/e/wiki/Elementary
-IUSE=dbus debug examples fbcon opengl quicklaunch sdl X xcb xdg static-libs nls doc
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/ecore-1.7.0[evas,fbcon?,opengl?,sdl?,X?,xcb?] >=media-libs/evas-1.7.0[fbcon?,opengl?,X?,xcb?] >=media-libs/edje-1.7.0 dbus? ( >=dev-libs/e_dbus-1.7.0 ) xdg? ( >=dev-libs/efreet-1.7.0 ) nls? ( sys-devel/gettext )
-SLOT=0
-SRC_URI=http://download.enlightenment.org/releases/elementary-1.7.2.tar.bz2
-_eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b40be7cdbd1a2868deecf68a5f7ffedc
diff --git a/metadata/md5-cache/media-libs/elementary-1.7.1 b/metadata/md5-cache/media-libs/elementary-1.7.4
similarity index 61%
rename from metadata/md5-cache/media-libs/elementary-1.7.1
rename to metadata/md5-cache/media-libs/elementary-1.7.4
index 0d5b659aa5f3..46b3646c7a5c 100644
--- a/metadata/md5-cache/media-libs/elementary-1.7.1
+++ b/metadata/md5-cache/media-libs/elementary-1.7.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-libs/ecore-1.7.0[evas,fbcon?,opengl?,sdl?,X?,xcb?] >=media-libs/evas-1.7.0[fbcon?,opengl?,X?,xcb?] >=media-libs/edje-1.7.0 dbus? ( >=dev-libs/e_dbus-1.7.0 ) xdg? ( >=dev-libs/efreet-1.7.0 ) doc? ( app-doc/doxygen )
+DEPEND=>=dev-libs/ecore-1.7.0[evas,fbcon?,opengl?,sdl?,X?,xcb?] >=media-libs/evas-1.7.0[fbcon?,opengl?,X?,xcb?] >=media-libs/edje-1.7.0 dbus? ( >=dev-libs/e_dbus-1.7.0 ) emotion? ( >=media-libs/emotion-1.7.0 ) ethumb? ( >=media-libs/ethumb-1.7.0 ) xdg? ( >=dev-libs/efreet-1.7.0 ) doc? ( app-doc/doxygen )
 DESCRIPTION=Basic widget set, based on EFL for mobile touch-screen devices.
 EAPI=2
 HOMEPAGE=http://trac.enlightenment.org/e/wiki/Elementary
-IUSE=dbus debug examples fbcon opengl quicklaunch sdl X xcb xdg static-libs nls doc
+IUSE=dbus debug emotion ethumb examples fbcon opengl quicklaunch sdl X xcb xdg static-libs nls doc
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/ecore-1.7.0[evas,fbcon?,opengl?,sdl?,X?,xcb?] >=media-libs/evas-1.7.0[fbcon?,opengl?,X?,xcb?] >=media-libs/edje-1.7.0 dbus? ( >=dev-libs/e_dbus-1.7.0 ) xdg? ( >=dev-libs/efreet-1.7.0 ) nls? ( sys-devel/gettext )
+RDEPEND=>=dev-libs/ecore-1.7.0[evas,fbcon?,opengl?,sdl?,X?,xcb?] >=media-libs/evas-1.7.0[fbcon?,opengl?,X?,xcb?] >=media-libs/edje-1.7.0 dbus? ( >=dev-libs/e_dbus-1.7.0 ) emotion? ( >=media-libs/emotion-1.7.0 ) ethumb? ( >=media-libs/ethumb-1.7.0 ) xdg? ( >=dev-libs/efreet-1.7.0 ) nls? ( sys-devel/gettext )
 SLOT=0
-SRC_URI=http://download.enlightenment.org/releases/elementary-1.7.1.tar.bz2
+SRC_URI=http://download.enlightenment.org/releases/elementary-1.7.4.tar.bz2
 _eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bc7d91dd536fad120d2386118454753b
+_md5_=27eb84ca7ab810a7922f2bc58c3c3798
diff --git a/metadata/md5-cache/media-libs/emotion-1.7.3 b/metadata/md5-cache/media-libs/emotion-1.7.3
deleted file mode 100644
index 441d44c7e567..000000000000
--- a/metadata/md5-cache/media-libs/emotion-1.7.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=media-libs/evas-1.7.0 >=media-libs/edje-1.7.0 >=dev-libs/ecore-1.7.0 >=dev-libs/eeze-1.7.0 xine? ( >=media-libs/xine-lib-1.1.1 ) !gstreamer? ( !xine? ( >=media-libs/xine-lib-1.1.1 ) ) gstreamer? ( =media-libs/gstreamer-0.10* =media-libs/gst-plugins-good-0.10* =media-plugins/gst-plugins-ffmpeg-0.10* ) doc? ( app-doc/doxygen )
-DESCRIPTION=video libraries for e17
-HOMEPAGE=http://www.enlightenment.org/
-IUSE=gstreamer static-libs xine nls doc
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=media-libs/evas-1.7.0 >=media-libs/edje-1.7.0 >=dev-libs/ecore-1.7.0 >=dev-libs/eeze-1.7.0 xine? ( >=media-libs/xine-lib-1.1.1 ) !gstreamer? ( !xine? ( >=media-libs/xine-lib-1.1.1 ) ) gstreamer? ( =media-libs/gstreamer-0.10* =media-libs/gst-plugins-good-0.10* =media-plugins/gst-plugins-ffmpeg-0.10* ) nls? ( sys-devel/gettext )
-SLOT=0
-SRC_URI=http://download.enlightenment.org/releases/emotion-1.7.3.tar.bz2
-_eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b7ac559eca61b3f690f7cec8760ea194
diff --git a/metadata/md5-cache/media-libs/emotion-1.7.1 b/metadata/md5-cache/media-libs/emotion-1.7.4
similarity index 90%
rename from metadata/md5-cache/media-libs/emotion-1.7.1
rename to metadata/md5-cache/media-libs/emotion-1.7.4
index 51a193ce3692..badd98caa09a 100644
--- a/metadata/md5-cache/media-libs/emotion-1.7.1
+++ b/metadata/md5-cache/media-libs/emotion-1.7.4
@@ -4,9 +4,9 @@ DESCRIPTION=video libraries for e17
 HOMEPAGE=http://www.enlightenment.org/
 IUSE=gstreamer static-libs xine nls doc
 KEYWORDS=~amd64 ~x86
-LICENSE=BSD
+LICENSE=BSD-2
 RDEPEND=>=media-libs/evas-1.7.0 >=media-libs/edje-1.7.0 >=dev-libs/ecore-1.7.0 >=dev-libs/eeze-1.7.0 xine? ( >=media-libs/xine-lib-1.1.1 ) !gstreamer? ( !xine? ( >=media-libs/xine-lib-1.1.1 ) ) gstreamer? ( =media-libs/gstreamer-0.10* =media-libs/gst-plugins-good-0.10* =media-plugins/gst-plugins-ffmpeg-0.10* ) nls? ( sys-devel/gettext )
 SLOT=0
-SRC_URI=http://download.enlightenment.org/releases/emotion-1.7.1.tar.bz2
+SRC_URI=http://download.enlightenment.org/releases/emotion-1.7.4.tar.bz2
 _eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7fb70508e2d5a253ef2e37c0bbd2d73b
+_md5_=9b74985e39c93c781f3146b925105a06
diff --git a/metadata/md5-cache/media-libs/ethumb-1.7.4 b/metadata/md5-cache/media-libs/ethumb-1.7.4
new file mode 100644
index 000000000000..2a60708abcd5
--- /dev/null
+++ b/metadata/md5-cache/media-libs/ethumb-1.7.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=>=dev-libs/eina-1.7 >=dev-libs/ecore-1.7 >=media-libs/edje-1.7 >=media-libs/evas-1.7 media-libs/libexif dbus? ( >=dev-libs/e_dbus-1.7 ) emotion? ( >=media-libs/emotion-1.7 ) doc? ( app-doc/doxygen )
+DESCRIPTION=Enlightenment thumbnailing library (meant to replace epsilon)
+EAPI=2
+HOMEPAGE=http://trac.enlightenment.org/e/wiki/Ethumb
+IUSE=+dbus emotion static-libs nls doc
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/eina-1.7 >=dev-libs/ecore-1.7 >=media-libs/edje-1.7 >=media-libs/evas-1.7 media-libs/libexif dbus? ( >=dev-libs/e_dbus-1.7 ) emotion? ( >=media-libs/emotion-1.7 ) nls? ( sys-devel/gettext )
+SLOT=0
+SRC_URI=http://download.enlightenment.org/releases/ethumb-1.7.4.tar.bz2
+_eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f168a145ab1e1401705ac01b56ab6e1a
diff --git a/metadata/md5-cache/media-libs/evas-1.7.3 b/metadata/md5-cache/media-libs/evas-1.7.3
deleted file mode 100644
index 0464848273fd..000000000000
--- a/metadata/md5-cache/media-libs/evas-1.7.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=>=dev-libs/eina-1.7.0 >=media-libs/freetype-2.3.9 fontconfig? ( media-libs/fontconfig ) gles? ( media-libs/mesa[gallium,gles2] ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( media-libs/libpng ) bidi? ( >=dev-libs/fribidi-0.19.1 ) directfb? ( >=dev-libs/DirectFB-0.9.16 ) tiff? ( media-libs/tiff ) xpm? ( x11-libs/libXpm ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender opengl? ( virtual/opengl ) ) !X? ( xcb? ( x11-libs/xcb-util ) ) eet? ( >=dev-libs/eet-1.7.0 ) doc? ( app-doc/doxygen )
-DESCRIPTION=hardware-accelerated retained canvas API
-EAPI=2
-HOMEPAGE=http://trac.enlightenment.org/e/wiki/Evas
-IUSE=altivec bidi +bmp directfb +eet fbcon +fontconfig gles gif +ico +jpeg mmx opengl +png +ppm +psd sse sse3 static-libs tga +threads tiff X xcb xpm nls doc
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/eina-1.7.0 >=media-libs/freetype-2.3.9 fontconfig? ( media-libs/fontconfig ) gles? ( media-libs/mesa[gallium,gles2] ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( media-libs/libpng ) bidi? ( >=dev-libs/fribidi-0.19.1 ) directfb? ( >=dev-libs/DirectFB-0.9.16 ) tiff? ( media-libs/tiff ) xpm? ( x11-libs/libXpm ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender opengl? ( virtual/opengl ) ) !X? ( xcb? ( x11-libs/xcb-util ) ) eet? ( >=dev-libs/eet-1.7.0 ) nls? ( sys-devel/gettext )
-SLOT=0
-SRC_URI=http://download.enlightenment.org/releases/evas-1.7.3.tar.bz2
-_eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d3eb6facb914e0b6d4deed617d1aebad
diff --git a/metadata/md5-cache/media-libs/evas-1.7.2 b/metadata/md5-cache/media-libs/evas-1.7.4
similarity index 93%
rename from metadata/md5-cache/media-libs/evas-1.7.2
rename to metadata/md5-cache/media-libs/evas-1.7.4
index eceaa58c0f52..cc9009dad465 100644
--- a/metadata/md5-cache/media-libs/evas-1.7.2
+++ b/metadata/md5-cache/media-libs/evas-1.7.4
@@ -5,9 +5,9 @@ EAPI=2
 HOMEPAGE=http://trac.enlightenment.org/e/wiki/Evas
 IUSE=altivec bidi +bmp directfb +eet fbcon +fontconfig gles gif +ico +jpeg mmx opengl +png +ppm +psd sse sse3 static-libs tga +threads tiff X xcb xpm nls doc
 KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
+LICENSE=BSD-2
 RDEPEND=>=dev-libs/eina-1.7.0 >=media-libs/freetype-2.3.9 fontconfig? ( media-libs/fontconfig ) gles? ( media-libs/mesa[gallium,gles2] ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( media-libs/libpng ) bidi? ( >=dev-libs/fribidi-0.19.1 ) directfb? ( >=dev-libs/DirectFB-0.9.16 ) tiff? ( media-libs/tiff ) xpm? ( x11-libs/libXpm ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender opengl? ( virtual/opengl ) ) !X? ( xcb? ( x11-libs/xcb-util ) ) eet? ( >=dev-libs/eet-1.7.0 ) nls? ( sys-devel/gettext )
 SLOT=0
-SRC_URI=http://download.enlightenment.org/releases/evas-1.7.2.tar.bz2
+SRC_URI=http://download.enlightenment.org/releases/evas-1.7.4.tar.bz2
 _eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=039f1e297556453996d94026dcd11e6c
+_md5_=e85327fbb24a1602784d909e821d9dc9
diff --git a/metadata/md5-cache/media-libs/libmediainfo-0.7.58 b/metadata/md5-cache/media-libs/libmediainfo-0.7.58
deleted file mode 100644
index c41aadb3ffb5..000000000000
--- a/metadata/md5-cache/media-libs/libmediainfo-0.7.58
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/zlib dev-libs/tinyxml2 >=media-libs/libzen-0.4.27[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=MediaInfo libraries
-EAPI=4
-HOMEPAGE=http://mediainfo.sourceforge.net/
-IUSE=curl doc mms static-libs
-KEYWORDS=amd64 x86
-LICENSE=LGPL-3
-RDEPEND=sys-libs/zlib dev-libs/tinyxml2 >=media-libs/libzen-0.4.27[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
-SLOT=0
-SRC_URI=mirror://sourceforge/mediainfo/source/libmediainfo/0.7.58/libmediainfo_0.7.58.tar.bz2
-_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d09f191ad40a2e08af34001d270d9fa7
diff --git a/metadata/md5-cache/media-libs/libmediainfo-0.7.59 b/metadata/md5-cache/media-libs/libmediainfo-0.7.59
deleted file mode 100644
index 4bc82d4e2fe8..000000000000
--- a/metadata/md5-cache/media-libs/libmediainfo-0.7.59
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/zlib dev-libs/tinyxml2 >=media-libs/libzen-0.4.28[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=MediaInfo libraries
-EAPI=4
-HOMEPAGE=http://mediainfo.sourceforge.net/
-IUSE=curl doc mms static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=sys-libs/zlib dev-libs/tinyxml2 >=media-libs/libzen-0.4.28[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
-SLOT=0
-SRC_URI=mirror://sourceforge/mediainfo/source/libmediainfo/0.7.59/libmediainfo_0.7.59.tar.bz2
-_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5b576b0b81973f97f879ce5f1604dd51
diff --git a/metadata/md5-cache/media-libs/libmediainfo-0.7.60 b/metadata/md5-cache/media-libs/libmediainfo-0.7.60
deleted file mode 100644
index f0470daafbda..000000000000
--- a/metadata/md5-cache/media-libs/libmediainfo-0.7.60
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/zlib dev-libs/tinyxml2 >=media-libs/libzen-0.4.28[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=MediaInfo libraries
-EAPI=4
-HOMEPAGE=http://mediainfo.sourceforge.net/
-IUSE=curl doc mms static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=sys-libs/zlib dev-libs/tinyxml2 >=media-libs/libzen-0.4.28[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
-SLOT=0
-SRC_URI=mirror://sourceforge/mediainfo/source/libmediainfo/0.7.60/libmediainfo_0.7.60.tar.bz2
-_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d109539b7fb00285aed38e27ee3c6086
diff --git a/metadata/md5-cache/media-libs/libquvi-0.4.1 b/metadata/md5-cache/media-libs/libquvi-0.4.1
index 702884df3948..d1d83130bd9b 100644
--- a/metadata/md5-cache/media-libs/libquvi-0.4.1
+++ b/metadata/md5-cache/media-libs/libquvi-0.4.1
@@ -4,10 +4,10 @@ DESCRIPTION=Library for parsing video download links
 EAPI=4
 HOMEPAGE=http://quvi.sourceforge.net/
 IUSE=examples static-libs
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~hppa ppc ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=>=net-misc/curl-7.18.2 !<media-libs/quvi-0.4.0 >=media-libs/libquvi-scripts-0.4.0 >=dev-lang/lua-5.1[deprecated]
 SLOT=0
 SRC_URI=mirror://sourceforge/quvi/0.4/libquvi-0.4.1.tar.xz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=683373e001c7999f78b10a9634d0e58a
+_md5_=763d37ef5e80b4327f9a2df589764879
diff --git a/metadata/md5-cache/media-libs/libquvi-scripts-0.4.9 b/metadata/md5-cache/media-libs/libquvi-scripts-0.4.9
index 14076342ecc2..84f925e540d1 100644
--- a/metadata/md5-cache/media-libs/libquvi-scripts-0.4.9
+++ b/metadata/md5-cache/media-libs/libquvi-scripts-0.4.9
@@ -4,9 +4,9 @@ DESCRIPTION=Embedded lua scripts for libquvi
 EAPI=4
 HOMEPAGE=http://quvi.sourceforge.net/
 IUSE=offensive
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~hppa ppc ~ppc64 x86
 LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/quvi/0.4/libquvi-scripts-0.4.9.tar.xz
-_md5_=c3d0c60866d176cb42230f8b281fb5f0
+_md5_=09d05369fb140baa542ac35835cd188e
diff --git a/metadata/md5-cache/media-libs/libzen-0.4.27 b/metadata/md5-cache/media-libs/libzen-0.4.27
deleted file mode 100644
index 40b48ec727d5..000000000000
--- a/metadata/md5-cache/media-libs/libzen-0.4.27
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Shared library for libmediainfo and mediainfo
-EAPI=4
-HOMEPAGE=http://sourceforge.net/projects/zenlib
-IUSE=doc static-libs
-KEYWORDS=amd64 x86
-LICENSE=ZLIB
-SLOT=0
-SRC_URI=mirror://sourceforge/zenlib/ZenLib%20-%20Sources/0.4.27/libzen_0.4.27.tar.bz2
-_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8df6df01ef62b1d3266a0ac4d0576541
diff --git a/metadata/md5-cache/media-libs/opencv-2.4.3 b/metadata/md5-cache/media-libs/opencv-2.4.3
index d0565ed9770a..77424d1093f9 100644
--- a/metadata/md5-cache/media-libs/opencv-2.4.3
+++ b/metadata/md5-cache/media-libs/opencv-2.4.3
@@ -4,10 +4,10 @@ DESCRIPTION=A collection of algorithms and sample code for various computer visi
 EAPI=4
 HOMEPAGE=http://opencv.willowgarage.com
 IUSE=cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k opencl openexr opengl pch png qt4 testprograms threads tiff v4l xine
-KEYWORDS=~amd64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=app-arch/bzip2 dev-python/numpy sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2 ) eigen? ( dev-cpp/eigen:2 ) ffmpeg? ( virtual/ffmpeg ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) ipp? ( sci-libs/ipp ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/glu ) png? ( media-libs/libpng ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-test:4 opengl? ( x11-libs/qt-opengl:4 ) ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) v4l? ( >=media-libs/libv4l-0.8.3 ) xine? ( media-libs/xine-lib ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=mirror://sourceforge/opencvlibrary/OpenCV-2.4.3.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=80d440e30e2557d1b0488544685c9cdc
+_md5_=9a9a582d5dac506172e78dda384944b4
diff --git a/metadata/md5-cache/media-libs/quvi-0.4.2 b/metadata/md5-cache/media-libs/quvi-0.4.2
index 71aab4a08b94..a7fa350f0c57 100644
--- a/metadata/md5-cache/media-libs/quvi-0.4.2
+++ b/metadata/md5-cache/media-libs/quvi-0.4.2
@@ -3,9 +3,9 @@ DEPEND=>=net-misc/curl-7.18.2 >=media-libs/libquvi-0.4.0 app-arch/xz-utils virtu
 DESCRIPTION=A command line tool for parsing video download links
 EAPI=4
 HOMEPAGE=http://quvi.sourceforge.net/
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=net-misc/curl-7.18.2 >=media-libs/libquvi-0.4.0
 SLOT=0
 SRC_URI=mirror://sourceforge/quvi/0.4/quvi-0.4.2.tar.xz
-_md5_=3312fc278ba7f77e82b16b2eb87cd618
+_md5_=cac9e8ef737603dbcf181a03f3b93ea5
diff --git a/metadata/md5-cache/media-libs/skstream-0.3.9 b/metadata/md5-cache/media-libs/skstream-0.3.9
index c47d0a9b50ce..b665063bd7d7 100644
--- a/metadata/md5-cache/media-libs/skstream-0.3.9
+++ b/metadata/md5-cache/media-libs/skstream-0.3.9
@@ -4,9 +4,9 @@ DESCRIPTION=FreeSockets - Portable C++ classes for IP (sockets) applications
 EAPI=2
 HOMEPAGE=http://www.worldforge.org/
 IUSE=test
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/worldforge/skstream-0.3.9.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=55b170c58fe288fd2b47e7d28e484a9a
+_md5_=ddebd1c4fd78acdf05e09509a1551828
diff --git a/metadata/md5-cache/media-plugins/evas_generic_loaders-1.7.1 b/metadata/md5-cache/media-plugins/evas_generic_loaders-1.7.4
similarity index 94%
rename from metadata/md5-cache/media-plugins/evas_generic_loaders-1.7.1
rename to metadata/md5-cache/media-plugins/evas_generic_loaders-1.7.4
index 77203117159c..9b18ac0ce02c 100644
--- a/metadata/md5-cache/media-plugins/evas_generic_loaders-1.7.1
+++ b/metadata/md5-cache/media-plugins/evas_generic_loaders-1.7.4
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=media-libs/evas-1.7.0 gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) pdf? ( app-text/poppler ) postscript? ( app-text/libspectre ) raw? ( media-libs/libraw ) svg? ( gnome-base/librsvg x11-libs/cairo ) nls? ( sys-devel/gettext )
 SLOT=0
-SRC_URI=http://download.enlightenment.org/releases/evas_generic_loaders-1.7.1.tar.bz2
+SRC_URI=http://download.enlightenment.org/releases/evas_generic_loaders-1.7.4.tar.bz2
 _eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5168063ae45b15d35da409125c8f345e
+_md5_=7eab7e5979811825143c24ede6d4abff
diff --git a/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5 b/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5
new file mode 100644
index 000000000000..43087df94b65
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
+DEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DESCRIPTION=VDR Plugin: show duplicated records
+EAPI=5
+HOMEPAGE=http://www.tolleri.net/vdr/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
+SLOT=0
+SRC_URI=http://www.tolleri.net/vdr/plugins/vdr-duplicates-0.0.5.tgz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	b2eb2ff2d0cba816c8968a8d51ba322d
+_md5_=d4ce05b8054feb0ea563a2b6f2d6db76
diff --git a/metadata/md5-cache/media-sound/pnmixer-0.6_pre20111213 b/metadata/md5-cache/media-sound/pnmixer-0.6_pre20111213
index 04afab31d600..a8e925a8fd73 100644
--- a/metadata/md5-cache/media-sound/pnmixer-0.6_pre20111213
+++ b/metadata/md5-cache/media-sound/pnmixer-0.6_pre20111213
@@ -4,10 +4,10 @@ DESCRIPTION=Alsa volume mixer for the system tray
 EAPI=5
 HOMEPAGE=https://github.com/nicklan/pnmixer
 IUSE=libnotify
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-3
 RDEPEND=media-libs/alsa-lib x11-libs/gtk+:2 x11-libs/libX11 libnotify? ( x11-libs/libnotify )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~hasufell/distfiles/pnmixer-0.6_pre20111213.tar.xz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e00ac426329a9b8dec970ae77b18513c
+_md5_=82fc59b6859f0f67a0dd2a5f5f005e0f
diff --git a/metadata/md5-cache/media-sound/pulseaudio-3.0 b/metadata/md5-cache/media-sound/pulseaudio-3.0
index f24911e77a4e..1a3c479eddf9 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-3.0
+++ b/metadata/md5-cache/media-sound/pulseaudio-3.0
@@ -3,7 +3,7 @@ DEPEND=>=media-libs/libsndfile-1.0.20 X? ( >=x11-libs/libX11-1.4.0 >=x11-libs/li
 DESCRIPTION=A networked sound server with an advanced plugin system
 EAPI=4
 HOMEPAGE=http://www.pulseaudio.org/
-IUSE=+alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib gtk test doc +udev ipv6 system-wide realtime +orc ssl +gdbm +webrtc-aec xen systemd
+IUSE=+alsa avahi +caps equalizer jack lirc neon oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib gtk test doc +udev ipv6 system-wide realtime +orc ssl +gdbm +webrtc-aec xen systemd
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
 PDEPEND=alsa? ( media-plugins/alsa-plugins[pulseaudio] )
@@ -12,4 +12,4 @@ REQUIRED_USE=bluetooth? ( dbus )
 SLOT=0
 SRC_URI=http://freedesktop.org/software/pulseaudio/releases/pulseaudio-3.0.tar.xz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	udev	4f764d2b1e34e4ef12b9b0d6e680c0ee	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=86cae5c1dbf5a0203eef263ce1271524
+_md5_=1aefd82be8dd16992b4977e8caab1776
diff --git a/metadata/md5-cache/media-sound/qmmp-0.6.3 b/metadata/md5-cache/media-sound/qmmp-0.6.3
deleted file mode 100644
index d9c73b8868a1..000000000000
--- a/metadata/md5-cache/media-sound/qmmp-0.6.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=x11-libs/qt-qt3support:4 media-libs/taglib alsa? ( media-libs/alsa-lib ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio ) dbus? ( sys-apps/dbus ) aac? ( media-libs/faad2 ) enca? ( app-i18n/enca ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) ladspa? ( media-libs/ladspa-cmt ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) mplayer? ( || ( media-video/mplayer media-video/mplayer2 ) ) musepack? ( >=media-sound/musepack-tools-444 ) modplug? ( >=media-libs/libmodplug-0.8.4 ) vorbis? ( media-libs/libvorbis media-libs/libogg ) jack? ( media-sound/jack-audio-connection-kit media-libs/libsamplerate ) ffmpeg? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm x11-libs/qt-opengl:4 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) wavpack? ( media-sound/wavpack ) scrobbler? ( net-misc/curl ) sndfile? ( media-libs/libsndfile ) udev? ( sys-fs/udisks:0 ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Qt4-based audio player with winamp/xmms skins support
-EAPI=2
-HOMEPAGE=http://qmmp.ylsoftware.com/index_en.php
-IUSE=aac +alsa +dbus bs2b cdda cover crossfade enca ffmpeg flac jack game kde ladspa libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier oss projectm pulseaudio scrobbler sndfile stereo tray udev +vorbis wavpack
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/qt-qt3support:4 media-libs/taglib alsa? ( media-libs/alsa-lib ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio ) dbus? ( sys-apps/dbus ) aac? ( media-libs/faad2 ) enca? ( app-i18n/enca ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) ladspa? ( media-libs/ladspa-cmt ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) mplayer? ( || ( media-video/mplayer media-video/mplayer2 ) ) musepack? ( >=media-sound/musepack-tools-444 ) modplug? ( >=media-libs/libmodplug-0.8.4 ) vorbis? ( media-libs/libvorbis media-libs/libogg ) jack? ( media-sound/jack-audio-connection-kit media-libs/libsamplerate ) ffmpeg? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm x11-libs/qt-opengl:4 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) wavpack? ( media-sound/wavpack ) scrobbler? ( net-misc/curl ) sndfile? ( media-libs/libsndfile ) udev? ( sys-fs/udisks:0 )
-SLOT=0
-SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-0.6.3.tar.bz2
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fa826401349ee4993c73c32d891bd3ae
diff --git a/metadata/md5-cache/media-sound/qmmp-0.6.4 b/metadata/md5-cache/media-sound/qmmp-0.6.4
deleted file mode 100644
index 3fdfa63cc78f..000000000000
--- a/metadata/md5-cache/media-sound/qmmp-0.6.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=x11-libs/qt-qt3support:4 media-libs/taglib alsa? ( media-libs/alsa-lib ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio ) dbus? ( sys-apps/dbus ) aac? ( media-libs/faad2 ) enca? ( app-i18n/enca ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) ladspa? ( media-libs/ladspa-cmt ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) mplayer? ( || ( media-video/mplayer media-video/mplayer2 ) ) musepack? ( >=media-sound/musepack-tools-444 ) modplug? ( >=media-libs/libmodplug-0.8.4 ) vorbis? ( media-libs/libvorbis media-libs/libogg ) jack? ( media-sound/jack-audio-connection-kit media-libs/libsamplerate ) ffmpeg? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm x11-libs/qt-opengl:4 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) wavpack? ( media-sound/wavpack ) scrobbler? ( net-misc/curl ) sndfile? ( media-libs/libsndfile ) udev? ( sys-fs/udisks:0 ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Qt4-based audio player with winamp/xmms skins support
-EAPI=2
-HOMEPAGE=http://qmmp.ylsoftware.com/index_en.php
-IUSE=aac +alsa +dbus bs2b cdda cover crossfade enca ffmpeg flac jack game kde ladspa libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier oss projectm pulseaudio scrobbler sndfile stereo tray udev +vorbis wavpack
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/qt-qt3support:4 media-libs/taglib alsa? ( media-libs/alsa-lib ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio ) dbus? ( sys-apps/dbus ) aac? ( media-libs/faad2 ) enca? ( app-i18n/enca ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) ladspa? ( media-libs/ladspa-cmt ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) mplayer? ( || ( media-video/mplayer media-video/mplayer2 ) ) musepack? ( >=media-sound/musepack-tools-444 ) modplug? ( >=media-libs/libmodplug-0.8.4 ) vorbis? ( media-libs/libvorbis media-libs/libogg ) jack? ( media-sound/jack-audio-connection-kit media-libs/libsamplerate ) ffmpeg? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm x11-libs/qt-opengl:4 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) wavpack? ( media-sound/wavpack ) scrobbler? ( net-misc/curl ) sndfile? ( media-libs/libsndfile ) udev? ( sys-fs/udisks:0 )
-SLOT=0
-SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-0.6.4.tar.bz2
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4e3cb61879b4343e5e2a1510987c63f7
diff --git a/metadata/md5-cache/media-sound/rhythmbox-2.97 b/metadata/md5-cache/media-sound/rhythmbox-2.97
index fcfb874e0694..d72f9a267727 100644
--- a/metadata/md5-cache/media-sound/rhythmbox-2.97
+++ b/metadata/md5-cache/media-sound/rhythmbox-2.97
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.28.0:2 >=dev-libs/libxml2-2.7.8:2 >=x11-libs/gtk+-3.2:3[introspection] >=x11-libs/gdk-pixbuf-2.18.0:2 >=dev-libs/gobject-introspection-0.10.0 >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-2.32.1 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.32:0.10[introspection] >=media-libs/gstreamer-0.10.32:0.10[introspection] >=sys-libs/tdb-1.2.6 dev-libs/json-glib clutter? ( >=media-libs/clutter-1.2:1.0 >=media-libs/clutter-gst-1.0:1.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 ) cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.11:3.0 >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) html? ( >=net-libs/webkit-gtk-1.3.9:3 ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( || ( >=media-libs/musicbrainz-4.0.0:4 >=media-libs/musicbrainz-3.0.2:3 ) gnome-base/gconf:2 ) python? ( dev-python/pygobject:3 ) udev? ( virtual/udev[gudev] ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) ) zeitgeist? ( gnome-extra/zeitgeist ) virtual/pkgconfig dev-util/gtk-doc-am >=dev-util/intltool-0.35 app-text/scrollkeeper >=app-text/gnome-doc-utils-0.9.1 test? ( dev-libs/check ) app-arch/xz-utils >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) python? ( || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.28.0:2 >=dev-libs/libxml2-2.7.8:2 >=x11-libs/gtk+-3.2:3[introspection] >=x11-libs/gdk-pixbuf-2.18.0:2 >=dev-libs/gobject-introspection-0.10.0 >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-2.32.1 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.32:0.10[introspection] >=media-libs/gstreamer-0.10.32:0.10[introspection] >=sys-libs/tdb-1.2.6 dev-libs/json-glib clutter? ( >=media-libs/clutter-1.2:1.0 >=media-libs/clutter-gst-1.0:1.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 ) cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.11:3.0 >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) html? ( >=net-libs/webkit-gtk-1.3.9:3 ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/libdiscid || ( >=media-libs/musicbrainz-4.0.0:4 >=media-libs/musicbrainz-3.0.2:3 ) gnome-base/gconf:2 ) python? ( dev-python/pygobject:3 ) udev? ( virtual/udev[gudev] ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) ) zeitgeist? ( gnome-extra/zeitgeist ) virtual/pkgconfig dev-util/gtk-doc-am >=dev-util/intltool-0.35 app-text/scrollkeeper >=app-text/gnome-doc-utils-0.9.1 test? ( dev-libs/check ) app-arch/xz-utils >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) python? ( || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Music management and playback software for GNOME
 EAPI=4
 HOMEPAGE=http://www.rhythmbox.org/
 IUSE=cdr clutter daap dbus gnome-keyring html ipod libnotify lirc musicbrainz mtp nsplugin +python test +udev upnp-av webkit zeitgeist debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.28.0:2 >=dev-libs/libxml2-2.7.8:2 >=x11-libs/gtk+-3.2:3[introspection] >=x11-libs/gdk-pixbuf-2.18.0:2 >=dev-libs/gobject-introspection-0.10.0 >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-2.32.1 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.32:0.10[introspection] >=media-libs/gstreamer-0.10.32:0.10[introspection] >=sys-libs/tdb-1.2.6 dev-libs/json-glib clutter? ( >=media-libs/clutter-1.2:1.0 >=media-libs/clutter-gst-1.0:1.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 ) cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.11:3.0 >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) html? ( >=net-libs/webkit-gtk-1.3.9:3 ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( || ( >=media-libs/musicbrainz-4.0.0:4 >=media-libs/musicbrainz-3.0.2:3 ) gnome-base/gconf:2 ) python? ( dev-python/pygobject:3 ) udev? ( virtual/udev[gudev] ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) ) zeitgeist? ( gnome-extra/zeitgeist ) >=media-plugins/gst-plugins-soup-0.10:0.10 >=media-plugins/gst-plugins-libmms-0.10:0.10 || ( >=media-plugins/gst-plugins-cdparanoia-0.10:0.10 >=media-plugins/gst-plugins-cdio-0.10:0.10 ) >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-taglib-0.10.6:0.10 x11-themes/gnome-icon-theme-symbolic upnp-av? ( >=media-libs/grilo-0.1.17:0.1 >=media-plugins/grilo-plugins-0.1.17:0.1[upnp-av] ) python? ( >=dev-python/gst-python-0.10.8:0.10 x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] dbus? ( sys-apps/dbus ) gnome-keyring? ( dev-python/gnome-keyring-python ) webkit? ( dev-python/mako >=net-libs/webkit-gtk-1.3.9:3[introspection] ) ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) python? ( || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) )
+RDEPEND=>=dev-libs/glib-2.28.0:2 >=dev-libs/libxml2-2.7.8:2 >=x11-libs/gtk+-3.2:3[introspection] >=x11-libs/gdk-pixbuf-2.18.0:2 >=dev-libs/gobject-introspection-0.10.0 >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-2.32.1 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.32:0.10[introspection] >=media-libs/gstreamer-0.10.32:0.10[introspection] >=sys-libs/tdb-1.2.6 dev-libs/json-glib clutter? ( >=media-libs/clutter-1.2:1.0 >=media-libs/clutter-gst-1.0:1.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 ) cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.11:3.0 >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) html? ( >=net-libs/webkit-gtk-1.3.9:3 ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/libdiscid || ( >=media-libs/musicbrainz-4.0.0:4 >=media-libs/musicbrainz-3.0.2:3 ) gnome-base/gconf:2 ) python? ( dev-python/pygobject:3 ) udev? ( virtual/udev[gudev] ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) ) zeitgeist? ( gnome-extra/zeitgeist ) >=media-plugins/gst-plugins-soup-0.10:0.10 >=media-plugins/gst-plugins-libmms-0.10:0.10 || ( >=media-plugins/gst-plugins-cdparanoia-0.10:0.10 >=media-plugins/gst-plugins-cdio-0.10:0.10 ) >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-taglib-0.10.6:0.10 x11-themes/gnome-icon-theme-symbolic upnp-av? ( >=media-libs/grilo-0.1.17:0.1 >=media-plugins/grilo-plugins-0.1.17:0.1[upnp-av] ) python? ( >=dev-python/gst-python-0.10.8:0.10 x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] dbus? ( sys-apps/dbus ) gnome-keyring? ( dev-python/gnome-keyring-python ) webkit? ( dev-python/mako >=net-libs/webkit-gtk-1.3.9:3[introspection] ) ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) python? ( || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) )
 REQUIRED_USE=ipod? ( udev ) mtp? ( udev ) dbus? ( python ) gnome-keyring? ( python ) webkit? ( python )
 SLOT=0
 SRC_URI=mirror://gnome/sources/rhythmbox/2.97/rhythmbox-2.97.tar.xz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	18cda077fa5f661f96aa70c192b4b4a5	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d0c2a271d265fff026483b201b97bf83
+_md5_=0ecf78e5f12a6a554388723aa2d7db16
diff --git a/metadata/md5-cache/media-video/avidemux-2.6.1 b/metadata/md5-cache/media-video/avidemux-2.6.1
new file mode 100644
index 000000000000..082c3c33c1a0
--- /dev/null
+++ b/metadata/md5-cache/media-video/avidemux-2.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=virtual/libiconv dev-libs/libxml2 media-libs/libpng >=dev-lang/spidermonkey-1.5-r2 gtk? ( >=x11-libs/gtk+-2.6.0:2 ) qt4? ( >=x11-libs/qt-gui-4.8.3:4 ) x264? ( media-libs/x264 ) xvid? ( media-libs/xvid ) aften? ( media-libs/aften ) amr? ( media-libs/opencore-amr ) lame? ( media-sound/lame ) dts? ( media-libs/libdca ) vorbis? ( media-libs/libvorbis ) alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 ) jack? ( media-sound/jack-audio-connection-kit libsamplerate? ( media-libs/libsamplerate ) ) truetype? ( >=media-libs/freetype-2.1.5 ) fontconfig? ( media-libs/fontconfig ) sdl? ( media-libs/libsdl ) xv? ( x11-libs/libXv ) x11-libs/libX11 x11-libs/libXext x11-libs/libXrender oss? ( virtual/os-headers ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Video editor designed for simple cutting, filtering and encoding tasks
+EAPI=4
+HOMEPAGE=http://fixounet.free.fr/avidemux
+IUSE=aften a52 alsa amr debug dts fontconfig gtk jack lame libsamplerate mmx nls qt4 sdl vorbis truetype xvid xv oss x264 linguas_ca linguas_cs linguas_de linguas_el linguas_es linguas_fr linguas_it linguas_ja linguas_pt_BR linguas_ru linguas_sr linguas_sr@latin linguas_tr
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 MIT GPL-1 public-domain PSF-2
+RDEPEND=virtual/libiconv dev-libs/libxml2 media-libs/libpng >=dev-lang/spidermonkey-1.5-r2 gtk? ( >=x11-libs/gtk+-2.6.0:2 ) qt4? ( >=x11-libs/qt-gui-4.8.3:4 ) x264? ( media-libs/x264 ) xvid? ( media-libs/xvid ) aften? ( media-libs/aften ) amr? ( media-libs/opencore-amr ) lame? ( media-sound/lame ) dts? ( media-libs/libdca ) vorbis? ( media-libs/libvorbis ) alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 ) jack? ( media-sound/jack-audio-connection-kit libsamplerate? ( media-libs/libsamplerate ) ) truetype? ( >=media-libs/freetype-2.1.5 ) fontconfig? ( media-libs/fontconfig ) sdl? ( media-libs/libsdl ) xv? ( x11-libs/libXv ) x11-libs/libX11 x11-libs/libXext x11-libs/libXrender
+SLOT=2.6
+SRC_URI=mirror://sourceforge/avidemux/2.6.1/avidemux_2.6.1.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	l10n	33bde4fb0cfd3a21a277b66bfd837e19	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c3b7755c994a766a76eda1131c0dcb3e
diff --git a/metadata/md5-cache/media-video/libav-9_beta3 b/metadata/md5-cache/media-video/libav-9_beta3
new file mode 100644
index 000000000000..5b344c905872
--- /dev/null
+++ b/metadata/md5-cache/media-video/libav-9_beta3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+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 ) fdk? ( media-libs/fdk-aac ) 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 )
+DESCRIPTION=Complete solution to record, convert and stream audio and video.
+EAPI=4
+HOMEPAGE=http://libav.org/
+IUSE=aac alsa amr bindist +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk 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
+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
+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 ) encode? ( aac? ( media-libs/vo-aacenc ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) fdk? ( media-libs/fdk-aac ) 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 !fdk ) rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) test? ( encode zlib )
+SLOT=0
+SRC_URI=http://libav.org/releases/libav-9_beta3.tar.xz test? ( http://dev.gentoo.org/~lu_zero/libav/fate-9_beta2.tar.xz )
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=2f1cbb331f9ece85de42da99ec0e9783
diff --git a/metadata/md5-cache/media-video/mediainfo-0.7.58 b/metadata/md5-cache/media-video/mediainfo-0.7.58
deleted file mode 100644
index 31eb0ecd1860..000000000000
--- a/metadata/md5-cache/media-video/mediainfo-0.7.58
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=sys-libs/zlib media-libs/libzen ~media-libs/libmediainfo-0.7.58[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:2.8[X] ) virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=MediaInfo supplies technical and tag information about media files
-EAPI=4
-HOMEPAGE=http://mediainfo.sourceforge.net
-IUSE=curl mms wxwidgets
-KEYWORDS=amd64 x86
-LICENSE=LGPL-3
-RDEPEND=sys-libs/zlib media-libs/libzen ~media-libs/libmediainfo-0.7.58[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:2.8[X] )
-SLOT=0
-SRC_URI=mirror://sourceforge/mediainfo/source/mediainfo/0.7.58/mediainfo_0.7.58.tar.bz2
-_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
-_md5_=aee9d6e186c43fa70cc683a7132f6449
diff --git a/metadata/md5-cache/media-video/mediainfo-0.7.59 b/metadata/md5-cache/media-video/mediainfo-0.7.59
deleted file mode 100644
index 088cb85e2ba6..000000000000
--- a/metadata/md5-cache/media-video/mediainfo-0.7.59
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=sys-libs/zlib media-libs/libzen ~media-libs/libmediainfo-0.7.59[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:2.8[X] ) virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=MediaInfo supplies technical and tag information about media files
-EAPI=4
-HOMEPAGE=http://mediainfo.sourceforge.net
-IUSE=curl mms wxwidgets
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=sys-libs/zlib media-libs/libzen ~media-libs/libmediainfo-0.7.59[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:2.8[X] )
-SLOT=0
-SRC_URI=mirror://sourceforge/mediainfo/source/mediainfo/0.7.59/mediainfo_0.7.59.tar.bz2
-_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
-_md5_=28711a43e6443161180f5b53f9353590
diff --git a/metadata/md5-cache/media-video/mediainfo-0.7.60 b/metadata/md5-cache/media-video/mediainfo-0.7.60
deleted file mode 100644
index dd7cce35373c..000000000000
--- a/metadata/md5-cache/media-video/mediainfo-0.7.60
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=sys-libs/zlib media-libs/libzen ~media-libs/libmediainfo-0.7.60[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:2.8[X] ) virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=MediaInfo supplies technical and tag information about media files
-EAPI=4
-HOMEPAGE=http://mediainfo.sourceforge.net
-IUSE=curl mms wxwidgets
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=sys-libs/zlib media-libs/libzen ~media-libs/libmediainfo-0.7.60[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:2.8[X] )
-SLOT=0
-SRC_URI=mirror://sourceforge/mediainfo/source/mediainfo/0.7.60/mediainfo_0.7.60.tar.bz2
-_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
-_md5_=42e3f309bfa6d2507f78e38bfcb82a98
diff --git a/metadata/md5-cache/media-video/minitube-1.8 b/metadata/md5-cache/media-video/minitube-1.8
deleted file mode 100644
index 6fb9ef3f5a6d..000000000000
--- a/metadata/md5-cache/media-video/minitube-1.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=x11-libs/qt-gui-4.6:4[accessibility] >=x11-libs/qt-dbus-4.6:4 kde? ( || ( media-libs/phonon[gstreamer?] >=x11-libs/qt-phonon-4.6:4 ) ) !kde? ( || ( >=x11-libs/qt-phonon-4.6:4 media-libs/phonon[gstreamer?] ) ) gstreamer? ( media-plugins/gst-plugins-soup:0.10 media-plugins/gst-plugins-ffmpeg:0.10 media-plugins/gst-plugins-faac:0.10 media-plugins/gst-plugins-faad:0.10 )
-DESCRIPTION=Qt4 YouTube Client
-EAPI=4
-HOMEPAGE=http://flavio.tordini.org/minitube
-IUSE=debug gstreamer kde linguas_ar linguas_ca linguas_ca_ES linguas_da linguas_de_DE linguas_el linguas_en linguas_es linguas_es_AR linguas_es_ES linguas_fi linguas_fi_FI linguas_fr linguas_gl linguas_he_IL linguas_hr linguas_hu linguas_ia linguas_id linguas_id_ID linguas_it linguas_jv linguas_ka_GE linguas_nb linguas_nl linguas_nn linguas_pl linguas_pl_PL linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sq linguas_sr linguas_sv_SE linguas_te linguas_tr linguas_uk_UA linguas_zh_CN
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=x11-libs/qt-gui-4.6:4[accessibility] >=x11-libs/qt-dbus-4.6:4 kde? ( || ( media-libs/phonon[gstreamer?] >=x11-libs/qt-phonon-4.6:4 ) ) !kde? ( || ( >=x11-libs/qt-phonon-4.6:4 media-libs/phonon[gstreamer?] ) ) gstreamer? ( media-plugins/gst-plugins-soup:0.10 media-plugins/gst-plugins-ffmpeg:0.10 media-plugins/gst-plugins-faac:0.10 media-plugins/gst-plugins-faad:0.10 )
-SLOT=0
-SRC_URI=http://flavio.tordini.org/files/minitube/minitube-1.8.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	l10n	33bde4fb0cfd3a21a277b66bfd837e19	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-r2	19af9102ca9b827213997cc636e7e33c	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=92654bb61645e5b008749ac215986180
diff --git a/metadata/md5-cache/media-video/mplayer2-2.0_p20120828 b/metadata/md5-cache/media-video/mplayer2-2.0_p20120828
index 9b6b1e5c2b1c..008cc96e72b2 100644
--- a/metadata/md5-cache/media-video/mplayer2-2.0_p20120828
+++ b/metadata/md5-cache/media-video/mplayer2-2.0_p20120828
@@ -4,11 +4,11 @@ DESCRIPTION=Media Player for Linux
 EAPI=4
 HOMEPAGE=http://www.mplayer2.org/
 IUSE=+a52 aalib +alsa aqua bidi bindist bl bluray bs2b cddb +cdio cpudetection debug directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +faad fbcon ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa +libass libcaca lirc mad md5sum mng +mp3 nas +network nut +opengl oss png pnm portaudio postproc pulseaudio pvr +quicktime quvi radio +rar +real +rtc samba sdl +speex tga +theora +truetype +unicode v4l vdpau +vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvid symlink 3dnow 3dnowext altivec +mmx mmxext +shm sse sse2 ssse3 video_cards_s3virge video_cards_mga video_cards_tdfx
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses sys-libs/zlib !bindist? ( x86? ( win32codecs? ( media-libs/win32codecs ) ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ggi? ( media-libs/libggi media-libs/libggiwmh ) opengl? ( virtual/opengl ) vdpau? ( x11-libs/libvdpau ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( media-libs/libbluray ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) gif? ( media-libs/giflib ) iconv? ( virtual/libiconv ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10[enca?,fontconfig] ) libcaca? ( media-libs/libcaca ) lirc? ( app-misc/lirc ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) nut? ( >=media-libs/libnut-661 ) png? ( media-libs/libpng ) pnm? ( media-libs/netpbm ) portaudio? ( >=media-libs/portaudio-19_pre20111121 ) postproc? ( || ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg ) ) pulseaudio? ( media-sound/pulseaudio ) quvi? ( media-libs/libquvi ) rar? ( || ( app-arch/unrar app-arch/rar ) ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora ) truetype? ( media-libs/fontconfig >=media-libs/freetype-2.2.1:2 virtual/ttf-fonts ) vorbis? ( media-libs/libvorbis ) xanim? ( media-video/xanim ) xvid? ( media-libs/xvid ) >=virtual/ffmpeg-0.10.2 symlink? ( !media-video/mplayer )
 REQUIRED_USE=bindist? ( !win32codecs ) cddb? ( cdio network ) dvdnav? ( dvd ) dxr3? ( X ) ggi? ( X ) libass? ( truetype ) opengl? ( || ( X aqua ) ) radio? ( || ( dvb v4l ) ) truetype? ( iconv ) vdpau? ( X ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X )
 SLOT=0
 SRC_URI=http://dev.gentooexperimental.org/~scarabeus/mplayer2-2.0_p20120828.tar.xz !truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e782b145144737861903edc7d0207998
+_md5_=35b49437adbe6185477d292043d834e8
diff --git a/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.0_p2 b/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.0_p2
index 49caaf963f61..fbd472c620ea 100644
--- a/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.0_p2
+++ b/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.0_p2
@@ -4,10 +4,10 @@ DESCRIPTION=Nagios/Icinga event broker module that allows quick/direct access to
 EAPI=3
 HOMEPAGE=http://mathias-kettner.de/checkmk_livestatus.html
 IUSE=examples perl python test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=perl? ( dev-lang/perl virtual/perl-Digest-MD5 virtual/perl-Thread-Queue virtual/perl-Time-HiRes virtual/perl-Encode dev-perl/JSON-XS )
 SLOT=0
 SRC_URI=http://mathias-kettner.de/download/mk-livestatus-1.2.0p2.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=08c766bfb3db43d072a73f9454718c7f
+_md5_=c7b454c3a890ff1d4791bc6e13edcd28
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.8-r2 b/metadata/md5-cache/net-analyzer/munin-2.0.8-r2
index 69a6964b03d7..0d47f41d1ae3 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.8-r2
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.8-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Munin Server Monitoring Tool
 EAPI=4
 HOMEPAGE=http://munin-monitoring.org/
 IUSE=asterisk irc java memcached minimal mysql postgres ssl test cgi ipv6 syslog ipmi http dhcpd doc apache elibc_FreeBSD java
-KEYWORDS=amd64 ~arm ~mips ~ppc x86
+KEYWORDS=amd64 ~arm ~mips ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl[berkdb] sys-process/procps doc? ( dev-python/sphinx ) asterisk? ( dev-perl/Net-Telnet ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base ) memcached? ( dev-perl/Cache-Memcached ) cgi? ( dev-perl/FCGI ) apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) syslog? ( virtual/perl-Sys-Syslog ) http? ( dev-perl/libwww-perl ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy-Recursive dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/net-server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat6 net-analyzer/netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) java? ( >=dev-java/java-config-2.1.9-r1 )
 REQUIRED_USE=cgi? ( !minimal ) apache? ( cgi )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/munin/munin-2.0.8.tar.gz http://dev.gentoo.org/~flameeyes/munin/munin-2.0.8-patches-4.tar.xz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3609511f5bbaedc5b1cf301c64d554e7
+_md5_=bde14dd3afd88ec8bed4986402f26c4e
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.9 b/metadata/md5-cache/net-analyzer/munin-2.0.9
index 23ce29327df8..5ad249e16770 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.9
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.9
@@ -4,11 +4,11 @@ DESCRIPTION=Munin Server Monitoring Tool
 EAPI=5
 HOMEPAGE=http://munin-monitoring.org/
 IUSE=asterisk irc java memcached minimal mysql postgres ssl test cgi ipv6 syslog ipmi http dhcpd doc apache elibc_FreeBSD java
-KEYWORDS=~amd64 ~mips ~x86
+KEYWORDS=~amd64 ~mips ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl[berkdb] sys-process/procps doc? ( dev-python/sphinx ) asterisk? ( dev-perl/Net-Telnet ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base ) memcached? ( dev-perl/Cache-Memcached ) cgi? ( dev-perl/FCGI ) apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) syslog? ( virtual/perl-Sys-Syslog ) http? ( dev-perl/libwww-perl ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy-Recursive dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/net-server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat6 net-analyzer/netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) java? ( >=dev-java/java-config-2.1.9-r1 )
 REQUIRED_USE=cgi? ( !minimal ) apache? ( cgi )
 SLOT=0
 SRC_URI=mirror://sourceforge/munin/munin-2.0.9.tar.gz http://dev.gentoo.org/~flameeyes/munin/munin-2.0.9-patches-1.tar.xz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=863cfce2de27f9d835e7d7ed25f8e917
+_md5_=505e963db3d798516f770b0a73737797
diff --git a/metadata/md5-cache/net-analyzer/nagvis-1.6.6 b/metadata/md5-cache/net-analyzer/nagvis-1.6.6
index 546eeced7c25..cdd54528d262 100644
--- a/metadata/md5-cache/net-analyzer/nagvis-1.6.6
+++ b/metadata/md5-cache/net-analyzer/nagvis-1.6.6
@@ -4,10 +4,10 @@ DESCRIPTION=NagVis is a visualization addon for the well known network managment
 EAPI=4
 HOMEPAGE=http://www.nagvis.org/
 IUSE=apache2 automap apache2
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=|| ( net-analyzer/nagios net-analyzer/icinga ) automap? ( >=media-gfx/graphviz-2.14 ) apache2? ( dev-lang/php[apache2] ) net-analyzer/mk-livestatus dev-lang/php[gd,nls,json,session,pdo,sqlite3,sockets,mysql,unicode,xml] virtual/httpd-php apache2? ( =www-servers/apache-2* )
 SLOT=0
 SRC_URI=mirror://sourceforge/nagvis/nagvis-1.6.6.tar.gz
 _eclasses_=confutils	2ab69b52fa6ea0c0669a47fb94b354b4	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	depend.php	df169a364e191b840b695604097e3c21	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e3a71eb0a828bd6a158d4c538cb1d62d
+_md5_=286f910501cde7284af927e5b05b5049
diff --git a/metadata/md5-cache/net-dns/bind-9.9.2_p1 b/metadata/md5-cache/net-dns/bind-9.9.2_p1
index 84fc70d8fc69..cdeb465d54a9 100644
--- a/metadata/md5-cache/net-dns/bind-9.9.2_p1
+++ b/metadata/md5-cache/net-dns/bind-9.9.2_p1
@@ -4,11 +4,11 @@ DESCRIPTION=BIND - Berkeley Internet Name Domain - Name Server
 EAPI=4
 HOMEPAGE=http://www.isc.org/software/bind
 IUSE=berkdb caps dlz doc filter-aaaa geoip gost gssapi idn ipv6 ldap mysql odbc postgres python rpz rrl sdb-ldap selinux ssl static-libs threads urandom xml
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ISC BSD BSD-2 HPND JNIC RSA openssl
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6g ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( net-dns/idnkit ) postgres? ( dev-db/postgresql-base ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) sdb-ldap? ( net-nds/openldap ) gost? ( >=dev-libs/openssl-1.0.0[-bindist] ) python? ( virtual/python-argparse ) selinux? ( sec-policy/selinux-bind ) || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) python? ( || ( =dev-lang/python-3* =dev-lang/python-2.7* ) )
 REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz !threads ) odbc? ( dlz ) ldap? ( dlz ) sdb-ldap? ( dlz ) gost? ( ssl ) threads? ( caps )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/bind9/9.9.2-P1/bind-9.9.2-P1.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 ) geoip? ( http://bind-geoip.googlecode.com//files/bind-geoip-1.3-readme.txt http://bind-geoip.googlecode.com//files/bind-9.9.2-geoip-1.3.patch ) sdb-ldap? ( http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-1.1.0-fc14.patch.bz2 ) rrl? ( http://ss.vix.com/~vixie/rl-9.9.2.patch )
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=12b0e45e79b80c8e6356701573863056
+_md5_=66bad3f3bdc3e9bee24f3d855fb543ac
diff --git a/metadata/md5-cache/net-firewall/pglinux-2.2.2 b/metadata/md5-cache/net-firewall/pglinux-2.2.2
index b018d781587d..3cfe0ce49b07 100644
--- a/metadata/md5-cache/net-firewall/pglinux-2.2.2
+++ b/metadata/md5-cache/net-firewall/pglinux-2.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=Privacy oriented firewall application
 EAPI=4
 HOMEPAGE=https://sourceforge.net/projects/peerguardian/
 IUSE=cron dbus logrotate networkmanager qt4 zlib
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=net-libs/libnetfilter_queue net-libs/libnfnetlink dbus? ( sys-apps/dbus ) zlib? ( sys-libs/zlib ) qt4? ( sys-auth/polkit-qt x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 || ( kde-base/kdesu x11-libs/gksu x11-misc/ktsuss ) ) net-firewall/iptables sys-apps/sysvinit cron? ( virtual/cron ) logrotate? ( app-admin/logrotate ) networkmanager? ( net-misc/networkmanager )
 REQUIRED_USE=qt4? ( dbus )
 SLOT=0
 SRC_URI=mirror://sourceforge/peerguardian/pgl-2.2.2.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	gnome2-utils	794d2847b4af390a1e020924876c8297	linux-info	f01ffb28843e2de3ea571f80f07e5078	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c84fe8f7776e2c6e9bfda8a8c3332cf3
+_md5_=44ee18c787b805bb963d3e55e41c4abf
diff --git a/metadata/md5-cache/net-fs/samba-4.0.0 b/metadata/md5-cache/net-fs/samba-4.0.0
index f9e48d5379e3..f9c4c8b21d5f 100644
--- a/metadata/md5-cache/net-fs/samba-4.0.0
+++ b/metadata/md5-cache/net-fs/samba-4.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/iniparser dev-libs/popt sys-libs/readline virtual/libiconv >=dev-lang/python-2.4.2 dev-python/subunit sys-libs/libcap >=sys-libs/ldb-1.1.13 >=sys-libs/tdb-1.2.10[python] >=sys-libs/talloc-2.0.7[python] >=sys-libs/tevent-0.9.17 sys-libs/zlib >=app-crypt/heimdal-1.5[-ssl] ads? ( client? ( net-fs/cifs-utils[ads] ) ) client? ( net-fs/cifs-utils ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) ldap? ( net-nds/openldap[kerberos] ) gnutls? ( >=net-libs/gnutls-1.4.0 ) selinux? ( sec-policy/selinux-samba ) virtual/pkgconfig =dev-lang/python-2* dev-lang/python !dev-lang/python[-threads]
+DEPEND=dev-libs/iniparser dev-libs/popt sys-libs/readline virtual/libiconv >=dev-lang/python-2.4.2 dev-python/subunit sys-libs/libcap >=sys-libs/ldb-1.1.13 >=sys-libs/tdb-1.2.10[python] >=sys-libs/talloc-2.0.7[python] >=sys-libs/tevent-0.9.17 sys-libs/zlib >=app-crypt/heimdal-1.5[-ssl] ads? ( client? ( net-fs/cifs-utils[ads] ) ) client? ( net-fs/cifs-utils ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) ldap? ( net-nds/openldap ) gnutls? ( >=net-libs/gnutls-1.4.0 ) selinux? ( sec-policy/selinux-samba ) virtual/pkgconfig =dev-lang/python-2* dev-lang/python !dev-lang/python[-threads]
 DESCRIPTION=Samba Suite Version 4
 EAPI=4
 HOMEPAGE=http://www.samba.org/
-IUSE=acl addns ads aio avahi client cluster cups debug fulltest gnutls iprint ldap pam quota selinux swat syslog winbind
+IUSE=acl addns ads aio avahi client cluster cups gnutls iprint ldap pam quota selinux swat syslog winbind
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-libs/iniparser dev-libs/popt sys-libs/readline virtual/libiconv >=dev-lang/python-2.4.2 dev-python/subunit sys-libs/libcap >=sys-libs/ldb-1.1.13 >=sys-libs/tdb-1.2.10[python] >=sys-libs/talloc-2.0.7[python] >=sys-libs/tevent-0.9.17 sys-libs/zlib >=app-crypt/heimdal-1.5[-ssl] ads? ( client? ( net-fs/cifs-utils[ads] ) ) client? ( net-fs/cifs-utils ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) ldap? ( net-nds/openldap[kerberos] ) gnutls? ( >=net-libs/gnutls-1.4.0 ) selinux? ( sec-policy/selinux-samba ) =dev-lang/python-2*
+RDEPEND=dev-libs/iniparser dev-libs/popt sys-libs/readline virtual/libiconv >=dev-lang/python-2.4.2 dev-python/subunit sys-libs/libcap >=sys-libs/ldb-1.1.13 >=sys-libs/tdb-1.2.10[python] >=sys-libs/talloc-2.0.7[python] >=sys-libs/tevent-0.9.17 sys-libs/zlib >=app-crypt/heimdal-1.5[-ssl] ads? ( client? ( net-fs/cifs-utils[ads] ) ) client? ( net-fs/cifs-utils ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) ldap? ( net-nds/openldap ) gnutls? ( >=net-libs/gnutls-1.4.0 ) selinux? ( sec-policy/selinux-samba ) =dev-lang/python-2*
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://samba/samba-4.0.0.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	d40dc948067bd3db1c8ebf7d51897313	linux-info	f01ffb28843e2de3ea571f80f07e5078	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	waf-utils	681b3e9181d1a20ad8d0c186333ddcf7
-_md5_=a5fd2b7006a422288e9df59856442803
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	linux-info	f01ffb28843e2de3ea571f80f07e5078	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	waf-utils	681b3e9181d1a20ad8d0c186333ddcf7
+_md5_=07cfdfb2dacf6d4657e16f1aa795c0a4
diff --git a/metadata/md5-cache/net-im/emesene-2.12.9 b/metadata/md5-cache/net-im/emesene-2.12.9
index 96adc22cc246..65f3795fb9bd 100644
--- a/metadata/md5-cache/net-im/emesene-2.12.9
+++ b/metadata/md5-cache/net-im/emesene-2.12.9
@@ -4,10 +4,10 @@ DESCRIPTION=Platform independent MSN Messenger client written in Python+GTK
 EAPI=4
 HOMEPAGE=http://www.emesene.org
 IUSE=jabber
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 )
 RDEPEND=dev-python/pygtk:2 dev-python/notify-python dev-python/pycrypto dev-python/pywebkitgtk dev-python/pyopenssl jabber? ( dev-python/xmpppy ) =dev-lang/python-2* =dev-lang/python-2*[sqlite]
 SLOT=0
 SRC_URI=http://github.com/emesene/emesene/tarball/v2.12.9 -> emesene-2.12.9.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8c01fa567cec47e72c7acaf7fb02e7e2
+_md5_=15e86421b1610f9376f6760cf9f36ff9
diff --git a/metadata/md5-cache/net-im/telepathy-logger-0.2.12-r1 b/metadata/md5-cache/net-im/telepathy-logger-0.2.12-r1
deleted file mode 100644
index 6392084fd308..000000000000
--- a/metadata/md5-cache/net-im/telepathy-logger-0.2.12-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup test
-DEPEND=>=dev-libs/glib-2.25.11:2 >=sys-apps/dbus-1.1 >=dev-libs/dbus-glib-0.82 >=net-libs/telepathy-glib-0.15.6[introspection?] dev-libs/libxml2 dev-libs/libxslt dev-db/sqlite:3 introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) dev-util/gtk-doc-am >=dev-util/intltool-0.35 virtual/pkgconfig >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Telepathy Logger is a session daemon that should be activated whenever telepathy is being used.
-EAPI=4
-HOMEPAGE=http://telepathy.freedesktop.org/wiki/Logger
-IUSE=+introspection test
-KEYWORDS=alpha amd64 ia64 ppc sparc x86 ~x86-linux
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.25.11:2 >=sys-apps/dbus-1.1 >=dev-libs/dbus-glib-0.82 >=net-libs/telepathy-glib-0.15.6[introspection?] dev-libs/libxml2 dev-libs/libxslt dev-db/sqlite:3 introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-SLOT=0
-SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-0.2.12.tar.bz2
-_eclasses_=gnome2-utils	794d2847b4af390a1e020924876c8297	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3c6067ecee25e918e884f9b757cc807a
diff --git a/metadata/md5-cache/net-im/telepathy-logger-0.6.0 b/metadata/md5-cache/net-im/telepathy-logger-0.6.0
new file mode 100644
index 000000000000..f800394748f5
--- /dev/null
+++ b/metadata/md5-cache/net-im/telepathy-logger-0.6.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/glib-2.25.11:2 >=sys-apps/dbus-1.1 >=dev-libs/dbus-glib-0.82 >=net-libs/telepathy-glib-0.19.2[introspection?] dev-libs/libxml2 dev-libs/libxslt dev-db/sqlite:3 introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 ) dev-util/gtk-doc-am >=dev-util/intltool-0.35 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Telepathy Logger is a session daemon that should be activated whenever telepathy is being used.
+EAPI=5
+HOMEPAGE=http://telepathy.freedesktop.org/wiki/Logger
+IUSE=+introspection test
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.25.11:2 >=sys-apps/dbus-1.1 >=dev-libs/dbus-glib-0.82 >=net-libs/telepathy-glib-0.19.2[introspection?] dev-libs/libxml2 dev-libs/libxslt dev-db/sqlite:3 introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
+SLOT=0/3
+SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-0.6.0.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	18cda077fa5f661f96aa70c192b4b4a5	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	python-any-r1	d378f1938a81eb727abdd549cf6b4531	python-utils-r1	dcd8a7e28a2e90a45fc1875429811c73	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=79fdec4f04ec69406c96967020e7bde7
diff --git a/metadata/md5-cache/net-libs/rb_libtorrent-0.16.5 b/metadata/md5-cache/net-libs/rb_libtorrent-0.16.5
index e2e40c92cfac..e46eb4864b5c 100644
--- a/metadata/md5-cache/net-libs/rb_libtorrent-0.16.5
+++ b/metadata/md5-cache/net-libs/rb_libtorrent-0.16.5
@@ -4,11 +4,11 @@ DESCRIPTION=C++ BitTorrent implementation focusing on efficiency and scalability
 EAPI=4
 HOMEPAGE=http://www.rasterbar.com/products/libtorrent/
 IUSE=debug doc examples python ssl static-libs
-KEYWORDS=amd64 ~arm ~ppc ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ppc ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=>=dev-libs/boost-1.48[python?,threads(+)] >=sys-devel/libtool-2.2 sys-libs/zlib examples? ( !net-p2p/mldonkey ) ssl? ( dev-libs/openssl ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) python? ( || ( =dev-lang/python-2.7*[threads] =dev-lang/python-2.6*[threads] ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://libtorrent.googlecode.com/files/libtorrent-rasterbar-0.16.5.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c04f204db0a3be75be678049291345e0
+_md5_=5e8ae8cda30770b91f77cb2fffd9ee06
diff --git a/metadata/md5-cache/net-libs/telepathy-glib-0.16.5 b/metadata/md5-cache/net-libs/telepathy-glib-0.16.5
deleted file mode 100644
index bb807da6b9bf..000000000000
--- a/metadata/md5-cache/net-libs/telepathy-glib-0.16.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup test
-DEPEND=>=dev-libs/glib-2.28.0:2 >=dev-libs/dbus-glib-0.82 introspection? ( >=dev-libs/gobject-introspection-1.30 ) vala? ( >=dev-lang/vala-0.14.0:0.14[vapigen] >=dev-libs/gobject-introspection-1.30 ) dev-libs/libxslt virtual/pkgconfig || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=GLib bindings for the Telepathy D-Bus protocol.
-EAPI=4
-HOMEPAGE=http://telepathy.freedesktop.org
-IUSE=debug +introspection +vala test
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.28.0:2 >=dev-libs/dbus-glib-0.82 introspection? ( >=dev-libs/gobject-introspection-1.30 ) vala? ( >=dev-lang/vala-0.14.0:0.14[vapigen] >=dev-libs/gobject-introspection-1.30 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-SLOT=0
-SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.16.5.tar.gz
-_eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c665269576ec693e5531c7f764b444ef
diff --git a/metadata/md5-cache/net-libs/telepathy-glib-0.18.1 b/metadata/md5-cache/net-libs/telepathy-glib-0.18.1
index 248134066991..f69ab7f32ed2 100644
--- a/metadata/md5-cache/net-libs/telepathy-glib-0.18.1
+++ b/metadata/md5-cache/net-libs/telepathy-glib-0.18.1
@@ -5,9 +5,9 @@ EAPI=4
 HOMEPAGE=http://telepathy.freedesktop.org
 IUSE=debug +introspection +vala test
 KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
+LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.30.0:2 >=dev-libs/dbus-glib-0.90 introspection? ( >=dev-libs/gobject-introspection-1.30 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.18.1.tar.gz
 _eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b75977f9a23fd463c51df47fe2b71b81
+_md5_=480e8fbaeae210a2c78d3587780d814e
diff --git a/metadata/md5-cache/net-libs/telepathy-glib-0.18.2 b/metadata/md5-cache/net-libs/telepathy-glib-0.18.2
index 7a13bd1ae75e..910c01536588 100644
--- a/metadata/md5-cache/net-libs/telepathy-glib-0.18.2
+++ b/metadata/md5-cache/net-libs/telepathy-glib-0.18.2
@@ -5,10 +5,10 @@ EAPI=4
 HOMEPAGE=http://telepathy.freedesktop.org
 IUSE=debug +introspection +vala test
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
+LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.30.0:2 >=dev-libs/dbus-glib-0.90 introspection? ( >=dev-libs/gobject-introspection-1.30 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.18.2.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	vala	ad1e7234faa2244a7e10f1c864371475	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=9eb75e51b07bc14e66c0b5e981967404
+_md5_=b23fbbcc02107801ea9a3e1d82d867cd
diff --git a/metadata/md5-cache/net-libs/telepathy-glib-0.20.1-r1 b/metadata/md5-cache/net-libs/telepathy-glib-0.20.1-r1
new file mode 100644
index 000000000000..b90ab1ae7ec6
--- /dev/null
+++ b/metadata/md5-cache/net-libs/telepathy-glib-0.20.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/dbus-glib-0.90 introspection? ( >=dev-libs/gobject-introspection-1.30 ) dev-libs/libxslt dev-util/gtk-doc-am virtual/pkgconfig vala? ( || ( dev-lang/vala:0.18[vapigen] ) ) dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=GLib bindings for the Telepathy D-Bus protocol.
+EAPI=5
+HOMEPAGE=http://telepathy.freedesktop.org
+IUSE=debug +introspection +vala python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 test
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/dbus-glib-0.90 introspection? ( >=dev-libs/gobject-introspection-1.30 )
+REQUIRED_USE=vala? ( introspection ) || ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.20.1.tar.gz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	gnome2-utils	794d2847b4af390a1e020924876c8297	multilib	9aa8a023e062fca0ba79362d9d0cc488	python-r1	cdb57e63096bf34e3390d45726a76258	python-utils-r1	dcd8a7e28a2e90a45fc1875429811c73	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	vala	ad1e7234faa2244a7e10f1c864371475	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=165388232191c89e1d919bf843f2363e
diff --git a/metadata/md5-cache/net-mail/cmd5checkpw-0.30-r1 b/metadata/md5-cache/net-mail/cmd5checkpw-0.30-r1
index 64c590968ce0..aed6888519c5 100644
--- a/metadata/md5-cache/net-mail/cmd5checkpw-0.30-r1
+++ b/metadata/md5-cache/net-mail/cmd5checkpw-0.30-r1
@@ -3,8 +3,8 @@ DEPEND=>=sys-apps/sed-4
 DESCRIPTION=A checkpassword compatible authentication program that used CRAM-MD5 authentication mode.
 HOMEPAGE=http://www.fehcom.de/qmail/smtpauth.html
 KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=as-is
+LICENSE=public-domain RSA
 SLOT=0
 SRC_URI=http://www.fehcom.de/qmail/auth/cmd5checkpw-030_tgz.bin
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a6cd48048410850b304f0485f892adb3
+_md5_=91ed1542a243cf05975583c95939c0fa
diff --git a/metadata/md5-cache/net-mail/dot-forward-0.71-r2 b/metadata/md5-cache/net-mail/dot-forward-0.71-r2
index bf8119e81321..8c4140c03309 100644
--- a/metadata/md5-cache/net-mail/dot-forward-0.71-r2
+++ b/metadata/md5-cache/net-mail/dot-forward-0.71-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install setup unpack
 DESCRIPTION=reads sendmail's .forward files under qmail
 HOMEPAGE=http://cr.yp.to/dot-forward.html
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=as-is
+LICENSE=public-domain
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cr.yp.to/software/dot-forward-0.71.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2418644196ebfb649b882b772de45866
+_md5_=5d1d239a0abe948dde57bc63dbf8497b
diff --git a/metadata/md5-cache/net-mail/dot-forward-0.71-r3 b/metadata/md5-cache/net-mail/dot-forward-0.71-r3
index 79418fced8ac..bdfd5395b9f5 100644
--- a/metadata/md5-cache/net-mail/dot-forward-0.71-r3
+++ b/metadata/md5-cache/net-mail/dot-forward-0.71-r3
@@ -3,9 +3,9 @@ DEPEND=>=sys-apps/sed-4 >=sys-apps/sed-4
 DESCRIPTION=reads sendmail's .forward files under qmail
 HOMEPAGE=http://cr.yp.to/dot-forward.html
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=as-is
+LICENSE=public-domain
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cr.yp.to/software/dot-forward-0.71.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qmail	5fc81682db4b862e5b126eae627ba70c	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ea07623182330f5e7d8c5d73ac94cc0b
+_md5_=66da025b29eb0689d5d39f9ae204cba5
diff --git a/metadata/md5-cache/net-mail/fastforward-0.51-r1 b/metadata/md5-cache/net-mail/fastforward-0.51-r1
index c5252d6fcda3..bfef31a77ce7 100644
--- a/metadata/md5-cache/net-mail/fastforward-0.51-r1
+++ b/metadata/md5-cache/net-mail/fastforward-0.51-r1
@@ -3,9 +3,9 @@ DEPEND=sys-apps/groff >=sys-apps/sed-4
 DESCRIPTION=handle qmail forwarding according to a cdb database
 HOMEPAGE=http://cr.yp.to/fastforward.html
 KEYWORDS=x86 sparc ~ppc
-LICENSE=as-is
+LICENSE=public-domain
 RDEPEND=sys-apps/groff
 SLOT=0
 SRC_URI=http://cr.yp.to/software/fastforward-0.51.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ba684105492837ddee03017e5bfa7c5c
+_md5_=2022eece9691d602368a4b088f39e12d
diff --git a/metadata/md5-cache/net-misc/aggregate-1.6 b/metadata/md5-cache/net-misc/aggregate-1.6
index 91ed64b04744..899c7ad366be 100644
--- a/metadata/md5-cache/net-misc/aggregate-1.6
+++ b/metadata/md5-cache/net-misc/aggregate-1.6
@@ -3,9 +3,9 @@ DESCRIPTION=aggregate takes a list of prefixes in conventional format on stdin,
 EAPI=2
 HOMEPAGE=http://dist.automagic.org/
 KEYWORDS=alpha amd64 hppa ia64 ~mips ppc sparc x86
-LICENSE=as-is
+LICENSE=ISC
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=http://dist.automagic.org//aggregate-1.6.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8af26d4a897d2ea271a4b7d8cf90232b
+_md5_=99d79590981e3287d4784384e31ba188
diff --git a/metadata/md5-cache/net-misc/leechcraft-blogique-9999 b/metadata/md5-cache/net-misc/leechcraft-blogique-9999
new file mode 100644
index 000000000000..ff40bfd748a2
--- /dev/null
+++ b/metadata/md5-cache/net-misc/leechcraft-blogique-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare pretend test unpack
+DEPEND=~net-misc/leechcraft-core-9999 x11-libs/qt-sql[sqlite] metida? ( x11-libs/qt-xmlpatterns ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-vcs/git
+DESCRIPTION=Blogging client for LeechCraft
+EAPI=4
+HOMEPAGE=http://leechcraft.org/
+IUSE=debug +metida
+LICENSE=GPL-3
+RDEPEND=~net-misc/leechcraft-core-9999 x11-libs/qt-sql[sqlite] metida? ( x11-libs/qt-xmlpatterns ) virtual/leechcraft-wysiwyg-editor
+SLOT=0
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	e109d3760f198d77aa1420c85584f7c6	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=9e4955961b9ee3d6932f5ab8712655fd
diff --git a/metadata/md5-cache/net-misc/openconnect-4.07-r1 b/metadata/md5-cache/net-misc/openconnect-4.07-r1
deleted file mode 100644
index a57e54471ac0..000000000000
--- a/metadata/md5-cache/net-misc/openconnect-4.07-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst setup
-DEPEND=dev-libs/libxml2 net-libs/libproxy sys-libs/zlib gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) openssl? ( dev-libs/openssl[static-libs?] )
-DESCRIPTION=Free client for Cisco AnyConnect SSL VPN software
-EAPI=5
-HOMEPAGE=http://www.infradead.org/openconnect.html
-IUSE=static-libs nls -gnutls +openssl linguas_ar linguas_as linguas_ast linguas_bg linguas_bg_BG linguas_bn linguas_bn_IN linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_en_US linguas_eo linguas_es linguas_es_CR linguas_es_MX linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_gd linguas_gl linguas_gu linguas_he linguas_hi linguas_hi_IN linguas_hu linguas_id linguas_it linguas_ja linguas_km linguas_kn linguas_ko linguas_ku linguas_lo linguas_lt linguas_lv linguas_ml linguas_mr linguas_ms linguas_nb linguas_nl linguas_nn linguas_no linguas_or linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_pt_PT linguas_ro linguas_ru linguas_sk linguas_sl linguas_sq linguas_sr linguas_sr@latin linguas_sv linguas_ta linguas_te linguas_tg linguas_th linguas_tl linguas_tr linguas_ug linguas_uk linguas_ur_PK linguas_vi linguas_vi_VN linguas_wa linguas_zh_CN linguas_zh_HK linguas_zh_TW
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libxml2 net-libs/libproxy sys-libs/zlib gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) openssl? ( dev-libs/openssl[static-libs?] ) sys-apps/iproute2
-REQUIRED_USE=^^ ( gnutls openssl )
-SLOT=0
-SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-4.07.tar.gz http://dev.gentoo.org/~hwoarang/distfiles/openconnect-script-20121108205904.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	linux-info	f01ffb28843e2de3ea571f80f07e5078	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=18ee8bd5d99778b000aa1d289f991ac0
diff --git a/metadata/md5-cache/net-misc/openconnect-4.07 b/metadata/md5-cache/net-misc/openconnect-4.07-r2
similarity index 88%
rename from metadata/md5-cache/net-misc/openconnect-4.07
rename to metadata/md5-cache/net-misc/openconnect-4.07-r2
index 9012d2cef534..9fc7af9fbfa6 100644
--- a/metadata/md5-cache/net-misc/openconnect-4.07
+++ b/metadata/md5-cache/net-misc/openconnect-4.07-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2 net-libs/libproxy sys-libs/zlib gnutls? ( || ( ( >=net-
 REQUIRED_USE=^^ ( gnutls openssl )
 SLOT=0
 SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-4.07.tar.gz http://dev.gentoo.org/~hwoarang/distfiles/openconnect-script-20121108205904.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	linux-info	f01ffb28843e2de3ea571f80f07e5078	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=07575844460f9d1b9b419504ec2ef8b5
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	linux-info	f01ffb28843e2de3ea571f80f07e5078	multilib	9aa8a023e062fca0ba79362d9d0cc488	python-any-r1	d378f1938a81eb727abdd549cf6b4531	python-utils-r1	dcd8a7e28a2e90a45fc1875429811c73	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=89a5438ff7bb4d23785aec863d96910e
diff --git a/metadata/md5-cache/net-misc/openntpd-20080406 b/metadata/md5-cache/net-misc/openntpd-20080406
new file mode 100644
index 000000000000..48b1c3d4ff28
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openntpd-20080406
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=ssl? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-ntp ) !<=net-misc/ntp-4.2.0-r2 !net-misc/ntp[-openntpd] virtual/yacc || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Lightweight NTP server ported from OpenBSD
+EAPI=5
+HOMEPAGE=http://www.openntpd.org/
+IUSE=ssl selinux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=BSD GPL-2
+RDEPEND=ssl? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-ntp ) !<=net-misc/ntp-4.2.0-r2 !net-misc/ntp[-openntpd]
+SLOT=0
+SRC_URI=mirror://debian/pool/main/o/openntpd/openntpd_20080406p.orig.tar.gz mirror://debian/pool/main/o/openntpd/openntpd_20080406p-4.debian.tar.gz
+_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=cf87148a7e9822914fc747dab02ce105
diff --git a/metadata/md5-cache/net-misc/quagga-0.99.21 b/metadata/md5-cache/net-misc/quagga-0.99.21
index 0c5e9d9df417..9564cb85a033 100644
--- a/metadata/md5-cache/net-misc/quagga-0.99.21
+++ b/metadata/md5-cache/net-misc/quagga-0.99.21
@@ -4,10 +4,10 @@ DESCRIPTION=A free routing daemon replacing Zebra supporting RIP, OSPF and BGP
 EAPI=4
 HOMEPAGE=http://quagga.net/
 IUSE=bgpclassless caps doc elibc_glibc ipv6 multipath ospfapi pam +readline snmp tcp-zebra
-KEYWORDS=alpha amd64 arm hppa ~ppc s390 sparc x86
+KEYWORDS=alpha amd64 arm hppa ppc s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=caps? ( sys-libs/libcap ) snmp? ( net-analyzer/net-snmp ) readline? ( sys-libs/readline pam? ( sys-libs/pam ) ) !elibc_glibc? ( dev-libs/libpcre ) sys-apps/openrc sys-apps/iproute2
 SLOT=0
 SRC_URI=mirror://nongnu/quagga/quagga-0.99.21.tar.xz bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/ht-20040304-classless-bgp.patch )
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=966488a6df675c25cdafc996b63b2cfb
+_md5_=b872724ad0264026b600b9f3b028e42c
diff --git a/metadata/md5-cache/net-misc/sslh-1.14 b/metadata/md5-cache/net-misc/sslh-1.14
new file mode 100644
index 000000000000..dcefb313312a
--- /dev/null
+++ b/metadata/md5-cache/net-misc/sslh-1.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install
+DEPEND=tcpd? ( sys-apps/tcp-wrappers ) dev-libs/libconfig dev-lang/perl
+DESCRIPTION=Port multiplexer - accept both HTTPS and SSH connections on the same port
+EAPI=5
+HOMEPAGE=http://www.rutschle.net/tech/sslh.shtml
+IUSE=tcpd
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) dev-libs/libconfig
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.rutschle.net/tech/sslh-1.14.tar.gz
+_eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
+_md5_=ff2773a4755ce2a988342810a0e0a87f
diff --git a/metadata/md5-cache/net-nntp/inn-2.5.3 b/metadata/md5-cache/net-nntp/inn-2.5.3
index 58574ba334a2..cdb7e4d52e1a 100644
--- a/metadata/md5-cache/net-nntp/inn-2.5.3
+++ b/metadata/md5-cache/net-nntp/inn-2.5.3
@@ -5,9 +5,9 @@ EAPI=4
 HOMEPAGE=https://www.isc.org/software/inn
 IUSE=berkdb innkeywords inntaggedhash ipv6 kerberos perl python sasl ssl ssl
 KEYWORDS=amd64 ppc x86
-LICENSE=as-is BSD GPL-2
+LICENSE=ISC GPL-2+ public-domain BSD-4 BSD-2 RSA BSD MIT GPL-2
 RDEPEND=virtual/mta dev-perl/MIME-tools kerberos? ( virtual/krb5 ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl ) python? ( dev-lang/python ) berkdb? ( sys-libs/db )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/inn/inn-2.5.3.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
-_md5_=aacde558fd89c0032fb805a33c0e6588
+_md5_=0950e02079c35222c6f182a59a472368
diff --git a/metadata/md5-cache/net-p2p/deluge-1.3.5-r2 b/metadata/md5-cache/net-p2p/deluge-1.3.5-r2
index f7f40024a0af..23b406896645 100644
--- a/metadata/md5-cache/net-p2p/deluge-1.3.5-r2
+++ b/metadata/md5-cache/net-p2p/deluge-1.3.5-r2
@@ -10,4 +10,4 @@ RDEPEND=>=net-libs/rb_libtorrent-0.14.9[python] dev-python/setuptools dev-util/i
 SLOT=0
 SRC_URI=http://download.deluge-torrent.org/source/deluge-1.3.5.tar.lzma
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5cd1fdb3cff2763df1b151372c2d0a84
+_md5_=65d9132961ffcaf512c21b5580f294de
diff --git a/metadata/md5-cache/net-p2p/deluge-9999 b/metadata/md5-cache/net-p2p/deluge-9999
index b6f027881bca..7cce2948ee04 100644
--- a/metadata/md5-cache/net-p2p/deluge-9999
+++ b/metadata/md5-cache/net-p2p/deluge-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/rb_libtorrent-0.14.9[python] dev-python/setuptools dev-python/chardet dev-python/pyopenssl dev-python/pyxdg || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson ) >=dev-python/twisted-8.1 >=dev-python/twisted-web-8.1 geoip? ( dev-libs/geoip ) gtk? ( dev-python/pygame dev-python/pygobject:2 >=dev-python/pygtk-2.12 gnome-base/librsvg libnotify? ( dev-python/notify-python ) ) setproctitle? ( dev-python/setproctitle ) webinterface? ( dev-python/mako ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ed907871774ff2f1c0d00b5d0d6b6a29
+_md5_=6f34029f22f5cce45278c120038da51f
diff --git a/metadata/md5-cache/net-print/gutenprint-5.2.9 b/metadata/md5-cache/net-print/gutenprint-5.2.9
index fead242dd9e2..619b34885ff3 100644
--- a/metadata/md5-cache/net-print/gutenprint-5.2.9
+++ b/metadata/md5-cache/net-print/gutenprint-5.2.9
@@ -4,7 +4,7 @@ DESCRIPTION=Ghostscript and cups printer drivers
 EAPI=4
 HOMEPAGE=http://gutenprint.sourceforge.net
 IUSE=cups foomaticdb gimp gtk nls readline ppds static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl dev-lang/perl readline? ( sys-libs/readline ) cups? ( >=net-print/cups-1.1.14 ) foomaticdb? ( net-print/foomatic-db-engine ) gimp? ( >=media-gfx/gimp-2.2 x11-libs/gtk+:2 ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl )
 REQUIRED_USE=gimp? ( gtk )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/gimp-print/gutenprint-5.2.9.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3de0d24c24b806b1e6266b945315bf65
+_md5_=1cfd114c67a6fa021dd679a7f30f09b1
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.5_beta15 b/metadata/md5-cache/net-proxy/haproxy-1.5_beta15
new file mode 100644
index 000000000000..6a9d1430fe9c
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-1.5_beta15
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst setup
+DEPEND=pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl[zlib?] ) zlib? ( sys-libs/zlib )
+DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
+EAPI=4
+HOMEPAGE=http://haproxy.1wt.eu
+IUSE=+crypt examples +pcre ssl vim-syntax +zlib
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl[zlib?] ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=http://haproxy.1wt.eu/download/1.5/src/devel/haproxy-1.5-dev15.tar.gz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=b1f957028762aa0b130e131aef60dfaf
diff --git a/metadata/md5-cache/net-proxy/squid-3.1.22 b/metadata/md5-cache/net-proxy/squid-3.1.22
index 7f27a9da9dc2..6e85583d6e60 100644
--- a/metadata/md5-cache/net-proxy/squid-3.1.22
+++ b/metadata/md5-cache/net-proxy/squid-3.1.22
@@ -4,11 +4,11 @@ DESCRIPTION=A full-featured web proxy cache
 EAPI=4
 HOMEPAGE=http://www.squid-cache.org/
 IUSE=caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap icap-client mysql postgres sqlite zero-penalty-hit pf-transparent ipf-transparent kqueue elibc_uclibc kernel_linux +epoll tproxy
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:0 ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
 REQUIRED_USE=tproxy? ( caps )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.22.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	f01ffb28843e2de3ea571f80f07e5078	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=5d5e92a47579b4483df07ccb4863afbc
+_md5_=ee20d1d74637b2da955835ef19cc55ef
diff --git a/metadata/md5-cache/net-wireless/iw-3.8 b/metadata/md5-cache/net-wireless/iw-3.8
new file mode 100644
index 000000000000..9ee23c145545
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/iw-3.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile prepare
+DEPEND=dev-libs/libnl virtual/pkgconfig
+DESCRIPTION=nl80211-based configuration utility for wireless devices using the mac80211 kernel stack
+EAPI=5
+HOMEPAGE=http://wireless.kernel.org/en/users/Documentation/iw
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=ISC
+RDEPEND=dev-libs/libnl
+SLOT=0
+SRC_URI=http://linuxwireless.org/download/iw/iw-3.8.tar.bz2
+_eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
+_md5_=311975a777b2c4ce8fac77bb6ec9ca99
diff --git a/metadata/md5-cache/net-wireless/wepdecrypt-0.8-r2 b/metadata/md5-cache/net-wireless/wepdecrypt-0.8-r2
new file mode 100644
index 000000000000..26675b93a47c
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/wepdecrypt-0.8-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/openssl net-libs/libpcap sys-libs/zlib X? ( x11-libs/fltk:1 )
+DESCRIPTION=Enhanced version of WepAttack a tool for breaking 802.11 WEP keys
+EAPI=4
+HOMEPAGE=http://wepdecrypt.sourceforge.net/
+IUSE=X
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/openssl net-libs/libpcap sys-libs/zlib X? ( x11-libs/fltk:1 )
+SLOT=0
+SRC_URI=mirror://sourceforge/wepdecrypt/wepdecrypt-0.8.tar.gz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=ffb4430446b56b53d7fd80ed10f42955
diff --git a/metadata/md5-cache/perl-core/File-Path-2.08 b/metadata/md5-cache/perl-core/File-Path-2.08
index 488fc5ce3c44..711d07a5e96e 100644
--- a/metadata/md5-cache/perl-core/File-Path-2.08
+++ b/metadata/md5-cache/perl-core/File-Path-2.08
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install postinst postrm preinst prerm setup test unpack
 DESCRIPTION=File path and name utilities
 HOMEPAGE=http://search.cpan.org/dist/File-Path/
-KEYWORDS=amd64 ~ia64 ~sparc x86 ~ppc-aix
+KEYWORDS=amd64 ~ia64 ~ppc ~sparc x86 ~ppc-aix
 LICENSE=|| ( Artistic GPL-2 )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DL/DLAND/File-Path-2.08.tar.gz
 _eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8c72dbcf557d7ef532a52e1e7f7f6c42
+_md5_=e4c16e83664736457eea8436b6dc4c5c
diff --git a/metadata/md5-cache/perl-core/Thread-Queue-3.10.0 b/metadata/md5-cache/perl-core/Thread-Queue-3.10.0
index 06533e0dd21a..29238f7bde9d 100644
--- a/metadata/md5-cache/perl-core/Thread-Queue-3.10.0
+++ b/metadata/md5-cache/perl-core/Thread-Queue-3.10.0
@@ -4,10 +4,10 @@ DESCRIPTION=Thread-safe queues
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Thread-Queue/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl[ithreads] >=virtual/perl-threads-shared-1.21 virtual/perl-Scalar-List-Utils dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JD/JDHEDDEN/Thread-Queue-3.01.tar.gz
 _eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6d9475b6f047cfc46762a8f679c4af35
+_md5_=23e96c62568f5ad32194aaa6f3fcf50f
diff --git a/metadata/md5-cache/perl-core/threads-shared-1.420.0 b/metadata/md5-cache/perl-core/threads-shared-1.420.0
index 02fa6557f3ae..f76f7ba87c49 100644
--- a/metadata/md5-cache/perl-core/threads-shared-1.420.0
+++ b/metadata/md5-cache/perl-core/threads-shared-1.420.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl[ithreads] >=virtual/perl-threads-1.71 dev-lang/perl[-build]
 DESCRIPTION=Extension for sharing data structures between threads
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/threads-shared/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl[ithreads] >=virtual/perl-threads-1.71 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JD/JDHEDDEN/threads-shared-1.42.tar.gz
 _eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=11d16883f8bf1ef04645d82fb5247955
+_md5_=f3c458c7783ef269366c294be808a746
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-4.6_beta2 b/metadata/md5-cache/sci-chemistry/gromacs-4.6_beta2
deleted file mode 100644
index 5ef268039b32..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-4.6_beta2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit ) fftw? ( sci-libs/fftw:3.0 ) fkernels? ( !threads? ( !sse2? ( virtual/fortran ) ) ) gsl? ( sci-libs/gsl ) lapack? ( virtual/lapack ) mpi? ( virtual/mpi ) openmm? ( sci-libs/openmm[cuda,opencl] ) virtual/pkgconfig >=dev-util/cmake-2.8.5-r2 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) virtual/fortran
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=5
-HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas cuda doc -double-precision +fftw gsl lapack mpi openmm openmp +single-precision test +threads zsh-completion fkernels power6 sse2 sse41 avx128fma avx256
-KEYWORDS=~alpha ~amd64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit ) fftw? ( sci-libs/fftw:3.0 ) fkernels? ( !threads? ( !sse2? ( virtual/fortran ) ) ) gsl? ( sci-libs/gsl ) lapack? ( virtual/lapack ) mpi? ( virtual/mpi ) openmm? ( sci-libs/openmm[cuda,opencl] ) virtual/fortran
-REQUIRED_USE=cuda? ( single-precision ) openmm? ( single-precision cuda )
-RESTRICT=test
-SLOT=0
-SRC_URI=test? ( ftp://ftp.gromacs.org/pub/tests/gmxtest-4.0.4.tgz ) ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6-beta2.tar.gz doc? ( ftp://ftp.gromacs.org/pub/manual/gromacs-manual-4.6-beta1.pdf )
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	fortran-2	19652e219ec9b62d7d89735821d7afb6	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0602501885b01e267ba69ded95cf887f
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-4.6_beta3 b/metadata/md5-cache/sci-chemistry/gromacs-4.6_beta3
new file mode 100644
index 000000000000..d5be45009271
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/gromacs-4.6_beta3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
+DEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit ) fftw? ( sci-libs/fftw:3.0 ) gsl? ( sci-libs/gsl ) lapack? ( virtual/lapack ) mpi? ( virtual/mpi ) openmm? ( sci-libs/openmm[cuda,opencl] ) virtual/pkgconfig >=dev-util/cmake-2.8.5-r2 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=The ultimate molecular dynamics simulation package
+EAPI=5
+HOMEPAGE=http://www.gromacs.org/
+IUSE=X blas cuda doc -double-precision +fftw gsl lapack mpi +offensive openmm openmp +single-precision test +threads zsh-completion sse2 sse41 avx128fma avx256
+KEYWORDS=~alpha ~amd64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=GPL-2
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit ) fftw? ( sci-libs/fftw:3.0 ) gsl? ( sci-libs/gsl ) lapack? ( virtual/lapack ) mpi? ( virtual/mpi ) openmm? ( sci-libs/openmm[cuda,opencl] )
+REQUIRED_USE=cuda? ( single-precision ) openmm? ( single-precision cuda )
+RESTRICT=test
+SLOT=0
+SRC_URI=test? ( ftp://ftp.gromacs.org/pub/tests/gmxtest-4.0.4.tgz ) ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6-beta3.tar.gz doc? ( ftp://ftp.gromacs.org/pub/manual/gromacs-manual-4.6-beta1.pdf )
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=90879da3cb9f04321079d33b7384f97a
diff --git a/metadata/md5-cache/sci-electronics/gtkwave-3.3.41 b/metadata/md5-cache/sci-electronics/gtkwave-3.3.41
new file mode 100644
index 000000000000..2f81e7da81f0
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/gtkwave-3.3.41
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/pango sys-libs/zlib judy? ( dev-libs/judy ) tcl? ( dev-lang/tcl dev-lang/tk ) lzma? ( app-arch/xz-utils ) virtual/pkgconfig dev-util/gperf
+DESCRIPTION=A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files
+EAPI=4
+HOMEPAGE=http://gtkwave.sourceforge.net/
+IUSE=doc examples fasttree fatlines judy lzma packed tcl
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2 MIT
+RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/pango sys-libs/zlib judy? ( dev-libs/judy ) tcl? ( dev-lang/tcl dev-lang/tk ) lzma? ( app-arch/xz-utils )
+SLOT=0
+SRC_URI=mirror://sourceforge/gtkwave/gtkwave-3.3.41.tar.gz
+_eclasses_=fdo-mime	0acfe1a88fd8751a1d5dc671168219fa
+_md5_=b69b92717908624c1c0aeb6e4f0e8581
diff --git a/metadata/md5-cache/sec-policy/selinux-acct-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-acct-2.20120725-r9
new file mode 100644
index 000000000000..0fb6435e3a5f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-acct-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for acct
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e007738bc42d5574ff800d21d75f94ed
diff --git a/metadata/md5-cache/sec-policy/selinux-ada-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-ada-2.20120725-r9
new file mode 100644
index 000000000000..fe50d7c75491
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ada-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ada
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f2f55bacf8e104f89373a0244964e08e
diff --git a/metadata/md5-cache/sec-policy/selinux-afs-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-afs-2.20120725-r9
new file mode 100644
index 000000000000..6c6e1517728f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-afs-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for afs
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3c12414c2ac5947768d1989909852d1d
diff --git a/metadata/md5-cache/sec-policy/selinux-aide-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-aide-2.20120725-r9
new file mode 100644
index 000000000000..814410c3f475
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-aide-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for aide
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=1714db5a37a772654cb9a6502125c3be
diff --git a/metadata/md5-cache/sec-policy/selinux-alsa-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-alsa-2.20120725-r9
new file mode 100644
index 000000000000..432d6f85054f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-alsa-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for alsa
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a9f9602511970b669fa345058ae2d213
diff --git a/metadata/md5-cache/sec-policy/selinux-amanda-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-amanda-2.20120725-r9
new file mode 100644
index 000000000000..6f2312595c46
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-amanda-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for amanda
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=275237c5f49a2e894565c970837e0041
diff --git a/metadata/md5-cache/sec-policy/selinux-amavis-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-amavis-2.20120725-r9
new file mode 100644
index 000000000000..22ca0e254b82
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-amavis-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for amavis
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=0e00fd10fe6cf2bf5e957a0b43282005
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-apache-2.20120725-r9
new file mode 100644
index 000000000000..b0c9d73e6e39
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-apache-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for apache
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7c4d314a192081ec71f9ca4d6fd8b74d
diff --git a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20120725-r9
new file mode 100644
index 000000000000..ec5dc576e262
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for apcupsd
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a7a5a3e891857d19d8409000ce499775
diff --git a/metadata/md5-cache/sec-policy/selinux-apm-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-apm-2.20120725-r9
new file mode 100644
index 000000000000..d7bada1910d2
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-apm-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for apm
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b35940cb06ce68c4aba22daf57605a40
diff --git a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20120725-r9
new file mode 100644
index 000000000000..32bbcc0aca27
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for arpwatch
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f0398b75e91d0ec7c627f90e5a740fd8
diff --git a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20120725-r9
new file mode 100644
index 000000000000..cd0c7f63f2a9
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for asterisk
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=dfe07c036c37adf14999035357292aaf
diff --git a/metadata/md5-cache/sec-policy/selinux-at-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-at-2.20120725-r9
new file mode 100644
index 000000000000..40f8866b321a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-at-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for at
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d0c593c1be69a1c0d7bb1533c1dda4f1
diff --git a/metadata/md5-cache/sec-policy/selinux-automount-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-automount-2.20120725-r9
new file mode 100644
index 000000000000..41ae8dc8fadf
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-automount-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for automount
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7167a1acbcd33207698bc64ea390da6d
diff --git a/metadata/md5-cache/sec-policy/selinux-avahi-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-avahi-2.20120725-r9
new file mode 100644
index 000000000000..76342edf2f03
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-avahi-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for avahi
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=fcfa146fba99bfe13f32e98c6908734d
diff --git a/metadata/md5-cache/sec-policy/selinux-awstats-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-awstats-2.20120725-r9
new file mode 100644
index 000000000000..798c304a2eb1
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-awstats-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for awstats
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=1db039d127a3e66262cbe96ad68be88f
diff --git a/metadata/md5-cache/sec-policy/selinux-bacula-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-bacula-2.20120725-r9
new file mode 100644
index 000000000000..a7e50273fb9c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-bacula-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for bacula
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=5167893e39e9febd77ef277783edf99a
diff --git a/metadata/md5-cache/sec-policy/selinux-base-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-base-2.20120725-r9
new file mode 100644
index 000000000000..bc43e98af9d8
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-base-2.20120725-r9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare
+DEPEND=>=sys-apps/policycoreutils-2.1.10 >=sys-fs/udev-151 !<=sec-policy/selinux-base-policy-2.20120725 sys-devel/m4 >=sys-apps/checkpolicy-2.1.8
+DESCRIPTION=Gentoo base policy for SELinux
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+IUSE=+peer_perms +open_perms +ubac unconfined doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.1.10 >=sys-fs/udev-151 !<=sec-policy/selinux-base-policy-2.20120725
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=0a34d4438ab29a492ad291d7b770eb65
diff --git a/metadata/md5-cache/sec-policy/selinux-base-policy-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-base-policy-2.20120725-r9
new file mode 100644
index 000000000000..59071e78560d
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-base-policy-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare
+DESCRIPTION=SELinux policy for core modules
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+IUSE=unconfined
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sec-policy/selinux-base-2.20120725-r9 unconfined? ( sec-policy/selinux-unconfined )
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7c6b3a6e44642b7cdae6d31126b6c363
diff --git a/metadata/md5-cache/sec-policy/selinux-bind-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-bind-2.20120725-r9
new file mode 100644
index 000000000000..c53fc65b9794
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-bind-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for bind
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f5d6842b1a33165925e7dfd917c3228f
diff --git a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20120725-r9
new file mode 100644
index 000000000000..939b135e6b5b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for bitlbee
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=1e0dd867b17259c064603b2dad77ca2b
diff --git a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20120725-r9
new file mode 100644
index 000000000000..2cf3e1213b2f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for bluetooth
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=8b4b3f37afd339c06b6fcf5c3eb52fba
diff --git a/metadata/md5-cache/sec-policy/selinux-brctl-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-brctl-2.20120725-r9
new file mode 100644
index 000000000000..93686d95a5ad
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-brctl-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for brctl
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=703c60262ae0717f0586708a9b9d4179
diff --git a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20120725-r9
new file mode 100644
index 000000000000..1b2588ae1c14
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for calamaris
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=dd5d913400b5ddd5af7f9949fd84c942
diff --git a/metadata/md5-cache/sec-policy/selinux-canna-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-canna-2.20120725-r9
new file mode 100644
index 000000000000..5ff35f89e288
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-canna-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for canna
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=aea37202a65523c0e44c2f75955b513b
diff --git a/metadata/md5-cache/sec-policy/selinux-ccs-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-ccs-2.20120725-r9
new file mode 100644
index 000000000000..f179f0dd1d3c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ccs-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ccs
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=21264b43ba96fac6c8f4030738510ec5
diff --git a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20120725-r9
new file mode 100644
index 000000000000..a037b2ab0bf0
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for cdrecord
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=262c3cbee1b3f4716a66cd2eb3c310b1
diff --git a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20120725-r9
new file mode 100644
index 000000000000..106ac9613271
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for cgroup
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=9af9ccf3ff48f568cf8e8eaec55a82ac
diff --git a/metadata/md5-cache/sec-policy/selinux-chromium-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-chromium-2.20120725-r9
new file mode 100644
index 000000000000..84d9c53f0f2e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-chromium-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for chromium
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=6b709d5034217e50e790ce4dc343b52e
diff --git a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20120725-r9
new file mode 100644
index 000000000000..7917221110b8
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for chronyd
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a29e5f1ee79632b0cfae838201a36fbc
diff --git a/metadata/md5-cache/sec-policy/selinux-clamav-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-clamav-2.20120725-r9
new file mode 100644
index 000000000000..2a12a105bd51
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-clamav-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for clamav
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=fd9a27191c53c0911166118693f8a628
diff --git a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20120725-r9
new file mode 100644
index 000000000000..29baf8f2d92d
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for clockspeed
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f5d6c72f263b75d03c7988af165001c0
diff --git a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-consolekit-2.20120725-r9
new file mode 100644
index 000000000000..5fd7b4943bd2
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-consolekit-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for consolekit
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=9b4fc6e48c791f1d6e271d26b3c7363e
diff --git a/metadata/md5-cache/sec-policy/selinux-corosync-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-corosync-2.20120725-r9
new file mode 100644
index 000000000000..682ccb0f4c48
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-corosync-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for corosync
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4cb302ba31984397b27071f82342951c
diff --git a/metadata/md5-cache/sec-policy/selinux-courier-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-courier-2.20120725-r9
new file mode 100644
index 000000000000..244d1d31dbfe
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-courier-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for courier
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=8780f5f01ca1dd183f684f75d0dacb5d
diff --git a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20120725-r9
new file mode 100644
index 000000000000..b64b336968e2
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for cpucontrol
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=462215d5fec16972180bc4e76d74aaec
diff --git a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20120725-r9
new file mode 100644
index 000000000000..6cc788006219
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for cpufreqselector
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c54fca932ae2cb0c3df6d3b0f919db80
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-cups-2.20120725-r9
new file mode 100644
index 000000000000..6e5bcea41688
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-cups-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for cups
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=6a3e9c17aff3e438be64cbe941dce74f
diff --git a/metadata/md5-cache/sec-policy/selinux-cvs-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-cvs-2.20120725-r9
new file mode 100644
index 000000000000..2a5c6508ba26
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-cvs-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for cvs
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=dd74ab29f5681106fe09ca73d1128c20
diff --git a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20120725-r9
new file mode 100644
index 000000000000..9e96876a68f1
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for cyphesis
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=33f0949b94c47e0e9e40bb7eb7b4bd39
diff --git a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20120725-r9
new file mode 100644
index 000000000000..f04eb7a679c3
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for daemontools
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a182ad361cf3878602acbed33b217a0a
diff --git a/metadata/md5-cache/sec-policy/selinux-dante-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-dante-2.20120725-r9
new file mode 100644
index 000000000000..ebe788b097c0
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dante-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dante
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e3f4d2330f0f8b6bb005b3236aeb5368
diff --git a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20120725-r9
new file mode 100644
index 000000000000..33ff28c154d1
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dbadm
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=94fff0a0aeab0d777cced137afd79dcc
diff --git a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20120725-r9
new file mode 100644
index 000000000000..98c89f5c71d3
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dbskk
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=51ac626f6d0e9bd4a1235452fb81a1c8
diff --git a/metadata/md5-cache/sec-policy/selinux-dbus-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-dbus-2.20120725-r9
new file mode 100644
index 000000000000..1651e6785db0
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dbus-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dbus
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=76babe4c9dbb593a0d74132f769337be
diff --git a/metadata/md5-cache/sec-policy/selinux-dcc-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-dcc-2.20120725-r9
new file mode 100644
index 000000000000..915972ef7894
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dcc-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dcc
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=07eee37b8e7414f25c39b3fc241a58b7
diff --git a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20120725-r9
new file mode 100644
index 000000000000..1408c473b125
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ddclient
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=00c26188b49d8fd68984e12f6ac7dc04
diff --git a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20120725-r9
new file mode 100644
index 000000000000..30acbc279831
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ddcprobe
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=50e44ab2ea4aeb42cd9708161e4c0023
diff --git a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20120725-r9
new file mode 100644
index 000000000000..19a29dafe61d
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for denyhosts
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=cd312619724c1171cec2047d1624673a
diff --git a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20120725-r9
new file mode 100644
index 000000000000..3c08cc0df96d
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for devicekit
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d129a1f3d49e53f2c8208ead307b48bf
diff --git a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20120725-r9
new file mode 100644
index 000000000000..c4012ffe3c92
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dhcp
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=08de0d32ccd7d29fc3f38a15923fceae
diff --git a/metadata/md5-cache/sec-policy/selinux-dictd-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-dictd-2.20120725-r9
new file mode 100644
index 000000000000..a21107af9b17
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dictd-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dictd
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b6453e1583779b9ead0c49cf04a7eea3
diff --git a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20120725-r9
new file mode 100644
index 000000000000..dc81442f2b37
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dirsrv
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e95fbf9d973069458d43e9cc8aa45e73
diff --git a/metadata/md5-cache/sec-policy/selinux-distcc-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-distcc-2.20120725-r9
new file mode 100644
index 000000000000..a143f3615f31
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-distcc-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for distcc
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=2ffd527591c5bf554d62100c9752f8c1
diff --git a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20120725-r9
new file mode 100644
index 000000000000..185e945136cd
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for djbdns
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=95e01a850eb9f2345d04d4d8fa69f8d5
diff --git a/metadata/md5-cache/sec-policy/selinux-dkim-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-dkim-2.20120725-r9
new file mode 100644
index 000000000000..077ba0e299d6
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dkim-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dkim
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=41e2e42750b35b1e0df4f6424485661c
diff --git a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20120725-r9
new file mode 100644
index 000000000000..c87d87685d29
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dmidecode
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d0188c38e01bb37e7979065ad6db6136
diff --git a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20120725-r9
new file mode 100644
index 000000000000..fd216684d9a9
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dnsmasq
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=581df0d4316bcdbdef73be0d5c77a339
diff --git a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20120725-r9
new file mode 100644
index 000000000000..8a886b04b381
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dovecot
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=80506f240445fc290f6d0762c5066266
diff --git a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20120725-r9
new file mode 100644
index 000000000000..248609bd9455
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dpkg
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=5c8a5f7df887e93792e35be55751a771
diff --git a/metadata/md5-cache/sec-policy/selinux-dracut-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-dracut-2.20120725-r9
new file mode 100644
index 000000000000..2e682c34f72a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dracut-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dracut
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f56e9dbaae2e66ac4acd6d5e1167cdde
diff --git a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20120725-r9
new file mode 100644
index 000000000000..7cf857b804fa
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for entropyd
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=35b935d08b213cf08649f55efec7c2b0
diff --git a/metadata/md5-cache/sec-policy/selinux-evolution-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-evolution-2.20120725-r9
new file mode 100644
index 000000000000..74adcd39d840
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-evolution-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for evolution
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=6c670ffd3ae4b3c42ee3938013061652
diff --git a/metadata/md5-cache/sec-policy/selinux-exim-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-exim-2.20120725-r9
new file mode 100644
index 000000000000..9bfc8ad66c6f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-exim-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for exim
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4199e7da14b4568bb600f1a524541b95
diff --git a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20120725-r9
new file mode 100644
index 000000000000..b445ce2cf7a8
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for fail2ban
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=6c03f765e034e93ab3e06e699cc54741
diff --git a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20120725-r9
new file mode 100644
index 000000000000..92e205f5458d
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for fetchmail
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=eab1ad2bbb578fe1d2da9f713831ca02
diff --git a/metadata/md5-cache/sec-policy/selinux-finger-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-finger-2.20120725-r9
new file mode 100644
index 000000000000..fa3c87b8cefb
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-finger-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for finger
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=53c88639c91069f29281b135aba3dd83
diff --git a/metadata/md5-cache/sec-policy/selinux-flash-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-flash-2.20120725-r9
new file mode 100644
index 000000000000..84e07246639a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-flash-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for flash
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=ddb8da4234687fc169c992e13e814c6d
diff --git a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20120725-r9
new file mode 100644
index 000000000000..b8e3640cd078
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for fprintd
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3dfc021f312450e3a9e2c8af14018f29
diff --git a/metadata/md5-cache/sec-policy/selinux-ftp-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-ftp-2.20120725-r9
new file mode 100644
index 000000000000..fb1e1c2539d6
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ftp-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ftp
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=fe66a90aed39ba6d44601b7610022efd
diff --git a/metadata/md5-cache/sec-policy/selinux-games-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-games-2.20120725-r9
new file mode 100644
index 000000000000..0d26050567f7
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-games-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for games
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=8d89e27599b3382a026b483624e50d3a
diff --git a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20120725-r9
new file mode 100644
index 000000000000..e1712ec1e78c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for gatekeeper
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d73c9c01354238f5705e72fc91fd9c76
diff --git a/metadata/md5-cache/sec-policy/selinux-gift-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-gift-2.20120725-r9
new file mode 100644
index 000000000000..39e48a4b7088
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-gift-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for gift
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=462e8c8933b3aea16b522330baf6390f
diff --git a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20120725-r9
new file mode 100644
index 000000000000..1c95ff999e27
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for gitosis
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a69d0a29ed7c0cf6c68ede675bc90bb9
diff --git a/metadata/md5-cache/sec-policy/selinux-gnome-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-gnome-2.20120725-r9
new file mode 100644
index 000000000000..f6ee83e926d1
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-gnome-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for gnome
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b179ddc0fba2cceefa3ee848695bf2a4
diff --git a/metadata/md5-cache/sec-policy/selinux-gorg-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-gorg-2.20120725-r9
new file mode 100644
index 000000000000..922392fdb4d4
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-gorg-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for gorg
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e453dd81450cf2e809fdecd49cd65e85
diff --git a/metadata/md5-cache/sec-policy/selinux-gpg-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-gpg-2.20120725-r9
new file mode 100644
index 000000000000..bd03f8dcb163
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-gpg-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for gpg
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=57d3458a1d1d737d7cdf0324aefd82e5
diff --git a/metadata/md5-cache/sec-policy/selinux-gpm-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-gpm-2.20120725-r9
new file mode 100644
index 000000000000..27a5e039334c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-gpm-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for gpm
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=6a576b949f0e3ec11860946be4ec1d7e
diff --git a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20120725-r9
new file mode 100644
index 000000000000..c1b117d8dd89
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for gpsd
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=5dbf330c17b5ddad5b57de1de763e927
diff --git a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20120725-r9
new file mode 100644
index 000000000000..b918bb14a9c7
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for hddtemp
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=70e20128b55f3e50f834c00af73db4f9
diff --git a/metadata/md5-cache/sec-policy/selinux-howl-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-howl-2.20120725-r9
new file mode 100644
index 000000000000..04e00790eea2
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-howl-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for howl
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=5116717ef07039423a850f0dff8fbf29
diff --git a/metadata/md5-cache/sec-policy/selinux-icecast-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-icecast-2.20120725-r9
new file mode 100644
index 000000000000..09976d9ec745
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-icecast-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for icecast
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c571ec322f07832c66a9895490950884
diff --git a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20120725-r9
new file mode 100644
index 000000000000..0bed3979198e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ifplugd
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=ba41192974ec6384f4e79fe8334c1190
diff --git a/metadata/md5-cache/sec-policy/selinux-imaze-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-imaze-2.20120725-r9
new file mode 100644
index 000000000000..ad02838c83ac
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-imaze-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for imaze
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=57b228431ff364549c6d7c7506b1ccba
diff --git a/metadata/md5-cache/sec-policy/selinux-inetd-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-inetd-2.20120725-r9
new file mode 100644
index 000000000000..2a92d5dddeb3
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-inetd-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for inetd
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f46a66eb8d53e86ee9cb80a06d33a178
diff --git a/metadata/md5-cache/sec-policy/selinux-inn-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-inn-2.20120725-r9
new file mode 100644
index 000000000000..c1d5ab210b9f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-inn-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for inn
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=06b72016321751944bbd8debe62bbbf3
diff --git a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20120725-r9
new file mode 100644
index 000000000000..3b2bf4ed563e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ipsec
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7af03f03a882d3da66e516cdeeb0b754
diff --git a/metadata/md5-cache/sec-policy/selinux-irc-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-irc-2.20120725-r9
new file mode 100644
index 000000000000..49862dfd83c3
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-irc-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for irc
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=71cd6897b317905a99b46df221df1ec5
diff --git a/metadata/md5-cache/sec-policy/selinux-ircd-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-ircd-2.20120725-r9
new file mode 100644
index 000000000000..36072e10f3fc
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ircd-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ircd
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=dd470ea8dac893d42d46e1230cbbecd3
diff --git a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20120725-r9
new file mode 100644
index 000000000000..0913bc721483
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for irqbalance
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7cf2301f148fd54fa1b5aa6f88fa57c3
diff --git a/metadata/md5-cache/sec-policy/selinux-jabber-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-jabber-2.20120725-r9
new file mode 100644
index 000000000000..22d5f222f5d3
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-jabber-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for jabber
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=04d4b234eb1089354e4522f79e3a3c9c
diff --git a/metadata/md5-cache/sec-policy/selinux-java-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-java-2.20120725-r9
new file mode 100644
index 000000000000..b38f38b0dbef
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-java-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for java
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=85faaff77df0eaae128203f6ebd83c19
diff --git a/metadata/md5-cache/sec-policy/selinux-kdump-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-kdump-2.20120725-r9
new file mode 100644
index 000000000000..4dcf928006d6
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-kdump-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for kdump
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c54fe12f2ef7bf1c13151176b57d89b2
diff --git a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20120725-r9
new file mode 100644
index 000000000000..c5d6eff3fee9
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for kerberos
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=1e51d90f262bf54c436a1345908da685
diff --git a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20120725-r9
new file mode 100644
index 000000000000..dd23c36acf18
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for kerneloops
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=737f727cd0ecb6be2ca5fac1b357f320
diff --git a/metadata/md5-cache/sec-policy/selinux-kismet-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-kismet-2.20120725-r9
new file mode 100644
index 000000000000..8eed9b3887ad
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-kismet-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for kismet
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a9b89538c0f4eafcab958bc7116f5fe3
diff --git a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20120725-r9
new file mode 100644
index 000000000000..66aefbc52be0
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ksmtuned
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7da33292f873c3d61f1231cd69d67620
diff --git a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20120725-r9
new file mode 100644
index 000000000000..12c0b1f3b05f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for kudzu
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f77977432107e6c51daa87e07ab56b0c
diff --git a/metadata/md5-cache/sec-policy/selinux-ldap-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-ldap-2.20120725-r9
new file mode 100644
index 000000000000..bb17f25254d7
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ldap-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ldap
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e2596a84d85adf817d7c5fd76d69cbd7
diff --git a/metadata/md5-cache/sec-policy/selinux-links-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-links-2.20120725-r9
new file mode 100644
index 000000000000..e126b3388c23
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-links-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for links
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=65c1605e08ceb0954140ff4453a387b8
diff --git a/metadata/md5-cache/sec-policy/selinux-lircd-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-lircd-2.20120725-r9
new file mode 100644
index 000000000000..982b02625e06
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-lircd-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for lircd
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=ef5f30efaf788c60146b87222f247451
diff --git a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20120725-r9
new file mode 100644
index 000000000000..5921883c0e6f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for loadkeys
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d09d85fc9c1ba28667a95b844ec9a2da
diff --git a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20120725-r9
new file mode 100644
index 000000000000..6e5e4f20d64b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for lockdev
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=9c74fa69318867725c43a01de1fac141
diff --git a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20120725-r9
new file mode 100644
index 000000000000..335c264dfa3e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for logrotate
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=ec902fc7e82f40894cd7e80a17dc37d8
diff --git a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20120725-r9
new file mode 100644
index 000000000000..4aeb6c838d31
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for logsentry
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=df034e1cefbeb421d53fdb4782c4f948
diff --git a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20120725-r9
new file mode 100644
index 000000000000..11bedc0fa5f0
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for logwatch
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b48cce762a077226ad589a8ab65857e6
diff --git a/metadata/md5-cache/sec-policy/selinux-lpd-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-lpd-2.20120725-r9
new file mode 100644
index 000000000000..1e57ee29b71a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-lpd-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for lpd
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=9df3068821296e80237fbdf9815cca97
diff --git a/metadata/md5-cache/sec-policy/selinux-mailman-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-mailman-2.20120725-r9
new file mode 100644
index 000000000000..6c0c77203e13
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mailman-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mailman
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3f777a83f4d6287db690acce689040fb
diff --git a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20120725-r9
new file mode 100644
index 000000000000..3c364bdd76bd
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for makewhatis
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=12448704606f64210c6241f68fcdc8ed
diff --git a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20120725-r9
new file mode 100644
index 000000000000..57152706353a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mcelog
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=eb346c63b5537b81a3eecfc0f11499ca
diff --git a/metadata/md5-cache/sec-policy/selinux-memcached-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-memcached-2.20120725-r9
new file mode 100644
index 000000000000..f4dd6658cace
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-memcached-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for memcached
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=1df4875b96620fb5e1298f050d08dac6
diff --git a/metadata/md5-cache/sec-policy/selinux-milter-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-milter-2.20120725-r9
new file mode 100644
index 000000000000..4cc1898c7587
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-milter-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for milter
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=444fc842bd41fcb7191bb0c7f4827060
diff --git a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20120725-r9
new file mode 100644
index 000000000000..3c9c24c85680
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-dbus sec-policy/selinux-networkmanager >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for modemmanager
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-dbus sec-policy/selinux-networkmanager >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e101c8c1ebc3866520257f1d5bff7ece
diff --git a/metadata/md5-cache/sec-policy/selinux-mono-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-mono-2.20120725-r9
new file mode 100644
index 000000000000..8ffe6ab6fe4f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mono-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mono
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f5a915667103a462ffaf2f7b7f925172
diff --git a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20120725-r9
new file mode 100644
index 000000000000..007eb193cab6
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mozilla
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d50ccf9ee5033f4cef5061e07b40e55b
diff --git a/metadata/md5-cache/sec-policy/selinux-mpd-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-mpd-2.20120725-r9
new file mode 100644
index 000000000000..77b324ce671e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mpd-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mpd
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3908882dd89ed2bc236f5215b1de7a20
diff --git a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20120725-r9
new file mode 100644
index 000000000000..ef0859929430
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mplayer
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=15024f9eacc23e66acab9b93810ca91f
diff --git a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20120725-r9
new file mode 100644
index 000000000000..0417aa6aefc1
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mrtg
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b4875941159f0b45274196ee665355ba
diff --git a/metadata/md5-cache/sec-policy/selinux-munin-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-munin-2.20120725-r9
new file mode 100644
index 000000000000..029200d99be3
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-munin-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for munin
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e13d121965bc47750280b2397a65a6b8
diff --git a/metadata/md5-cache/sec-policy/selinux-mutt-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-mutt-2.20120725-r9
new file mode 100644
index 000000000000..2b85990f4e2b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mutt-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mutt
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=bc937f359b14d37e2112d44efce54ddc
diff --git a/metadata/md5-cache/sec-policy/selinux-mysql-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-mysql-2.20120725-r9
new file mode 100644
index 000000000000..6860c7875a35
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mysql-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mysql
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a07faf704ef5a66d958dbc7e9f912862
diff --git a/metadata/md5-cache/sec-policy/selinux-nagios-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-nagios-2.20120725-r9
new file mode 100644
index 000000000000..2f9e94725f3c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-nagios-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for nagios
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=983c67d8c01210446cf69dad139474c8
diff --git a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20120725-r9
new file mode 100644
index 000000000000..98bc1aa8fa3c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ncftool
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c93773a8aad60a1e1152a7bd643c496a
diff --git a/metadata/md5-cache/sec-policy/selinux-nessus-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-nessus-2.20120725-r9
new file mode 100644
index 000000000000..08e9b2ba6911
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-nessus-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for nessus
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=9f7a1104a75c5603fc2e1551866939d9
diff --git a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20120725-r9
new file mode 100644
index 000000000000..cd32a41c3bfb
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for networkmanager
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=81c3d6665c0312681972a8ca0234dd1b
diff --git a/metadata/md5-cache/sec-policy/selinux-nginx-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-nginx-2.20120725-r9
new file mode 100644
index 000000000000..9d0f362ecc67
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-nginx-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for nginx
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=ea22ec513371247e7d0de6df71799517
diff --git a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20120725-r9
new file mode 100644
index 000000000000..339900c3caee
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for nslcd
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e7a169d8c2fdcfec9d101113b630b813
diff --git a/metadata/md5-cache/sec-policy/selinux-ntop-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-ntop-2.20120725-r9
new file mode 100644
index 000000000000..ad40e520406b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ntop-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ntop
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f64e4ce6e63101c7c20022044dba945c
diff --git a/metadata/md5-cache/sec-policy/selinux-ntp-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-ntp-2.20120725-r9
new file mode 100644
index 000000000000..b80f82fdc43c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ntp-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ntp
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=64c466bc559ac4f53643c8cebc8fe88b
diff --git a/metadata/md5-cache/sec-policy/selinux-nut-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-nut-2.20120725-r9
new file mode 100644
index 000000000000..698094a73974
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-nut-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for nut
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=020e04f9d1118e11ec4e998ac881a0e0
diff --git a/metadata/md5-cache/sec-policy/selinux-nx-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-nx-2.20120725-r9
new file mode 100644
index 000000000000..4941769c3f2b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-nx-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for nx
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=05b5e8fb4ef26f4c450bc28150d9c3a0
diff --git a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20120725-r9
new file mode 100644
index 000000000000..4de1bde67ab8
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for oddjob
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=60e6285b07213e9b73b6fea9a9d13e9e
diff --git a/metadata/md5-cache/sec-policy/selinux-oident-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-oident-2.20120725-r9
new file mode 100644
index 000000000000..396e7aaa50c4
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-oident-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for oident
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=52c5a32f2b81d4ac01bb4327c43d052f
diff --git a/metadata/md5-cache/sec-policy/selinux-openct-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-openct-2.20120725-r9
new file mode 100644
index 000000000000..60ffa21722dc
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-openct-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for openct
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=22e934414cbe7bd9f44284191787abf6
diff --git a/metadata/md5-cache/sec-policy/selinux-openrc-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-openrc-2.20120725-r9
new file mode 100644
index 000000000000..26e6744b2349
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-openrc-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for openrc
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=434d2ef236f7152b9e360c31eb96b785
diff --git a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20120725-r9
new file mode 100644
index 000000000000..58d4fdcc6a8d
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for openvpn
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e8b83ca6ee8bcd9860172262a23a438f
diff --git a/metadata/md5-cache/sec-policy/selinux-pan-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-pan-2.20120725-r9
new file mode 100644
index 000000000000..f617398ce5cb
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-pan-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for pan
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c55a34e6b44012f7675a846241c1eaf6
diff --git a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20120725-r9
new file mode 100644
index 000000000000..19de6178acc5
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for pcmcia
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f4e900c3efc50526c907bd203d83c4cb
diff --git a/metadata/md5-cache/sec-policy/selinux-perdition-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-perdition-2.20120725-r9
new file mode 100644
index 000000000000..57de7c3415a8
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-perdition-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for perdition
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=80c7a074dc02c05bb6ac4696bab4fb0a
diff --git a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20120725-r9
new file mode 100644
index 000000000000..dd21a6f56de7
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for phpfpm
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=dd18cd59e44bf1c376972e5085276520
diff --git a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20120725-r9
new file mode 100644
index 000000000000..6520bd5e18e8
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for plymouthd
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=688dd3c738ba80b7b0fd7e5c7f9f41d0
diff --git a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20120725-r9
new file mode 100644
index 000000000000..7acc8c54b75a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for podsleuth
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=364321643eea65c1b126f87b1ce240be
diff --git a/metadata/md5-cache/sec-policy/selinux-policykit-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-policykit-2.20120725-r9
new file mode 100644
index 000000000000..49a6db795fab
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-policykit-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for policykit
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=829cc47fd7b41843baae5ccf1bda27a8
diff --git a/metadata/md5-cache/sec-policy/selinux-portmap-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-portmap-2.20120725-r9
new file mode 100644
index 000000000000..ac89fa0db23b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-portmap-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for portmap
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=fc340ad46db9eb462590965ff500630a
diff --git a/metadata/md5-cache/sec-policy/selinux-postfix-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-postfix-2.20120725-r9
new file mode 100644
index 000000000000..c3ceed3a1643
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-postfix-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for postfix
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=ecabb1b228eca116c382673a5adc1ef4
diff --git a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20120725-r9
new file mode 100644
index 000000000000..5eda7fd7e7cb
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for postgresql
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=37f8573edbce38fe7a9d48d8f4c5c9ca
diff --git a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20120725-r9
new file mode 100644
index 000000000000..5270108ff8e9
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for postgrey
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a5e7bf7be164a428e7f9314b01224b46
diff --git a/metadata/md5-cache/sec-policy/selinux-ppp-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-ppp-2.20120725-r9
new file mode 100644
index 000000000000..446e274b4a65
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ppp-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ppp
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e9d3399fc103c1224c7eb3fe0478ae62
diff --git a/metadata/md5-cache/sec-policy/selinux-prelink-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-prelink-2.20120725-r9
new file mode 100644
index 000000000000..4338fb3b7c64
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-prelink-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for prelink
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=92621c66ba87229a7522cb2b9dfea71c
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-prelude-2.20120725-r9
new file mode 100644
index 000000000000..731df0761612
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-prelude-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for prelude
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b8a7ad95e2ae3b96d26cd9728ad7ce76
diff --git a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20120725-r9
new file mode 100644
index 000000000000..b38569c6c332
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for privoxy
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=fbd801a653d7086c2471409e38bf8d90
diff --git a/metadata/md5-cache/sec-policy/selinux-procmail-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-procmail-2.20120725-r9
new file mode 100644
index 000000000000..5ede79314c82
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-procmail-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for procmail
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=27bfd06e208e75ce4152ebbd609f667b
diff --git a/metadata/md5-cache/sec-policy/selinux-psad-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-psad-2.20120725-r9
new file mode 100644
index 000000000000..b4038ea98fb8
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-psad-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for psad
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c19d158ec69b788f802daf9f62ce1db0
diff --git a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20120725-r9
new file mode 100644
index 000000000000..a59e1fa72e31
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for publicfile
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=99bbcf8846098e87dc80c6315aee2156
diff --git a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20120725-r9
new file mode 100644
index 000000000000..880bc7c6ced8
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for pulseaudio
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e461a32aff77892d1dedf98be4f6fb83
diff --git a/metadata/md5-cache/sec-policy/selinux-puppet-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-puppet-2.20120725-r9
new file mode 100644
index 000000000000..801abdca0b91
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-puppet-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for puppet
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d36c38894942c583c7bda2d327a4f13f
diff --git a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20120725-r9
new file mode 100644
index 000000000000..e21a6f5c84d5
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for pyicqt
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=0ae2ec92df47d98a13461c8224a5c795
diff --git a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20120725-r9
new file mode 100644
index 000000000000..f504fa99e52e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for pyzor
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=93523b862562ccfc24637932bf9f687a
diff --git a/metadata/md5-cache/sec-policy/selinux-qemu-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-qemu-2.20120725-r9
new file mode 100644
index 000000000000..742cc497c266
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-qemu-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for qemu
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e3f430c63a9f20aaace4ed6f6d6dee92
diff --git a/metadata/md5-cache/sec-policy/selinux-qmail-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-qmail-2.20120725-r9
new file mode 100644
index 000000000000..b4ad21c3eb8b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-qmail-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for qmail
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d0b5a5c01e3373c1623ae05310493ba4
diff --git a/metadata/md5-cache/sec-policy/selinux-quota-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-quota-2.20120725-r9
new file mode 100644
index 000000000000..05e2a2da3ac4
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-quota-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for quota
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=6840a11fd2b1211fd8461df6a71053fd
diff --git a/metadata/md5-cache/sec-policy/selinux-radius-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-radius-2.20120725-r9
new file mode 100644
index 000000000000..5703ac31cea4
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-radius-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for radius
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7f825bcec165c67a7fe4fbb296476c13
diff --git a/metadata/md5-cache/sec-policy/selinux-radvd-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-radvd-2.20120725-r9
new file mode 100644
index 000000000000..e87dd524ed6f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-radvd-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for radvd
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=6d94cbefd6cd721ba31b44039574a873
diff --git a/metadata/md5-cache/sec-policy/selinux-razor-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-razor-2.20120725-r9
new file mode 100644
index 000000000000..dbf65ff56435
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-razor-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for razor
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3b3587c63fdb8135c174e85c37f1b445
diff --git a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20120725-r9
new file mode 100644
index 000000000000..a0a462b0a302
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for remotelogin
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b938bafdc389ba9fc1cc9c9604d2bc49
diff --git a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20120725-r9
new file mode 100644
index 000000000000..495ddadaddaf
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for rgmanager
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c6568b8797a95df44a1c05b03df39c31
diff --git a/metadata/md5-cache/sec-policy/selinux-roundup-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-roundup-2.20120725-r9
new file mode 100644
index 000000000000..5a3c1e6c8f7f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-roundup-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for roundup
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=290e500f75cdfca0e7b679eb380cc57c
diff --git a/metadata/md5-cache/sec-policy/selinux-rpc-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-rpc-2.20120725-r9
new file mode 100644
index 000000000000..f7f815192517
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-rpc-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for rpc
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3561cbf04cb3191b7a5b7af2e0f6bbe2
diff --git a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20120725-r9
new file mode 100644
index 000000000000..96dd1788ef30
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for rpcbind
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b8978255516e813f4f25e8d7c2465751
diff --git a/metadata/md5-cache/sec-policy/selinux-rpm-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-rpm-2.20120725-r9
new file mode 100644
index 000000000000..3d777d295b8a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-rpm-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for rpm
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=da58b4226a2f4a77e71cacced974255a
diff --git a/metadata/md5-cache/sec-policy/selinux-rssh-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-rssh-2.20120725-r9
new file mode 100644
index 000000000000..484f1e7c55b7
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-rssh-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for rssh
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=0caa24784765d25a7be84ed16aab6e1e
diff --git a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20120725-r9
new file mode 100644
index 000000000000..94727895fdeb
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for rtkit
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4b6c1f58fa556ba0736d459c130bc324
diff --git a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20120725-r9
new file mode 100644
index 000000000000..c0e050ca7394
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for rtorrent
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3d113df16f0bb5ce2af1ea08a25cf57e
diff --git a/metadata/md5-cache/sec-policy/selinux-samba-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-samba-2.20120725-r9
new file mode 100644
index 000000000000..1e401c91be1e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-samba-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for samba
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=1da526178b71c3378e2ca4a854029115
diff --git a/metadata/md5-cache/sec-policy/selinux-sasl-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-sasl-2.20120725-r9
new file mode 100644
index 000000000000..af89c7dbbdac
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-sasl-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for sasl
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3507fe0eff030b459e827445c4f7668d
diff --git a/metadata/md5-cache/sec-policy/selinux-screen-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-screen-2.20120725-r9
new file mode 100644
index 000000000000..519b283afac7
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-screen-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for screen
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4cbff58052dd60238b5cfc73b9fdaf80
diff --git a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20120725-r9
new file mode 100644
index 000000000000..d5f58f7056ef
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for sendmail
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4e63f7abc27128f8b22cb7597eacabae
diff --git a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20120725-r9
new file mode 100644
index 000000000000..5b3fb950f422
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for shorewall
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f751d3552dadbfc2e126e3af2053b5b8
diff --git a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20120725-r9
new file mode 100644
index 000000000000..79f99278f786
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for shutdown
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=88bf63d50b1fb44136bf514b60ac72ef
diff --git a/metadata/md5-cache/sec-policy/selinux-skype-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-skype-2.20120725-r9
new file mode 100644
index 000000000000..e7f3baeeaa21
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-skype-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for skype
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d0bf0af4e7f9226d984dbbe05742d51f
diff --git a/metadata/md5-cache/sec-policy/selinux-slocate-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-slocate-2.20120725-r9
new file mode 100644
index 000000000000..0de11c471fdf
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-slocate-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for slocate
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=2bb91bbf3f86e094b8ac121abfbef35a
diff --git a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20120725-r9
new file mode 100644
index 000000000000..bbdc1dcd314a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for slrnpull
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=29cb37e136f212126d92402315d938cc
diff --git a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20120725-r9
new file mode 100644
index 000000000000..e5c7a5fc3b89
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for smartmon
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e22b1e8a7f734a035d5ad4532daa0ac8
diff --git a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20120725-r9
new file mode 100644
index 000000000000..f7450e4b5623
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for smokeping
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=9c7ffc43979fc7ad9d7d4b9574739a61
diff --git a/metadata/md5-cache/sec-policy/selinux-snmp-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-snmp-2.20120725-r9
new file mode 100644
index 000000000000..2b94f57d2e64
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-snmp-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for snmp
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=13a9408a2d371be6b250b6ab8bf6da98
diff --git a/metadata/md5-cache/sec-policy/selinux-snort-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-snort-2.20120725-r9
new file mode 100644
index 000000000000..2e66d19f9923
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-snort-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for snort
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=1bbf26f6d3351c9be08c5001418cd6a6
diff --git a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20120725-r9
new file mode 100644
index 000000000000..452bfa76589c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for soundserver
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=db2ea0bdb2d0572b8654b6b3723eec74
diff --git a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20120725-r9
new file mode 100644
index 000000000000..f47b863c7def
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for spamassassin
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7428dba2b00bb5a222b45f530cb0c6ae
diff --git a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20120725-r9
new file mode 100644
index 000000000000..9a1c643fd256
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for speedtouch
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=02f3e324d959842f79af8d124823c17d
diff --git a/metadata/md5-cache/sec-policy/selinux-squid-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-squid-2.20120725-r9
new file mode 100644
index 000000000000..76f2e408a2b9
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-squid-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for squid
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3a5bfc70cb2ba4ee57b29e9c7507142c
diff --git a/metadata/md5-cache/sec-policy/selinux-sssd-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-sssd-2.20120725-r9
new file mode 100644
index 000000000000..ffacd861d7b8
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-sssd-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for sssd
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7c6c163f3879c17ec4f52ca9d06cfa57
diff --git a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20120725-r9
new file mode 100644
index 000000000000..8fe5f41cfa6c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for stunnel
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4f990be3678a7b1cfa5c3f6f1e05b8bd
diff --git a/metadata/md5-cache/sec-policy/selinux-sudo-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-sudo-2.20120725-r9
new file mode 100644
index 000000000000..58d9d3c6f236
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-sudo-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for sudo
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=ff4dcb21c6be5d65b9e7c201c16bc91c
diff --git a/metadata/md5-cache/sec-policy/selinux-sxid-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-sxid-2.20120725-r9
new file mode 100644
index 000000000000..1484a9ab2c99
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-sxid-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for sxid
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c87764c6946c1e630c9d432db78ec5f5
diff --git a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20120725-r9
new file mode 100644
index 000000000000..8181b3bba95f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for sysstat
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=5574b908d8b2e3743731c3bb17552bd5
diff --git a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20120725-r9
new file mode 100644
index 000000000000..3a61f6d601d9
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for tcpd
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7add9707fa1265afcc0c4fc9111894f0
diff --git a/metadata/md5-cache/sec-policy/selinux-telnet-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-telnet-2.20120725-r9
new file mode 100644
index 000000000000..5fbe39110286
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-telnet-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-remotelogin sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for telnet
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-remotelogin sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=2014fc45c9ea28788135b3e20fbcc713
diff --git a/metadata/md5-cache/sec-policy/selinux-tftp-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-tftp-2.20120725-r9
new file mode 100644
index 000000000000..528ae6d61cea
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-tftp-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for tftp
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=1b0cfbbb32426bf0591cf23660e934a5
diff --git a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20120725-r9
new file mode 100644
index 000000000000..6c0b8b298a5f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for tgtd
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b884c1ad66a11f04a12259e93089622b
diff --git a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20120725-r9
new file mode 100644
index 000000000000..789714bb92ef
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for thunderbird
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=223b1f3780350d71d7d83f856271a87b
diff --git a/metadata/md5-cache/sec-policy/selinux-timidity-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-timidity-2.20120725-r9
new file mode 100644
index 000000000000..e6efbcd571a4
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-timidity-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for timidity
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=6abe3c60e9474366e1b36fdec87ee021
diff --git a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20120725-r9
new file mode 100644
index 000000000000..e81c9e9c3bd2
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for tmpreaper
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3df71e3f3ac7fd08b6ac34cc224dc246
diff --git a/metadata/md5-cache/sec-policy/selinux-tor-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-tor-2.20120725-r9
new file mode 100644
index 000000000000..03d6acf7527c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-tor-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for tor
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=30f3a4d5ac1ba8ed4f1e093c9ff02f65
diff --git a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20120725-r9
new file mode 100644
index 000000000000..dc55d186a539
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for tripwire
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=27d35a019dbe6a549d405f5a423078da
diff --git a/metadata/md5-cache/sec-policy/selinux-tvtime-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-tvtime-2.20120725-r9
new file mode 100644
index 000000000000..749380231ef4
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-tvtime-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for tvtime
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4121803368d2f14f4d0610940d3839f3
diff --git a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20120725-r9
new file mode 100644
index 000000000000..1228955c1a37
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ucspitcp
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=5c18f5b5b4361215886b9cd715e71f02
diff --git a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20120725-r9
new file mode 100644
index 000000000000..283f3a77b7d7
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ulogd
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e57a86e4fe923888762b0f467925c1d5
diff --git a/metadata/md5-cache/sec-policy/selinux-uml-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-uml-2.20120725-r9
new file mode 100644
index 000000000000..c3a5f959acf1
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-uml-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for uml
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=1aa522313d374fa93ebd24c52920a833
diff --git a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20120725-r9
new file mode 100644
index 000000000000..72639cd27131
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for unconfined
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=ab6a397e39f7752c3bee4c0879fa2092
diff --git a/metadata/md5-cache/sec-policy/selinux-uptime-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-uptime-2.20120725-r9
new file mode 100644
index 000000000000..d947ba279ca2
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-uptime-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for uptime
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=68a637b341ae99ebcd665d4bff0f869f
diff --git a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20120725-r9
new file mode 100644
index 000000000000..d6497bc481e6
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for usbmuxd
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=8026290521334a927740e2297b584de1
diff --git a/metadata/md5-cache/sec-policy/selinux-uucp-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-uucp-2.20120725-r9
new file mode 100644
index 000000000000..27b079d8aa29
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-uucp-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for uucp
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=5a9d33fe380bb91ac9c3a515a707ecac
diff --git a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20120725-r9
new file mode 100644
index 000000000000..e9cd0d3a65e0
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for uwimap
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=18a3e274d589db9adcd6f5b2858edb84
diff --git a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20120725-r9
new file mode 100644
index 000000000000..6eb85019daff
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for varnishd
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e4f60d4610d41d779e3ffb5de0f31e74
diff --git a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20120725-r9
new file mode 100644
index 000000000000..f913a76f1c33
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for vbetool
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=138c9045e32b60ec4e19fd18497b7d30
diff --git a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20120725-r9
new file mode 100644
index 000000000000..ff8008c4604c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for vdagent
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a12d92be9c79a856cdd4361762d69c64
diff --git a/metadata/md5-cache/sec-policy/selinux-vde-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-vde-2.20120725-r9
new file mode 100644
index 000000000000..bca6b2b9d44f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-vde-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for vde
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=8ec9ad0e4c1eedfd31afa1ff86290464
diff --git a/metadata/md5-cache/sec-policy/selinux-virt-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-virt-2.20120725-r9
new file mode 100644
index 000000000000..7f08026e1d1f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-virt-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for virt
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=5a71f860435f89c6478a05554b179bea
diff --git a/metadata/md5-cache/sec-policy/selinux-vlock-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-vlock-2.20120725-r9
new file mode 100644
index 000000000000..bd2584b966e0
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-vlock-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for vlock
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=0b2ade393d4a5b7585ac7ddc977b5b71
diff --git a/metadata/md5-cache/sec-policy/selinux-vmware-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-vmware-2.20120725-r9
new file mode 100644
index 000000000000..7986f4c431ad
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-vmware-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for vmware
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=cd51e68811cbf8c8ef581674a1755feb
diff --git a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20120725-r9
new file mode 100644
index 000000000000..406dbb6762e5
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for vnstatd
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=ad42e30a600df1a042f55b89e857f992
diff --git a/metadata/md5-cache/sec-policy/selinux-vpn-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-vpn-2.20120725-r9
new file mode 100644
index 000000000000..f9ff7c56a460
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-vpn-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for vpn
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f267ac0690318cb671f20299776a64a8
diff --git a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20120725-r9
new file mode 100644
index 000000000000..fd0c0a215f69
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for watchdog
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4a785e3971c69bbf4749fd7bdc356d76
diff --git a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20120725-r9
new file mode 100644
index 000000000000..aa536a53516c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for webalizer
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3b03362423729c37fd8842b91e46dcbb
diff --git a/metadata/md5-cache/sec-policy/selinux-wine-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-wine-2.20120725-r9
new file mode 100644
index 000000000000..43938e17c6f4
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-wine-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for wine
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3b232b5380f7dc6a705e56acc0b220aa
diff --git a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20120725-r9
new file mode 100644
index 000000000000..87b746d40d14
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for wireshark
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4a87e4f7ce1441e849d6a488b3dd7e79
diff --git a/metadata/md5-cache/sec-policy/selinux-wm-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-wm-2.20120725-r9
new file mode 100644
index 000000000000..2974382517f3
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-wm-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for wm
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=fe3e7f73744a0517b3a4cee86067e1c4
diff --git a/metadata/md5-cache/sec-policy/selinux-xen-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-xen-2.20120725-r9
new file mode 100644
index 000000000000..0ec3c1c1a476
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-xen-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for xen
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c41c82818b3ebe096f479f72b0578c12
diff --git a/metadata/md5-cache/sec-policy/selinux-xfs-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-xfs-2.20120725-r9
new file mode 100644
index 000000000000..1add49112f03
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-xfs-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for xfs
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f75b29f62e7cb62f59f12b1608c8fcc1
diff --git a/metadata/md5-cache/sec-policy/selinux-xprint-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-xprint-2.20120725-r9
new file mode 100644
index 000000000000..3667ac65f6b9
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-xprint-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for xprint
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=aad310689d4b6d661febb279820e75f5
diff --git a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20120725-r9
new file mode 100644
index 000000000000..a0a771685b32
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for xscreensaver
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=dac0e3b159ee76a2ab1f2c9fdd9fecf7
diff --git a/metadata/md5-cache/sec-policy/selinux-xserver-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-xserver-2.20120725-r9
new file mode 100644
index 000000000000..4af6ea8c9ab9
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-xserver-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for xserver
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=09f4d051dccf3f66cd013842e9a06925
diff --git a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20120725-r9 b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20120725-r9
new file mode 100644
index 000000000000..e7b0510ef341
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20120725-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for zabbix
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120725-r9
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120725.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	selinux-policy-2	48460697200ebcb51ba3fb83596a787a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3dea3e62f5efd0146bc730d08ae3b442
diff --git a/metadata/md5-cache/sys-apps/portage-2.1.11.31 b/metadata/md5-cache/sys-apps/portage-2.1.11.31
index 92aeb56f6496..5dc26964012a 100644
--- a/metadata/md5-cache/sys-apps/portage-2.1.11.31
+++ b/metadata/md5-cache/sys-apps/portage-2.1.11.31
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
-DEPEND=python3? ( =dev-lang/python-3* ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )
+DEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )
 DESCRIPTION=Portage is the package management and distribution system for Gentoo
 EAPI=2
 HOMEPAGE=http://www.gentoo.org/proj/en/portage/index.xml
-IUSE=build doc epydoc +ipc linguas_pl pypy1_9 python2 python3 selinux xattr
+IUSE=build doc epydoc +ipc linguas_pl pypy2_0 python2 python3 selinux xattr
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-RDEPEND=python3? ( =dev-lang/python-3* ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 || ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( python3? ( =dev-lang/python-3*[ssl] ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) ) dev-python/python-mhash ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
+RDEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 || ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( python3? ( =dev-lang/python-3*[ssl] ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2,ssl] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) ) dev-python/python-mhash ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.1.11.31.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.1.11.31.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 )
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2128eec2034fc0e250a2dfc7646d86af
+_md5_=bc18183790e02fcdbdbd0e678cf69ac5
diff --git a/metadata/md5-cache/sys-apps/portage-2.1.11.37 b/metadata/md5-cache/sys-apps/portage-2.1.11.37
deleted file mode 100644
index dac5c259463c..000000000000
--- a/metadata/md5-cache/sys-apps/portage-2.1.11.37
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
-DEPEND=python3? ( =dev-lang/python-3* ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )
-DESCRIPTION=Portage is the package management and distribution system for Gentoo
-EAPI=2
-HOMEPAGE=http://www.gentoo.org/proj/en/portage/index.xml
-IUSE=build doc epydoc +ipc linguas_pl pypy1_9 python2 python3 selinux xattr
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-RDEPEND=python3? ( =dev-lang/python-3* ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 || ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( python3? ( =dev-lang/python-3*[ssl] ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) ) dev-python/python-mhash ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
-SLOT=0
-SRC_URI=mirror://gentoo/portage-2.1.11.37.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.1.11.37.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7d0b920c375c53c3200cc014a41ba397
diff --git a/metadata/md5-cache/sys-apps/portage-2.1.11.38 b/metadata/md5-cache/sys-apps/portage-2.1.11.38
index 5250e415f1a1..bb0bf69eea79 100644
--- a/metadata/md5-cache/sys-apps/portage-2.1.11.38
+++ b/metadata/md5-cache/sys-apps/portage-2.1.11.38
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
-DEPEND=python3? ( =dev-lang/python-3* ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )
+DEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )
 DESCRIPTION=Portage is the package management and distribution system for Gentoo
 EAPI=2
 HOMEPAGE=http://www.gentoo.org/proj/en/portage/index.xml
-IUSE=build doc epydoc +ipc linguas_pl pypy1_9 python2 python3 selinux xattr
+IUSE=build doc epydoc +ipc linguas_pl pypy2_0 python2 python3 selinux xattr
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-RDEPEND=python3? ( =dev-lang/python-3* ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 || ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( python3? ( =dev-lang/python-3*[ssl] ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) ) dev-python/python-mhash ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
+RDEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 || ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( python3? ( =dev-lang/python-3*[ssl] ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2,ssl] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) ) dev-python/python-mhash ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.1.11.38.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.1.11.38.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 )
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=64d5ca574eebdd5bfadf9e6cf5073e47
+_md5_=cfea471cae92103abb2c86aa406f2c40
diff --git a/metadata/md5-cache/sys-apps/portage-2.1.11.9 b/metadata/md5-cache/sys-apps/portage-2.1.11.9
deleted file mode 100644
index 624138f6efb1..000000000000
--- a/metadata/md5-cache/sys-apps/portage-2.1.11.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
-DEPEND=python3? ( =dev-lang/python-3* ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )
-DESCRIPTION=Portage is the package management and distribution system for Gentoo
-EAPI=2
-HOMEPAGE=http://www.gentoo.org/proj/en/portage/index.xml
-IUSE=build doc epydoc +ipc linguas_pl pypy1_9 python2 python3 selinux xattr
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-RDEPEND=python3? ( =dev-lang/python-3* ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 || ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( python3? ( =dev-lang/python-3*[ssl] ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) ) dev-python/python-mhash ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
-SLOT=0
-SRC_URI=mirror://gentoo/portage-2.1.11.9.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.1.11.9.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=88d289b80f57abfa068d098bcc6e2878
diff --git a/metadata/md5-cache/sys-apps/portage-2.2.0_alpha142 b/metadata/md5-cache/sys-apps/portage-2.2.0_alpha142
index f43cc46a0e4d..91bebd287002 100644
--- a/metadata/md5-cache/sys-apps/portage-2.2.0_alpha142
+++ b/metadata/md5-cache/sys-apps/portage-2.2.0_alpha142
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
-DEPEND=python3? ( =dev-lang/python-3* ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )
+DEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )
 DESCRIPTION=Portage is the package management and distribution system for Gentoo
 EAPI=3
 HOMEPAGE=http://www.gentoo.org/proj/en/portage/index.xml
-IUSE=build doc epydoc +ipc linguas_pl pypy1_9 python2 python3 selinux xattr
+IUSE=build doc epydoc +ipc linguas_pl pypy2_0 python2 python3 selinux xattr
 KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-RDEPEND=python3? ( =dev-lang/python-3* ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 || ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( python3? ( =dev-lang/python-3*[ssl] ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) ) dev-python/python-mhash ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
+RDEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 || ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( python3? ( =dev-lang/python-3*[ssl] ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2,ssl] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) ) dev-python/python-mhash ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.2.0_alpha142.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.2.0_alpha142.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 )
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=830551dcaefbe000024f87b9f46e8469
+_md5_=b3116d6064a996510cb0bf7c5599e22e
diff --git a/metadata/md5-cache/sys-apps/portage-2.2.0_alpha148 b/metadata/md5-cache/sys-apps/portage-2.2.0_alpha148
deleted file mode 100644
index d7017cf36bd6..000000000000
--- a/metadata/md5-cache/sys-apps/portage-2.2.0_alpha148
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
-DEPEND=python3? ( =dev-lang/python-3* ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )
-DESCRIPTION=Portage is the package management and distribution system for Gentoo
-EAPI=3
-HOMEPAGE=http://www.gentoo.org/proj/en/portage/index.xml
-IUSE=build doc epydoc +ipc linguas_pl pypy1_9 python2 python3 selinux xattr
-KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-RDEPEND=python3? ( =dev-lang/python-3* ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 || ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( python3? ( =dev-lang/python-3*[ssl] ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) ) dev-python/python-mhash ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
-SLOT=0
-SRC_URI=mirror://gentoo/portage-2.2.0_alpha142.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.2.0_alpha142.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 ) mirror://gentoo/portage-2.2.0_alpha148.patch.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.2.0_alpha148.patch.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fd123ec111f5715910d6f979d8f78dac
diff --git a/metadata/md5-cache/sys-apps/portage-2.2.0_alpha149 b/metadata/md5-cache/sys-apps/portage-2.2.0_alpha149
index f4827fc89aba..4af6fcc0bbce 100644
--- a/metadata/md5-cache/sys-apps/portage-2.2.0_alpha149
+++ b/metadata/md5-cache/sys-apps/portage-2.2.0_alpha149
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
-DEPEND=python3? ( =dev-lang/python-3* ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )
+DEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )
 DESCRIPTION=Portage is the package management and distribution system for Gentoo
 EAPI=3
 HOMEPAGE=http://www.gentoo.org/proj/en/portage/index.xml
-IUSE=build doc epydoc +ipc linguas_pl pypy1_9 python2 python3 selinux xattr
+IUSE=build doc epydoc +ipc linguas_pl pypy2_0 python2 python3 selinux xattr
 KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-RDEPEND=python3? ( =dev-lang/python-3* ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 || ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( python3? ( =dev-lang/python-3*[ssl] ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) ) dev-python/python-mhash ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
+RDEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 || ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( python3? ( =dev-lang/python-3*[ssl] ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2,ssl] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) ) dev-python/python-mhash ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.2.0_alpha142.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.2.0_alpha142.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 ) mirror://gentoo/portage-2.2.0_alpha149.patch.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.2.0_alpha149.patch.bz2
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bb3dd042a3be6af74a61b624524a7e11
+_md5_=7b9d136389dfc1d4036f688589650a87
diff --git a/metadata/md5-cache/sys-apps/portage-9999 b/metadata/md5-cache/sys-apps/portage-9999
index 77076bec015d..a945abc4cdf7 100644
--- a/metadata/md5-cache/sys-apps/portage-9999
+++ b/metadata/md5-cache/sys-apps/portage-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=python3? ( =dev-lang/python-3* ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 ) dev-vcs/git
+DEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 ) dev-vcs/git
 DESCRIPTION=Portage is the package management and distribution system for Gentoo
 EAPI=3
 HOMEPAGE=http://www.gentoo.org/proj/en/portage/index.xml
-IUSE=build doc epydoc +ipc pypy1_9 python2 python3 selinux xattr
+IUSE=build doc epydoc +ipc pypy2_0 python2 python3 selinux xattr
 LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-RDEPEND=python3? ( =dev-lang/python-3* ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 || ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( python3? ( =dev-lang/python-3*[ssl] ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) ) dev-python/python-mhash ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
+RDEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 || ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( python3? ( =dev-lang/python-3*[ssl] ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2,ssl] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) ) dev-python/python-mhash ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
 SLOT=0
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a94bfa10a38d28ac366dd466432a1717
+_md5_=715fe4e3057afe2ba36e7080ce614e24
diff --git a/metadata/md5-cache/sys-devel/autoconf-2.69 b/metadata/md5-cache/sys-devel/autoconf-2.69
index b2c1040ddbcf..4f4542f1e14d 100644
--- a/metadata/md5-cache/sys-devel/autoconf-2.69
+++ b/metadata/md5-cache/sys-devel/autoconf-2.69
@@ -4,10 +4,10 @@ DESCRIPTION=Used to create autoconfiguration files
 EAPI=3
 HOMEPAGE=http://www.gnu.org/software/autoconf/autoconf.html
 IUSE=emacs
-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=GPL-3
 PDEPEND=emacs? ( app-emacs/autoconf-mode )
 RDEPEND=>=sys-apps/texinfo-4.3 >=sys-devel/m4-1.4.16 >=dev-lang/perl-5.6 >=sys-devel/autoconf-wrapper-10
 SLOT=2.5
 SRC_URI=mirror://gnu/autoconf/autoconf-2.69.tar.xz ftp://alpha.gnu.org/pub/gnu/autoconf/autoconf-2.69.tar.xz
-_md5_=4cf0cda9109104c78b36ddc97eaf6a6a
+_md5_=cbbb7065d609803e5e292abe879c0c2b
diff --git a/metadata/md5-cache/sys-devel/flex-2.5.37 b/metadata/md5-cache/sys-devel/flex-2.5.37
index 36663934e74b..915f4af5024c 100644
--- a/metadata/md5-cache/sys-devel/flex-2.5.37
+++ b/metadata/md5-cache/sys-devel/flex-2.5.37
@@ -4,10 +4,10 @@ DESCRIPTION=The Fast Lexical Analyzer
 EAPI=3
 HOMEPAGE=http://flex.sourceforge.net/
 IUSE=nls static test
-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=FLEX
 RDEPEND=sys-devel/m4
 SLOT=0
 SRC_URI=mirror://sourceforge/flex/flex-2.5.37.tar.bz2
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=446e6a0026108e4c9d84c5c773031d62
+_md5_=8b582dd5b364748361cba30830c68094
diff --git a/metadata/md5-cache/sys-fs/e4rat-0.2.1-r2 b/metadata/md5-cache/sys-fs/e4rat-0.2.1-r2
deleted file mode 100644
index 3709f9d68e5c..000000000000
--- a/metadata/md5-cache/sys-fs/e4rat-0.2.1-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl >=dev-libs/boost-1.42 sys-fs/e2fsprogs sys-process/audit >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Toolset to accelerate the boot process and application startup
-EAPI=4
-HOMEPAGE=http://e4rat.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-lang/perl >=dev-libs/boost-1.42 sys-fs/e2fsprogs sys-process/audit
-SLOT=0
-SRC_URI=mirror://sourceforge/e4rat/e4rat_0.2.1_src.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	linux-info	f01ffb28843e2de3ea571f80f07e5078	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d77e394f6335c49aa63acdd930fdc4ea
diff --git a/metadata/md5-cache/sys-fs/e4rat-0.2.2 b/metadata/md5-cache/sys-fs/e4rat-0.2.2
deleted file mode 100644
index 1a0a7c836df9..000000000000
--- a/metadata/md5-cache/sys-fs/e4rat-0.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl >=dev-libs/boost-1.42 sys-fs/e2fsprogs sys-process/audit >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Toolset to accelerate the boot process and application startup
-EAPI=4
-HOMEPAGE=http://e4rat.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-lang/perl >=dev-libs/boost-1.42 sys-fs/e2fsprogs sys-process/audit
-SLOT=0
-SRC_URI=mirror://sourceforge/e4rat/e4rat_0.2.2_src.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	linux-info	f01ffb28843e2de3ea571f80f07e5078	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=08e033c88c20406af3fa2da59b51e705
diff --git a/metadata/md5-cache/sys-fs/e4rat-0.2.3-r1 b/metadata/md5-cache/sys-fs/e4rat-0.2.3-r1
index 16ea34c40ced..433eb0cc68c4 100644
--- a/metadata/md5-cache/sys-fs/e4rat-0.2.3-r1
+++ b/metadata/md5-cache/sys-fs/e4rat-0.2.3-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl >=dev-libs/boost-1.42 sys-fs/e2fsprogs sys-process/audit >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=dev-lang/perl >=dev-libs/boost-1.42 sys-fs/e2fsprogs sys-process/audit sys-process/lsof >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=Toolset to accelerate the boot process and application startup
 EAPI=4
 HOMEPAGE=http://e4rat.sourceforge.net/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-lang/perl >=dev-libs/boost-1.42 sys-fs/e2fsprogs sys-process/audit
+RDEPEND=dev-lang/perl >=dev-libs/boost-1.42 sys-fs/e2fsprogs sys-process/audit sys-process/lsof
 SLOT=0
 SRC_URI=mirror://sourceforge/e4rat/e4rat_0.2.3_src.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	linux-info	f01ffb28843e2de3ea571f80f07e5078	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e02b9bd86e40fc5cf47a0e3a0acd4742
+_md5_=3df4d2b93147c55020fff16b4a4bc64e
diff --git a/metadata/md5-cache/sys-kernel/git-sources-3.7_rc8 b/metadata/md5-cache/sys-kernel/git-sources-3.8_rc1
similarity index 81%
rename from metadata/md5-cache/sys-kernel/git-sources-3.7_rc8
rename to metadata/md5-cache/sys-kernel/git-sources-3.8_rc1
index bcf3c407f187..5c7d6bc8c6f7 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-3.7_rc8
+++ b/metadata/md5-cache/sys-kernel/git-sources-3.8_rc1
@@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
-SLOT=3.7_rc8
-SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.7-rc8.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.6.tar.bz2
+SLOT=3.8_rc1
+SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.8-rc1.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.7.tar.bz2
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	kernel-2	dd451098928ff900df7c254820871c00	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f0e10744207737f1fcec24532fe89990
+_md5_=d2e13090d255ba7748fe5e0a7ef08ede
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.6.10 b/metadata/md5-cache/sys-kernel/pf-sources-3.6.12
similarity index 88%
rename from metadata/md5-cache/sys-kernel/pf-sources-3.6.10
rename to metadata/md5-cache/sys-kernel/pf-sources-3.6.12
index 74d1d2084823..d316e0daae5c 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.6.10
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.6.12
@@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
-SLOT=3.6.10
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.6.tar.bz2 http://pf.natalenko.name/sources/3.6/patch-3.6.10-pf.bz2
+SLOT=3.6.12
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.6.tar.bz2 http://pf.natalenko.name/sources/3.6/patch-3.6.12-pf.bz2
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	kernel-2	dd451098928ff900df7c254820871c00	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b4c1663426ce3cfcf13a8bbe0049e44f
+_md5_=46a7add3717a7e6a19eb71f0641902ad
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.6.9 b/metadata/md5-cache/sys-kernel/pf-sources-3.7.1
similarity index 82%
rename from metadata/md5-cache/sys-kernel/pf-sources-3.6.9
rename to metadata/md5-cache/sys-kernel/pf-sources-3.7.1
index f95cc0d7ec6c..b6209b01e668 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.6.9
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.7.1
@@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
-SLOT=3.6.9
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.6.tar.bz2 http://pf.natalenko.name/sources/3.6/patch-3.6.9-pf.bz2
+SLOT=3.7.1
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.7.tar.bz2 http://pf.natalenko.name/sources/3.7/patch-3.7.1-pf.bz2
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	kernel-2	dd451098928ff900df7c254820871c00	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=edcc79ead49237d25fbda34224e877a4
+_md5_=19402926a31d35537defe13b62967d74
diff --git a/metadata/md5-cache/sys-process/audit-2.1.3-r1 b/metadata/md5-cache/sys-process/audit-2.1.3-r1
index df950f040d71..e8b45a084ffc 100644
--- a/metadata/md5-cache/sys-process/audit-2.1.3-r1
+++ b/metadata/md5-cache/sys-process/audit-2.1.3-r1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://people.redhat.com/sgrubb/audit/audit-2.1.3.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	f01ffb28843e2de3ea571f80f07e5078	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a6422195f702432c92fccd8cec1c36fb
+_md5_=a8a21877c1a165de82042ddbf2021557
diff --git a/metadata/md5-cache/sys-process/audit-2.2.2 b/metadata/md5-cache/sys-process/audit-2.2.2
new file mode 100644
index 000000000000..aa46d74eb38f
--- /dev/null
+++ b/metadata/md5-cache/sys-process/audit-2.2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=ldap? ( net-nds/openldap ) prelude? ( dev-libs/libprelude ) sys-libs/libcap-ng python? ( dev-lang/swig ) >=sys-kernel/linux-headers-2.6.34 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DESCRIPTION=Userspace utilities for storing and processing auditing records
+EAPI=4
+HOMEPAGE=http://people.redhat.com/sgrubb/audit/
+IUSE=ldap prelude python
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=ldap? ( net-nds/openldap ) prelude? ( dev-libs/libprelude ) sys-libs/libcap-ng python? ( =dev-lang/python-2* )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://people.redhat.com/sgrubb/audit/audit-2.2.2.tar.gz
+_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	f01ffb28843e2de3ea571f80f07e5078	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=3a8df461dfd59d54ff97e34247651136
diff --git a/metadata/md5-cache/virtual/leechcraft-wysiwyg-editor-9999 b/metadata/md5-cache/virtual/leechcraft-wysiwyg-editor-9999
new file mode 100644
index 000000000000..17f23c25e4ad
--- /dev/null
+++ b/metadata/md5-cache/virtual/leechcraft-wysiwyg-editor-9999
@@ -0,0 +1,6 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for LeechCraft plugins providing WYSIWYG text editor
+EAPI=4
+RDEPEND=~x11-plugins/leechcraft-lhtr-9999
+SLOT=0
+_md5_=27084c80cf5c00d19cfe4e9028a79304
diff --git a/metadata/md5-cache/virtual/perl-File-Path-2.08 b/metadata/md5-cache/virtual/perl-File-Path-2.08
index b6c6e8ed4c81..6f263780ff49 100644
--- a/metadata/md5-cache/virtual/perl-File-Path-2.08
+++ b/metadata/md5-cache/virtual/perl-File-Path-2.08
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for File-Path
-KEYWORDS=amd64 ~ia64 ~sparc x86 ~ppc-aix
+KEYWORDS=amd64 ~ia64 ~ppc ~sparc x86 ~ppc-aix
 RDEPEND=~perl-core/File-Path-2.08
 SLOT=0
-_md5_=d98261c5c4044ab7437314b75245b92c
+_md5_=e48392830eac7bc3e0d6be1ae3709c2a
diff --git a/metadata/md5-cache/virtual/perl-Thread-Queue-3.10.0 b/metadata/md5-cache/virtual/perl-Thread-Queue-3.10.0
index c71c5b1f1e6e..b88a832e218d 100644
--- a/metadata/md5-cache/virtual/perl-Thread-Queue-3.10.0
+++ b/metadata/md5-cache/virtual/perl-Thread-Queue-3.10.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Thread-Queue
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~x86
 RDEPEND=~perl-core/Thread-Queue-3.10.0
 SLOT=0
-_md5_=414600eeaca9d18b51b8a720beb9b229
+_md5_=83fef9743baf8491a4b551c5dfcf8708
diff --git a/metadata/md5-cache/virtual/perl-Thread-Semaphore-2.120.0-r2 b/metadata/md5-cache/virtual/perl-Thread-Semaphore-2.120.0-r2
index 862daad0d582..6c7bd97c047b 100644
--- a/metadata/md5-cache/virtual/perl-Thread-Semaphore-2.120.0-r2
+++ b/metadata/md5-cache/virtual/perl-Thread-Semaphore-2.120.0-r2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Thread-Semaphore
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~x86
 RDEPEND=|| ( =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~perl-core/Thread-Semaphore-2.120.0 )
 SLOT=0
-_md5_=ab570de6c46e68c788983aa3deef567a
+_md5_=7bb24fa6a243e8e00952df6c7ca2dc35
diff --git a/metadata/md5-cache/virtual/perl-threads-1.860.0-r1 b/metadata/md5-cache/virtual/perl-threads-1.860.0-r1
index 66d5bfbbc147..7c9c206203d5 100644
--- a/metadata/md5-cache/virtual/perl-threads-1.860.0-r1
+++ b/metadata/md5-cache/virtual/perl-threads-1.860.0-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for threads
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~x86
 RDEPEND=|| ( =dev-lang/perl-5.16* ~perl-core/threads-1.860.0 )
 SLOT=0
-_md5_=963cd457b0bc15a5467ef231d8b0d998
+_md5_=33e8957ff6b49cab56b848dbb274d297
diff --git a/metadata/md5-cache/virtual/perl-threads-shared-1.420.0 b/metadata/md5-cache/virtual/perl-threads-shared-1.420.0
index a0f4733b3b7a..8e01ab0fa074 100644
--- a/metadata/md5-cache/virtual/perl-threads-shared-1.420.0
+++ b/metadata/md5-cache/virtual/perl-threads-shared-1.420.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for threads-shared
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~x86
 RDEPEND=~perl-core/threads-shared-1.420.0
 SLOT=0
-_md5_=13dafe33a57968ace21eddbe991b47b0
+_md5_=7b9130becb519a46a20c98d457f2e025
diff --git a/metadata/md5-cache/virtual/pyparsing-0 b/metadata/md5-cache/virtual/pyparsing-0
new file mode 100644
index 000000000000..967068103af7
--- /dev/null
+++ b/metadata/md5-cache/virtual/pyparsing-0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=A virtual for pyparsing, for Python 2 & 3
+EAPI=5
+IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_8 python_targets_pypy1_9
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=<dev-python/pyparsing-1.5.6-r2
+REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_8 python_targets_pypy1_9 )
+SLOT=0
+_eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	python-r1	cdb57e63096bf34e3390d45726a76258	python-utils-r1	dcd8a7e28a2e90a45fc1875429811c73	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
+_md5_=14ca6cbf9fe92742fde86df125bd6e6a
diff --git a/metadata/md5-cache/virtual/pyparsing-1 b/metadata/md5-cache/virtual/pyparsing-1
new file mode 100644
index 000000000000..370a5e3116ba
--- /dev/null
+++ b/metadata/md5-cache/virtual/pyparsing-1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=A virtual for pyparsing, for Python 2 & 3
+EAPI=5
+IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_8 python_targets_pypy1_9
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=<dev-python/pyparsing-1.5.7[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_python3_3?,python_targets_pypy1_8?,python_targets_pypy1_9?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_8(-),-python_single_target_pypy1_9(-)]
+REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_8 python_targets_pypy1_9 )
+SLOT=0
+_eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	python-r1	cdb57e63096bf34e3390d45726a76258	python-utils-r1	dcd8a7e28a2e90a45fc1875429811c73	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
+_md5_=88687ac058ba099315e59f54a6d663d6
diff --git a/metadata/md5-cache/www-apps/horde-pear-1.3-r3 b/metadata/md5-cache/www-apps/horde-pear-1.3-r3
index 3f1081a85e9a..25741a3fe768 100644
--- a/metadata/md5-cache/www-apps/horde-pear-1.3-r3
+++ b/metadata/md5-cache/www-apps/horde-pear-1.3-r3
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Meta package for the PEAR packages required by Horde.
 HOMEPAGE=http://pear.php.net/
 KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86
-LICENSE=as-is
+LICENSE=metapackage
 RDEPEND=dev-php/PEAR-Log dev-php/PEAR-Net_Sieve dev-php/PEAR-Mail_Mime >=dev-php/PEAR-DB-1.6.0 dev-php/PEAR-File dev-php/PEAR-Date >=dev-php/PEAR-Services_Weather-1.3.1 dev-php/PEAR-Mail
 SLOT=1
-_md5_=8a16a4413e95d0c590b0b7052911ae0f
+_md5_=6b4a3b9cb317212865fda8f253dea989
diff --git a/metadata/md5-cache/www-apps/phpsysinfo-3.0.20 b/metadata/md5-cache/www-apps/phpsysinfo-3.0.20
new file mode 100644
index 000000000000..7689ade45cd1
--- /dev/null
+++ b/metadata/md5-cache/www-apps/phpsysinfo-3.0.20
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=phpSysInfo is a nice package that will display your system stats via PHP.
+EAPI=5
+HOMEPAGE=http://rk4an.github.com/phpsysinfo/
+IUSE=vhosts
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=virtual/httpd-php dev-lang/php[simplexml,xml,xsl,unicode] >=app-admin/webapp-config-1.50.15
+SLOT=3.0.20
+SRC_URI=mirror://sourceforge/phpsysinfo/phpsysinfo-3.0.20.tar.gz
+_eclasses_=webapp	25b9b1696f5e698711f47d45c3d45e3e
+_md5_=ad40ae1205d414403703cb2e50c2cdbc
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.1.24 b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.1.24
new file mode 100644
index 000000000000..3639d65062bf
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.1.24
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=<x11-base/xorg-server-1.12.99[-minimal] x11-libs/libXcomposite >=dev-util/kbuild-0.1.999 =dev-lang/python-2* >=dev-lang/yasm-0.6.2 sys-devel/dev86 sys-power/iasl x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-libs/libXdmcp x11-libs/libXau x11-libs/libX11 x11-libs/libXfixes x11-libs/libXext dri? ( x11-proto/xf86driproto >=x11-libs/libdrm-2.4.5 ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DESCRIPTION=VirtualBox video driver
+EAPI=2
+HOMEPAGE=http://www.virtualbox.org/
+IUSE=dri kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=<x11-base/xorg-server-1.12.99[-minimal] x11-libs/libXcomposite kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=http://download.virtualbox.org/virtualbox/4.1.24/VirtualBox-4.1.24.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	linux-info	f01ffb28843e2de3ea571f80f07e5078	linux-mod	dbc722ed035721476f23ab7b0572985e	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=d54a9facdd05e3a18cc9c3f8895138df
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.2.2 b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.2.6
similarity index 90%
rename from metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.2.2
rename to metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.2.6
index 00ee839ff4a9..d4b2e6ff934b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.2.2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.2.6
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=<x11-base/xorg-server-1.13.99[-minimal] x11-libs/libXcomposite kernel_linux? ( virtual/modutils )
 SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.2.2/VirtualBox-4.2.2.tar.bz2
+SRC_URI=http://download.virtualbox.org/virtualbox/4.2.6/VirtualBox-4.2.6.tar.bz2
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	linux-info	f01ffb28843e2de3ea571f80f07e5078	linux-mod	dbc722ed035721476f23ab7b0572985e	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=620b0cda615c2670acc3078672359b97
+_md5_=a9db708bb2b9fe1429180f78dcc07a86
diff --git a/metadata/md5-cache/x11-libs/qt-assistant-4.7.4 b/metadata/md5-cache/x11-libs/qt-assistant-4.7.4
index 99292520aa10..ef688429c72f 100644
--- a/metadata/md5-cache/x11-libs/qt-assistant-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-assistant-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-gui-4.7.4[aqua=,debug=,glib=,qt3support=,trace?] ~x11-libs/qt-sql-4.7.4[aqua=,debug=,qt3support=,sqlite] ~x11-libs/qt-webkit-4.7.4[aqua=,debug=] ~x11-libs/qt-declarative-4.7.4[debug=,qt3support=] !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz compat? ( ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=973dd9b306fdaa69bd7f7cb5d46463fb
diff --git a/metadata/md5-cache/x11-libs/qt-assistant-4.8.1-r1 b/metadata/md5-cache/x11-libs/qt-assistant-4.8.1-r1
index 266a11e539d7..9770c67e2c5d 100644
--- a/metadata/md5-cache/x11-libs/qt-assistant-4.8.1-r1
+++ b/metadata/md5-cache/x11-libs/qt-assistant-4.8.1-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-gui-4.8.1[aqua=,c++0x=,debug=,glib=,qpa=,qt3support=,trace?] ~x11-libs/qt-sql-4.8.1[aqua=,c++0x=,debug=,qpa=,qt3support=,sqlite] webkit? ( ~x11-libs/qt-webkit-4.8.1[aqua=,debug=,qpa=] ) !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz compat? ( ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=63e744abf3a29653d98e6159008b7772
diff --git a/metadata/md5-cache/x11-libs/qt-assistant-4.8.2-r1 b/metadata/md5-cache/x11-libs/qt-assistant-4.8.2-r1
index 0a45ca429640..b81f194125a2 100644
--- a/metadata/md5-cache/x11-libs/qt-assistant-4.8.2-r1
+++ b/metadata/md5-cache/x11-libs/qt-assistant-4.8.2-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-gui-4.8.2[aqua=,c++0x=,debug=,glib=,qpa=,qt3support=,trace?] ~x11-libs/qt-sql-4.8.2[aqua=,c++0x=,debug=,qpa=,qt3support=,sqlite] webkit? ( ~x11-libs/qt-webkit-4.8.2[aqua=,debug=,qpa=] ) !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz compat? ( ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d97eb9a86fa92eb8c16c40446ba19b7b
diff --git a/metadata/md5-cache/x11-libs/qt-assistant-4.8.3 b/metadata/md5-cache/x11-libs/qt-assistant-4.8.3
index 38c1d8d64403..3c3f2be6d38f 100644
--- a/metadata/md5-cache/x11-libs/qt-assistant-4.8.3
+++ b/metadata/md5-cache/x11-libs/qt-assistant-4.8.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-gui-4.8.3[aqua=,debug=,glib=,qt3support=,trace?] ~x11-libs/qt-sql-4.8.3[aqua=,debug=,qt3support=,sqlite] webkit? ( ~x11-libs/qt-webkit-4.8.3[aqua=,debug=] ) !<x11-libs/qt-assistant-4.8.3:4 !>x11-libs/qt-assistant-4.8.3-r9999:4 !<x11-libs/qt-bearer-4.8.3:4 !>x11-libs/qt-bearer-4.8.3-r9999:4 !<x11-libs/qt-core-4.8.3:4 !>x11-libs/qt-core-4.8.3-r9999:4 !<x11-libs/qt-dbus-4.8.3:4 !>x11-libs/qt-dbus-4.8.3-r9999:4 !<x11-libs/qt-declarative-4.8.3:4 !>x11-libs/qt-declarative-4.8.3-r9999:4 !<x11-libs/qt-demo-4.8.3:4 !>x11-libs/qt-demo-4.8.3-r9999:4 !<x11-libs/qt-gui-4.8.3:4 !>x11-libs/qt-gui-4.8.3-r9999:4 !<x11-libs/qt-multimedia-4.8.3:4 !>x11-libs/qt-multimedia-4.8.3-r9999:4 !<x11-libs/qt-opengl-4.8.3:4 !>x11-libs/qt-opengl-4.8.3-r9999:4 !<x11-libs/qt-openvg-4.8.3:4 !>x11-libs/qt-openvg-4.8.3-r9999:4 !<x11-libs/qt-phonon-4.8.3:4 !>x11-libs/qt-phonon-4.8.3-r9999:4 !<x11-libs/qt-qt3support-4.8.3:4 !>x11-libs/qt-qt3support-4.8.3-r9999:4 !<x11-libs/qt-script-4.8.3:4 !>x11-libs/qt-script-4.8.3-r9999:4 !<x11-libs/qt-sql-4.8.3:4 !>x11-libs/qt-sql-4.8.3-r9999:4 !<x11-libs/qt-svg-4.8.3:4 !>x11-libs/qt-svg-4.8.3-r9999:4 !<x11-libs/qt-test-4.8.3:4 !>x11-libs/qt-test-4.8.3-r9999:4 !<x11-libs/qt-webkit-4.8.3:4 !>x11-libs/qt-webkit-4.8.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.3:4 !>x11-libs/qt-xmlpatterns-4.8.3-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz compat? ( ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7dc4a6684781eac150533b9c7cc58510
diff --git a/metadata/md5-cache/x11-libs/qt-assistant-4.8.4 b/metadata/md5-cache/x11-libs/qt-assistant-4.8.4
index 42c4e653145e..1b3453ecbad3 100644
--- a/metadata/md5-cache/x11-libs/qt-assistant-4.8.4
+++ b/metadata/md5-cache/x11-libs/qt-assistant-4.8.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-gui-4.8.4[aqua=,debug=,glib=,qt3support=,trace?] ~x11-libs/qt-sql-4.8.4[aqua=,debug=,qt3support=,sqlite] webkit? ( ~x11-libs/qt-webkit-4.8.4[aqua=,debug=] ) !<x11-libs/qt-assistant-4.8.4:4 !>x11-libs/qt-assistant-4.8.4-r9999:4 !<x11-libs/qt-bearer-4.8.4:4 !>x11-libs/qt-bearer-4.8.4-r9999:4 !<x11-libs/qt-core-4.8.4:4 !>x11-libs/qt-core-4.8.4-r9999:4 !<x11-libs/qt-dbus-4.8.4:4 !>x11-libs/qt-dbus-4.8.4-r9999:4 !<x11-libs/qt-declarative-4.8.4:4 !>x11-libs/qt-declarative-4.8.4-r9999:4 !<x11-libs/qt-demo-4.8.4:4 !>x11-libs/qt-demo-4.8.4-r9999:4 !<x11-libs/qt-gui-4.8.4:4 !>x11-libs/qt-gui-4.8.4-r9999:4 !<x11-libs/qt-multimedia-4.8.4:4 !>x11-libs/qt-multimedia-4.8.4-r9999:4 !<x11-libs/qt-opengl-4.8.4:4 !>x11-libs/qt-opengl-4.8.4-r9999:4 !<x11-libs/qt-openvg-4.8.4:4 !>x11-libs/qt-openvg-4.8.4-r9999:4 !<x11-libs/qt-phonon-4.8.4:4 !>x11-libs/qt-phonon-4.8.4-r9999:4 !<x11-libs/qt-qt3support-4.8.4:4 !>x11-libs/qt-qt3support-4.8.4-r9999:4 !<x11-libs/qt-script-4.8.4:4 !>x11-libs/qt-script-4.8.4-r9999:4 !<x11-libs/qt-sql-4.8.4:4 !>x11-libs/qt-sql-4.8.4-r9999:4 !<x11-libs/qt-svg-4.8.4:4 !>x11-libs/qt-svg-4.8.4-r9999:4 !<x11-libs/qt-test-4.8.4:4 !>x11-libs/qt-test-4.8.4-r9999:4 !<x11-libs/qt-webkit-4.8.4:4 !>x11-libs/qt-webkit-4.8.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.4:4 !>x11-libs/qt-xmlpatterns-4.8.4-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.4.tar.gz compat? ( ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ff7fc027da10002d0371de7f28fe9069
diff --git a/metadata/md5-cache/x11-libs/qt-bearer-4.8.1 b/metadata/md5-cache/x11-libs/qt-bearer-4.8.1
index 9af6920fa6b7..c1b62bee83a9 100644
--- a/metadata/md5-cache/x11-libs/qt-bearer-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-bearer-4.8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,qpa=] connman? ( ~x11-libs/qt-dbus-4.8.1[aqua=,c++0x=,debug=,qpa=] ) networkmanager? ( ~x11-libs/qt-dbus-4.8.1[aqua=,c++0x=,debug=,qpa=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=13793892ad9ae82474fefdf7b23cfa6c
diff --git a/metadata/md5-cache/x11-libs/qt-bearer-4.8.2 b/metadata/md5-cache/x11-libs/qt-bearer-4.8.2
index 24aee9ace6a5..f60bbf29732f 100644
--- a/metadata/md5-cache/x11-libs/qt-bearer-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-bearer-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.2[aqua=,c++0x=,debug=,qpa=] connman? ( ~x11-libs/qt-dbus-4.8.2[aqua=,c++0x=,debug=,qpa=] ) networkmanager? ( ~x11-libs/qt-dbus-4.8.2[aqua=,c++0x=,debug=,qpa=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7f8332e633c60603f2082691ea951514
diff --git a/metadata/md5-cache/x11-libs/qt-bearer-4.8.3 b/metadata/md5-cache/x11-libs/qt-bearer-4.8.3
index dd48d12369c9..95667256cde0 100644
--- a/metadata/md5-cache/x11-libs/qt-bearer-4.8.3
+++ b/metadata/md5-cache/x11-libs/qt-bearer-4.8.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.3[aqua=,debug=] connman? ( ~x11-libs/qt-dbus-4.8.3[aqua=,debug=] ) networkmanager? ( ~x11-libs/qt-dbus-4.8.3[aqua=,debug=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) !<x11-libs/qt-assistant-4.8.3:4 !>x11-libs/qt-assistant-4.8.3-r9999:4 !<x11-libs/qt-bearer-4.8.3:4 !>x11-libs/qt-bearer-4.8.3-r9999:4 !<x11-libs/qt-core-4.8.3:4 !>x11-libs/qt-core-4.8.3-r9999:4 !<x11-libs/qt-dbus-4.8.3:4 !>x11-libs/qt-dbus-4.8.3-r9999:4 !<x11-libs/qt-declarative-4.8.3:4 !>x11-libs/qt-declarative-4.8.3-r9999:4 !<x11-libs/qt-demo-4.8.3:4 !>x11-libs/qt-demo-4.8.3-r9999:4 !<x11-libs/qt-gui-4.8.3:4 !>x11-libs/qt-gui-4.8.3-r9999:4 !<x11-libs/qt-multimedia-4.8.3:4 !>x11-libs/qt-multimedia-4.8.3-r9999:4 !<x11-libs/qt-opengl-4.8.3:4 !>x11-libs/qt-opengl-4.8.3-r9999:4 !<x11-libs/qt-openvg-4.8.3:4 !>x11-libs/qt-openvg-4.8.3-r9999:4 !<x11-libs/qt-phonon-4.8.3:4 !>x11-libs/qt-phonon-4.8.3-r9999:4 !<x11-libs/qt-qt3support-4.8.3:4 !>x11-libs/qt-qt3support-4.8.3-r9999:4 !<x11-libs/qt-script-4.8.3:4 !>x11-libs/qt-script-4.8.3-r9999:4 !<x11-libs/qt-sql-4.8.3:4 !>x11-libs/qt-sql-4.8.3-r9999:4 !<x11-libs/qt-svg-4.8.3:4 !>x11-libs/qt-svg-4.8.3-r9999:4 !<x11-libs/qt-test-4.8.3:4 !>x11-libs/qt-test-4.8.3-r9999:4 !<x11-libs/qt-webkit-4.8.3:4 !>x11-libs/qt-webkit-4.8.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.3:4 !>x11-libs/qt-xmlpatterns-4.8.3-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c2e454b27049a459f2cdc3271c9eb3e1
diff --git a/metadata/md5-cache/x11-libs/qt-bearer-4.8.4 b/metadata/md5-cache/x11-libs/qt-bearer-4.8.4
index b016a717f5ec..bb4b4358801f 100644
--- a/metadata/md5-cache/x11-libs/qt-bearer-4.8.4
+++ b/metadata/md5-cache/x11-libs/qt-bearer-4.8.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.4[aqua=,debug=] connman? ( ~x11-libs/qt-dbus-4.8.4[aqua=,debug=] ) networkmanager? ( ~x11-libs/qt-dbus-4.8.4[aqua=,debug=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) !<x11-libs/qt-assistant-4.8.4:4 !>x11-libs/qt-assistant-4.8.4-r9999:4 !<x11-libs/qt-bearer-4.8.4:4 !>x11-libs/qt-bearer-4.8.4-r9999:4 !<x11-libs/qt-core-4.8.4:4 !>x11-libs/qt-core-4.8.4-r9999:4 !<x11-libs/qt-dbus-4.8.4:4 !>x11-libs/qt-dbus-4.8.4-r9999:4 !<x11-libs/qt-declarative-4.8.4:4 !>x11-libs/qt-declarative-4.8.4-r9999:4 !<x11-libs/qt-demo-4.8.4:4 !>x11-libs/qt-demo-4.8.4-r9999:4 !<x11-libs/qt-gui-4.8.4:4 !>x11-libs/qt-gui-4.8.4-r9999:4 !<x11-libs/qt-multimedia-4.8.4:4 !>x11-libs/qt-multimedia-4.8.4-r9999:4 !<x11-libs/qt-opengl-4.8.4:4 !>x11-libs/qt-opengl-4.8.4-r9999:4 !<x11-libs/qt-openvg-4.8.4:4 !>x11-libs/qt-openvg-4.8.4-r9999:4 !<x11-libs/qt-phonon-4.8.4:4 !>x11-libs/qt-phonon-4.8.4-r9999:4 !<x11-libs/qt-qt3support-4.8.4:4 !>x11-libs/qt-qt3support-4.8.4-r9999:4 !<x11-libs/qt-script-4.8.4:4 !>x11-libs/qt-script-4.8.4-r9999:4 !<x11-libs/qt-sql-4.8.4:4 !>x11-libs/qt-sql-4.8.4-r9999:4 !<x11-libs/qt-svg-4.8.4:4 !>x11-libs/qt-svg-4.8.4-r9999:4 !<x11-libs/qt-test-4.8.4:4 !>x11-libs/qt-test-4.8.4-r9999:4 !<x11-libs/qt-webkit-4.8.4:4 !>x11-libs/qt-webkit-4.8.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.4:4 !>x11-libs/qt-xmlpatterns-4.8.4-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a1df5e3c10d9a880ffd51fdb3a72f85a
diff --git a/metadata/md5-cache/x11-libs/qt-core-4.7.4-r1 b/metadata/md5-cache/x11-libs/qt-core-4.7.4-r1
index 7ffa9665413e..bb1f1b46ec7f 100644
--- a/metadata/md5-cache/x11-libs/qt-core-4.7.4-r1
+++ b/metadata/md5-cache/x11-libs/qt-core-4.7.4-r1
@@ -10,5 +10,5 @@ PDEPEND=qt3support? ( ~x11-libs/qt-gui-4.7.4[aqua=,glib=,qt3support] )
 RDEPEND=sys-libs/zlib glib? ( dev-libs/glib ) ssl? ( dev-libs/openssl ) !<x11-libs/qt-4.4.0:4 !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e1d915a994c04fa29c0b8615e2e1288e
diff --git a/metadata/md5-cache/x11-libs/qt-core-4.8.1-r3 b/metadata/md5-cache/x11-libs/qt-core-4.8.1-r3
index d9e0d1aeaead..b2d25d28e56a 100644
--- a/metadata/md5-cache/x11-libs/qt-core-4.8.1-r3
+++ b/metadata/md5-cache/x11-libs/qt-core-4.8.1-r3
@@ -10,5 +10,5 @@ PDEPEND=qt3support? ( ~x11-libs/qt-gui-4.8.1[aqua=,c++0x=,debug=,glib=,qpa=,qt3s
 RDEPEND=sys-libs/zlib glib? ( dev-libs/glib:2 ) icu? ( >=dev-libs/icu-49 ) ssl? ( dev-libs/openssl ) !<x11-libs/cairo-1.10.2-r2 !<x11-libs/qt-4.4.0:4 !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b4b9147b02b58c8b9cb6d89b0d091808
diff --git a/metadata/md5-cache/x11-libs/qt-core-4.8.2 b/metadata/md5-cache/x11-libs/qt-core-4.8.2
index 7913e8669bdd..36e7eb71a173 100644
--- a/metadata/md5-cache/x11-libs/qt-core-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-core-4.8.2
@@ -10,5 +10,5 @@ PDEPEND=qt3support? ( ~x11-libs/qt-gui-4.8.2[aqua=,c++0x=,debug=,glib=,qpa=,qt3s
 RDEPEND=sys-libs/zlib glib? ( dev-libs/glib:2 ) icu? ( >=dev-libs/icu-49 ) ssl? ( dev-libs/openssl ) !<x11-libs/cairo-1.10.2-r2 !x11-libs/qt:4 !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=166900f1420a7b6faadefefa55d45794
diff --git a/metadata/md5-cache/x11-libs/qt-core-4.8.3-r1 b/metadata/md5-cache/x11-libs/qt-core-4.8.3-r1
index 1b4bf5d65564..281e06e26fa4 100644
--- a/metadata/md5-cache/x11-libs/qt-core-4.8.3-r1
+++ b/metadata/md5-cache/x11-libs/qt-core-4.8.3-r1
@@ -10,5 +10,5 @@ PDEPEND=qt3support? ( ~x11-libs/qt-gui-4.8.3[aqua=,debug=,glib=,qt3support] )
 RDEPEND=sys-libs/zlib glib? ( dev-libs/glib:2 ) icu? ( >=dev-libs/icu-49 ) ssl? ( dev-libs/openssl ) !<x11-libs/cairo-1.10.2-r2 !x11-libs/qt:4 !<x11-libs/qt-assistant-4.8.3:4 !>x11-libs/qt-assistant-4.8.3-r9999:4 !<x11-libs/qt-bearer-4.8.3:4 !>x11-libs/qt-bearer-4.8.3-r9999:4 !<x11-libs/qt-core-4.8.3:4 !>x11-libs/qt-core-4.8.3-r9999:4 !<x11-libs/qt-dbus-4.8.3:4 !>x11-libs/qt-dbus-4.8.3-r9999:4 !<x11-libs/qt-declarative-4.8.3:4 !>x11-libs/qt-declarative-4.8.3-r9999:4 !<x11-libs/qt-demo-4.8.3:4 !>x11-libs/qt-demo-4.8.3-r9999:4 !<x11-libs/qt-gui-4.8.3:4 !>x11-libs/qt-gui-4.8.3-r9999:4 !<x11-libs/qt-multimedia-4.8.3:4 !>x11-libs/qt-multimedia-4.8.3-r9999:4 !<x11-libs/qt-opengl-4.8.3:4 !>x11-libs/qt-opengl-4.8.3-r9999:4 !<x11-libs/qt-openvg-4.8.3:4 !>x11-libs/qt-openvg-4.8.3-r9999:4 !<x11-libs/qt-phonon-4.8.3:4 !>x11-libs/qt-phonon-4.8.3-r9999:4 !<x11-libs/qt-qt3support-4.8.3:4 !>x11-libs/qt-qt3support-4.8.3-r9999:4 !<x11-libs/qt-script-4.8.3:4 !>x11-libs/qt-script-4.8.3-r9999:4 !<x11-libs/qt-sql-4.8.3:4 !>x11-libs/qt-sql-4.8.3-r9999:4 !<x11-libs/qt-svg-4.8.3:4 !>x11-libs/qt-svg-4.8.3-r9999:4 !<x11-libs/qt-test-4.8.3:4 !>x11-libs/qt-test-4.8.3-r9999:4 !<x11-libs/qt-webkit-4.8.3:4 !>x11-libs/qt-webkit-4.8.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.3:4 !>x11-libs/qt-xmlpatterns-4.8.3-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9180d5a4d067a7485715555695b7154d
diff --git a/metadata/md5-cache/x11-libs/qt-core-4.8.4 b/metadata/md5-cache/x11-libs/qt-core-4.8.4
index 918422706336..579b7492e85f 100644
--- a/metadata/md5-cache/x11-libs/qt-core-4.8.4
+++ b/metadata/md5-cache/x11-libs/qt-core-4.8.4
@@ -10,5 +10,5 @@ PDEPEND=qt3support? ( ~x11-libs/qt-gui-4.8.4[aqua=,debug=,glib=,qt3support] )
 RDEPEND=sys-libs/zlib glib? ( dev-libs/glib:2 ) icu? ( >=dev-libs/icu-49 ) ssl? ( dev-libs/openssl ) !<x11-libs/cairo-1.10.2-r2 !x11-libs/qt:4 !<x11-libs/qt-assistant-4.8.4:4 !>x11-libs/qt-assistant-4.8.4-r9999:4 !<x11-libs/qt-bearer-4.8.4:4 !>x11-libs/qt-bearer-4.8.4-r9999:4 !<x11-libs/qt-core-4.8.4:4 !>x11-libs/qt-core-4.8.4-r9999:4 !<x11-libs/qt-dbus-4.8.4:4 !>x11-libs/qt-dbus-4.8.4-r9999:4 !<x11-libs/qt-declarative-4.8.4:4 !>x11-libs/qt-declarative-4.8.4-r9999:4 !<x11-libs/qt-demo-4.8.4:4 !>x11-libs/qt-demo-4.8.4-r9999:4 !<x11-libs/qt-gui-4.8.4:4 !>x11-libs/qt-gui-4.8.4-r9999:4 !<x11-libs/qt-multimedia-4.8.4:4 !>x11-libs/qt-multimedia-4.8.4-r9999:4 !<x11-libs/qt-opengl-4.8.4:4 !>x11-libs/qt-opengl-4.8.4-r9999:4 !<x11-libs/qt-openvg-4.8.4:4 !>x11-libs/qt-openvg-4.8.4-r9999:4 !<x11-libs/qt-phonon-4.8.4:4 !>x11-libs/qt-phonon-4.8.4-r9999:4 !<x11-libs/qt-qt3support-4.8.4:4 !>x11-libs/qt-qt3support-4.8.4-r9999:4 !<x11-libs/qt-script-4.8.4:4 !>x11-libs/qt-script-4.8.4-r9999:4 !<x11-libs/qt-sql-4.8.4:4 !>x11-libs/qt-sql-4.8.4-r9999:4 !<x11-libs/qt-svg-4.8.4:4 !>x11-libs/qt-svg-4.8.4-r9999:4 !<x11-libs/qt-test-4.8.4:4 !>x11-libs/qt-test-4.8.4-r9999:4 !<x11-libs/qt-webkit-4.8.4:4 !>x11-libs/qt-webkit-4.8.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.4:4 !>x11-libs/qt-xmlpatterns-4.8.4-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=792f36c7b2f2b9d83f7ec239b6181a18
diff --git a/metadata/md5-cache/x11-libs/qt-dbus-4.7.4 b/metadata/md5-cache/x11-libs/qt-dbus-4.7.4
index cd1240b5ebb0..a4b1b7fe4ade 100644
--- a/metadata/md5-cache/x11-libs/qt-dbus-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-dbus-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.7.4[aqua=,debug=] >=sys-apps/dbus-1.0.2 !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0c232fb72bcc982245b612922f0baa9a
diff --git a/metadata/md5-cache/x11-libs/qt-dbus-4.8.1 b/metadata/md5-cache/x11-libs/qt-dbus-4.8.1
index 4d5df4c9593a..f4891f457d8c 100644
--- a/metadata/md5-cache/x11-libs/qt-dbus-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-dbus-4.8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=>=sys-apps/dbus-1.2 ~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,qpa=] !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=da33e17291bf3d63185f34f9383c1bd6
diff --git a/metadata/md5-cache/x11-libs/qt-dbus-4.8.2 b/metadata/md5-cache/x11-libs/qt-dbus-4.8.2
index 9f950877f736..8b0c5741fc59 100644
--- a/metadata/md5-cache/x11-libs/qt-dbus-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-dbus-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=>=sys-apps/dbus-1.2 ~x11-libs/qt-core-4.8.2[aqua=,c++0x=,debug=,qpa=] !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1e5b33c7f45dfc2865dbfe6912d1b971
diff --git a/metadata/md5-cache/x11-libs/qt-dbus-4.8.3 b/metadata/md5-cache/x11-libs/qt-dbus-4.8.3
index e80e87b9ce35..8d4073c33b86 100644
--- a/metadata/md5-cache/x11-libs/qt-dbus-4.8.3
+++ b/metadata/md5-cache/x11-libs/qt-dbus-4.8.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=>=sys-apps/dbus-1.2 ~x11-libs/qt-core-4.8.3[aqua=,debug=] !<x11-libs/qt-assistant-4.8.3:4 !>x11-libs/qt-assistant-4.8.3-r9999:4 !<x11-libs/qt-bearer-4.8.3:4 !>x11-libs/qt-bearer-4.8.3-r9999:4 !<x11-libs/qt-core-4.8.3:4 !>x11-libs/qt-core-4.8.3-r9999:4 !<x11-libs/qt-dbus-4.8.3:4 !>x11-libs/qt-dbus-4.8.3-r9999:4 !<x11-libs/qt-declarative-4.8.3:4 !>x11-libs/qt-declarative-4.8.3-r9999:4 !<x11-libs/qt-demo-4.8.3:4 !>x11-libs/qt-demo-4.8.3-r9999:4 !<x11-libs/qt-gui-4.8.3:4 !>x11-libs/qt-gui-4.8.3-r9999:4 !<x11-libs/qt-multimedia-4.8.3:4 !>x11-libs/qt-multimedia-4.8.3-r9999:4 !<x11-libs/qt-opengl-4.8.3:4 !>x11-libs/qt-opengl-4.8.3-r9999:4 !<x11-libs/qt-openvg-4.8.3:4 !>x11-libs/qt-openvg-4.8.3-r9999:4 !<x11-libs/qt-phonon-4.8.3:4 !>x11-libs/qt-phonon-4.8.3-r9999:4 !<x11-libs/qt-qt3support-4.8.3:4 !>x11-libs/qt-qt3support-4.8.3-r9999:4 !<x11-libs/qt-script-4.8.3:4 !>x11-libs/qt-script-4.8.3-r9999:4 !<x11-libs/qt-sql-4.8.3:4 !>x11-libs/qt-sql-4.8.3-r9999:4 !<x11-libs/qt-svg-4.8.3:4 !>x11-libs/qt-svg-4.8.3-r9999:4 !<x11-libs/qt-test-4.8.3:4 !>x11-libs/qt-test-4.8.3-r9999:4 !<x11-libs/qt-webkit-4.8.3:4 !>x11-libs/qt-webkit-4.8.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.3:4 !>x11-libs/qt-xmlpatterns-4.8.3-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0e6f83eb09f3b99b96ff1d75664f6a8e
diff --git a/metadata/md5-cache/x11-libs/qt-dbus-4.8.4 b/metadata/md5-cache/x11-libs/qt-dbus-4.8.4
index cdf9aaad4817..9a9bd0129b0b 100644
--- a/metadata/md5-cache/x11-libs/qt-dbus-4.8.4
+++ b/metadata/md5-cache/x11-libs/qt-dbus-4.8.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=>=sys-apps/dbus-1.2 ~x11-libs/qt-core-4.8.4[aqua=,debug=] !<x11-libs/qt-assistant-4.8.4:4 !>x11-libs/qt-assistant-4.8.4-r9999:4 !<x11-libs/qt-bearer-4.8.4:4 !>x11-libs/qt-bearer-4.8.4-r9999:4 !<x11-libs/qt-core-4.8.4:4 !>x11-libs/qt-core-4.8.4-r9999:4 !<x11-libs/qt-dbus-4.8.4:4 !>x11-libs/qt-dbus-4.8.4-r9999:4 !<x11-libs/qt-declarative-4.8.4:4 !>x11-libs/qt-declarative-4.8.4-r9999:4 !<x11-libs/qt-demo-4.8.4:4 !>x11-libs/qt-demo-4.8.4-r9999:4 !<x11-libs/qt-gui-4.8.4:4 !>x11-libs/qt-gui-4.8.4-r9999:4 !<x11-libs/qt-multimedia-4.8.4:4 !>x11-libs/qt-multimedia-4.8.4-r9999:4 !<x11-libs/qt-opengl-4.8.4:4 !>x11-libs/qt-opengl-4.8.4-r9999:4 !<x11-libs/qt-openvg-4.8.4:4 !>x11-libs/qt-openvg-4.8.4-r9999:4 !<x11-libs/qt-phonon-4.8.4:4 !>x11-libs/qt-phonon-4.8.4-r9999:4 !<x11-libs/qt-qt3support-4.8.4:4 !>x11-libs/qt-qt3support-4.8.4-r9999:4 !<x11-libs/qt-script-4.8.4:4 !>x11-libs/qt-script-4.8.4-r9999:4 !<x11-libs/qt-sql-4.8.4:4 !>x11-libs/qt-sql-4.8.4-r9999:4 !<x11-libs/qt-svg-4.8.4:4 !>x11-libs/qt-svg-4.8.4-r9999:4 !<x11-libs/qt-test-4.8.4:4 !>x11-libs/qt-test-4.8.4-r9999:4 !<x11-libs/qt-webkit-4.8.4:4 !>x11-libs/qt-webkit-4.8.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.4:4 !>x11-libs/qt-xmlpatterns-4.8.4-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=293947a3ba4996cfa66794bb5ecce252
diff --git a/metadata/md5-cache/x11-libs/qt-declarative-4.7.4 b/metadata/md5-cache/x11-libs/qt-declarative-4.7.4
index fb095b5e4341..3d1d7cb1beed 100644
--- a/metadata/md5-cache/x11-libs/qt-declarative-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-declarative-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.7.4[aqua=,qt3support=] ~x11-libs/qt-gui-4.7.4[aqua=,qt3support=] ~x11-libs/qt-opengl-4.7.4[aqua=,qt3support=] ~x11-libs/qt-script-4.7.4[aqua=] ~x11-libs/qt-sql-4.7.4[aqua=,qt3support=] ~x11-libs/qt-svg-4.7.4[aqua=] ~x11-libs/qt-xmlpatterns-4.7.4[aqua=] qt3support? ( ~x11-libs/qt-qt3support-4.7.4[aqua=] ) webkit? ( ~x11-libs/qt-webkit-4.7.4[aqua=] ) !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d4739412655170ca5df298c1250ab65e
diff --git a/metadata/md5-cache/x11-libs/qt-declarative-4.8.1 b/metadata/md5-cache/x11-libs/qt-declarative-4.8.1
index 42282e260045..cdce76c37818 100644
--- a/metadata/md5-cache/x11-libs/qt-declarative-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-declarative-4.8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,qpa=,qt3support=] ~x11-libs/qt-gui-4.8.1[accessibility=,aqua=,c++0x=,debug=,qpa=,qt3support=] ~x11-libs/qt-opengl-4.8.1[aqua=,c++0x=,debug=,qpa=,qt3support=] ~x11-libs/qt-script-4.8.1[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-sql-4.8.1[aqua=,c++0x=,debug=,qpa=,qt3support=] ~x11-libs/qt-svg-4.8.1[accessibility=,aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-xmlpatterns-4.8.1[aqua=,c++0x=,debug=,qpa=] qt3support? ( ~x11-libs/qt-qt3support-4.8.1[accessibility=,aqua=,c++0x=,debug=,qpa=] ) webkit? ( ~x11-libs/qt-webkit-4.8.1[aqua=,debug=,qpa=] ) !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5769b9c31e48fa662e773fb8ba48447c
diff --git a/metadata/md5-cache/x11-libs/qt-declarative-4.8.2 b/metadata/md5-cache/x11-libs/qt-declarative-4.8.2
index 5763332eb48b..cf76d1ea0097 100644
--- a/metadata/md5-cache/x11-libs/qt-declarative-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-declarative-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.2[aqua=,c++0x=,debug=,qpa=,qt3support=] ~x11-libs/qt-gui-4.8.2[accessibility=,aqua=,c++0x=,debug=,qpa=,qt3support=] ~x11-libs/qt-opengl-4.8.2[aqua=,c++0x=,debug=,qpa=,qt3support=] ~x11-libs/qt-script-4.8.2[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-sql-4.8.2[aqua=,c++0x=,debug=,qpa=,qt3support=] ~x11-libs/qt-svg-4.8.2[accessibility=,aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-xmlpatterns-4.8.2[aqua=,c++0x=,debug=,qpa=] qt3support? ( ~x11-libs/qt-qt3support-4.8.2[accessibility=,aqua=,c++0x=,debug=,qpa=] ) webkit? ( ~x11-libs/qt-webkit-4.8.2[aqua=,debug=,qpa=] ) !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ae2dc6f73596eb69f0f5f938253f100e
diff --git a/metadata/md5-cache/x11-libs/qt-declarative-4.8.3-r1 b/metadata/md5-cache/x11-libs/qt-declarative-4.8.3-r1
index a31b2dba5a02..bcde31e3b723 100644
--- a/metadata/md5-cache/x11-libs/qt-declarative-4.8.3-r1
+++ b/metadata/md5-cache/x11-libs/qt-declarative-4.8.3-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.3[aqua=,debug=,qt3support=] ~x11-libs/qt-gui-4.8.3[accessibility=,aqua=,debug=,qt3support=] ~x11-libs/qt-opengl-4.8.3[aqua=,debug=,qt3support=] ~x11-libs/qt-script-4.8.3[aqua=,debug=] ~x11-libs/qt-sql-4.8.3[aqua=,debug=,qt3support=] ~x11-libs/qt-svg-4.8.3[accessibility=,aqua=,debug=] ~x11-libs/qt-xmlpatterns-4.8.3[aqua=,debug=] qt3support? ( ~x11-libs/qt-qt3support-4.8.3[accessibility=,aqua=,debug=] ) webkit? ( ~x11-libs/qt-webkit-4.8.3[aqua=,debug=] ) !<x11-libs/qt-assistant-4.8.3:4 !>x11-libs/qt-assistant-4.8.3-r9999:4 !<x11-libs/qt-bearer-4.8.3:4 !>x11-libs/qt-bearer-4.8.3-r9999:4 !<x11-libs/qt-core-4.8.3:4 !>x11-libs/qt-core-4.8.3-r9999:4 !<x11-libs/qt-dbus-4.8.3:4 !>x11-libs/qt-dbus-4.8.3-r9999:4 !<x11-libs/qt-declarative-4.8.3:4 !>x11-libs/qt-declarative-4.8.3-r9999:4 !<x11-libs/qt-demo-4.8.3:4 !>x11-libs/qt-demo-4.8.3-r9999:4 !<x11-libs/qt-gui-4.8.3:4 !>x11-libs/qt-gui-4.8.3-r9999:4 !<x11-libs/qt-multimedia-4.8.3:4 !>x11-libs/qt-multimedia-4.8.3-r9999:4 !<x11-libs/qt-opengl-4.8.3:4 !>x11-libs/qt-opengl-4.8.3-r9999:4 !<x11-libs/qt-openvg-4.8.3:4 !>x11-libs/qt-openvg-4.8.3-r9999:4 !<x11-libs/qt-phonon-4.8.3:4 !>x11-libs/qt-phonon-4.8.3-r9999:4 !<x11-libs/qt-qt3support-4.8.3:4 !>x11-libs/qt-qt3support-4.8.3-r9999:4 !<x11-libs/qt-script-4.8.3:4 !>x11-libs/qt-script-4.8.3-r9999:4 !<x11-libs/qt-sql-4.8.3:4 !>x11-libs/qt-sql-4.8.3-r9999:4 !<x11-libs/qt-svg-4.8.3:4 !>x11-libs/qt-svg-4.8.3-r9999:4 !<x11-libs/qt-test-4.8.3:4 !>x11-libs/qt-test-4.8.3-r9999:4 !<x11-libs/qt-webkit-4.8.3:4 !>x11-libs/qt-webkit-4.8.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.3:4 !>x11-libs/qt-xmlpatterns-4.8.3-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2c3b2ac32779de78d2c35a1ec68dce87
diff --git a/metadata/md5-cache/x11-libs/qt-declarative-4.8.4 b/metadata/md5-cache/x11-libs/qt-declarative-4.8.4
index fb876e4f5c48..fe67457f0911 100644
--- a/metadata/md5-cache/x11-libs/qt-declarative-4.8.4
+++ b/metadata/md5-cache/x11-libs/qt-declarative-4.8.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.4[aqua=,debug=,qt3support=] ~x11-libs/qt-gui-4.8.4[accessibility=,aqua=,debug=,qt3support=] ~x11-libs/qt-opengl-4.8.4[aqua=,debug=,qt3support=] ~x11-libs/qt-script-4.8.4[aqua=,debug=] ~x11-libs/qt-sql-4.8.4[aqua=,debug=,qt3support=] ~x11-libs/qt-svg-4.8.4[accessibility=,aqua=,debug=] ~x11-libs/qt-xmlpatterns-4.8.4[aqua=,debug=] qt3support? ( ~x11-libs/qt-qt3support-4.8.4[accessibility=,aqua=,debug=] ) webkit? ( ~x11-libs/qt-webkit-4.8.4[aqua=,debug=] ) !<x11-libs/qt-assistant-4.8.4:4 !>x11-libs/qt-assistant-4.8.4-r9999:4 !<x11-libs/qt-bearer-4.8.4:4 !>x11-libs/qt-bearer-4.8.4-r9999:4 !<x11-libs/qt-core-4.8.4:4 !>x11-libs/qt-core-4.8.4-r9999:4 !<x11-libs/qt-dbus-4.8.4:4 !>x11-libs/qt-dbus-4.8.4-r9999:4 !<x11-libs/qt-declarative-4.8.4:4 !>x11-libs/qt-declarative-4.8.4-r9999:4 !<x11-libs/qt-demo-4.8.4:4 !>x11-libs/qt-demo-4.8.4-r9999:4 !<x11-libs/qt-gui-4.8.4:4 !>x11-libs/qt-gui-4.8.4-r9999:4 !<x11-libs/qt-multimedia-4.8.4:4 !>x11-libs/qt-multimedia-4.8.4-r9999:4 !<x11-libs/qt-opengl-4.8.4:4 !>x11-libs/qt-opengl-4.8.4-r9999:4 !<x11-libs/qt-openvg-4.8.4:4 !>x11-libs/qt-openvg-4.8.4-r9999:4 !<x11-libs/qt-phonon-4.8.4:4 !>x11-libs/qt-phonon-4.8.4-r9999:4 !<x11-libs/qt-qt3support-4.8.4:4 !>x11-libs/qt-qt3support-4.8.4-r9999:4 !<x11-libs/qt-script-4.8.4:4 !>x11-libs/qt-script-4.8.4-r9999:4 !<x11-libs/qt-sql-4.8.4:4 !>x11-libs/qt-sql-4.8.4-r9999:4 !<x11-libs/qt-svg-4.8.4:4 !>x11-libs/qt-svg-4.8.4-r9999:4 !<x11-libs/qt-test-4.8.4:4 !>x11-libs/qt-test-4.8.4-r9999:4 !<x11-libs/qt-webkit-4.8.4:4 !>x11-libs/qt-webkit-4.8.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.4:4 !>x11-libs/qt-xmlpatterns-4.8.4-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a51cde7aacad22d1059437d794061b50
diff --git a/metadata/md5-cache/x11-libs/qt-demo-4.7.4 b/metadata/md5-cache/x11-libs/qt-demo-4.7.4
index 26489e96f6c2..42d6fee2dd78 100644
--- a/metadata/md5-cache/x11-libs/qt-demo-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-demo-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-assistant-4.7.4:4[aqua=] ~x11-libs/qt-core-4.7.4:4[aqua=,qt3support=] ~x11-libs/qt-dbus-4.7.4:4[aqua=] ~x11-libs/qt-declarative-4.7.4:4[aqua=,webkit] ~x11-libs/qt-gui-4.7.4:4[aqua=,qt3support=] ~x11-libs/qt-multimedia-4.7.4:4[aqua=] ~x11-libs/qt-opengl-4.7.4:4[aqua=,qt3support=] !kde? ( || ( ~x11-libs/qt-phonon-4.7.4:4[aqua=] media-libs/phonon[aqua=] ) ) kde? ( media-libs/phonon[aqua=] ) ~x11-libs/qt-script-4.7.4:4[aqua=] ~x11-libs/qt-sql-4.7.4:4[aqua=,qt3support=] ~x11-libs/qt-svg-4.7.4:4[aqua=] ~x11-libs/qt-test-4.7.4:4[aqua=] ~x11-libs/qt-webkit-4.7.4:4[aqua=] ~x11-libs/qt-xmlpatterns-4.7.4:4[aqua=] !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3de66d45b1e97b53e98c412c4573ba1f
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 f82b3ea30fbc..ce6ac30af598 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
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 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=,debug=,qpa=] ) xmlpatterns? ( ~x11-libs/qt-xmlpatterns-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7727a6135566f263d18398f0caa0aa1c
diff --git a/metadata/md5-cache/x11-libs/qt-demo-4.8.2 b/metadata/md5-cache/x11-libs/qt-demo-4.8.2
index 98be030e8dce..156c77ee89c6 100644
--- a/metadata/md5-cache/x11-libs/qt-demo-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-demo-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-assistant-4.8.2:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-core-4.8.2:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-gui-4.8.2:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-script-4.8.2:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-sql-4.8.2:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-svg-4.8.2:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-test-4.8.2:4[aqua=,c++0x=,debug=,qpa=] dbus? ( ~x11-libs/qt-dbus-4.8.2:4[aqua=,c++0x=,debug=,qpa=] ) declarative? ( ~x11-libs/qt-declarative-4.8.2:4[aqua=,c++0x=,debug=,qpa=,webkit?] ) kde? ( media-libs/phonon[aqua=] ) !kde? ( || ( ~x11-libs/qt-phonon-4.8.2:4[aqua=,c++0x=,debug=,qpa=] media-libs/phonon[aqua=] ) ) multimedia? ( ~x11-libs/qt-multimedia-4.8.2:4[aqua=,c++0x=,debug=,qpa=] ) opengl? ( ~x11-libs/qt-opengl-4.8.2:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ) openvg? ( ~x11-libs/qt-openvg-4.8.2:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ) qt3support? ( ~x11-libs/qt-qt3support-4.8.2:4[aqua=,c++0x=,debug=,qpa=] ) webkit? ( ~x11-libs/qt-webkit-4.8.2:4[aqua=,debug=,qpa=] ) xmlpatterns? ( ~x11-libs/qt-xmlpatterns-4.8.2:4[aqua=,c++0x=,debug=,qpa=] ) !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c449722c3aae965913955ba7410284d7
diff --git a/metadata/md5-cache/x11-libs/qt-demo-4.8.3 b/metadata/md5-cache/x11-libs/qt-demo-4.8.3
index 0953e7c71f95..948da96f4f87 100644
--- a/metadata/md5-cache/x11-libs/qt-demo-4.8.3
+++ b/metadata/md5-cache/x11-libs/qt-demo-4.8.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-assistant-4.8.3:4[aqua=,debug=] ~x11-libs/qt-core-4.8.3:4[aqua=,debug=,qt3support?] ~x11-libs/qt-gui-4.8.3:4[aqua=,debug=,qt3support?] ~x11-libs/qt-script-4.8.3:4[aqua=,debug=] ~x11-libs/qt-sql-4.8.3:4[aqua=,debug=,qt3support?] ~x11-libs/qt-svg-4.8.3:4[aqua=,debug=] ~x11-libs/qt-test-4.8.3:4[aqua=,debug=] dbus? ( ~x11-libs/qt-dbus-4.8.3:4[aqua=,debug=] ) declarative? ( ~x11-libs/qt-declarative-4.8.3:4[aqua=,debug=,webkit?] ) kde? ( media-libs/phonon[aqua=] ) !kde? ( || ( ~x11-libs/qt-phonon-4.8.3:4[aqua=,debug=] media-libs/phonon[aqua=] ) ) multimedia? ( ~x11-libs/qt-multimedia-4.8.3:4[aqua=,debug=] ) opengl? ( ~x11-libs/qt-opengl-4.8.3:4[aqua=,debug=,qt3support?] ) openvg? ( ~x11-libs/qt-openvg-4.8.3:4[aqua=,debug=,qt3support?] ) qt3support? ( ~x11-libs/qt-qt3support-4.8.3:4[aqua=,debug=] ) webkit? ( ~x11-libs/qt-webkit-4.8.3:4[aqua=,debug=] ) xmlpatterns? ( ~x11-libs/qt-xmlpatterns-4.8.3:4[aqua=,debug=] ) !<x11-libs/qt-assistant-4.8.3:4 !>x11-libs/qt-assistant-4.8.3-r9999:4 !<x11-libs/qt-bearer-4.8.3:4 !>x11-libs/qt-bearer-4.8.3-r9999:4 !<x11-libs/qt-core-4.8.3:4 !>x11-libs/qt-core-4.8.3-r9999:4 !<x11-libs/qt-dbus-4.8.3:4 !>x11-libs/qt-dbus-4.8.3-r9999:4 !<x11-libs/qt-declarative-4.8.3:4 !>x11-libs/qt-declarative-4.8.3-r9999:4 !<x11-libs/qt-demo-4.8.3:4 !>x11-libs/qt-demo-4.8.3-r9999:4 !<x11-libs/qt-gui-4.8.3:4 !>x11-libs/qt-gui-4.8.3-r9999:4 !<x11-libs/qt-multimedia-4.8.3:4 !>x11-libs/qt-multimedia-4.8.3-r9999:4 !<x11-libs/qt-opengl-4.8.3:4 !>x11-libs/qt-opengl-4.8.3-r9999:4 !<x11-libs/qt-openvg-4.8.3:4 !>x11-libs/qt-openvg-4.8.3-r9999:4 !<x11-libs/qt-phonon-4.8.3:4 !>x11-libs/qt-phonon-4.8.3-r9999:4 !<x11-libs/qt-qt3support-4.8.3:4 !>x11-libs/qt-qt3support-4.8.3-r9999:4 !<x11-libs/qt-script-4.8.3:4 !>x11-libs/qt-script-4.8.3-r9999:4 !<x11-libs/qt-sql-4.8.3:4 !>x11-libs/qt-sql-4.8.3-r9999:4 !<x11-libs/qt-svg-4.8.3:4 !>x11-libs/qt-svg-4.8.3-r9999:4 !<x11-libs/qt-test-4.8.3:4 !>x11-libs/qt-test-4.8.3-r9999:4 !<x11-libs/qt-webkit-4.8.3:4 !>x11-libs/qt-webkit-4.8.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.3:4 !>x11-libs/qt-xmlpatterns-4.8.3-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=74ac26bbd4bdc58d34267c796c8d0816
diff --git a/metadata/md5-cache/x11-libs/qt-demo-4.8.4 b/metadata/md5-cache/x11-libs/qt-demo-4.8.4
index dcf272625d4f..9906f374435f 100644
--- a/metadata/md5-cache/x11-libs/qt-demo-4.8.4
+++ b/metadata/md5-cache/x11-libs/qt-demo-4.8.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-assistant-4.8.4:4[aqua=,debug=] ~x11-libs/qt-core-4.8.4:4[aqua=,debug=,qt3support?] ~x11-libs/qt-gui-4.8.4:4[aqua=,debug=,qt3support?] ~x11-libs/qt-script-4.8.4:4[aqua=,debug=] ~x11-libs/qt-sql-4.8.4:4[aqua=,debug=,qt3support?] ~x11-libs/qt-svg-4.8.4:4[aqua=,debug=] ~x11-libs/qt-test-4.8.4:4[aqua=,debug=] dbus? ( ~x11-libs/qt-dbus-4.8.4:4[aqua=,debug=] ) declarative? ( ~x11-libs/qt-declarative-4.8.4:4[aqua=,debug=,webkit?] ) kde? ( media-libs/phonon[aqua=] ) !kde? ( || ( ~x11-libs/qt-phonon-4.8.4:4[aqua=,debug=] media-libs/phonon[aqua=] ) ) multimedia? ( ~x11-libs/qt-multimedia-4.8.4:4[aqua=,debug=] ) opengl? ( ~x11-libs/qt-opengl-4.8.4:4[aqua=,debug=,qt3support?] ) openvg? ( ~x11-libs/qt-openvg-4.8.4:4[aqua=,debug=,qt3support?] ) qt3support? ( ~x11-libs/qt-qt3support-4.8.4:4[aqua=,debug=] ) webkit? ( ~x11-libs/qt-webkit-4.8.4:4[aqua=,debug=] ) xmlpatterns? ( ~x11-libs/qt-xmlpatterns-4.8.4:4[aqua=,debug=] ) !<x11-libs/qt-assistant-4.8.4:4 !>x11-libs/qt-assistant-4.8.4-r9999:4 !<x11-libs/qt-bearer-4.8.4:4 !>x11-libs/qt-bearer-4.8.4-r9999:4 !<x11-libs/qt-core-4.8.4:4 !>x11-libs/qt-core-4.8.4-r9999:4 !<x11-libs/qt-dbus-4.8.4:4 !>x11-libs/qt-dbus-4.8.4-r9999:4 !<x11-libs/qt-declarative-4.8.4:4 !>x11-libs/qt-declarative-4.8.4-r9999:4 !<x11-libs/qt-demo-4.8.4:4 !>x11-libs/qt-demo-4.8.4-r9999:4 !<x11-libs/qt-gui-4.8.4:4 !>x11-libs/qt-gui-4.8.4-r9999:4 !<x11-libs/qt-multimedia-4.8.4:4 !>x11-libs/qt-multimedia-4.8.4-r9999:4 !<x11-libs/qt-opengl-4.8.4:4 !>x11-libs/qt-opengl-4.8.4-r9999:4 !<x11-libs/qt-openvg-4.8.4:4 !>x11-libs/qt-openvg-4.8.4-r9999:4 !<x11-libs/qt-phonon-4.8.4:4 !>x11-libs/qt-phonon-4.8.4-r9999:4 !<x11-libs/qt-qt3support-4.8.4:4 !>x11-libs/qt-qt3support-4.8.4-r9999:4 !<x11-libs/qt-script-4.8.4:4 !>x11-libs/qt-script-4.8.4-r9999:4 !<x11-libs/qt-sql-4.8.4:4 !>x11-libs/qt-sql-4.8.4-r9999:4 !<x11-libs/qt-svg-4.8.4:4 !>x11-libs/qt-svg-4.8.4-r9999:4 !<x11-libs/qt-test-4.8.4:4 !>x11-libs/qt-test-4.8.4-r9999:4 !<x11-libs/qt-webkit-4.8.4:4 !>x11-libs/qt-webkit-4.8.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.4:4 !>x11-libs/qt-xmlpatterns-4.8.4-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4f731f9ba343228bd60905a86d5795d5
diff --git a/metadata/md5-cache/x11-libs/qt-gui-4.7.4-r1 b/metadata/md5-cache/x11-libs/qt-gui-4.7.4-r1
index da63d565dccf..5c6e9d3d519a 100644
--- a/metadata/md5-cache/x11-libs/qt-gui-4.7.4-r1
+++ b/metadata/md5-cache/x11-libs/qt-gui-4.7.4-r1
@@ -10,5 +10,5 @@ PDEPEND=qt3support? ( ~x11-libs/qt-qt3support-4.7.4[aqua=,debug=] )
 RDEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sys-libs/zlib virtual/jpeg ~x11-libs/qt-core-4.7.4[aqua=,debug=,glib=,qt3support=] ~x11-libs/qt-script-4.7.4[aqua=,debug=] !aqua? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXcursor x11-libs/libXfont x11-libs/libSM x11-libs/libXi ) cups? ( net-print/cups ) dbus? ( ~x11-libs/qt-dbus-4.7.4[aqua=,debug=] ) gtkstyle? ( x11-libs/gtk+:2[aqua=] ) mng? ( >=media-libs/libmng-1.0.9 ) nas? ( >=media-libs/nas-1.5 ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d6273fe89fef54f51a5f61efa64ea6ab
diff --git a/metadata/md5-cache/x11-libs/qt-gui-4.8.1-r1 b/metadata/md5-cache/x11-libs/qt-gui-4.8.1-r1
index 9913dff9d559..3b86c181c16a 100644
--- a/metadata/md5-cache/x11-libs/qt-gui-4.8.1-r1
+++ b/metadata/md5-cache/x11-libs/qt-gui-4.8.1-r1
@@ -11,5 +11,5 @@ RDEPEND=app-admin/eselect-qtgraphicssystem media-libs/fontconfig media-libs/free
 REQUIRED_USE=gtkstyle? ( glib )
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=73ec9553c0946fc534fb9c78dc914fb1
diff --git a/metadata/md5-cache/x11-libs/qt-gui-4.8.2 b/metadata/md5-cache/x11-libs/qt-gui-4.8.2
index 1027bab943af..b8d63b92cbda 100644
--- a/metadata/md5-cache/x11-libs/qt-gui-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-gui-4.8.2
@@ -11,5 +11,5 @@ RDEPEND=app-admin/eselect-qtgraphicssystem media-libs/fontconfig media-libs/free
 REQUIRED_USE=gtkstyle? ( glib )
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cac6b67ac1776177d83967bc4dfded1c
diff --git a/metadata/md5-cache/x11-libs/qt-gui-4.8.3-r1 b/metadata/md5-cache/x11-libs/qt-gui-4.8.3-r1
index c76aa2aa4021..25ee0d0117cd 100644
--- a/metadata/md5-cache/x11-libs/qt-gui-4.8.3-r1
+++ b/metadata/md5-cache/x11-libs/qt-gui-4.8.3-r1
@@ -11,5 +11,5 @@ RDEPEND=app-admin/eselect-qtgraphicssystem media-libs/fontconfig media-libs/free
 REQUIRED_USE=gtkstyle? ( glib )
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=19eddd137371dad70dfe7d58e46fe5fc
diff --git a/metadata/md5-cache/x11-libs/qt-gui-4.8.4 b/metadata/md5-cache/x11-libs/qt-gui-4.8.4
index 6cb18b3b6e17..dfa0396c162a 100644
--- a/metadata/md5-cache/x11-libs/qt-gui-4.8.4
+++ b/metadata/md5-cache/x11-libs/qt-gui-4.8.4
@@ -11,5 +11,5 @@ RDEPEND=app-admin/eselect-qtgraphicssystem media-libs/fontconfig media-libs/free
 REQUIRED_USE=gtkstyle? ( glib )
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b2442a5607f6da87d45432e037fb3471
diff --git a/metadata/md5-cache/x11-libs/qt-multimedia-4.7.4 b/metadata/md5-cache/x11-libs/qt-multimedia-4.7.4
index f56e1b9ccd9c..78b03be2c442 100644
--- a/metadata/md5-cache/x11-libs/qt-multimedia-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-multimedia-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=!aqua? ( media-libs/alsa-lib ) ~x11-libs/qt-core-4.7.4[aqua=,debug=] ~x11-libs/qt-gui-4.7.4[aqua=,debug=] !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c79b8c32eab86d5ee26e9b9aee1eb1c4
diff --git a/metadata/md5-cache/x11-libs/qt-multimedia-4.8.1 b/metadata/md5-cache/x11-libs/qt-multimedia-4.8.1
index e4f18284fb9a..07dbc58400bd 100644
--- a/metadata/md5-cache/x11-libs/qt-multimedia-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-multimedia-4.8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-gui-4.8.1[aqua=,c++0x=,debug=,qpa=] alsa? ( media-libs/alsa-lib ) !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7319396a6dbb3ecf17d4c1777b2ffaf8
diff --git a/metadata/md5-cache/x11-libs/qt-multimedia-4.8.2 b/metadata/md5-cache/x11-libs/qt-multimedia-4.8.2
index 4119a85e8a0b..1b4f56f9676f 100644
--- a/metadata/md5-cache/x11-libs/qt-multimedia-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-multimedia-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.2[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-gui-4.8.2[aqua=,c++0x=,debug=,qpa=] alsa? ( media-libs/alsa-lib ) !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ea329e9abec96baaab2f8e8be473dc3b
diff --git a/metadata/md5-cache/x11-libs/qt-multimedia-4.8.3 b/metadata/md5-cache/x11-libs/qt-multimedia-4.8.3
index 84cb17f3a6e9..422d7a66d65a 100644
--- a/metadata/md5-cache/x11-libs/qt-multimedia-4.8.3
+++ b/metadata/md5-cache/x11-libs/qt-multimedia-4.8.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.3[aqua=,debug=] ~x11-libs/qt-gui-4.8.3[aqua=,debug=] alsa? ( media-libs/alsa-lib ) !<x11-libs/qt-assistant-4.8.3:4 !>x11-libs/qt-assistant-4.8.3-r9999:4 !<x11-libs/qt-bearer-4.8.3:4 !>x11-libs/qt-bearer-4.8.3-r9999:4 !<x11-libs/qt-core-4.8.3:4 !>x11-libs/qt-core-4.8.3-r9999:4 !<x11-libs/qt-dbus-4.8.3:4 !>x11-libs/qt-dbus-4.8.3-r9999:4 !<x11-libs/qt-declarative-4.8.3:4 !>x11-libs/qt-declarative-4.8.3-r9999:4 !<x11-libs/qt-demo-4.8.3:4 !>x11-libs/qt-demo-4.8.3-r9999:4 !<x11-libs/qt-gui-4.8.3:4 !>x11-libs/qt-gui-4.8.3-r9999:4 !<x11-libs/qt-multimedia-4.8.3:4 !>x11-libs/qt-multimedia-4.8.3-r9999:4 !<x11-libs/qt-opengl-4.8.3:4 !>x11-libs/qt-opengl-4.8.3-r9999:4 !<x11-libs/qt-openvg-4.8.3:4 !>x11-libs/qt-openvg-4.8.3-r9999:4 !<x11-libs/qt-phonon-4.8.3:4 !>x11-libs/qt-phonon-4.8.3-r9999:4 !<x11-libs/qt-qt3support-4.8.3:4 !>x11-libs/qt-qt3support-4.8.3-r9999:4 !<x11-libs/qt-script-4.8.3:4 !>x11-libs/qt-script-4.8.3-r9999:4 !<x11-libs/qt-sql-4.8.3:4 !>x11-libs/qt-sql-4.8.3-r9999:4 !<x11-libs/qt-svg-4.8.3:4 !>x11-libs/qt-svg-4.8.3-r9999:4 !<x11-libs/qt-test-4.8.3:4 !>x11-libs/qt-test-4.8.3-r9999:4 !<x11-libs/qt-webkit-4.8.3:4 !>x11-libs/qt-webkit-4.8.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.3:4 !>x11-libs/qt-xmlpatterns-4.8.3-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=037968d2719f97e332f397d59420a016
diff --git a/metadata/md5-cache/x11-libs/qt-multimedia-4.8.4 b/metadata/md5-cache/x11-libs/qt-multimedia-4.8.4
index 55200a6356bb..ee12eb0e259e 100644
--- a/metadata/md5-cache/x11-libs/qt-multimedia-4.8.4
+++ b/metadata/md5-cache/x11-libs/qt-multimedia-4.8.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.4[aqua=,debug=] ~x11-libs/qt-gui-4.8.4[aqua=,debug=] alsa? ( media-libs/alsa-lib ) !<x11-libs/qt-assistant-4.8.4:4 !>x11-libs/qt-assistant-4.8.4-r9999:4 !<x11-libs/qt-bearer-4.8.4:4 !>x11-libs/qt-bearer-4.8.4-r9999:4 !<x11-libs/qt-core-4.8.4:4 !>x11-libs/qt-core-4.8.4-r9999:4 !<x11-libs/qt-dbus-4.8.4:4 !>x11-libs/qt-dbus-4.8.4-r9999:4 !<x11-libs/qt-declarative-4.8.4:4 !>x11-libs/qt-declarative-4.8.4-r9999:4 !<x11-libs/qt-demo-4.8.4:4 !>x11-libs/qt-demo-4.8.4-r9999:4 !<x11-libs/qt-gui-4.8.4:4 !>x11-libs/qt-gui-4.8.4-r9999:4 !<x11-libs/qt-multimedia-4.8.4:4 !>x11-libs/qt-multimedia-4.8.4-r9999:4 !<x11-libs/qt-opengl-4.8.4:4 !>x11-libs/qt-opengl-4.8.4-r9999:4 !<x11-libs/qt-openvg-4.8.4:4 !>x11-libs/qt-openvg-4.8.4-r9999:4 !<x11-libs/qt-phonon-4.8.4:4 !>x11-libs/qt-phonon-4.8.4-r9999:4 !<x11-libs/qt-qt3support-4.8.4:4 !>x11-libs/qt-qt3support-4.8.4-r9999:4 !<x11-libs/qt-script-4.8.4:4 !>x11-libs/qt-script-4.8.4-r9999:4 !<x11-libs/qt-sql-4.8.4:4 !>x11-libs/qt-sql-4.8.4-r9999:4 !<x11-libs/qt-svg-4.8.4:4 !>x11-libs/qt-svg-4.8.4-r9999:4 !<x11-libs/qt-test-4.8.4:4 !>x11-libs/qt-test-4.8.4-r9999:4 !<x11-libs/qt-webkit-4.8.4:4 !>x11-libs/qt-webkit-4.8.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.4:4 !>x11-libs/qt-xmlpatterns-4.8.4-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7247aeb7069b77c6fdfe65055d307d08
diff --git a/metadata/md5-cache/x11-libs/qt-opengl-4.7.4 b/metadata/md5-cache/x11-libs/qt-opengl-4.7.4
index 538b82f8d5c8..02c30c9d41b8 100644
--- a/metadata/md5-cache/x11-libs/qt-opengl-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-opengl-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.7.4[aqua=,debug=,qt3support=] ~x11-libs/qt-gui-4.7.4[aqua=,debug=,egl=,qt3support=] virtual/opengl !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=29ce73d67e9e56ff12dda2a645bb8dac
diff --git a/metadata/md5-cache/x11-libs/qt-opengl-4.8.1 b/metadata/md5-cache/x11-libs/qt-opengl-4.8.1
index 845bb73949bd..8a38fb8cb0e7 100644
--- a/metadata/md5-cache/x11-libs/qt-opengl-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-opengl-4.8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=virtual/opengl ~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,qpa=,qt3support=] ~x11-libs/qt-gui-4.8.1[aqua=,c++0x=,debug=,egl=,qpa=,qt3support=] !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e043ffbc70c80a191a1670575003cf9d
diff --git a/metadata/md5-cache/x11-libs/qt-opengl-4.8.2 b/metadata/md5-cache/x11-libs/qt-opengl-4.8.2
index 2f13817f8249..6e7099bbcdfa 100644
--- a/metadata/md5-cache/x11-libs/qt-opengl-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-opengl-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=virtual/opengl ~x11-libs/qt-core-4.8.2[aqua=,c++0x=,debug=,qpa=,qt3support=] ~x11-libs/qt-gui-4.8.2[aqua=,c++0x=,debug=,egl=,qpa=,qt3support=] !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0765c2853d7d4646922f608ce7f1a829
diff --git a/metadata/md5-cache/x11-libs/qt-opengl-4.8.3 b/metadata/md5-cache/x11-libs/qt-opengl-4.8.3
index 34a348c3a0b6..96a95fdbca11 100644
--- a/metadata/md5-cache/x11-libs/qt-opengl-4.8.3
+++ b/metadata/md5-cache/x11-libs/qt-opengl-4.8.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=virtual/opengl ~x11-libs/qt-core-4.8.3[aqua=,debug=,qt3support=] ~x11-libs/qt-gui-4.8.3[aqua=,debug=,egl=,qt3support=] !<x11-libs/qt-assistant-4.8.3:4 !>x11-libs/qt-assistant-4.8.3-r9999:4 !<x11-libs/qt-bearer-4.8.3:4 !>x11-libs/qt-bearer-4.8.3-r9999:4 !<x11-libs/qt-core-4.8.3:4 !>x11-libs/qt-core-4.8.3-r9999:4 !<x11-libs/qt-dbus-4.8.3:4 !>x11-libs/qt-dbus-4.8.3-r9999:4 !<x11-libs/qt-declarative-4.8.3:4 !>x11-libs/qt-declarative-4.8.3-r9999:4 !<x11-libs/qt-demo-4.8.3:4 !>x11-libs/qt-demo-4.8.3-r9999:4 !<x11-libs/qt-gui-4.8.3:4 !>x11-libs/qt-gui-4.8.3-r9999:4 !<x11-libs/qt-multimedia-4.8.3:4 !>x11-libs/qt-multimedia-4.8.3-r9999:4 !<x11-libs/qt-opengl-4.8.3:4 !>x11-libs/qt-opengl-4.8.3-r9999:4 !<x11-libs/qt-openvg-4.8.3:4 !>x11-libs/qt-openvg-4.8.3-r9999:4 !<x11-libs/qt-phonon-4.8.3:4 !>x11-libs/qt-phonon-4.8.3-r9999:4 !<x11-libs/qt-qt3support-4.8.3:4 !>x11-libs/qt-qt3support-4.8.3-r9999:4 !<x11-libs/qt-script-4.8.3:4 !>x11-libs/qt-script-4.8.3-r9999:4 !<x11-libs/qt-sql-4.8.3:4 !>x11-libs/qt-sql-4.8.3-r9999:4 !<x11-libs/qt-svg-4.8.3:4 !>x11-libs/qt-svg-4.8.3-r9999:4 !<x11-libs/qt-test-4.8.3:4 !>x11-libs/qt-test-4.8.3-r9999:4 !<x11-libs/qt-webkit-4.8.3:4 !>x11-libs/qt-webkit-4.8.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.3:4 !>x11-libs/qt-xmlpatterns-4.8.3-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=94245f7c8b3efeebe58dac3bb7e899d2
diff --git a/metadata/md5-cache/x11-libs/qt-opengl-4.8.4 b/metadata/md5-cache/x11-libs/qt-opengl-4.8.4
index 984ed099ac69..b52edec8f866 100644
--- a/metadata/md5-cache/x11-libs/qt-opengl-4.8.4
+++ b/metadata/md5-cache/x11-libs/qt-opengl-4.8.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=virtual/opengl ~x11-libs/qt-core-4.8.4[aqua=,debug=,qt3support=] ~x11-libs/qt-gui-4.8.4[aqua=,debug=,egl=,qt3support=] !<x11-libs/qt-assistant-4.8.4:4 !>x11-libs/qt-assistant-4.8.4-r9999:4 !<x11-libs/qt-bearer-4.8.4:4 !>x11-libs/qt-bearer-4.8.4-r9999:4 !<x11-libs/qt-core-4.8.4:4 !>x11-libs/qt-core-4.8.4-r9999:4 !<x11-libs/qt-dbus-4.8.4:4 !>x11-libs/qt-dbus-4.8.4-r9999:4 !<x11-libs/qt-declarative-4.8.4:4 !>x11-libs/qt-declarative-4.8.4-r9999:4 !<x11-libs/qt-demo-4.8.4:4 !>x11-libs/qt-demo-4.8.4-r9999:4 !<x11-libs/qt-gui-4.8.4:4 !>x11-libs/qt-gui-4.8.4-r9999:4 !<x11-libs/qt-multimedia-4.8.4:4 !>x11-libs/qt-multimedia-4.8.4-r9999:4 !<x11-libs/qt-opengl-4.8.4:4 !>x11-libs/qt-opengl-4.8.4-r9999:4 !<x11-libs/qt-openvg-4.8.4:4 !>x11-libs/qt-openvg-4.8.4-r9999:4 !<x11-libs/qt-phonon-4.8.4:4 !>x11-libs/qt-phonon-4.8.4-r9999:4 !<x11-libs/qt-qt3support-4.8.4:4 !>x11-libs/qt-qt3support-4.8.4-r9999:4 !<x11-libs/qt-script-4.8.4:4 !>x11-libs/qt-script-4.8.4-r9999:4 !<x11-libs/qt-sql-4.8.4:4 !>x11-libs/qt-sql-4.8.4-r9999:4 !<x11-libs/qt-svg-4.8.4:4 !>x11-libs/qt-svg-4.8.4-r9999:4 !<x11-libs/qt-test-4.8.4:4 !>x11-libs/qt-test-4.8.4-r9999:4 !<x11-libs/qt-webkit-4.8.4:4 !>x11-libs/qt-webkit-4.8.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.4:4 !>x11-libs/qt-xmlpatterns-4.8.4-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=daec0084b52c498934fdcd971d2c662d
diff --git a/metadata/md5-cache/x11-libs/qt-openvg-4.8.1 b/metadata/md5-cache/x11-libs/qt-openvg-4.8.1
index c45e6b51ec2a..b2d5199fa774 100644
--- a/metadata/md5-cache/x11-libs/qt-openvg-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-openvg-4.8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=media-libs/mesa[egl,openvg] ~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,qpa=,qt3support=] ~x11-libs/qt-gui-4.8.1[aqua=,c++0x=,debug=,egl,qpa=,qt3support=] !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d17745ef4eeeb1cd1b8674afbf9d5869
diff --git a/metadata/md5-cache/x11-libs/qt-openvg-4.8.2 b/metadata/md5-cache/x11-libs/qt-openvg-4.8.2
index c1c4a2da627b..08271fc0d71f 100644
--- a/metadata/md5-cache/x11-libs/qt-openvg-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-openvg-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=media-libs/mesa[egl,openvg] ~x11-libs/qt-core-4.8.2[aqua=,c++0x=,debug=,qpa=,qt3support=] ~x11-libs/qt-gui-4.8.2[aqua=,c++0x=,debug=,egl,qpa=,qt3support=] !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7117c6157854402bb9ae817305015099
diff --git a/metadata/md5-cache/x11-libs/qt-openvg-4.8.3 b/metadata/md5-cache/x11-libs/qt-openvg-4.8.3
index f5bf6c1164c5..41edbb21a57d 100644
--- a/metadata/md5-cache/x11-libs/qt-openvg-4.8.3
+++ b/metadata/md5-cache/x11-libs/qt-openvg-4.8.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=media-libs/mesa[egl,openvg] ~x11-libs/qt-core-4.8.3[aqua=,debug=,qt3support=] ~x11-libs/qt-gui-4.8.3[aqua=,debug=,egl,qt3support=] !<x11-libs/qt-assistant-4.8.3:4 !>x11-libs/qt-assistant-4.8.3-r9999:4 !<x11-libs/qt-bearer-4.8.3:4 !>x11-libs/qt-bearer-4.8.3-r9999:4 !<x11-libs/qt-core-4.8.3:4 !>x11-libs/qt-core-4.8.3-r9999:4 !<x11-libs/qt-dbus-4.8.3:4 !>x11-libs/qt-dbus-4.8.3-r9999:4 !<x11-libs/qt-declarative-4.8.3:4 !>x11-libs/qt-declarative-4.8.3-r9999:4 !<x11-libs/qt-demo-4.8.3:4 !>x11-libs/qt-demo-4.8.3-r9999:4 !<x11-libs/qt-gui-4.8.3:4 !>x11-libs/qt-gui-4.8.3-r9999:4 !<x11-libs/qt-multimedia-4.8.3:4 !>x11-libs/qt-multimedia-4.8.3-r9999:4 !<x11-libs/qt-opengl-4.8.3:4 !>x11-libs/qt-opengl-4.8.3-r9999:4 !<x11-libs/qt-openvg-4.8.3:4 !>x11-libs/qt-openvg-4.8.3-r9999:4 !<x11-libs/qt-phonon-4.8.3:4 !>x11-libs/qt-phonon-4.8.3-r9999:4 !<x11-libs/qt-qt3support-4.8.3:4 !>x11-libs/qt-qt3support-4.8.3-r9999:4 !<x11-libs/qt-script-4.8.3:4 !>x11-libs/qt-script-4.8.3-r9999:4 !<x11-libs/qt-sql-4.8.3:4 !>x11-libs/qt-sql-4.8.3-r9999:4 !<x11-libs/qt-svg-4.8.3:4 !>x11-libs/qt-svg-4.8.3-r9999:4 !<x11-libs/qt-test-4.8.3:4 !>x11-libs/qt-test-4.8.3-r9999:4 !<x11-libs/qt-webkit-4.8.3:4 !>x11-libs/qt-webkit-4.8.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.3:4 !>x11-libs/qt-xmlpatterns-4.8.3-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=255b8ad2772aa3e9e43a787e1717e6f8
diff --git a/metadata/md5-cache/x11-libs/qt-openvg-4.8.4 b/metadata/md5-cache/x11-libs/qt-openvg-4.8.4
index 5e9fb00051c0..d04617eb685e 100644
--- a/metadata/md5-cache/x11-libs/qt-openvg-4.8.4
+++ b/metadata/md5-cache/x11-libs/qt-openvg-4.8.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=media-libs/mesa[egl,openvg] ~x11-libs/qt-core-4.8.4[aqua=,debug=,qt3support=] ~x11-libs/qt-gui-4.8.4[aqua=,debug=,egl,qt3support=] !<x11-libs/qt-assistant-4.8.4:4 !>x11-libs/qt-assistant-4.8.4-r9999:4 !<x11-libs/qt-bearer-4.8.4:4 !>x11-libs/qt-bearer-4.8.4-r9999:4 !<x11-libs/qt-core-4.8.4:4 !>x11-libs/qt-core-4.8.4-r9999:4 !<x11-libs/qt-dbus-4.8.4:4 !>x11-libs/qt-dbus-4.8.4-r9999:4 !<x11-libs/qt-declarative-4.8.4:4 !>x11-libs/qt-declarative-4.8.4-r9999:4 !<x11-libs/qt-demo-4.8.4:4 !>x11-libs/qt-demo-4.8.4-r9999:4 !<x11-libs/qt-gui-4.8.4:4 !>x11-libs/qt-gui-4.8.4-r9999:4 !<x11-libs/qt-multimedia-4.8.4:4 !>x11-libs/qt-multimedia-4.8.4-r9999:4 !<x11-libs/qt-opengl-4.8.4:4 !>x11-libs/qt-opengl-4.8.4-r9999:4 !<x11-libs/qt-openvg-4.8.4:4 !>x11-libs/qt-openvg-4.8.4-r9999:4 !<x11-libs/qt-phonon-4.8.4:4 !>x11-libs/qt-phonon-4.8.4-r9999:4 !<x11-libs/qt-qt3support-4.8.4:4 !>x11-libs/qt-qt3support-4.8.4-r9999:4 !<x11-libs/qt-script-4.8.4:4 !>x11-libs/qt-script-4.8.4-r9999:4 !<x11-libs/qt-sql-4.8.4:4 !>x11-libs/qt-sql-4.8.4-r9999:4 !<x11-libs/qt-svg-4.8.4:4 !>x11-libs/qt-svg-4.8.4-r9999:4 !<x11-libs/qt-test-4.8.4:4 !>x11-libs/qt-test-4.8.4-r9999:4 !<x11-libs/qt-webkit-4.8.4:4 !>x11-libs/qt-webkit-4.8.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.4:4 !>x11-libs/qt-xmlpatterns-4.8.4-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=79cecfe190bb63a8eb8cda089d0ccaa0
diff --git a/metadata/md5-cache/x11-libs/qt-phonon-4.7.4 b/metadata/md5-cache/x11-libs/qt-phonon-4.7.4
index 90aabf6f4b0d..a65b73c8f46e 100644
--- a/metadata/md5-cache/x11-libs/qt-phonon-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-phonon-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-gui-4.7.4[aqua=,debug=,qt3support=] !kde-base/phonon-kde !kde-base/phonon-xine !media-libs/phonon !media-sound/phonon !aqua? ( media-libs/gstreamer:0.10 media-plugins/gst-plugins-meta:0.10 ) aqua? ( ~x11-libs/qt-opengl-4.7.4[aqua,qt3support=] ) dbus? ( ~x11-libs/qt-dbus-4.7.4[aqua=,debug=] ) !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=247ecc328dd168659775773061570e0b
diff --git a/metadata/md5-cache/x11-libs/qt-phonon-4.8.1 b/metadata/md5-cache/x11-libs/qt-phonon-4.8.1
index c2be761662d4..07f4c16bc7ce 100644
--- a/metadata/md5-cache/x11-libs/qt-phonon-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-phonon-4.8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-gui-4.8.1[aqua=,c++0x=,qpa=,debug=,qt3support=] !kde-base/phonon-kde !kde-base/phonon-xine !media-libs/phonon !media-sound/phonon !aqua? ( media-libs/gstreamer:0.10 media-plugins/gst-plugins-meta:0.10 ) aqua? ( ~x11-libs/qt-opengl-4.8.1[aqua,debug=,qt3support=] ) dbus? ( ~x11-libs/qt-dbus-4.8.1[aqua=,c++0x=,qpa=,debug=] ) !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4908aba037c3d27e1444da66ba734925
diff --git a/metadata/md5-cache/x11-libs/qt-phonon-4.8.2 b/metadata/md5-cache/x11-libs/qt-phonon-4.8.2
index 3f774acc6af5..28da183c12af 100644
--- a/metadata/md5-cache/x11-libs/qt-phonon-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-phonon-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-gui-4.8.2[aqua=,c++0x=,qpa=,debug=,qt3support=] !kde-base/phonon-kde !kde-base/phonon-xine !media-libs/phonon !media-sound/phonon !aqua? ( media-libs/gstreamer:0.10 media-plugins/gst-plugins-meta:0.10 ) aqua? ( ~x11-libs/qt-opengl-4.8.2[aqua,debug=,qt3support=] ) dbus? ( ~x11-libs/qt-dbus-4.8.2[aqua=,c++0x=,qpa=,debug=] ) !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=512089648e7fc3555e237dfc9ec40c94
diff --git a/metadata/md5-cache/x11-libs/qt-phonon-4.8.3 b/metadata/md5-cache/x11-libs/qt-phonon-4.8.3
index d55246a4dd9b..a4ff08847dcd 100644
--- a/metadata/md5-cache/x11-libs/qt-phonon-4.8.3
+++ b/metadata/md5-cache/x11-libs/qt-phonon-4.8.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-gui-4.8.3[aqua=,debug=,qt3support=] !kde-base/phonon-kde !kde-base/phonon-xine !media-libs/phonon !media-sound/phonon !aqua? ( media-libs/gstreamer:0.10 media-plugins/gst-plugins-meta:0.10 ) aqua? ( ~x11-libs/qt-opengl-4.8.3[aqua,debug=,qt3support=] ) dbus? ( ~x11-libs/qt-dbus-4.8.3[aqua=,debug=] ) !<x11-libs/qt-assistant-4.8.3:4 !>x11-libs/qt-assistant-4.8.3-r9999:4 !<x11-libs/qt-bearer-4.8.3:4 !>x11-libs/qt-bearer-4.8.3-r9999:4 !<x11-libs/qt-core-4.8.3:4 !>x11-libs/qt-core-4.8.3-r9999:4 !<x11-libs/qt-dbus-4.8.3:4 !>x11-libs/qt-dbus-4.8.3-r9999:4 !<x11-libs/qt-declarative-4.8.3:4 !>x11-libs/qt-declarative-4.8.3-r9999:4 !<x11-libs/qt-demo-4.8.3:4 !>x11-libs/qt-demo-4.8.3-r9999:4 !<x11-libs/qt-gui-4.8.3:4 !>x11-libs/qt-gui-4.8.3-r9999:4 !<x11-libs/qt-multimedia-4.8.3:4 !>x11-libs/qt-multimedia-4.8.3-r9999:4 !<x11-libs/qt-opengl-4.8.3:4 !>x11-libs/qt-opengl-4.8.3-r9999:4 !<x11-libs/qt-openvg-4.8.3:4 !>x11-libs/qt-openvg-4.8.3-r9999:4 !<x11-libs/qt-phonon-4.8.3:4 !>x11-libs/qt-phonon-4.8.3-r9999:4 !<x11-libs/qt-qt3support-4.8.3:4 !>x11-libs/qt-qt3support-4.8.3-r9999:4 !<x11-libs/qt-script-4.8.3:4 !>x11-libs/qt-script-4.8.3-r9999:4 !<x11-libs/qt-sql-4.8.3:4 !>x11-libs/qt-sql-4.8.3-r9999:4 !<x11-libs/qt-svg-4.8.3:4 !>x11-libs/qt-svg-4.8.3-r9999:4 !<x11-libs/qt-test-4.8.3:4 !>x11-libs/qt-test-4.8.3-r9999:4 !<x11-libs/qt-webkit-4.8.3:4 !>x11-libs/qt-webkit-4.8.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.3:4 !>x11-libs/qt-xmlpatterns-4.8.3-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=11cd823866acc08cf81e91ce850c870b
diff --git a/metadata/md5-cache/x11-libs/qt-phonon-4.8.4 b/metadata/md5-cache/x11-libs/qt-phonon-4.8.4
index 0725163544d6..9749216acaf2 100644
--- a/metadata/md5-cache/x11-libs/qt-phonon-4.8.4
+++ b/metadata/md5-cache/x11-libs/qt-phonon-4.8.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-gui-4.8.4[aqua=,debug=,qt3support=] !kde-base/phonon-kde !kde-base/phonon-xine !media-libs/phonon !media-sound/phonon !aqua? ( media-libs/gstreamer:0.10 media-plugins/gst-plugins-meta:0.10 ) aqua? ( ~x11-libs/qt-opengl-4.8.4[aqua,debug=,qt3support=] ) dbus? ( ~x11-libs/qt-dbus-4.8.4[aqua=,debug=] ) !<x11-libs/qt-assistant-4.8.4:4 !>x11-libs/qt-assistant-4.8.4-r9999:4 !<x11-libs/qt-bearer-4.8.4:4 !>x11-libs/qt-bearer-4.8.4-r9999:4 !<x11-libs/qt-core-4.8.4:4 !>x11-libs/qt-core-4.8.4-r9999:4 !<x11-libs/qt-dbus-4.8.4:4 !>x11-libs/qt-dbus-4.8.4-r9999:4 !<x11-libs/qt-declarative-4.8.4:4 !>x11-libs/qt-declarative-4.8.4-r9999:4 !<x11-libs/qt-demo-4.8.4:4 !>x11-libs/qt-demo-4.8.4-r9999:4 !<x11-libs/qt-gui-4.8.4:4 !>x11-libs/qt-gui-4.8.4-r9999:4 !<x11-libs/qt-multimedia-4.8.4:4 !>x11-libs/qt-multimedia-4.8.4-r9999:4 !<x11-libs/qt-opengl-4.8.4:4 !>x11-libs/qt-opengl-4.8.4-r9999:4 !<x11-libs/qt-openvg-4.8.4:4 !>x11-libs/qt-openvg-4.8.4-r9999:4 !<x11-libs/qt-phonon-4.8.4:4 !>x11-libs/qt-phonon-4.8.4-r9999:4 !<x11-libs/qt-qt3support-4.8.4:4 !>x11-libs/qt-qt3support-4.8.4-r9999:4 !<x11-libs/qt-script-4.8.4:4 !>x11-libs/qt-script-4.8.4-r9999:4 !<x11-libs/qt-sql-4.8.4:4 !>x11-libs/qt-sql-4.8.4-r9999:4 !<x11-libs/qt-svg-4.8.4:4 !>x11-libs/qt-svg-4.8.4-r9999:4 !<x11-libs/qt-test-4.8.4:4 !>x11-libs/qt-test-4.8.4-r9999:4 !<x11-libs/qt-webkit-4.8.4:4 !>x11-libs/qt-webkit-4.8.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.4:4 !>x11-libs/qt-xmlpatterns-4.8.4-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=256d79d1d8dd838006eec6dfea134c9c
diff --git a/metadata/md5-cache/x11-libs/qt-qt3support-4.7.4 b/metadata/md5-cache/x11-libs/qt-qt3support-4.7.4
index f8aeacaf3161..bd12a3cb76e6 100644
--- a/metadata/md5-cache/x11-libs/qt-qt3support-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-qt3support-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.7.4[aqua=,debug=,qt3support] ~x11-libs/qt-gui-4.7.4[accessibility=,aqua=,debug=,qt3support] ~x11-libs/qt-sql-4.7.4[aqua=,debug=,qt3support] phonon? ( !kde? ( || ( ~x11-libs/qt-phonon-4.7.4[aqua=,debug=] media-libs/phonon[aqua=,gstreamer] ) ) kde? ( media-libs/phonon[aqua=,gstreamer] ) ) !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d69f15c9ce69be3a6d713d0e90d87f63
diff --git a/metadata/md5-cache/x11-libs/qt-qt3support-4.8.1 b/metadata/md5-cache/x11-libs/qt-qt3support-4.8.1
index 64ebd44e78db..8a4dbbc3c802 100644
--- a/metadata/md5-cache/x11-libs/qt-qt3support-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-qt3support-4.8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,qpa=,qt3support] ~x11-libs/qt-gui-4.8.1[accessibility=,aqua=,c++0x=,debug=,qpa=,qt3support] ~x11-libs/qt-sql-4.8.1[aqua=,c++0x=,debug=,qpa=,qt3support] !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e373d2cbb4cb115f82b82e73810179a4
diff --git a/metadata/md5-cache/x11-libs/qt-qt3support-4.8.2 b/metadata/md5-cache/x11-libs/qt-qt3support-4.8.2
index 5ae0e91f1f6a..571500306cb5 100644
--- a/metadata/md5-cache/x11-libs/qt-qt3support-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-qt3support-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.2[aqua=,c++0x=,debug=,qpa=,qt3support] ~x11-libs/qt-gui-4.8.2[accessibility=,aqua=,c++0x=,debug=,qpa=,qt3support] ~x11-libs/qt-sql-4.8.2[aqua=,c++0x=,debug=,qpa=,qt3support] !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0b207aaac1a45d7a46a3fa7d7e8bf6a2
diff --git a/metadata/md5-cache/x11-libs/qt-qt3support-4.8.3 b/metadata/md5-cache/x11-libs/qt-qt3support-4.8.3
index 2846341cebcd..a4f343d6a8e5 100644
--- a/metadata/md5-cache/x11-libs/qt-qt3support-4.8.3
+++ b/metadata/md5-cache/x11-libs/qt-qt3support-4.8.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.3[aqua=,debug=,qt3support] ~x11-libs/qt-gui-4.8.3[accessibility=,aqua=,debug=,qt3support] ~x11-libs/qt-sql-4.8.3[aqua=,debug=,qt3support] !<x11-libs/qt-assistant-4.8.3:4 !>x11-libs/qt-assistant-4.8.3-r9999:4 !<x11-libs/qt-bearer-4.8.3:4 !>x11-libs/qt-bearer-4.8.3-r9999:4 !<x11-libs/qt-core-4.8.3:4 !>x11-libs/qt-core-4.8.3-r9999:4 !<x11-libs/qt-dbus-4.8.3:4 !>x11-libs/qt-dbus-4.8.3-r9999:4 !<x11-libs/qt-declarative-4.8.3:4 !>x11-libs/qt-declarative-4.8.3-r9999:4 !<x11-libs/qt-demo-4.8.3:4 !>x11-libs/qt-demo-4.8.3-r9999:4 !<x11-libs/qt-gui-4.8.3:4 !>x11-libs/qt-gui-4.8.3-r9999:4 !<x11-libs/qt-multimedia-4.8.3:4 !>x11-libs/qt-multimedia-4.8.3-r9999:4 !<x11-libs/qt-opengl-4.8.3:4 !>x11-libs/qt-opengl-4.8.3-r9999:4 !<x11-libs/qt-openvg-4.8.3:4 !>x11-libs/qt-openvg-4.8.3-r9999:4 !<x11-libs/qt-phonon-4.8.3:4 !>x11-libs/qt-phonon-4.8.3-r9999:4 !<x11-libs/qt-qt3support-4.8.3:4 !>x11-libs/qt-qt3support-4.8.3-r9999:4 !<x11-libs/qt-script-4.8.3:4 !>x11-libs/qt-script-4.8.3-r9999:4 !<x11-libs/qt-sql-4.8.3:4 !>x11-libs/qt-sql-4.8.3-r9999:4 !<x11-libs/qt-svg-4.8.3:4 !>x11-libs/qt-svg-4.8.3-r9999:4 !<x11-libs/qt-test-4.8.3:4 !>x11-libs/qt-test-4.8.3-r9999:4 !<x11-libs/qt-webkit-4.8.3:4 !>x11-libs/qt-webkit-4.8.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.3:4 !>x11-libs/qt-xmlpatterns-4.8.3-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5efcb556d87efe9439439e7104c7c391
diff --git a/metadata/md5-cache/x11-libs/qt-qt3support-4.8.4 b/metadata/md5-cache/x11-libs/qt-qt3support-4.8.4
index d6069c403874..b884d4c7f933 100644
--- a/metadata/md5-cache/x11-libs/qt-qt3support-4.8.4
+++ b/metadata/md5-cache/x11-libs/qt-qt3support-4.8.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.4[aqua=,debug=,qt3support] ~x11-libs/qt-gui-4.8.4[accessibility=,aqua=,debug=,qt3support] ~x11-libs/qt-sql-4.8.4[aqua=,debug=,qt3support] !<x11-libs/qt-assistant-4.8.4:4 !>x11-libs/qt-assistant-4.8.4-r9999:4 !<x11-libs/qt-bearer-4.8.4:4 !>x11-libs/qt-bearer-4.8.4-r9999:4 !<x11-libs/qt-core-4.8.4:4 !>x11-libs/qt-core-4.8.4-r9999:4 !<x11-libs/qt-dbus-4.8.4:4 !>x11-libs/qt-dbus-4.8.4-r9999:4 !<x11-libs/qt-declarative-4.8.4:4 !>x11-libs/qt-declarative-4.8.4-r9999:4 !<x11-libs/qt-demo-4.8.4:4 !>x11-libs/qt-demo-4.8.4-r9999:4 !<x11-libs/qt-gui-4.8.4:4 !>x11-libs/qt-gui-4.8.4-r9999:4 !<x11-libs/qt-multimedia-4.8.4:4 !>x11-libs/qt-multimedia-4.8.4-r9999:4 !<x11-libs/qt-opengl-4.8.4:4 !>x11-libs/qt-opengl-4.8.4-r9999:4 !<x11-libs/qt-openvg-4.8.4:4 !>x11-libs/qt-openvg-4.8.4-r9999:4 !<x11-libs/qt-phonon-4.8.4:4 !>x11-libs/qt-phonon-4.8.4-r9999:4 !<x11-libs/qt-qt3support-4.8.4:4 !>x11-libs/qt-qt3support-4.8.4-r9999:4 !<x11-libs/qt-script-4.8.4:4 !>x11-libs/qt-script-4.8.4-r9999:4 !<x11-libs/qt-sql-4.8.4:4 !>x11-libs/qt-sql-4.8.4-r9999:4 !<x11-libs/qt-svg-4.8.4:4 !>x11-libs/qt-svg-4.8.4-r9999:4 !<x11-libs/qt-test-4.8.4:4 !>x11-libs/qt-test-4.8.4-r9999:4 !<x11-libs/qt-webkit-4.8.4:4 !>x11-libs/qt-webkit-4.8.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.4:4 !>x11-libs/qt-xmlpatterns-4.8.4-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=940f2beb9c7268f3a5982e8ac0807ef6
diff --git a/metadata/md5-cache/x11-libs/qt-script-4.7.4 b/metadata/md5-cache/x11-libs/qt-script-4.7.4
index b59a6a5deaa1..6e8fadf5e3d5 100644
--- a/metadata/md5-cache/x11-libs/qt-script-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-script-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.7.4[aqua=,debug=] !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=26686e115a17f7090162fc0cf365a426
diff --git a/metadata/md5-cache/x11-libs/qt-script-4.8.1 b/metadata/md5-cache/x11-libs/qt-script-4.8.1
index 1f333f09147d..6ae167f786b5 100644
--- a/metadata/md5-cache/x11-libs/qt-script-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-script-4.8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,qpa=] !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fe81d3d534d507935afc3190a5b69794
diff --git a/metadata/md5-cache/x11-libs/qt-script-4.8.2 b/metadata/md5-cache/x11-libs/qt-script-4.8.2
index 8dc871e6d68c..07347a47c957 100644
--- a/metadata/md5-cache/x11-libs/qt-script-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-script-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.2[aqua=,c++0x=,debug=,qpa=] !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0df1871873248012b84084650e4a182c
diff --git a/metadata/md5-cache/x11-libs/qt-script-4.8.3 b/metadata/md5-cache/x11-libs/qt-script-4.8.3
index a10b8275e78d..26860ed031a5 100644
--- a/metadata/md5-cache/x11-libs/qt-script-4.8.3
+++ b/metadata/md5-cache/x11-libs/qt-script-4.8.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.3[aqua=,debug=] !<x11-libs/qt-assistant-4.8.3:4 !>x11-libs/qt-assistant-4.8.3-r9999:4 !<x11-libs/qt-bearer-4.8.3:4 !>x11-libs/qt-bearer-4.8.3-r9999:4 !<x11-libs/qt-core-4.8.3:4 !>x11-libs/qt-core-4.8.3-r9999:4 !<x11-libs/qt-dbus-4.8.3:4 !>x11-libs/qt-dbus-4.8.3-r9999:4 !<x11-libs/qt-declarative-4.8.3:4 !>x11-libs/qt-declarative-4.8.3-r9999:4 !<x11-libs/qt-demo-4.8.3:4 !>x11-libs/qt-demo-4.8.3-r9999:4 !<x11-libs/qt-gui-4.8.3:4 !>x11-libs/qt-gui-4.8.3-r9999:4 !<x11-libs/qt-multimedia-4.8.3:4 !>x11-libs/qt-multimedia-4.8.3-r9999:4 !<x11-libs/qt-opengl-4.8.3:4 !>x11-libs/qt-opengl-4.8.3-r9999:4 !<x11-libs/qt-openvg-4.8.3:4 !>x11-libs/qt-openvg-4.8.3-r9999:4 !<x11-libs/qt-phonon-4.8.3:4 !>x11-libs/qt-phonon-4.8.3-r9999:4 !<x11-libs/qt-qt3support-4.8.3:4 !>x11-libs/qt-qt3support-4.8.3-r9999:4 !<x11-libs/qt-script-4.8.3:4 !>x11-libs/qt-script-4.8.3-r9999:4 !<x11-libs/qt-sql-4.8.3:4 !>x11-libs/qt-sql-4.8.3-r9999:4 !<x11-libs/qt-svg-4.8.3:4 !>x11-libs/qt-svg-4.8.3-r9999:4 !<x11-libs/qt-test-4.8.3:4 !>x11-libs/qt-test-4.8.3-r9999:4 !<x11-libs/qt-webkit-4.8.3:4 !>x11-libs/qt-webkit-4.8.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.3:4 !>x11-libs/qt-xmlpatterns-4.8.3-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bec1e78f61af1273fb36a3cdfd53ff5e
diff --git a/metadata/md5-cache/x11-libs/qt-script-4.8.4 b/metadata/md5-cache/x11-libs/qt-script-4.8.4
index 53ab1cd1ffea..b680cdb17406 100644
--- a/metadata/md5-cache/x11-libs/qt-script-4.8.4
+++ b/metadata/md5-cache/x11-libs/qt-script-4.8.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.4[aqua=,debug=] !<x11-libs/qt-assistant-4.8.4:4 !>x11-libs/qt-assistant-4.8.4-r9999:4 !<x11-libs/qt-bearer-4.8.4:4 !>x11-libs/qt-bearer-4.8.4-r9999:4 !<x11-libs/qt-core-4.8.4:4 !>x11-libs/qt-core-4.8.4-r9999:4 !<x11-libs/qt-dbus-4.8.4:4 !>x11-libs/qt-dbus-4.8.4-r9999:4 !<x11-libs/qt-declarative-4.8.4:4 !>x11-libs/qt-declarative-4.8.4-r9999:4 !<x11-libs/qt-demo-4.8.4:4 !>x11-libs/qt-demo-4.8.4-r9999:4 !<x11-libs/qt-gui-4.8.4:4 !>x11-libs/qt-gui-4.8.4-r9999:4 !<x11-libs/qt-multimedia-4.8.4:4 !>x11-libs/qt-multimedia-4.8.4-r9999:4 !<x11-libs/qt-opengl-4.8.4:4 !>x11-libs/qt-opengl-4.8.4-r9999:4 !<x11-libs/qt-openvg-4.8.4:4 !>x11-libs/qt-openvg-4.8.4-r9999:4 !<x11-libs/qt-phonon-4.8.4:4 !>x11-libs/qt-phonon-4.8.4-r9999:4 !<x11-libs/qt-qt3support-4.8.4:4 !>x11-libs/qt-qt3support-4.8.4-r9999:4 !<x11-libs/qt-script-4.8.4:4 !>x11-libs/qt-script-4.8.4-r9999:4 !<x11-libs/qt-sql-4.8.4:4 !>x11-libs/qt-sql-4.8.4-r9999:4 !<x11-libs/qt-svg-4.8.4:4 !>x11-libs/qt-svg-4.8.4-r9999:4 !<x11-libs/qt-test-4.8.4:4 !>x11-libs/qt-test-4.8.4-r9999:4 !<x11-libs/qt-webkit-4.8.4:4 !>x11-libs/qt-webkit-4.8.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.4:4 !>x11-libs/qt-xmlpatterns-4.8.4-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0f7e1cda2441289b7b9066a0abdde3e5
diff --git a/metadata/md5-cache/x11-libs/qt-sql-4.7.4 b/metadata/md5-cache/x11-libs/qt-sql-4.7.4
index feaa7606a534..d4847b8bdade 100644
--- a/metadata/md5-cache/x11-libs/qt-sql-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-sql-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.7.4[aqua=,debug=,qt3support=] firebird? ( dev-db/firebird ) freetds? ( dev-db/freetds ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=93f6dad8b9ba453fe34dd0f68ff0c094
diff --git a/metadata/md5-cache/x11-libs/qt-sql-4.8.1 b/metadata/md5-cache/x11-libs/qt-sql-4.8.1
index 8d65550f98ed..2a2c512e49f3 100644
--- a/metadata/md5-cache/x11-libs/qt-sql-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-sql-4.8.1
@@ -10,5 +10,5 @@ RDEPEND=~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,qpa=,qt3support=] firebird?
 REQUIRED_USE=|| ( firebird freetds mysql odbc postgres sqlite )
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0e21f12b744638f84bb881b3ec05dc59
diff --git a/metadata/md5-cache/x11-libs/qt-sql-4.8.2 b/metadata/md5-cache/x11-libs/qt-sql-4.8.2
index d217fac8c0b0..f2d7e7701d10 100644
--- a/metadata/md5-cache/x11-libs/qt-sql-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-sql-4.8.2
@@ -10,5 +10,5 @@ RDEPEND=~x11-libs/qt-core-4.8.2[aqua=,c++0x=,debug=,qpa=,qt3support=] firebird?
 REQUIRED_USE=|| ( firebird freetds mysql oci8 odbc postgres sqlite )
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9c4abf550f5dfdb8dc8ef9826aee5138
diff --git a/metadata/md5-cache/x11-libs/qt-sql-4.8.3 b/metadata/md5-cache/x11-libs/qt-sql-4.8.3
index 81fcb3a0809e..f91cbc87baee 100644
--- a/metadata/md5-cache/x11-libs/qt-sql-4.8.3
+++ b/metadata/md5-cache/x11-libs/qt-sql-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=~x11-libs/qt-core-4.8.3[aqua=,debug=,qt3support=] firebird? ( dev-db/fir
 REQUIRED_USE=|| ( firebird freetds mysql oci8 odbc postgres sqlite )
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ac73138434bd273202130977a104dc1b
diff --git a/metadata/md5-cache/x11-libs/qt-sql-4.8.4 b/metadata/md5-cache/x11-libs/qt-sql-4.8.4
index bc3d558d46ae..e690685abca0 100644
--- a/metadata/md5-cache/x11-libs/qt-sql-4.8.4
+++ b/metadata/md5-cache/x11-libs/qt-sql-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=~x11-libs/qt-core-4.8.4[aqua=,debug=,qt3support=] firebird? ( dev-db/fir
 REQUIRED_USE=|| ( firebird freetds mysql oci8 odbc postgres sqlite )
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9dabdf82dfea4875e1e6831d7b602124
diff --git a/metadata/md5-cache/x11-libs/qt-svg-4.7.4 b/metadata/md5-cache/x11-libs/qt-svg-4.7.4
index c9d92b280ed2..f3630299c4c0 100644
--- a/metadata/md5-cache/x11-libs/qt-svg-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-svg-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-gui-4.7.4[accessibility=,aqua=,debug=] !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f8f1bfbc13c171a02fc9bf2ad8a28a8c
diff --git a/metadata/md5-cache/x11-libs/qt-svg-4.8.1 b/metadata/md5-cache/x11-libs/qt-svg-4.8.1
index f3b1f3d1b931..12b6bdbdd062 100644
--- a/metadata/md5-cache/x11-libs/qt-svg-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-svg-4.8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=sys-libs/zlib ~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-gui-4.8.1[accessibility=,aqua=,c++0x=,debug=,qpa=] !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e4af797e44bb8be66afa6ff203900b80
diff --git a/metadata/md5-cache/x11-libs/qt-svg-4.8.2 b/metadata/md5-cache/x11-libs/qt-svg-4.8.2
index 6ad7e9d70638..389e1f22e9b6 100644
--- a/metadata/md5-cache/x11-libs/qt-svg-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-svg-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=sys-libs/zlib ~x11-libs/qt-core-4.8.2[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-gui-4.8.2[accessibility=,aqua=,c++0x=,debug=,qpa=] !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5e1d87b77d66b4040b2c55d1d7725b0d
diff --git a/metadata/md5-cache/x11-libs/qt-svg-4.8.3 b/metadata/md5-cache/x11-libs/qt-svg-4.8.3
index 9891648409e3..ca257a13553d 100644
--- a/metadata/md5-cache/x11-libs/qt-svg-4.8.3
+++ b/metadata/md5-cache/x11-libs/qt-svg-4.8.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=sys-libs/zlib ~x11-libs/qt-core-4.8.3[aqua=,debug=] ~x11-libs/qt-gui-4.8.3[accessibility=,aqua=,debug=] !<x11-libs/qt-assistant-4.8.3:4 !>x11-libs/qt-assistant-4.8.3-r9999:4 !<x11-libs/qt-bearer-4.8.3:4 !>x11-libs/qt-bearer-4.8.3-r9999:4 !<x11-libs/qt-core-4.8.3:4 !>x11-libs/qt-core-4.8.3-r9999:4 !<x11-libs/qt-dbus-4.8.3:4 !>x11-libs/qt-dbus-4.8.3-r9999:4 !<x11-libs/qt-declarative-4.8.3:4 !>x11-libs/qt-declarative-4.8.3-r9999:4 !<x11-libs/qt-demo-4.8.3:4 !>x11-libs/qt-demo-4.8.3-r9999:4 !<x11-libs/qt-gui-4.8.3:4 !>x11-libs/qt-gui-4.8.3-r9999:4 !<x11-libs/qt-multimedia-4.8.3:4 !>x11-libs/qt-multimedia-4.8.3-r9999:4 !<x11-libs/qt-opengl-4.8.3:4 !>x11-libs/qt-opengl-4.8.3-r9999:4 !<x11-libs/qt-openvg-4.8.3:4 !>x11-libs/qt-openvg-4.8.3-r9999:4 !<x11-libs/qt-phonon-4.8.3:4 !>x11-libs/qt-phonon-4.8.3-r9999:4 !<x11-libs/qt-qt3support-4.8.3:4 !>x11-libs/qt-qt3support-4.8.3-r9999:4 !<x11-libs/qt-script-4.8.3:4 !>x11-libs/qt-script-4.8.3-r9999:4 !<x11-libs/qt-sql-4.8.3:4 !>x11-libs/qt-sql-4.8.3-r9999:4 !<x11-libs/qt-svg-4.8.3:4 !>x11-libs/qt-svg-4.8.3-r9999:4 !<x11-libs/qt-test-4.8.3:4 !>x11-libs/qt-test-4.8.3-r9999:4 !<x11-libs/qt-webkit-4.8.3:4 !>x11-libs/qt-webkit-4.8.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.3:4 !>x11-libs/qt-xmlpatterns-4.8.3-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7f4c366fdf47e65dbab0fde29a44cff3
diff --git a/metadata/md5-cache/x11-libs/qt-svg-4.8.4 b/metadata/md5-cache/x11-libs/qt-svg-4.8.4
index 21ccde0d319c..ad47b5e34d3a 100644
--- a/metadata/md5-cache/x11-libs/qt-svg-4.8.4
+++ b/metadata/md5-cache/x11-libs/qt-svg-4.8.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=sys-libs/zlib ~x11-libs/qt-core-4.8.4[aqua=,debug=] ~x11-libs/qt-gui-4.8.4[accessibility=,aqua=,debug=] !<x11-libs/qt-assistant-4.8.4:4 !>x11-libs/qt-assistant-4.8.4-r9999:4 !<x11-libs/qt-bearer-4.8.4:4 !>x11-libs/qt-bearer-4.8.4-r9999:4 !<x11-libs/qt-core-4.8.4:4 !>x11-libs/qt-core-4.8.4-r9999:4 !<x11-libs/qt-dbus-4.8.4:4 !>x11-libs/qt-dbus-4.8.4-r9999:4 !<x11-libs/qt-declarative-4.8.4:4 !>x11-libs/qt-declarative-4.8.4-r9999:4 !<x11-libs/qt-demo-4.8.4:4 !>x11-libs/qt-demo-4.8.4-r9999:4 !<x11-libs/qt-gui-4.8.4:4 !>x11-libs/qt-gui-4.8.4-r9999:4 !<x11-libs/qt-multimedia-4.8.4:4 !>x11-libs/qt-multimedia-4.8.4-r9999:4 !<x11-libs/qt-opengl-4.8.4:4 !>x11-libs/qt-opengl-4.8.4-r9999:4 !<x11-libs/qt-openvg-4.8.4:4 !>x11-libs/qt-openvg-4.8.4-r9999:4 !<x11-libs/qt-phonon-4.8.4:4 !>x11-libs/qt-phonon-4.8.4-r9999:4 !<x11-libs/qt-qt3support-4.8.4:4 !>x11-libs/qt-qt3support-4.8.4-r9999:4 !<x11-libs/qt-script-4.8.4:4 !>x11-libs/qt-script-4.8.4-r9999:4 !<x11-libs/qt-sql-4.8.4:4 !>x11-libs/qt-sql-4.8.4-r9999:4 !<x11-libs/qt-svg-4.8.4:4 !>x11-libs/qt-svg-4.8.4-r9999:4 !<x11-libs/qt-test-4.8.4:4 !>x11-libs/qt-test-4.8.4-r9999:4 !<x11-libs/qt-webkit-4.8.4:4 !>x11-libs/qt-webkit-4.8.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.4:4 !>x11-libs/qt-xmlpatterns-4.8.4-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=719e35053f7afd290c852ffdce77da31
diff --git a/metadata/md5-cache/x11-libs/qt-test-4.7.4 b/metadata/md5-cache/x11-libs/qt-test-4.7.4
index 36f762123efc..fe2d16669cc2 100644
--- a/metadata/md5-cache/x11-libs/qt-test-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-test-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.7.4[aqua=,debug=] !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c8a722e1c56efc8f99bf491f1567c8f9
diff --git a/metadata/md5-cache/x11-libs/qt-test-4.8.1 b/metadata/md5-cache/x11-libs/qt-test-4.8.1
index b0115a7a5d40..04d17ecae54b 100644
--- a/metadata/md5-cache/x11-libs/qt-test-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-test-4.8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,qpa=] !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2c179f14a49dbe61b73d8bd7fc24e843
diff --git a/metadata/md5-cache/x11-libs/qt-test-4.8.2 b/metadata/md5-cache/x11-libs/qt-test-4.8.2
index f0d6c5384162..24d5bc5bca37 100644
--- a/metadata/md5-cache/x11-libs/qt-test-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-test-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.2[aqua=,c++0x=,debug=,qpa=] !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e00fee1c11f21f8260b618db40a11c2d
diff --git a/metadata/md5-cache/x11-libs/qt-test-4.8.3 b/metadata/md5-cache/x11-libs/qt-test-4.8.3
index d759eed42d51..b519cb4832a0 100644
--- a/metadata/md5-cache/x11-libs/qt-test-4.8.3
+++ b/metadata/md5-cache/x11-libs/qt-test-4.8.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.3[aqua=,debug=] !<x11-libs/qt-assistant-4.8.3:4 !>x11-libs/qt-assistant-4.8.3-r9999:4 !<x11-libs/qt-bearer-4.8.3:4 !>x11-libs/qt-bearer-4.8.3-r9999:4 !<x11-libs/qt-core-4.8.3:4 !>x11-libs/qt-core-4.8.3-r9999:4 !<x11-libs/qt-dbus-4.8.3:4 !>x11-libs/qt-dbus-4.8.3-r9999:4 !<x11-libs/qt-declarative-4.8.3:4 !>x11-libs/qt-declarative-4.8.3-r9999:4 !<x11-libs/qt-demo-4.8.3:4 !>x11-libs/qt-demo-4.8.3-r9999:4 !<x11-libs/qt-gui-4.8.3:4 !>x11-libs/qt-gui-4.8.3-r9999:4 !<x11-libs/qt-multimedia-4.8.3:4 !>x11-libs/qt-multimedia-4.8.3-r9999:4 !<x11-libs/qt-opengl-4.8.3:4 !>x11-libs/qt-opengl-4.8.3-r9999:4 !<x11-libs/qt-openvg-4.8.3:4 !>x11-libs/qt-openvg-4.8.3-r9999:4 !<x11-libs/qt-phonon-4.8.3:4 !>x11-libs/qt-phonon-4.8.3-r9999:4 !<x11-libs/qt-qt3support-4.8.3:4 !>x11-libs/qt-qt3support-4.8.3-r9999:4 !<x11-libs/qt-script-4.8.3:4 !>x11-libs/qt-script-4.8.3-r9999:4 !<x11-libs/qt-sql-4.8.3:4 !>x11-libs/qt-sql-4.8.3-r9999:4 !<x11-libs/qt-svg-4.8.3:4 !>x11-libs/qt-svg-4.8.3-r9999:4 !<x11-libs/qt-test-4.8.3:4 !>x11-libs/qt-test-4.8.3-r9999:4 !<x11-libs/qt-webkit-4.8.3:4 !>x11-libs/qt-webkit-4.8.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.3:4 !>x11-libs/qt-xmlpatterns-4.8.3-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=824d1eb925be11671329719a4167ffbd
diff --git a/metadata/md5-cache/x11-libs/qt-test-4.8.4 b/metadata/md5-cache/x11-libs/qt-test-4.8.4
index 6d27829fc73c..0858e2ce677b 100644
--- a/metadata/md5-cache/x11-libs/qt-test-4.8.4
+++ b/metadata/md5-cache/x11-libs/qt-test-4.8.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.4[aqua=,debug=] !<x11-libs/qt-assistant-4.8.4:4 !>x11-libs/qt-assistant-4.8.4-r9999:4 !<x11-libs/qt-bearer-4.8.4:4 !>x11-libs/qt-bearer-4.8.4-r9999:4 !<x11-libs/qt-core-4.8.4:4 !>x11-libs/qt-core-4.8.4-r9999:4 !<x11-libs/qt-dbus-4.8.4:4 !>x11-libs/qt-dbus-4.8.4-r9999:4 !<x11-libs/qt-declarative-4.8.4:4 !>x11-libs/qt-declarative-4.8.4-r9999:4 !<x11-libs/qt-demo-4.8.4:4 !>x11-libs/qt-demo-4.8.4-r9999:4 !<x11-libs/qt-gui-4.8.4:4 !>x11-libs/qt-gui-4.8.4-r9999:4 !<x11-libs/qt-multimedia-4.8.4:4 !>x11-libs/qt-multimedia-4.8.4-r9999:4 !<x11-libs/qt-opengl-4.8.4:4 !>x11-libs/qt-opengl-4.8.4-r9999:4 !<x11-libs/qt-openvg-4.8.4:4 !>x11-libs/qt-openvg-4.8.4-r9999:4 !<x11-libs/qt-phonon-4.8.4:4 !>x11-libs/qt-phonon-4.8.4-r9999:4 !<x11-libs/qt-qt3support-4.8.4:4 !>x11-libs/qt-qt3support-4.8.4-r9999:4 !<x11-libs/qt-script-4.8.4:4 !>x11-libs/qt-script-4.8.4-r9999:4 !<x11-libs/qt-sql-4.8.4:4 !>x11-libs/qt-sql-4.8.4-r9999:4 !<x11-libs/qt-svg-4.8.4:4 !>x11-libs/qt-svg-4.8.4-r9999:4 !<x11-libs/qt-test-4.8.4:4 !>x11-libs/qt-test-4.8.4-r9999:4 !<x11-libs/qt-webkit-4.8.4:4 !>x11-libs/qt-webkit-4.8.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.4:4 !>x11-libs/qt-xmlpatterns-4.8.4-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=18b264159e1c885fc0c8b5ee47d3ab12
diff --git a/metadata/md5-cache/x11-libs/qt-webkit-4.7.4 b/metadata/md5-cache/x11-libs/qt-webkit-4.7.4
index 6e48b7f0c034..7d900da375ff 100644
--- a/metadata/md5-cache/x11-libs/qt-webkit-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-webkit-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=dev-db/sqlite:3 ~x11-libs/qt-core-4.7.4[aqua=,debug=,ssl] ~x11-libs/qt-gui-4.7.4[aqua=,dbus?,debug=] ~x11-libs/qt-xmlpatterns-4.7.4[aqua=,debug=] dbus? ( ~x11-libs/qt-dbus-4.7.4[aqua=,debug=] ) !kde? ( || ( ~x11-libs/qt-phonon-4.7.4:4[aqua=,dbus=,debug=] media-libs/phonon[aqua=] ) ) kde? ( || ( media-libs/phonon[aqua=] ~x11-libs/qt-phonon-4.7.4:4[aqua=,dbus=,debug=] ) ) !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e2a3e8a1480ee2658592dfe4bb03668b
diff --git a/metadata/md5-cache/x11-libs/qt-webkit-4.8.1 b/metadata/md5-cache/x11-libs/qt-webkit-4.8.1
index c9e539192b73..ecd9abd3ad9c 100644
--- a/metadata/md5-cache/x11-libs/qt-webkit-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-webkit-4.8.1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 x11-libs/libX11 x11-libs/libXrender ~x11-libs/qt-core-4.
 REQUIRED_USE=gstreamer? ( icu )
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=440fb447b6130586e9c5201329d214fd
diff --git a/metadata/md5-cache/x11-libs/qt-webkit-4.8.2 b/metadata/md5-cache/x11-libs/qt-webkit-4.8.2
index c108103601f5..beb914103e9f 100644
--- a/metadata/md5-cache/x11-libs/qt-webkit-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-webkit-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=dev-db/sqlite:3 x11-libs/libX11 x11-libs/libXrender ~x11-libs/qt-core-4.8.2[aqua=,debug=,ssl,qpa=] ~x11-libs/qt-gui-4.8.2[aqua=,debug=,qpa=] ~x11-libs/qt-xmlpatterns-4.8.2[aqua=,debug=,qpa=] gstreamer? ( dev-libs/glib:2 dev-libs/libxml2:2[!icu?] media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) icu? ( dev-libs/icu ) !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8fa33c7b8b27cebcf493c28b47244fda
diff --git a/metadata/md5-cache/x11-libs/qt-webkit-4.8.3 b/metadata/md5-cache/x11-libs/qt-webkit-4.8.3
index 9fc3e8b61690..d2261ef2c26a 100644
--- a/metadata/md5-cache/x11-libs/qt-webkit-4.8.3
+++ b/metadata/md5-cache/x11-libs/qt-webkit-4.8.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=dev-db/sqlite:3 x11-libs/libX11 x11-libs/libXrender ~x11-libs/qt-core-4.8.3[aqua=,debug=,ssl] ~x11-libs/qt-gui-4.8.3[aqua=,debug=] ~x11-libs/qt-xmlpatterns-4.8.3[aqua=,debug=] gstreamer? ( dev-libs/glib:2 dev-libs/libxml2:2[!icu?] media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) icu? ( dev-libs/icu ) !<x11-libs/qt-assistant-4.8.3:4 !>x11-libs/qt-assistant-4.8.3-r9999:4 !<x11-libs/qt-bearer-4.8.3:4 !>x11-libs/qt-bearer-4.8.3-r9999:4 !<x11-libs/qt-core-4.8.3:4 !>x11-libs/qt-core-4.8.3-r9999:4 !<x11-libs/qt-dbus-4.8.3:4 !>x11-libs/qt-dbus-4.8.3-r9999:4 !<x11-libs/qt-declarative-4.8.3:4 !>x11-libs/qt-declarative-4.8.3-r9999:4 !<x11-libs/qt-demo-4.8.3:4 !>x11-libs/qt-demo-4.8.3-r9999:4 !<x11-libs/qt-gui-4.8.3:4 !>x11-libs/qt-gui-4.8.3-r9999:4 !<x11-libs/qt-multimedia-4.8.3:4 !>x11-libs/qt-multimedia-4.8.3-r9999:4 !<x11-libs/qt-opengl-4.8.3:4 !>x11-libs/qt-opengl-4.8.3-r9999:4 !<x11-libs/qt-openvg-4.8.3:4 !>x11-libs/qt-openvg-4.8.3-r9999:4 !<x11-libs/qt-phonon-4.8.3:4 !>x11-libs/qt-phonon-4.8.3-r9999:4 !<x11-libs/qt-qt3support-4.8.3:4 !>x11-libs/qt-qt3support-4.8.3-r9999:4 !<x11-libs/qt-script-4.8.3:4 !>x11-libs/qt-script-4.8.3-r9999:4 !<x11-libs/qt-sql-4.8.3:4 !>x11-libs/qt-sql-4.8.3-r9999:4 !<x11-libs/qt-svg-4.8.3:4 !>x11-libs/qt-svg-4.8.3-r9999:4 !<x11-libs/qt-test-4.8.3:4 !>x11-libs/qt-test-4.8.3-r9999:4 !<x11-libs/qt-webkit-4.8.3:4 !>x11-libs/qt-webkit-4.8.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.3:4 !>x11-libs/qt-xmlpatterns-4.8.3-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cba29175bc973b01340c027e56e955c6
diff --git a/metadata/md5-cache/x11-libs/qt-webkit-4.8.4 b/metadata/md5-cache/x11-libs/qt-webkit-4.8.4
index e0f383ec16cd..30d1efd603cb 100644
--- a/metadata/md5-cache/x11-libs/qt-webkit-4.8.4
+++ b/metadata/md5-cache/x11-libs/qt-webkit-4.8.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=dev-db/sqlite:3 x11-libs/libX11 x11-libs/libXrender ~x11-libs/qt-core-4.8.4[aqua=,debug=,ssl] ~x11-libs/qt-gui-4.8.4[aqua=,debug=] ~x11-libs/qt-xmlpatterns-4.8.4[aqua=,debug=] gstreamer? ( dev-libs/glib:2 dev-libs/libxml2:2[!icu?] media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) icu? ( dev-libs/icu ) !<x11-libs/qt-assistant-4.8.4:4 !>x11-libs/qt-assistant-4.8.4-r9999:4 !<x11-libs/qt-bearer-4.8.4:4 !>x11-libs/qt-bearer-4.8.4-r9999:4 !<x11-libs/qt-core-4.8.4:4 !>x11-libs/qt-core-4.8.4-r9999:4 !<x11-libs/qt-dbus-4.8.4:4 !>x11-libs/qt-dbus-4.8.4-r9999:4 !<x11-libs/qt-declarative-4.8.4:4 !>x11-libs/qt-declarative-4.8.4-r9999:4 !<x11-libs/qt-demo-4.8.4:4 !>x11-libs/qt-demo-4.8.4-r9999:4 !<x11-libs/qt-gui-4.8.4:4 !>x11-libs/qt-gui-4.8.4-r9999:4 !<x11-libs/qt-multimedia-4.8.4:4 !>x11-libs/qt-multimedia-4.8.4-r9999:4 !<x11-libs/qt-opengl-4.8.4:4 !>x11-libs/qt-opengl-4.8.4-r9999:4 !<x11-libs/qt-openvg-4.8.4:4 !>x11-libs/qt-openvg-4.8.4-r9999:4 !<x11-libs/qt-phonon-4.8.4:4 !>x11-libs/qt-phonon-4.8.4-r9999:4 !<x11-libs/qt-qt3support-4.8.4:4 !>x11-libs/qt-qt3support-4.8.4-r9999:4 !<x11-libs/qt-script-4.8.4:4 !>x11-libs/qt-script-4.8.4-r9999:4 !<x11-libs/qt-sql-4.8.4:4 !>x11-libs/qt-sql-4.8.4-r9999:4 !<x11-libs/qt-svg-4.8.4:4 !>x11-libs/qt-svg-4.8.4-r9999:4 !<x11-libs/qt-test-4.8.4:4 !>x11-libs/qt-test-4.8.4-r9999:4 !<x11-libs/qt-webkit-4.8.4:4 !>x11-libs/qt-webkit-4.8.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.4:4 !>x11-libs/qt-xmlpatterns-4.8.4-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=45ed1e0c71d0d602b98b4d76b682125b
diff --git a/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.7.4 b/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.7.4
index b19ad503aceb..1bab805329f8 100644
--- a/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.7.4[aqua=,debug=,exceptions] !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=566131abe5cb5930101637035b323e06
diff --git a/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.8.1 b/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.8.1
index e09054ab74f9..6647d2f33f2e 100644
--- a/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,exceptions,qpa=] !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=534067c89a7b6a615422e964996bea40
diff --git a/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.8.2 b/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.8.2
index d0508027b871..21d202fb5419 100644
--- a/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.2[aqua=,c++0x=,debug=,qpa=] !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=502e2360612077e88b3498f80cd5baa3
diff --git a/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.8.3 b/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.8.3
index 9448bd668134..a7f5bb5e1acc 100644
--- a/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.8.3
+++ b/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.8.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.3[aqua=,debug=] !<x11-libs/qt-assistant-4.8.3:4 !>x11-libs/qt-assistant-4.8.3-r9999:4 !<x11-libs/qt-bearer-4.8.3:4 !>x11-libs/qt-bearer-4.8.3-r9999:4 !<x11-libs/qt-core-4.8.3:4 !>x11-libs/qt-core-4.8.3-r9999:4 !<x11-libs/qt-dbus-4.8.3:4 !>x11-libs/qt-dbus-4.8.3-r9999:4 !<x11-libs/qt-declarative-4.8.3:4 !>x11-libs/qt-declarative-4.8.3-r9999:4 !<x11-libs/qt-demo-4.8.3:4 !>x11-libs/qt-demo-4.8.3-r9999:4 !<x11-libs/qt-gui-4.8.3:4 !>x11-libs/qt-gui-4.8.3-r9999:4 !<x11-libs/qt-multimedia-4.8.3:4 !>x11-libs/qt-multimedia-4.8.3-r9999:4 !<x11-libs/qt-opengl-4.8.3:4 !>x11-libs/qt-opengl-4.8.3-r9999:4 !<x11-libs/qt-openvg-4.8.3:4 !>x11-libs/qt-openvg-4.8.3-r9999:4 !<x11-libs/qt-phonon-4.8.3:4 !>x11-libs/qt-phonon-4.8.3-r9999:4 !<x11-libs/qt-qt3support-4.8.3:4 !>x11-libs/qt-qt3support-4.8.3-r9999:4 !<x11-libs/qt-script-4.8.3:4 !>x11-libs/qt-script-4.8.3-r9999:4 !<x11-libs/qt-sql-4.8.3:4 !>x11-libs/qt-sql-4.8.3-r9999:4 !<x11-libs/qt-svg-4.8.3:4 !>x11-libs/qt-svg-4.8.3-r9999:4 !<x11-libs/qt-test-4.8.3:4 !>x11-libs/qt-test-4.8.3-r9999:4 !<x11-libs/qt-webkit-4.8.3:4 !>x11-libs/qt-webkit-4.8.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.3:4 !>x11-libs/qt-xmlpatterns-4.8.3-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=94ec875e491ad8defab76a6f61e23ef2
diff --git a/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.8.4 b/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.8.4
index ecd81e942475..1490f7dff3e7 100644
--- a/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.8.4
+++ b/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.8.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.4[aqua=,debug=] !<x11-libs/qt-assistant-4.8.4:4 !>x11-libs/qt-assistant-4.8.4-r9999:4 !<x11-libs/qt-bearer-4.8.4:4 !>x11-libs/qt-bearer-4.8.4-r9999:4 !<x11-libs/qt-core-4.8.4:4 !>x11-libs/qt-core-4.8.4-r9999:4 !<x11-libs/qt-dbus-4.8.4:4 !>x11-libs/qt-dbus-4.8.4-r9999:4 !<x11-libs/qt-declarative-4.8.4:4 !>x11-libs/qt-declarative-4.8.4-r9999:4 !<x11-libs/qt-demo-4.8.4:4 !>x11-libs/qt-demo-4.8.4-r9999:4 !<x11-libs/qt-gui-4.8.4:4 !>x11-libs/qt-gui-4.8.4-r9999:4 !<x11-libs/qt-multimedia-4.8.4:4 !>x11-libs/qt-multimedia-4.8.4-r9999:4 !<x11-libs/qt-opengl-4.8.4:4 !>x11-libs/qt-opengl-4.8.4-r9999:4 !<x11-libs/qt-openvg-4.8.4:4 !>x11-libs/qt-openvg-4.8.4-r9999:4 !<x11-libs/qt-phonon-4.8.4:4 !>x11-libs/qt-phonon-4.8.4-r9999:4 !<x11-libs/qt-qt3support-4.8.4:4 !>x11-libs/qt-qt3support-4.8.4-r9999:4 !<x11-libs/qt-script-4.8.4:4 !>x11-libs/qt-script-4.8.4-r9999:4 !<x11-libs/qt-sql-4.8.4:4 !>x11-libs/qt-sql-4.8.4-r9999:4 !<x11-libs/qt-svg-4.8.4:4 !>x11-libs/qt-svg-4.8.4-r9999:4 !<x11-libs/qt-test-4.8.4:4 !>x11-libs/qt-test-4.8.4-r9999:4 !<x11-libs/qt-webkit-4.8.4:4 !>x11-libs/qt-webkit-4.8.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.4:4 !>x11-libs/qt-xmlpatterns-4.8.4-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.4.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	a99fc3fe09eb9d8b699de07d06765ec3	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-build	28adcb8dfa8158da553cc521e2f14a17	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c1fc916a8297e22fa7bc1a79b7f058ca
diff --git a/metadata/md5-cache/x11-misc/shutter-0.90 b/metadata/md5-cache/x11-misc/shutter-0.90
new file mode 100644
index 000000000000..bc8261616efc
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/shutter-0.90
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Feature-rich screenshot program
+EAPI=2
+HOMEPAGE=http://shutter-project.org/
+IUSE=drawing webphoto
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-lang/perl drawing? ( dev-perl/Goo-Canvas ) webphoto? ( gnome-extra/gnome-web-photo ) || ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] ) dev-perl/libxml-perl dev-perl/gnome2-wnck dev-perl/gnome2-canvas dev-perl/gnome2-perl dev-perl/Gtk2-Unique dev-perl/Gtk2-ImageView dev-perl/File-DesktopEntry dev-perl/File-HomeDir dev-perl/File-Which dev-perl/JSON dev-perl/File-Copy-Recursive dev-perl/File-MimeInfo dev-perl/Locale-gettext dev-perl/Net-DBus dev-perl/Proc-Simple dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/WWW-Mechanize dev-perl/X11-Protocol dev-perl/XML-Simple dev-perl/libwww-perl
+SLOT=0
+SRC_URI=http://shutter-project.org/wp-content/uploads/releases/tars/shutter-0.90.tar.gz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=5b7f63e3abbd8b75bc0ea46358e7e3e8
diff --git a/metadata/md5-cache/x11-plugins/echievements-2 b/metadata/md5-cache/x11-plugins/echievements-2
index 32994a19b860..2f2cc2ca705c 100644
--- a/metadata/md5-cache/x11-plugins/echievements-2
+++ b/metadata/md5-cache/x11-plugins/echievements-2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/e_dbus media-libs/edje x11-wm/enlightenment:0.17= virtual/pkgconfig doc? ( app-doc/doxygen )
+DEPEND=>=dev-games/etrophy-0.5.1 dev-libs/e_dbus media-libs/edje x11-wm/enlightenment:0.17= virtual/pkgconfig doc? ( app-doc/doxygen )
 DESCRIPTION=Show enlightenment echievements
 EAPI=5
 HOMEPAGE=http://www.enlightenment.org/
 IUSE=nls doc
 KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/e_dbus media-libs/edje x11-wm/enlightenment:0.17= nls? ( sys-devel/gettext )
+LICENSE=BSD-2
+RDEPEND=>=dev-games/etrophy-0.5.1 dev-libs/e_dbus media-libs/edje x11-wm/enlightenment:0.17= nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=http://download.enlightenment.org/releases/echievements-2.tar.bz2
 _eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ae46d14b8aad870a5ec347928aa89a4d
+_md5_=9743d066ac1d5942e90fe596bc95f9d5
diff --git a/metadata/md5-cache/x11-plugins/leechcraft-lhtr-9999 b/metadata/md5-cache/x11-plugins/leechcraft-lhtr-9999
new file mode 100644
index 000000000000..5938034591bb
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/leechcraft-lhtr-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare pretend test unpack
+DEPEND=~net-misc/leechcraft-core-9999 x11-libs/qt-webkit >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-vcs/git
+DESCRIPTION=LeechCraft HTML Text editoR component
+EAPI=4
+HOMEPAGE=http://leechcraft.org/
+IUSE=debug
+LICENSE=GPL-3
+RDEPEND=~net-misc/leechcraft-core-9999 x11-libs/qt-webkit
+SLOT=0
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	e109d3760f198d77aa1420c85584f7c6	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=110edc7d5bcbb6dcc0ad4d8ee5e97122
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.17.0_beta2 b/metadata/md5-cache/x11-wm/enlightenment-0.17.0
similarity index 82%
rename from metadata/md5-cache/x11-wm/enlightenment-0.17.0_beta2
rename to metadata/md5-cache/x11-wm/enlightenment-0.17.0
index cd748062d7d1..85970680beda 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.17.0_beta2
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.17.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=pam? ( sys-libs/pam ) >=dev-libs/efreet-1.7.3 >=dev-libs/eio-1.7.3 >=dev-libs/eina-1.7.3[mempool-chained] || ( >=dev-libs/ecore-1.7.3[X,evas,inotify] >=dev-libs/ecore-1.7.3[xcb,evas,inotify] ) >=media-libs/edje-1.7.3 >=dev-libs/e_dbus-1.7.1[libnotify,udev?] ukit? ( >=dev-libs/e_dbus-1.7.1[udev] ) enlightenment_modules_connman? ( >=dev-libs/e_dbus-1.7.1[connman] ) enlightenment_modules_shot? ( >=dev-libs/ecore-1.7.3[curl] ) || ( >=media-libs/evas-1.7.3[eet,X,jpeg,png] >=media-libs/evas-1.7.3[eet,xcb,jpeg,png] ) >=dev-libs/eeze-1.7.1 emotion? ( >=media-libs/emotion-1.7.3 ) x11-libs/xcb-util-keysyms || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen )
+DEPEND=pam? ( sys-libs/pam ) >=dev-libs/efreet-1.7.3 >=dev-libs/eio-1.7.3 >=dev-libs/eina-1.7.3[mempool-chained] || ( >=dev-libs/ecore-1.7.3[X,evas,inotify] >=dev-libs/ecore-1.7.3[xcb,evas,inotify] ) >=media-libs/edje-1.7.3 >=dev-libs/e_dbus-1.7.1[libnotify,udev?] ukit? ( >=dev-libs/e_dbus-1.7.1[udev] ) enlightenment_modules_connman? ( >=dev-libs/e_dbus-1.7.1[connman] ) enlightenment_modules_shot? ( >=dev-libs/ecore-1.7.3[curl] ) || ( >=media-libs/evas-1.7.3[eet,X,jpeg,png] >=media-libs/evas-1.7.3[eet,xcb,jpeg,png] ) >=dev-libs/eeze-1.7.1 emotion? ( >=media-libs/emotion-1.7.3 ) x11-libs/xcb-util-keysyms doc? ( app-doc/doxygen )
 DESCRIPTION=Enlightenment DR17 window manager
-EAPI=2
+EAPI=5
 HOMEPAGE=http://www.enlightenment.org/
 IUSE=emotion pam spell static-libs +udev ukit +enlightenment_modules_conf-applications +enlightenment_modules_conf-dialogs +enlightenment_modules_conf-display +enlightenment_modules_conf-edgebindings +enlightenment_modules_conf-interaction +enlightenment_modules_conf-intl +enlightenment_modules_conf-keybindings +enlightenment_modules_conf-menus +enlightenment_modules_conf-paths +enlightenment_modules_conf-performance +enlightenment_modules_conf-randr +enlightenment_modules_conf-shelves +enlightenment_modules_conf-theme +enlightenment_modules_conf-window-manipulation +enlightenment_modules_conf-window-remembers enlightenment_modules_access +enlightenment_modules_backlight +enlightenment_modules_battery +enlightenment_modules_clock +enlightenment_modules_comp +enlightenment_modules_connman +enlightenment_modules_cpufreq +enlightenment_modules_dropshadow +enlightenment_modules_everything +enlightenment_modules_fileman +enlightenment_modules_fileman-opinfo +enlightenment_modules_gadman +enlightenment_modules_ibar +enlightenment_modules_ibox +enlightenment_modules_illume2 +enlightenment_modules_mixer +enlightenment_modules_msgbus +enlightenment_modules_notification +enlightenment_modules_pager +enlightenment_modules_quickaccess enlightenment_modules_shot +enlightenment_modules_start +enlightenment_modules_syscon +enlightenment_modules_systray +enlightenment_modules_tasks +enlightenment_modules_temperature +enlightenment_modules_tiling +enlightenment_modules_winlist +enlightenment_modules_wizard +enlightenment_modules_xkbswitch nls doc
 KEYWORDS=~amd64 ~x86
-LICENSE=BSD
+LICENSE=BSD-2
 RDEPEND=pam? ( sys-libs/pam ) >=dev-libs/efreet-1.7.3 >=dev-libs/eio-1.7.3 >=dev-libs/eina-1.7.3[mempool-chained] || ( >=dev-libs/ecore-1.7.3[X,evas,inotify] >=dev-libs/ecore-1.7.3[xcb,evas,inotify] ) >=media-libs/edje-1.7.3 >=dev-libs/e_dbus-1.7.1[libnotify,udev?] ukit? ( >=dev-libs/e_dbus-1.7.1[udev] ) enlightenment_modules_connman? ( >=dev-libs/e_dbus-1.7.1[connman] ) enlightenment_modules_shot? ( >=dev-libs/ecore-1.7.3[curl] ) || ( >=media-libs/evas-1.7.3[eet,X,jpeg,png] >=media-libs/evas-1.7.3[eet,xcb,jpeg,png] ) >=dev-libs/eeze-1.7.1 emotion? ( >=media-libs/emotion-1.7.3 ) x11-libs/xcb-util-keysyms nls? ( sys-devel/gettext )
-SLOT=0.17
-SRC_URI=http://download.enlightenment.org/releases/enlightenment-0.17.0-lucky.tar.bz2
-_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=db3c35d562d08da95aa42fd4906f4365
+SLOT=0.17/0.17.0
+SRC_URI=http://download.enlightenment.org/releases/enlightenment-0.17.0.tar.bz2
+_eclasses_=enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b67963ba81ab786a9ca34caee80def2f
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.17.0_beta3 b/metadata/md5-cache/x11-wm/enlightenment-0.17.0_beta3
deleted file mode 100644
index b07770f8cfbf..000000000000
--- a/metadata/md5-cache/x11-wm/enlightenment-0.17.0_beta3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=pam? ( sys-libs/pam ) >=dev-libs/efreet-1.7.3 >=dev-libs/eio-1.7.3 >=dev-libs/eina-1.7.3[mempool-chained] || ( >=dev-libs/ecore-1.7.3[X,evas,inotify] >=dev-libs/ecore-1.7.3[xcb,evas,inotify] ) >=media-libs/edje-1.7.3 >=dev-libs/e_dbus-1.7.1[libnotify,udev?] ukit? ( >=dev-libs/e_dbus-1.7.1[udev] ) enlightenment_modules_connman? ( >=dev-libs/e_dbus-1.7.1[connman] ) enlightenment_modules_shot? ( >=dev-libs/ecore-1.7.3[curl] ) || ( >=media-libs/evas-1.7.3[eet,X,jpeg,png] >=media-libs/evas-1.7.3[eet,xcb,jpeg,png] ) >=dev-libs/eeze-1.7.1 emotion? ( >=media-libs/emotion-1.7.3 ) x11-libs/xcb-util-keysyms || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen )
-DESCRIPTION=Enlightenment DR17 window manager
-EAPI=5
-HOMEPAGE=http://www.enlightenment.org/
-IUSE=emotion pam spell static-libs +udev ukit +enlightenment_modules_conf-applications +enlightenment_modules_conf-dialogs +enlightenment_modules_conf-display +enlightenment_modules_conf-edgebindings +enlightenment_modules_conf-interaction +enlightenment_modules_conf-intl +enlightenment_modules_conf-keybindings +enlightenment_modules_conf-menus +enlightenment_modules_conf-paths +enlightenment_modules_conf-performance +enlightenment_modules_conf-randr +enlightenment_modules_conf-shelves +enlightenment_modules_conf-theme +enlightenment_modules_conf-window-manipulation +enlightenment_modules_conf-window-remembers enlightenment_modules_access +enlightenment_modules_backlight +enlightenment_modules_battery +enlightenment_modules_clock +enlightenment_modules_comp +enlightenment_modules_connman +enlightenment_modules_cpufreq +enlightenment_modules_dropshadow +enlightenment_modules_everything +enlightenment_modules_fileman +enlightenment_modules_fileman-opinfo +enlightenment_modules_gadman +enlightenment_modules_ibar +enlightenment_modules_ibox +enlightenment_modules_illume2 +enlightenment_modules_mixer +enlightenment_modules_msgbus +enlightenment_modules_notification +enlightenment_modules_pager +enlightenment_modules_quickaccess enlightenment_modules_shot +enlightenment_modules_start +enlightenment_modules_syscon +enlightenment_modules_systray +enlightenment_modules_tasks +enlightenment_modules_temperature +enlightenment_modules_tiling +enlightenment_modules_winlist +enlightenment_modules_wizard +enlightenment_modules_xkbswitch nls doc
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=pam? ( sys-libs/pam ) >=dev-libs/efreet-1.7.3 >=dev-libs/eio-1.7.3 >=dev-libs/eina-1.7.3[mempool-chained] || ( >=dev-libs/ecore-1.7.3[X,evas,inotify] >=dev-libs/ecore-1.7.3[xcb,evas,inotify] ) >=media-libs/edje-1.7.3 >=dev-libs/e_dbus-1.7.1[libnotify,udev?] ukit? ( >=dev-libs/e_dbus-1.7.1[udev] ) enlightenment_modules_connman? ( >=dev-libs/e_dbus-1.7.1[connman] ) enlightenment_modules_shot? ( >=dev-libs/ecore-1.7.3[curl] ) || ( >=media-libs/evas-1.7.3[eet,X,jpeg,png] >=media-libs/evas-1.7.3[eet,xcb,jpeg,png] ) >=dev-libs/eeze-1.7.1 emotion? ( >=media-libs/emotion-1.7.3 ) x11-libs/xcb-util-keysyms nls? ( sys-devel/gettext )
-SLOT=0.17/0.17.0_beta3
-SRC_URI=http://download.enlightenment.org/releases/enlightenment-0.17.0-omega.tar.bz2
-_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	enlightenment	59018f068e8f700839d3c75f86495011	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2ae2c5bb8fb9a35635a7a7fc31fb32e1
diff --git a/metadata/md5-cache/x11-wm/matchbox-1.0 b/metadata/md5-cache/x11-wm/matchbox-1.0
index bc82b0b08286..f0b8230b9a7a 100644
--- a/metadata/md5-cache/x11-wm/matchbox-1.0
+++ b/metadata/md5-cache/x11-wm/matchbox-1.0
@@ -3,7 +3,7 @@ DESCRIPTION=Light weight WM designed for use on PDA computers
 HOMEPAGE=http://matchbox-project.org/
 IUSE=minimal
 KEYWORDS=amd64 ~arm ~hppa ppc x86
-LICENSE=as-is
+LICENSE=metapackage
 RDEPEND=x11-wm/matchbox-common x11-wm/matchbox-desktop x11-wm/matchbox-panel x11-wm/matchbox-window-manager !minimal? ( x11-misc/matchbox-keyboard x11-misc/matchbox-panel-manager x11-themes/matchbox-themes-extra x11-plugins/matchbox-applet-input-manager x11-plugins/matchbox-applet-startup-monitor x11-plugins/matchbox-applet-volume )
 SLOT=0
-_md5_=9c03bc0401651402a0512e790bd8cb48
+_md5_=b6f51d90ec35ebe84d7a64ea9c8aa027
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index d140c084ee50..e73720d29b2f 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 21 Dec 2012 17:06:54 +0000
+Sat, 22 Dec 2012 20:06:55 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 1799c3660cb8..0e8829a589ee 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Dec 21 16:36:52 UTC 2012
+Sat Dec 22 20:06:53 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f422b89041de..1323e2459960 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 21 Dec 2012 17:00:01 +0000
+Sat, 22 Dec 2012 20:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 2e497174ce8c..d40bfe1c6e92 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1356107701 Fri Dec 21 16:35:01 2012 UTC
+1356206701 Sat Dec 22 20:05:01 2012 UTC
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.0_p2.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.0_p2.ebuild
index 1c5a277d836d..6e2fb6f5600b 100644
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.0_p2.ebuild
+++ b/net-analyzer/mk-livestatus/mk-livestatus-1.2.0_p2.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/mk-livestatus/mk-livestatus-1.2.0_p2.ebuild,v 1.1 2012/09/03 19:14:10 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mk-livestatus/mk-livestatus-1.2.0_p2.ebuild,v 1.2 2012/12/22 18:24:19 ago Exp $
 
 EAPI=3
 
@@ -18,7 +18,7 @@ SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="examples perl python test"
 
 RDEPEND="perl? (
diff --git a/net-analyzer/munin/munin-2.0.8-r2.ebuild b/net-analyzer/munin/munin-2.0.8-r2.ebuild
index 1274347a2ef9..8ad2df2564a9 100644
--- a/net-analyzer/munin/munin-2.0.8-r2.ebuild
+++ b/net-analyzer/munin/munin-2.0.8-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/net-analyzer/munin/munin-2.0.8-r2.ebuild,v 1.5 2012/12/12 09:45:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.8-r2.ebuild,v 1.6 2012/12/22 15:18:15 ago Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/munin/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc x86"
+KEYWORDS="amd64 ~arm ~mips ppc x86"
 IUSE="asterisk irc java memcached minimal mysql postgres ssl test cgi ipv6 syslog ipmi http dhcpd doc apache"
 REQUIRED_USE="cgi? ( !minimal ) apache? ( cgi )"
 
diff --git a/net-analyzer/munin/munin-2.0.9.ebuild b/net-analyzer/munin/munin-2.0.9.ebuild
index 823c9ee1205c..7b5d4538f556 100644
--- a/net-analyzer/munin/munin-2.0.9.ebuild
+++ b/net-analyzer/munin/munin-2.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.9.ebuild,v 1.1 2012/12/12 09:45:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.9.ebuild,v 1.2 2012/12/22 17:25:15 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/munin/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
 IUSE="asterisk irc java memcached minimal mysql postgres ssl test cgi ipv6 syslog ipmi http dhcpd doc apache"
 REQUIRED_USE="cgi? ( !minimal ) apache? ( cgi )"
 
diff --git a/net-analyzer/nagvis/nagvis-1.6.6.ebuild b/net-analyzer/nagvis/nagvis-1.6.6.ebuild
index afd0c85ab3f7..d3bcb342f7c5 100644
--- a/net-analyzer/nagvis/nagvis-1.6.6.ebuild
+++ b/net-analyzer/nagvis/nagvis-1.6.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/net-analyzer/nagvis/nagvis-1.6.6.ebuild,v 1.1 2012/07/31 18:49:50 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagvis/nagvis-1.6.6.ebuild,v 1.2 2012/12/22 18:24:04 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="apache2 automap"
 
 DEPEND=""
diff --git a/net-dns/bind/bind-9.9.2_p1.ebuild b/net-dns/bind/bind-9.9.2_p1.ebuild
index 62d49b36b90e..2b61f59a4132 100644
--- a/net-dns/bind/bind-9.9.2_p1.ebuild
+++ b/net-dns/bind/bind-9.9.2_p1.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-dns/bind/bind-9.9.2_p1.ebuild,v 1.4 2012/12/16 16:24:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.2_p1.ebuild,v 1.5 2012/12/22 15:20:10 ago Exp $
 
 # Re dlz/mysql and threads, needs to be verified..
 # MySQL uses thread local storage in its C api. Thus MySQL
@@ -52,7 +52,7 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
 
 LICENSE="ISC BSD BSD-2 HPND JNIC RSA openssl"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb caps dlz doc filter-aaaa geoip gost gssapi idn ipv6 ldap mysql odbc
 postgres python rpz rrl sdb-ldap selinux ssl static-libs threads urandom xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
diff --git a/net-firewall/pglinux/pglinux-2.2.2.ebuild b/net-firewall/pglinux/pglinux-2.2.2.ebuild
index 1a5f3452de31..c94857e44915 100644
--- a/net-firewall/pglinux/pglinux-2.2.2.ebuild
+++ b/net-firewall/pglinux/pglinux-2.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/pglinux/pglinux-2.2.2.ebuild,v 1.1 2012/11/25 13:16:54 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/pglinux/pglinux-2.2.2.ebuild,v 1.2 2012/12/22 10:59:50 ago Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://sourceforge.net/projects/peerguardian/"
 SRC_URI="mirror://sourceforge/peerguardian/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 SLOT="0"
 IUSE="cron dbus logrotate networkmanager qt4 zlib"
 
diff --git a/net-fs/samba/samba-4.0.0.ebuild b/net-fs/samba/samba-4.0.0.ebuild
index a6ca08d7133a..d919db41b2bc 100644
--- a/net-fs/samba/samba-4.0.0.ebuild
+++ b/net-fs/samba/samba-4.0.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.0.ebuild,v 1.1 2012/12/12 04:50:23 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.0.ebuild,v 1.2 2012/12/21 18:18:08 vostorga Exp $
 
 EAPI=4
 PYTHON_DEPEND="2"
 
-inherit confutils python waf-utils multilib linux-info
+inherit python waf-utils multilib linux-info
 
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
@@ -25,7 +25,7 @@ LICENSE="GPL-3"
 
 SLOT="0"
 
-IUSE="acl addns ads aio avahi client cluster cups debug fulltest gnutls iprint
+IUSE="acl addns ads aio avahi client cluster cups gnutls iprint
 ldap pam quota selinux swat syslog winbind"
 
 RDEPEND="dev-libs/iniparser
@@ -44,7 +44,7 @@ RDEPEND="dev-libs/iniparser
 	ads? ( client? ( net-fs/cifs-utils[ads] ) )
 	client? ( net-fs/cifs-utils )
 	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
-	ldap? ( net-nds/openldap[kerberos] )
+	ldap? ( net-nds/openldap )
 	gnutls? ( >=net-libs/gnutls-1.4.0 )
 	selinux? ( sec-policy/selinux-samba )"
 DEPEND="${RDEPEND}
@@ -59,8 +59,6 @@ CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
 WAF_BINARY="${S}/buildtools/bin/waf"
 
 pkg_setup() {
-	confutils_use_depend_all fulltest test
-
 	python_set_active_version 2
 	python_pkg_setup
 
@@ -80,12 +78,8 @@ pkg_setup() {
 
 src_configure() {
 	local myconf=''
-	if use "debug"; then
-		myconf="${myconf} --enable-developer"
-	fi
-	if use "cluster"; then
-		myconf="${myconf} --with-ctdb-dir=/usr"
-	fi
+	use "cluster" && myconf+=" --with-ctdb-dir=/usr"
+	use "test" && myconf+=" --enable-selftest"
 	myconf="${myconf} \
 		--enable-fhs \
 		--sysconfdir=/etc \
@@ -113,7 +107,8 @@ src_configure() {
 		$(use_with quota) \
 		$(use_with syslog) \
 		$(use_with swat) \
-		$(use_with winbind)"
+		$(use_with winbind)
+		"
 	CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \
 		waf-utils_src_configure ${myconf}
 }
@@ -129,25 +124,29 @@ src_install() {
 	mv "${D}"/usr/$(get_libdir)/ldb/*.so "${D}"/usr/$(get_libdir)/ldb/modules/ldb
 
 	# Install init script and conf.d file
-	newinitd "${CONFDIR}/samba4.initd-r1" samba || die "newinitd failed"
-	newconfd "${CONFDIR}/samba4.confd" samba || die "newconfd failed"
+	newinitd "${CONFDIR}/samba4.initd-r1" samba
+	newconfd "${CONFDIR}/samba4.confd" samba
 }
 
 src_test() {
-	local extra_opts=""
-	use fulltest || extra_opts+="--quick"
-	"${WAF_BINARY}" test ${extra_opts} || die "test failed"
+	"${WAF_BINARY}" test || die "test failed"
 }
 
 pkg_postinst() {
 	# Optimize the python modules so they get properly removed
 	python_mod_optimize "${PN}"
 
-	# Warn that it's a release candidate
-	ewarn "This is not necessarily compatible with samba-3. Read the wiki page."
+	elog "This is is the first stable release of Samba 4.0"
+
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
 
-	einfo "See http://wiki.samba.org/index.php/Samba4/HOWTO for more"
-	einfo "information about samba 4."
+	elog "For further information and migration steps make sure to read "
+	#elog "http://samba.org/samba/history/${P}.html and "
+	elog "http://samba.org/samba/history/${PN}-4.0.0.html and"
+	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
 }
 
 pkg_postrm() {
diff --git a/net-im/emesene/emesene-2.12.9.ebuild b/net-im/emesene/emesene-2.12.9.ebuild
index d610660b3836..52b82764a97b 100644
--- a/net-im/emesene/emesene-2.12.9.ebuild
+++ b/net-im/emesene/emesene-2.12.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/emesene/emesene-2.12.9.ebuild,v 1.5 2012/12/20 20:04:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/emesene/emesene-2.12.9.ebuild,v 1.6 2012/12/22 09:26:12 ago Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -16,7 +16,7 @@ SRC_URI="http://github.com/emesene/emesene/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 GPL-3 LGPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="jabber"
 
 RDEPEND="dev-python/pygtk:2
diff --git a/net-im/telepathy-logger/Manifest b/net-im/telepathy-logger/Manifest
index 1f67c7ba25cf..985b40a7e587 100644
--- a/net-im/telepathy-logger/Manifest
+++ b/net-im/telepathy-logger/Manifest
@@ -1,2 +1,2 @@
-DIST telepathy-logger-0.2.12.tar.bz2 465574 SHA256 43ce8c6d0309889b56116e9a6eb023e6698962fad72deb1202fee36d64a80199 SHA512 66d243e3d2f653c7a800dcd4f5c21a412c83bc95da40c9d913f3cc250dbf27a65864f8fd784359540288969cc7aeba3fcdc79538cad1aee99171e3be97aa0ebc WHIRLPOOL ce4426d70306c5f93f0fde02ac57f120892af889abdfd2e50904de2db8ca7f616b3b7ca0e10d638de42c6b32048fd4e228cf83ea73081772be3bd3c9e72afc45
 DIST telepathy-logger-0.4.0.tar.bz2 523642 SHA256 06b5ab0616afd7572a1bbda58e6a9487bb305f69358c85985a8999f26f4465e5 SHA512 bcd95b0f86a30c445764abd319fc368b500f394ff611312b9d0b871b8bed353cc991f34261fa64f73dca0bd3f69a259e9dab64242e208156ae917e66da6726f4 WHIRLPOOL 0eeff69445b738edc271e57c65556513e306dd544270555e530fec4903fa14d11e2e437b0a4aaff44e1cbffb3ad48a4df0d0b99512f10388d366f3b7013e6930
+DIST telepathy-logger-0.6.0.tar.bz2 523741 SHA256 a5ac79a0ba27db1046e4e5d324b9ceb19d8e6891f8a750e52d0597479260edf1 SHA512 1ca0470d1494ddfbfae362465874e14051c8b7a5adb8b3afa09789451f92b066eeb2b03e03529351378b06bd9ae4c7adefc581e7d95ff48013a4bd4d4f646212 WHIRLPOOL 4c5cd1a8d377abf49017cb75b5b9a382ae90651d7cf0067c0e04b0f289535000f0fdb91ccd83ee5c31d77a72aabd51973667b9d44b1253b9defcf169f9d5fe3c
diff --git a/net-im/telepathy-logger/metadata.xml b/net-im/telepathy-logger/metadata.xml
index d6acf46776c7..da6fd63d0085 100644
--- a/net-im/telepathy-logger/metadata.xml
+++ b/net-im/telepathy-logger/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
-<use>
-  <flag name='introspection'>Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
-</use>
 </pkgmetadata>
diff --git a/net-im/telepathy-logger/telepathy-logger-0.2.12-r1.ebuild b/net-im/telepathy-logger/telepathy-logger-0.6.0.ebuild
similarity index 52%
rename from net-im/telepathy-logger/telepathy-logger-0.2.12-r1.ebuild
rename to net-im/telepathy-logger/telepathy-logger-0.6.0.ebuild
index 48e698c3e426..c3be2f4a3810 100644
--- a/net-im/telepathy-logger/telepathy-logger-0.2.12-r1.ebuild
+++ b/net-im/telepathy-logger/telepathy-logger-0.6.0.ebuild
@@ -1,64 +1,52 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-logger/telepathy-logger-0.2.12-r1.ebuild,v 1.9 2012/10/09 23:45:43 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-logger/telepathy-logger-0.6.0.ebuild,v 1.1 2012/12/21 22:03:03 eva Exp $
 
-EAPI="4"
-PYTHON_DEPEND="2:2.5"
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_{5,6,7} )
 
-inherit gnome2-utils python virtualx
+inherit gnome2 python-any-r1 virtualx
 
 DESCRIPTION="Telepathy Logger is a session daemon that should be activated whenever telepathy is being used."
 HOMEPAGE="http://telepathy.freedesktop.org/wiki/Logger"
 SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-linux"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-linux"
 IUSE="+introspection"
 
-RDEPEND=">=dev-libs/glib-2.25.11:2
+RDEPEND="
+	>=dev-libs/glib-2.25.11:2
 	>=sys-apps/dbus-1.1
 	>=dev-libs/dbus-glib-0.82
-	>=net-libs/telepathy-glib-0.15.6[introspection?]
+	>=net-libs/telepathy-glib-0.19.2[introspection?]
 	dev-libs/libxml2
 	dev-libs/libxslt
 	dev-db/sqlite:3
 	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
 "
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
 	virtual/pkgconfig
 "
 
-DOCS=(AUTHORS ChangeLog NEWS README)
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-}
-
 src_configure() {
-	econf \
-		$(use_enable introspection) \
-		--enable-call \
-		--enable-debug \
-		--enable-public-extensions \
-		--disable-coding-style-checks \
-		--disable-Werror \
-		--disable-static
+	G2CONF="${G2CONF}
+		$(use_enable introspection)
+		--enable-debug
+		--enable-public-extensions
+		--disable-coding-style-checks
+		--disable-Werror
+		--disable-static"
+	gnome2_src_configure
 }
 
 src_test() {
 	gnome2_environment_reset
 	Xemake check || die "make check failed"
 }
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -delete || die "la files removal failed"
-}
diff --git a/net-irc/irssi-xmpp/metadata.xml b/net-irc/irssi-xmpp/metadata.xml
index a8f6a5760f5b..3d31a697ce11 100644
--- a/net-irc/irssi-xmpp/metadata.xml
+++ b/net-irc/irssi-xmpp/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>xarthisius@gentoo.org</email>
-	<name>Kacper Kowalik</name>
-</maintainer>
+   <maintainer>
+	  <email>maintainer-needed@gentoo.org</email>
+   </maintainer>
 </pkgmetadata>
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.16.5.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.16.5.ebuild
index e3ba0dd04e0c..7347c2233d0e 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.16.5.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.16.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.16.5.ebuild,v 1.7 2012/12/18 10:43:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.16.5.ebuild,v 1.8 2012/12/22 14:02:59 ago Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2:2.6"
@@ -19,7 +19,7 @@ SRC_URI="http://libtorrent.googlecode.com/files/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="debug doc examples python ssl static-libs"
 RESTRICT="test"
 
diff --git a/net-libs/telepathy-glib/Manifest b/net-libs/telepathy-glib/Manifest
index 94d840e84e51..70a24aba19cc 100644
--- a/net-libs/telepathy-glib/Manifest
+++ b/net-libs/telepathy-glib/Manifest
@@ -1,3 +1,3 @@
-DIST telepathy-glib-0.16.5.tar.gz 3113658 SHA256 7d15d608ad5d960e3aa0bd9c76f6ead0008a5eb0fe1fa5bdc90f9dd913b48478 SHA512 f85224f528fe78b39d1b8f3a90bc80c593c6e13ac6f3b2c7aa5404e30acbc23e02e8c6d4804eaeadfa56993edcc2e2c0b67b545c6596bea6e7c22151ca9fda49 WHIRLPOOL 28b52106a5c679a4247de33bfc4b74e33e039a6768efe9c311b9f8cb78f762370df8f5460896ca3929a197db4ecd83814bfee683392451565060a271ece13585
 DIST telepathy-glib-0.18.1.tar.gz 3537671 SHA256 3738256689e34c22ddf9c4eb33f44ce7505c18fb1a14c53b8e56dd9c262f4c6d SHA512 a9897a86fe27310bd8d553e05b1d91efbb982fdf415dab13bd65250dbae53c503ca8ddc8458d7743786463212a48835b815a998cda196f6201365fbdeaf7d32d WHIRLPOOL 5f5d3c31f852f11d920dabcd85887192fe40c5e955e190a7f7d29366df4e0990a6c3b0bb112811b653b6de71f8a971587f4fcbce962dc2eff908fd58760b4554
 DIST telepathy-glib-0.18.2.tar.gz 3539165 SHA256 372375578be8053398f9fb1e12188a8b472d6d897e0ac73b230d31e112c68b3f SHA512 3f3d805c8c683596e92d60907dead975e378363d13a2c5b073e068809be24f0a07f433d952cf92a95fa29ced259b06334d69cad006d859f7c1f7bcc63added4d WHIRLPOOL 9f3ee0464e945f879917d0a490fe4e11073ab431835b1b5eb643a0ab8440bddfcabe0f7118b9b2574d7ca6f7de90c9066ec82f9e37e5d1376784f2fc9981879f
+DIST telepathy-glib-0.20.1.tar.gz 3755290 SHA256 01a0343f61fbd389fed9c819751aa75914150aa567472dcb480ced7f4ed261b6 SHA512 41407a40a6dc81cef17cbc4d5c558bd90ae6db57445acbb9fad2188b04b4ba95456232b9e1565336af271db0379b295a660af845cf6d535b3518e75577496bac WHIRLPOOL 9f875102d4553bcc2aa3f78c1901bed48f5eddf38cd1558c036c84cd8ff7eea6d7a116081fb9973b0fe9f1ebbf4fe558c627eb3e8f374ab4407e6cbadac459ee
diff --git a/net-libs/telepathy-glib/metadata.xml b/net-libs/telepathy-glib/metadata.xml
index 1bef2fe27933..a34f24c057bb 100644
--- a/net-libs/telepathy-glib/metadata.xml
+++ b/net-libs/telepathy-glib/metadata.xml
@@ -7,12 +7,7 @@
 		<email>peper@gentoo.org</email>
 		<name>Piotr Jaroszyński</name>
 	</maintainer>
-	<longdescription lang="en">
-	</longdescription>
 	<use>
-		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-		for introspection</flag>
 		<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
 	</use>
 </pkgmetadata>
-
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.16.5.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.16.5.ebuild
deleted file mode 100644
index 93fc71e1b34b..000000000000
--- a/net-libs/telepathy-glib/telepathy-glib-0.16.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.16.5.ebuild,v 1.8 2012/07/15 18:20:30 armin76 Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.5"
-
-inherit python virtualx
-
-DESCRIPTION="GLib bindings for the Telepathy D-Bus protocol."
-HOMEPAGE="http://telepathy.freedesktop.org"
-SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-linux"
-IUSE="debug +introspection +vala"
-
-RDEPEND=">=dev-libs/glib-2.28.0:2
-	>=dev-libs/dbus-glib-0.82
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )
-	vala? (
-		>=dev-lang/vala-0.14.0:0.14[vapigen]
-		>=dev-libs/gobject-introspection-1.30 )"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig"
-
-src_prepare() {
-	python_convert_shebangs -r 2 examples tests tools
-	default_src_prepare
-}
-
-src_configure() {
-	local myconf
-
-	if use vala; then
-		myconf="--enable-introspection
-			VALAC=$(type -p valac-0.14)
-			VAPIGEN=$(type -p vapigen-0.14)"
-	fi
-
-	econf --disable-static \
-		PYTHON=$(PYTHON -2 -a) \
-		$(use_enable debug backtrace) \
-		$(use_enable debug handle-leak-debug) \
-		$(use_enable debug debug-cache) \
-		$(use_enable introspection) \
-		$(use_enable vala vala-bindings) \
-		${myconf}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	# Needs dbus for tests (auto-launched)
-	Xemake -j1 check
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS ChangeLog NEWS README
-
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.18.1.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.18.1.ebuild
index 6b782432795f..7c2b8fe48b98 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.18.1.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.18.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.18.1.ebuild,v 1.10 2012/10/28 16:29:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.18.1.ebuild,v 1.11 2012/12/21 21:12:43 eva Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.5"
@@ -11,7 +11,7 @@ DESCRIPTION="GLib bindings for the Telepathy D-Bus protocol."
 HOMEPAGE="http://telepathy.freedesktop.org"
 SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug +introspection +vala"
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	python_convert_shebangs -r 2 examples tests tools
-	default_src_prepare
+	default
 }
 
 src_configure() {
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.18.2.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.18.2.ebuild
index 0c32bfcf6180..187b7e5df806 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.18.2.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.18.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.18.2.ebuild,v 1.2 2012/09/16 00:15:03 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.18.2.ebuild,v 1.3 2012/12/21 21:12:43 eva Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.5"
@@ -13,7 +13,7 @@ DESCRIPTION="GLib bindings for the Telepathy D-Bus protocol."
 HOMEPAGE="http://telepathy.freedesktop.org"
 SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug +introspection +vala"
@@ -30,20 +30,17 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	python_convert_shebangs -r 2 examples tests tools
 	use vala && vala_src_prepare
-	default_src_prepare
+	default
 }
 
 src_configure() {
-	local myconf
-
 	econf --disable-static \
 		--disable-installed-tests \
 		PYTHON=$(PYTHON -2 -a) \
 		$(use_enable debug backtrace) \
 		$(use_enable debug debug-cache) \
 		$(use_enable introspection) \
-		$(use_enable vala vala-bindings) \
-		${myconf}
+		$(use_enable vala vala-bindings)
 }
 
 src_test() {
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.20.1-r1.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.20.1-r1.ebuild
new file mode 100644
index 000000000000..517626943ffe
--- /dev/null
+++ b/net-libs/telepathy-glib/telepathy-glib-0.20.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.20.1-r1.ebuild,v 1.1 2012/12/21 21:12:43 eva Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_{5,6,7} )
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome2-utils python-r1 vala virtualx
+
+DESCRIPTION="GLib bindings for the Telepathy D-Bus protocol."
+HOMEPAGE="http://telepathy.freedesktop.org"
+SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug +introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.32.0:2
+	>=dev-libs/dbus-glib-0.90
+	introspection? ( >=dev-libs/gobject-introspection-1.30 )"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+	${PYTHON_DEPS}
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	default
+}
+
+src_configure() {
+	python_export_best
+	econf --disable-static \
+		--disable-installed-tests \
+		$(use_enable debug backtrace) \
+		$(use_enable debug debug-cache) \
+		$(use_enable introspection) \
+		$(use_enable vala vala-bindings)
+}
+
+src_test() {
+	gnome2_environment_reset
+	unset DBUS_SESSION_BUS_ADDRESS
+	# Needs dbus for tests (auto-launched)
+	Xemake -j1 check
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/net-mail/cmd5checkpw/Manifest b/net-mail/cmd5checkpw/Manifest
index caa9f30033c8..d0a1f503d44d 100644
--- a/net-mail/cmd5checkpw/Manifest
+++ b/net-mail/cmd5checkpw/Manifest
@@ -1 +1 @@
-DIST cmd5checkpw-030_tgz.bin 25812 RMD160 01445093e6f005ebdb5483836e15625cc326d563 SHA1 0c78f99e38fa9faba3730a27c0fe2d5d182aff72 SHA256 88588e134a498f7efa69ee1d2a217aec7cb65a41b4206100455b5aa40d692f2d
+DIST cmd5checkpw-030_tgz.bin 25812 SHA256 88588e134a498f7efa69ee1d2a217aec7cb65a41b4206100455b5aa40d692f2d
diff --git a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild
index 855827ca1c43..8b3e459224be 100644
--- a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild
+++ b/net-mail/cmd5checkpw/cmd5checkpw-0.30-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/net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild,v 1.12 2011/07/11 15:17:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild,v 1.13 2012/12/22 17:19:59 ulm Exp $
 
 inherit eutils fixheadtails
 
@@ -10,7 +10,7 @@ DESCRIPTION="A checkpassword compatible authentication program that used CRAM-MD
 SRC_URI="http://www.fehcom.de/qmail/auth/${PN}-${MY_VER}_tgz.bin"
 HOMEPAGE="http://www.fehcom.de/qmail/smtpauth.html"
 
-LICENSE="as-is"
+LICENSE="public-domain RSA"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
diff --git a/net-mail/dot-forward/Manifest b/net-mail/dot-forward/Manifest
index fa7381d6735b..2fa23983a114 100644
--- a/net-mail/dot-forward/Manifest
+++ b/net-mail/dot-forward/Manifest
@@ -1 +1 @@
-DIST dot-forward-0.71.tar.gz 26352 RMD160 1e5fd7558296cf213274e6e80944ba26fed74c79 SHA1 2adacc13bb43fcf7ae13d3fbeaadd2649ff91137 SHA256 18086b59edf113aaeb02a770afb5429c3200e8637d06ce15094247416fc6e258
+DIST dot-forward-0.71.tar.gz 26352 SHA256 18086b59edf113aaeb02a770afb5429c3200e8637d06ce15094247416fc6e258
diff --git a/net-mail/dot-forward/dot-forward-0.71-r2.ebuild b/net-mail/dot-forward/dot-forward-0.71-r2.ebuild
index 4f929129a394..5aba51d7a555 100644
--- a/net-mail/dot-forward/dot-forward-0.71-r2.ebuild
+++ b/net-mail/dot-forward/dot-forward-0.71-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/net-mail/dot-forward/dot-forward-0.71-r2.ebuild,v 1.11 2011/02/06 09:35:04 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dot-forward/dot-forward-0.71-r2.ebuild,v 1.12 2012/12/22 16:48:53 ulm Exp $
 
 inherit eutils toolchain-funcs
 
@@ -8,7 +8,7 @@ DESCRIPTION="reads sendmail's .forward files under qmail"
 HOMEPAGE="http://cr.yp.to/dot-forward.html"
 SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
diff --git a/net-mail/dot-forward/dot-forward-0.71-r3.ebuild b/net-mail/dot-forward/dot-forward-0.71-r3.ebuild
index 15c9a907d977..90610dd60d4e 100644
--- a/net-mail/dot-forward/dot-forward-0.71-r3.ebuild
+++ b/net-mail/dot-forward/dot-forward-0.71-r3.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/net-mail/dot-forward/dot-forward-0.71-r3.ebuild,v 1.9 2011/07/11 15:19:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dot-forward/dot-forward-0.71-r3.ebuild,v 1.10 2012/12/22 16:48:53 ulm Exp $
 
 inherit eutils fixheadtails qmail
 
@@ -8,7 +8,7 @@ DESCRIPTION="reads sendmail's .forward files under qmail"
 HOMEPAGE="http://cr.yp.to/dot-forward.html"
 SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
diff --git a/net-mail/fastforward/Manifest b/net-mail/fastforward/Manifest
index af22756046fe..71269355cb9d 100644
--- a/net-mail/fastforward/Manifest
+++ b/net-mail/fastforward/Manifest
@@ -1 +1 @@
-DIST fastforward-0.51.tar.gz 40659 RMD160 84518647b43f0d32dd4fde198dd4712896e8ed25 SHA1 5a20d2a60d2de791d9a7fbbe6ddb1fdca567053e SHA256 45a1a071d54701bf973fed7582b5ff76cb6ed3e43089da6da87caabbb4b4fd7e
+DIST fastforward-0.51.tar.gz 40659 SHA256 45a1a071d54701bf973fed7582b5ff76cb6ed3e43089da6da87caabbb4b4fd7e
diff --git a/net-mail/fastforward/fastforward-0.51-r1.ebuild b/net-mail/fastforward/fastforward-0.51-r1.ebuild
index b6aaf84e4de6..a94a2cac4661 100644
--- a/net-mail/fastforward/fastforward-0.51-r1.ebuild
+++ b/net-mail/fastforward/fastforward-0.51-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/net-mail/fastforward/fastforward-0.51-r1.ebuild,v 1.8 2011/08/22 08:39:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fastforward/fastforward-0.51-r1.ebuild,v 1.9 2012/12/22 16:51:13 ulm Exp $
 
 inherit eutils fixheadtails
 
@@ -8,8 +8,8 @@ DESCRIPTION="handle qmail forwarding according to a cdb database"
 HOMEPAGE="http://cr.yp.to/fastforward.html"
 SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
 
+LICENSE="public-domain"
 SLOT="0"
-LICENSE="as-is"
 KEYWORDS="x86 sparc ~ppc"
 IUSE=""
 
diff --git a/net-misc/aggregate/Manifest b/net-misc/aggregate/Manifest
index 00dc5c50d1ab..8bb8e99bfa61 100644
--- a/net-misc/aggregate/Manifest
+++ b/net-misc/aggregate/Manifest
@@ -1 +1 @@
-DIST aggregate-1.6.tar.gz 20566 RMD160 f6ce594c0fb44642c839d1514d8c3e3fe014a865 SHA1 13420baf4f3f93dbed3c380ab6cca175609c5d7d SHA256 166503005cd8722c730e530cc90652ddfa198a25624914c65dffc3eb87ba5482
+DIST aggregate-1.6.tar.gz 20566 SHA256 166503005cd8722c730e530cc90652ddfa198a25624914c65dffc3eb87ba5482
diff --git a/net-misc/aggregate/aggregate-1.6.ebuild b/net-misc/aggregate/aggregate-1.6.ebuild
index 9b6b51d3a53c..1408a39348fa 100644
--- a/net-misc/aggregate/aggregate-1.6.ebuild
+++ b/net-misc/aggregate/aggregate-1.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aggregate/aggregate-1.6.ebuild,v 1.16 2010/10/28 09:25:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aggregate/aggregate-1.6.ebuild,v 1.17 2012/12/22 17:24:28 ulm Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs
@@ -9,7 +9,7 @@ DESCRIPTION="aggregate takes a list of prefixes in conventional format on stdin,
 HOMEPAGE="http://dist.automagic.org/"
 SRC_URI="${HOMEPAGE}/${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="ISC"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
 IUSE=""
diff --git a/net-misc/identicurse/Manifest b/net-misc/identicurse/Manifest
index 021ef033d9a8..62ddb017e539 100644
--- a/net-misc/identicurse/Manifest
+++ b/net-misc/identicurse/Manifest
@@ -1 +1 @@
-DIST identicurse-0.9.tar.bz2 62278 RMD160 f6cd4763ca53f48561787a768f1ee90c5863e84b SHA1 ec5a821baedf5fe99e50bd2489a1d03d78b6fa82 SHA256 27caaf2e2af1fdcb3428aa811d7a03d2104f13fb9055b3ef612a7d4c70352ebb
+DIST identicurse-0.9.tar.bz2 62278 SHA256 27caaf2e2af1fdcb3428aa811d7a03d2104f13fb9055b3ef612a7d4c70352ebb
diff --git a/net-misc/identicurse/metadata.xml b/net-misc/identicurse/metadata.xml
index 7fe0a8f74542..6062d6be9022 100644
--- a/net-misc/identicurse/metadata.xml
+++ b/net-misc/identicurse/metadata.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>xarthisius@gentoo.org</email>
-		<name>Kacper Kowalik</name>
+		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 	<longdescription>A simple Identi.ca client with a curses-based UI.</longdescription>
 </pkgmetadata>
diff --git a/net-misc/leechcraft-blogique/Manifest b/net-misc/leechcraft-blogique/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/net-misc/leechcraft-blogique/leechcraft-blogique-9999.ebuild b/net-misc/leechcraft-blogique/leechcraft-blogique-9999.ebuild
new file mode 100644
index 000000000000..bd9bd64f3ca1
--- /dev/null
+++ b/net-misc/leechcraft-blogique/leechcraft-blogique-9999.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/net-misc/leechcraft-blogique/leechcraft-blogique-9999.ebuild,v 1.1 2012/12/22 15:47:39 maksbotan Exp $
+
+EAPI="4"
+
+inherit leechcraft
+
+DESCRIPTION="Blogging client for LeechCraft"
+
+SLOT="0"
+KEYWORDS=""
+IUSE="debug +metida"
+
+DEPEND="~net-misc/leechcraft-core-${PV}
+	x11-libs/qt-sql[sqlite]
+	metida? ( x11-libs/qt-xmlpatterns )
+	"
+RDEPEND="${DEPEND}
+	virtual/leechcraft-wysiwyg-editor
+	"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_enable metida BLOGIQUE_METIDA)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/net-misc/leechcraft-blogique/metadata.xml b/net-misc/leechcraft-blogique/metadata.xml
new file mode 100644
index 000000000000..1291592a73ba
--- /dev/null
+++ b/net-misc/leechcraft-blogique/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>leechcraft</herd>
+<use>
+	<flag name="metida">Support for the LiveJournal blogging platform</flag>
+</use>
+</pkgmetadata>
diff --git a/net-misc/openconnect/files/openconnect.init.in b/net-misc/openconnect/files/openconnect.init.in
index 3f3f32651cde..5eee4ec15e08 100644
--- a/net-misc/openconnect/files/openconnect.init.in
+++ b/net-misc/openconnect/files/openconnect.init.in
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/files/openconnect.init.in,v 1.3 2012/12/11 19:45:50 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/files/openconnect.init.in,v 1.4 2012/12/22 11:21:37 hwoarang Exp $
 
 VPN="${RC_SVCNAME#*.}"
 VPNLOG="/var/log/openconnect/${VPN}"
@@ -82,7 +82,7 @@ start() {
 
 	start-stop-daemon --start --make-pidfile --pidfile "${VPNPID}" --stderr "${VPNERRFILE}" --stdout "${VPNLOGFILE}" --background \
 			--exec /usr/sbin/openconnect \
-			-- ${!VPNOPTS} ${!SERVER} <<< ${!PASSWORD}
+			-- --pid-file="${VPNPID}" ${!VPNOPTS} ${!SERVER} <<< ${!PASSWORD}
 
  	local retval=$?
 
diff --git a/net-misc/openconnect/openconnect-4.07-r1.ebuild b/net-misc/openconnect/openconnect-4.07-r2.ebuild
similarity index 96%
rename from net-misc/openconnect/openconnect-4.07-r1.ebuild
rename to net-misc/openconnect/openconnect-4.07-r2.ebuild
index e8f58990c583..e5e660f06221 100644
--- a/net-misc/openconnect/openconnect-4.07-r1.ebuild
+++ b/net-misc/openconnect/openconnect-4.07-r2.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/openconnect-4.07-r1.ebuild,v 1.1 2012/12/11 19:45:50 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/openconnect-4.07-r2.ebuild,v 1.1 2012/12/22 11:21:37 hwoarang Exp $
 
 EAPI="5"
 
-inherit eutils linux-info
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit eutils linux-info python-any-r1
 
 DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
 HOMEPAGE="http://www.infradead.org/openconnect.html"
@@ -59,6 +61,7 @@ tun_tap_check() {
 }
 
 pkg_setup() {
+	python-any-r1_pkg_setup
 	if use kernel_linux; then
 		get_version
 		if linux_config_exists; then
diff --git a/net-misc/openconnect/openconnect-4.07.ebuild b/net-misc/openconnect/openconnect-4.07.ebuild
deleted file mode 100644
index 80cba3786829..000000000000
--- a/net-misc/openconnect/openconnect-4.07.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/openconnect-4.07.ebuild,v 1.1 2012/12/05 18:53:47 hwoarang Exp $
-
-EAPI="5"
-
-inherit eutils linux-info
-
-DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
-HOMEPAGE="http://www.infradead.org/openconnect.html"
-# New versions of openconnect-script can be found here:
-# http://git.infradead.org/users/dwmw2/vpnc-scripts.git/history/HEAD:/vpnc-script
-SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz
-	http://dev.gentoo.org/~hwoarang/distfiles/openconnect-script-20121108205904.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs nls -gnutls +openssl"
-ILINGUAS="ar as ast bg bg_BG bn bn_IN bs ca ca@valencia cs da de el en_GB en_US eo es es_CR
-	es_MX et eu fa fi fr gd gl gu he hi hi_IN hu id it ja km kn ko ku lo lt lv ml mr
-	ms nb nl nn no or pa pl pt pt_BR pt_PT ro ru sk sl sq sr sr@latin sv ta te
-	tg th tl tr ug uk ur_PK vi vi_VN wa zh_CN zh_HK zh_TW"
-for lang in $ILINGUAS; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-# only one ssl provider can be enabled
-REQUIRED_USE="^^ ( gnutls openssl )"
-
-DEPEND="dev-libs/libxml2
-	net-libs/libproxy
-	sys-libs/zlib
-	gnutls? (
-		|| (
-			( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle )
-			( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle )
-			( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] )
-		)
-		app-misc/ca-certificates
-	)
-	openssl? ( dev-libs/openssl[static-libs?] )"
-
-RDEPEND="${DEPEND}
-	 sys-apps/iproute2"
-
-tun_tap_check() {
-	ebegin "Checking for TUN/TAP support"
-	if { ! linux_chkconfig_present TUN; }; then
-		eerror "Please enable TUN/TAP support in your kernel config, found at:"
-		eerror
-		eerror "  Device Drivers  --->"
-		eerror "    [*] Network device support  --->"
-		eerror "      <*>   Universal TUN/TAP device driver support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "no CONFIG_TUN support detected!"
-	fi
-	eend $?
-}
-
-pkg_setup() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			tun_tap_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that OpenConnect requires CONFIG_TUN to be set in your"
-			ewarn "kernel .config, Without it, it will not work correctly."
-			# We don't die here, so it's possible to compile this package without
-			# kernel sources available. Required for cross-compilation.
-		fi
-	fi
-}
-
-src_configure() {
-	strip-linguas $ILINGUAS
-	echo ${LINGUAS} > po/LINGUAS
-	# Override vpn-script test since the build system violates the sandbox and
-	# needs the path set to the real default path after it's installed
-	sed -e "s#-x \"\$with_vpnc_script\"#-n \"${WORKDIR}/openconnect-script\"#" \
-		-i configure || die
-	econf \
-		--with-vpnc-script=/etc/openconnect/openconnect.sh \
-		$(use_enable static-libs static) \
-		$(use_enable nls ) \
-		$(use_with openssl ) \
-		$(use_with gnutls )
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS TODO
-	newinitd "${FILESDIR}"/openconnect.init.in openconnect
-	dodir /etc/openconnect
-	insinto /etc/openconnect
-	newconfd "${FILESDIR}"/openconnect.conf.in openconnect
-	exeinto /etc/openconnect
-	newexe "${WORKDIR}"/openconnect-script openconnect.sh
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openconnect.logrotate openconnect
-	keepdir /var/run/openconnect /var/log/openconnect
-
-	# Remove useless .la files
-	find "${D}" -name '*.la' -delete || die "la file removal failed"
-}
-
-pkg_postinst() {
-	elog "The init script for openconnect has changed and now supports multiple vpn tunnels."
-	elog
-	elog "You need to create a symbolic link to /etc/init.d/openconnect in /etc/init.d"
-	elog "instead of calling it directly:"
-	elog
-	elog "ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0"
-	elog
-	elog "You can then start the vpn tunnel like this:"
-	elog
-	elog "/etc/init.d/openconnect.vpn0 start"
-	elog
-	elog "If you would like to run preup, postup, predown, and/or postdown scripts,"
-	elog "You need to create a directory in /etc/openconnect with the name of the vpn:"
-	elog
-	elog "mkdir /etc/openconnect/vpn0"
-	elog
-	elog "Then add executable shell files:"
-	elog
-	elog "mkdir /etc/openconnect/vpn0"
-	elog "cd /etc/openconnect/vpn0"
-	elog "echo '#!/bin/sh' > preup.sh"
-	elog "cp preup.sh predown.sh"
-	elog "cp preup.sh postup.sh"
-	elog "cp preup.sh postdown.sh"
-	elog "chmod 755 /etc/openconnect/vpn0/*"
-}
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index 200f50ff3077..853672ba6fcc 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -1,2 +1,4 @@
 DIST openntpd-3.9p1.tar.gz 152700 SHA256 83dd7c1e8ec8b4567afe49af539271b5a73562fb7a3ca51df73eccba89ec8c49 SHA512 e19e7242b67c8d12fbf0a78cd29dae4248afff5b5308069b190b663a9f9426666aad20f8c9ec70fabf8d2e5c2a2e61052191fe4ccc132c62a7decd8c498c2a13 WHIRLPOOL ba5793b8a5548d2b923d8cf2c7a6eba72689a6ea7e7f90b6c014e8244f8cb53f35f22945616782754e5bf0d1d24bd40132f90debbbc030aaf6576a2a0e27b0c2
+DIST openntpd_20080406p-4.debian.tar.gz 11480 SHA256 cec5f49a253288384499017bbd5894ec08480de2e4b3b9ce7cad21c056ad2c07 SHA512 bb09991e64d25e098f3d5efc97d422f767c6b4d11e647a00acc2464ad1251613b2da446d5cc0496719bbd5bd2440476326360ffa7dbafdf9e11acfca5165730b WHIRLPOOL bbd6b880197f7a61c423ac996aefdb64ae78a1ed56c10c2065df7c2b3a1a6befe86f986487408802679d6636c847c39d93c418a162510f59725b463d14f34972
+DIST openntpd_20080406p.orig.tar.gz 175923 SHA256 52f473dd8ea8864023ebcdce16a9a50571803af7ffc32a00212242c6a866c3b2 SHA512 9561788002b232786d1589f74bbe2f07a029e3407da4471d2ac9d5e20d8839dbb6e6e53493c78829058611ca23bf00560bbe7bcfe76204d206747752fd47f696 WHIRLPOOL 545125d0ee5ced7827df3d804ac63938d2614e9fb4a2bf3c6bbc17f6040175aa03c057d7a4d3da71ae944f4a556e2b66266d1c6d0463c1cad5d86de3ae896712
 DIST openntpd_3.9p1+debian-8.debian.tar.gz 15052 SHA256 e3bc604d81d4e1e8008560cabc22942c76130854ec67eb5968ce638d598780ad SHA512 dd2249e16761ec0fc64ee47e343459d24603094cc59da516639b741951c891e7f3905fd6c34edba6766b1e15261b7286279128631248c69e894f8b645588468a WHIRLPOOL ba3426b0cf2efd600775eb748da777c78ebf82c7d1d821d39c389b393b1e538517fc5feb46230fa89765c3d5d76e29a820a62c5be64ca96e157441028a27541c
diff --git a/net-misc/openntpd/openntpd-20080406.ebuild b/net-misc/openntpd/openntpd-20080406.ebuild
new file mode 100644
index 000000000000..3fd455ada193
--- /dev/null
+++ b/net-misc/openntpd/openntpd-20080406.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-20080406.ebuild,v 1.1 2012/12/22 06:30:51 ottxor Exp $
+
+EAPI=5
+
+inherit autotools eutils toolchain-funcs user
+
+MY_P="${P/-/_}p"
+DEB_VER="4"
+DESCRIPTION="Lightweight NTP server ported from OpenBSD"
+HOMEPAGE="http://www.openntpd.org/"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}.orig.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}-${DEB_VER}.debian.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ssl selinux"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	selinux? ( sec-policy/selinux-ntp )
+	!<=net-misc/ntp-4.2.0-r2
+	!net-misc/ntp[-openntpd]"
+DEPEND="${RDEPEND}
+	virtual/yacc"
+
+S="${WORKDIR}/${MY_P/_/-}"
+
+pkg_setup() {
+	enewgroup ntp
+	enewuser ntp -1 -1 /var/lib/openntpd/chroot ntp
+
+	# make sure user has correct HOME when flipping between
+	# the standard ntp pkg and this one
+	usermod -d /var/lib/openntpd/chroot ntp
+}
+
+src_prepare() {
+	sed -i '/NTPD_USER/s:_ntp:ntp:' ntpd.h || die
+
+	epatch "${WORKDIR}"/debian/patches/*.patch
+	sed -i 's:debian:gentoo:g' ntpd.conf || die
+	eautoreconf # deb patchset touches .ac files and such
+}
+
+src_configure() {
+	econf \
+		--disable-strip \
+		$(use_with !ssl builtin-arc4random) \
+		AR="$(type -p $(tc-getAR))"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/openntpd.init.d-3.9_p1-r4" ntpd
+	newconfd "${FILESDIR}/openntpd.conf.d-3.9_p1-r4" ntpd
+}
diff --git a/net-misc/quagga/quagga-0.99.21.ebuild b/net-misc/quagga/quagga-0.99.21.ebuild
index d4b85fbd2ffc..4ec9fc6606c7 100644
--- a/net-misc/quagga/quagga-0.99.21.ebuild
+++ b/net-misc/quagga/quagga-0.99.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/net-misc/quagga/quagga-0.99.21.ebuild,v 1.8 2012/12/15 20:15:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.21.ebuild,v 1.9 2012/12/22 15:20:38 ago Exp $
 
 EAPI="4"
 
@@ -19,7 +19,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ppc s390 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ppc s390 sparc x86"
 IUSE="bgpclassless caps doc elibc_glibc ipv6 multipath ospfapi pam +readline snmp tcp-zebra"
 
 COMMON_DEPEND="
diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
index 7278f71f716f..3bf154748997 100644
--- a/net-misc/sslh/Manifest
+++ b/net-misc/sslh/Manifest
@@ -1 +1,2 @@
 DIST sslh-1.13b.tar.gz 30986 SHA256 e6493b53767b542652e99e64a1bceeded1d01a5e7a083fde9d67e7550f9c0eec SHA512 516d0e53875494137a44b30bb70985c505f44a73d19800a4fb64da9a7e9ec3ed13657310ad8848eb5f671b7e5e6a3703883b3b4f0d398e42491d618c7ead0504 WHIRLPOOL a025eccbdae638add41854df4dacf5cdde565b4160133bd3377f8af9ceeb0349d08de4426574fc1781ab9fb816076d62721bf707c1b6a097796f513fed42ab95
+DIST sslh-1.14.tar.gz 33278 SHA256 028922071cf6bb5816de3aa70f4f451ee2ce2f4a704bc18d2984334976cce8e7 SHA512 db1b37f9c354f95f274559be0146c11d9d5459cc2a25a65e606cece13794d41c963bef8a22c3e4f69d015010ca208fccf652e52965cb2b1838bd2268ff3754ca WHIRLPOOL c6e2d3b479a11312d9aa3d50cafa084b7a34e762df133e16a9796c5d919b3088ed4c10ea2fc9ce1c1995067a44a7dd27f40818cf0360c93c397976ebc52dff38
diff --git a/net-misc/sslh/sslh-1.14.ebuild b/net-misc/sslh/sslh-1.14.ebuild
new file mode 100644
index 000000000000..59ff7d1cb799
--- /dev/null
+++ b/net-misc/sslh/sslh-1.14.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/net-misc/sslh/sslh-1.14.ebuild,v 1.1 2012/12/22 16:04:25 kensington Exp $
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
+HOMEPAGE="http://www.rutschle.net/tech/sslh.shtml"
+SRC_URI="http://www.rutschle.net/tech/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tcpd"
+
+RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	dev-libs/libconfig"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+RESTRICT="test"
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		USELIBWRAP=$(usev tcpd)
+}
+
+src_install() {
+	dosbin sslh-{fork,select}
+	dosym sslh-fork /usr/sbin/sslh
+	doman sslh.8.gz
+	dodoc ChangeLog README
+
+	newinitd "${FILESDIR}"/sslh.init.d-2 sslh
+	newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
+}
diff --git a/net-nntp/inn/inn-2.5.3.ebuild b/net-nntp/inn/inn-2.5.3.ebuild
index 5f3f88cae404..a420ae297ed7 100644
--- a/net-nntp/inn/inn-2.5.3.ebuild
+++ b/net-nntp/inn/inn-2.5.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/net-nntp/inn/inn-2.5.3.ebuild,v 1.5 2012/11/20 20:54:30 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/inn-2.5.3.ebuild,v 1.6 2012/12/22 17:28:47 ulm Exp $
 
 EAPI=4
 inherit autotools multilib ssl-cert
@@ -9,8 +9,9 @@ DESCRIPTION="The Internet News daemon, fully featured NNTP server"
 HOMEPAGE="https://www.isc.org/software/inn"
 SRC_URI="ftp://ftp.isc.org/isc/inn/${P}.tar.gz"
 
+# GPL-2 only for init script
+LICENSE="ISC GPL-2+ public-domain BSD-4 BSD-2 RSA BSD MIT GPL-2"
 SLOT="0"
-LICENSE="as-is BSD GPL-2"
 KEYWORDS="amd64 ppc x86"
 IUSE="berkdb innkeywords inntaggedhash ipv6 kerberos perl python sasl ssl"
 
diff --git a/net-p2p/deluge/deluge-1.3.5-r2.ebuild b/net-p2p/deluge/deluge-1.3.5-r2.ebuild
index d12c4f487204..1ece04fc9127 100644
--- a/net-p2p/deluge/deluge-1.3.5-r2.ebuild
+++ b/net-p2p/deluge/deluge-1.3.5-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/net-p2p/deluge/deluge-1.3.5-r2.ebuild,v 1.1 2012/12/20 22:23:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.5-r2.ebuild,v 1.2 2012/12/21 20:27:51 hwoarang Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.5"
@@ -47,6 +47,8 @@ src_prepare() {
 	distutils_src_prepare
 	python_convert_shebangs -r 2 .
 	epatch "${FILESDIR}/${P}-rb_libtorrent-disable-python-bindings"
+	epatch "${FILESDIR}/${P}-disable_libtorrent_internal_copy.patch"
+	
 }
 
 src_install() {
diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 61b6c6555655..19ff341fed59 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-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/net-p2p/deluge/deluge-9999.ebuild,v 1.31 2012/12/20 22:23:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-9999.ebuild,v 1.32 2012/12/21 20:27:51 hwoarang Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.5"
@@ -48,6 +48,7 @@ pkg_setup() {
 src_prepare() {
 	distutils_src_prepare
 	python_convert_shebangs -r 2 .
+	epatch "${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
 }
 
 src_install() {
diff --git a/net-p2p/deluge/files/deluge-1.3.5-disable_libtorrent_internal_copy.patch b/net-p2p/deluge/files/deluge-1.3.5-disable_libtorrent_internal_copy.patch
new file mode 100644
index 000000000000..235b7f7c2438
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-1.3.5-disable_libtorrent_internal_copy.patch
@@ -0,0 +1,42 @@
+--- setup.py
++++ setup.py
+@@ -205,38 +205,7 @@
+ 
+ _ext_modules = []
+ 
+-# Check for a system libtorrent and if found, then do not build the libtorrent extension
+-build_libtorrent = True
+-try:
+-    from deluge._libtorrent import lt
+-except ImportError:
+-    build_libtorrent = True
+-else:
+-    build_libtorrent = False
+-
+-if build_libtorrent:
+-    got_libtorrent = False
+-    if not os.path.exists("libtorrent"):
+-        import subprocess
+-        if subprocess.call(['./get_libtorrent.sh']) > 0:
+-            got_libtorrent = False
+-        else:
+-            got_libtorrent = True
+-    else:
+-        got_libtorrent = True
+-
+-    if got_libtorrent:
+-        # There isn't a system libtorrent library, so let's build the one included with deluge
+-        libtorrent = Extension(
+-            'libtorrent',
+-            extra_compile_args = _extra_compile_args,
+-            include_dirs = _include_dirs,
+-            libraries = _libraries,
+-            library_dirs = _library_dirs,
+-            sources = _sources
+-        )
+-
+-        _ext_modules = [libtorrent]
++import deluge._libtorrent
+ 
+ desktop_data = 'deluge/data/share/applications/deluge.desktop'
+ 
diff --git a/net-print/gutenprint/gutenprint-5.2.9.ebuild b/net-print/gutenprint/gutenprint-5.2.9.ebuild
index ab74a3917852..923573c387fd 100644
--- a/net-print/gutenprint/gutenprint-5.2.9.ebuild
+++ b/net-print/gutenprint/gutenprint-5.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/gutenprint-5.2.9.ebuild,v 1.1 2012/07/09 09:23:05 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/gutenprint-5.2.9.ebuild,v 1.3 2012/12/22 14:03:32 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/gimp-print/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
 IUSE="cups foomaticdb gimp gtk nls readline ppds static-libs"
 
 RDEPEND="app-text/ghostscript-gpl
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 538eb698a27e..e20544716408 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,2 +1,3 @@
 DIST haproxy-1.4.21.tar.gz 827392 SHA256 6e28575f0492def31c331faf9ead08225dd62153334880688f8a7c477c8c31a4 SHA512 68dc0604a102b3848516511f8dcd6cf6f52e7de5e64437ab2b2f735b62ce35a476894a9accbec7e27682579a1d5ebc2896b12d67faa3e94e8786fbc2b37a111e WHIRLPOOL a67921ba843f1b2978b2b7adb3914d62858d60cec6ab776e253223ea8478e2609e888dd6e3d9ec11d362f6a65109da6027c2223989f9eb2821ee262b42024ba0
 DIST haproxy-1.4.22.tar.gz 831791 SHA256 ba221b3eaa4d71233230b156c3000f5c2bd4dace94d9266235517fe42f917fc6 SHA512 a436aeacbda4dcc3de09250187e22589c1c71dda7d77f5b2cf33bfdaaa443fc5b2d9ab6d57085296fde7581ea8cc1d04408569e70879f96687bc3151120a9afa WHIRLPOOL dbef99d77c122c889d95756f227f873c01b3052c3a4c9be57a311321bf36aaa39913a930bcdd2272a3baa3a1dec16e6afc87f52e15df57dd2888446e5a725b55
+DIST haproxy-1.5-dev15.tar.gz 1095962 SHA256 417d746c6ff179b290410b8640b699a5f2b98cdb916ace4656d7d1ea79880047 SHA512 bde924a53c40b3a9624e94ca53da3c22963e7015441331868fe689559416470bf2d397e3af87e7f0bc8e34cbd5eec5d36f777fe6a6ec2ae020aee9f2b0fe33a8 WHIRLPOOL 0ece061ccb8483b3e09e4e00d68dee2e0fade282021e710c67ceab77671c8f53524e2b170bf3d74b3364a49d255b6f81c7d07c20a3f034871ba3d3ad42321455
diff --git a/net-proxy/haproxy/haproxy-1.5_beta15.ebuild b/net-proxy/haproxy/haproxy-1.5_beta15.ebuild
new file mode 100644
index 000000000000..ddd29e4514d0
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.5_beta15.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.5_beta15.ebuild,v 1.1 2012/12/22 17:06:21 idl0r Exp $
+
+EAPI="4"
+
+inherit eutils versionator toolchain-funcs flag-o-matic
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://haproxy.1wt.eu"
+SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/devel/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+crypt examples +pcre ssl vim-syntax +zlib"
+
+DEPEND="pcre? ( dev-libs/libpcre )
+	ssl? ( dev-libs/openssl[zlib?] )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup haproxy
+	enewuser haproxy -1 -1 -1 haproxy
+}
+
+src_compile() {
+	local args="TARGET=linux2628 USE_GETADDRINFO=1"
+
+	if use pcre; then
+		args="${args} USE_PCRE=1"
+	else
+		args="${args} USE_PCRE="
+	fi
+
+#	if use kernel_linux; then
+#		args="${args} USE_LINUX_SPLICE=1 USE_LINUX_TPROXY=1"
+#	else
+#		args="${args} USE_LINUX_SPLICE= USE_LINUX_TPROXY="
+#	fi
+
+	if use crypt; then
+		args="${args} USE_LIBCRYPT=1"
+	else
+		args="${args} USE_LIBCRYPT="
+	fi
+
+	if use ssl; then
+		args="${args} USE_OPENSSL=1"
+	else
+		args="${args} USE_OPENSSL="
+	fi
+
+	if use zlib; then
+		args="${args} USE_ZLIB=1"
+	else
+		args="${args} USE_ZLIB="
+	fi
+
+	# For now, until the strict-aliasing breakage will be fixed
+#	append-cflags -fno-strict-aliasing
+
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args} || die
+}
+
+src_install() {
+	dobin haproxy || die
+
+	newinitd "${FILESDIR}/haproxy.initd-r2" haproxy || die
+
+	# Don't install useless files
+#	rm examples/build.cfg doc/*gpl.txt
+
+	dodoc CHANGELOG ROADMAP TODO doc/{configuration,haproxy-en}.txt
+	doman doc/haproxy.1
+
+	if use examples;
+	then
+		docinto examples
+		dodoc examples/*.cfg || die
+	fi
+
+	if use vim-syntax;
+	then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins examples/haproxy.vim || die
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${ROOT}/etc/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${ROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${ROOT}usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/squid/squid-3.1.22.ebuild b/net-proxy/squid/squid-3.1.22.ebuild
index 756e070c3116..7db53da20af5 100644
--- a/net-proxy/squid/squid-3.1.22.ebuild
+++ b/net-proxy/squid/squid-3.1.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.22.ebuild,v 1.4 2012/12/19 15:41:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.22.ebuild,v 1.5 2012/12/22 15:19:36 ago Exp $
 
 EAPI=4
 inherit eutils pam toolchain-funcs autotools linux-info user
@@ -11,7 +11,7 @@ SRC_URI="http://www.squid-cache.org/Versions/v3/3.1/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
 	ecap icap-client \
 	mysql postgres sqlite \
diff --git a/net-wireless/iw/Manifest b/net-wireless/iw/Manifest
index 82650b1671b3..962bc36943b0 100644
--- a/net-wireless/iw/Manifest
+++ b/net-wireless/iw/Manifest
@@ -2,3 +2,4 @@ DIST iw-3.3.tar.bz2 62245 SHA256 567f0d389dd7c9919832101aaa8e3863a463cb505545534
 DIST iw-3.4.tar.bz2 62750 SHA256 989b5677588e32de6eda97bf978810b366a7620f78f26f9cc61c15bdb434218a
 DIST iw-3.6.tar.bz2 65762 SHA256 df11036ac11df31f44083da962a6e9c74bdea7c01c596c4b5840f948cdb6c857 SHA512 8436e51cb6b963e393ea147845fa004c99934d245f8af3c3f43b5e72b684191359c565f70be6a9e7f23e0780e90e9c5f6b952ef05deff5a0c50aec8bb0dad483 WHIRLPOOL e2d8500b0938d19ed5aadc1802a7fa7931874c62c9f244363d4b4c2a8c0cde04083bddaee3665e519f3ac803fa647e9d806fecd862a64d34ce76a81c30758a9e
 DIST iw-3.7.tar.bz2 66086 SHA256 2390785667a778ec4c3b2fa8bc89105ff775ada30203e76f2945b83619833224 SHA512 4cf480a977883f4abced1d5a23f883a40e0328531013076f3d0f0f241d13e3a8ce4de4aebdc5c386f768ab0dd9fecc497f419517bfef7e065735dca3a05e84a1 WHIRLPOOL 66da8276d0f21450009e4f42afb1c85d979c55a6541ea9a4f156adb75a7edc63af791525161031e79b52e29c7605485091ca14e6d1514a569a9af8e2ff15c9fb
+DIST iw-3.8.tar.bz2 69448 SHA256 3dae92ca5989cbc21155941fa01907a5536da3c5f6898642440c61484fc7e0f9 SHA512 65639f3dee844e0ab689bec5ab420eea7f0c8ff6f70b64edb7d4a55c41632f6e830700994d5ae59aca3d557eaea2a5970886b145f432bd583bc28605aa6ee7fb WHIRLPOOL d08766e02317b54a4b1c854cac85c08f75d7e5c58fc3940858d5da6055049416f313a502953fe515a2be69d3fbca1615ddcf35387ed63a5c5f673c1049e9f69e
diff --git a/net-wireless/iw/iw-3.8.ebuild b/net-wireless/iw/iw-3.8.ebuild
new file mode 100644
index 000000000000..6d06304db59b
--- /dev/null
+++ b/net-wireless/iw/iw-3.8.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/net-wireless/iw/iw-3.8.ebuild,v 1.1 2012/12/22 04:34:16 zerochaos Exp $
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="nl80211-based configuration utility for wireless devices using the mac80211 kernel stack"
+HOMEPAGE="http://wireless.kernel.org/en/users/Documentation/iw"
+SRC_URI="http://linuxwireless.org/download/${PN}/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-libs/libnl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	tc-export CC LD
+}
+
+src_compile() {
+	emake V=1
+}
diff --git a/net-wireless/madwifi-ng-tools/metadata.xml b/net-wireless/madwifi-ng-tools/metadata.xml
index a85736562787..2184aad79759 100644
--- a/net-wireless/madwifi-ng-tools/metadata.xml
+++ b/net-wireless/madwifi-ng-tools/metadata.xml
@@ -5,4 +5,8 @@
 	<email>pva@gentoo.org</email>
 	<name>Peter Volkov</name>
 </maintainer>
+<maintainer>
+	<email>zerochaos@gentoo.org</email>
+	<name>Rick Farina</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-wireless/madwifi-ng/metadata.xml b/net-wireless/madwifi-ng/metadata.xml
index 8b875fa33ea0..48b25a942ca3 100644
--- a/net-wireless/madwifi-ng/metadata.xml
+++ b/net-wireless/madwifi-ng/metadata.xml
@@ -9,6 +9,10 @@
 		<email>pva@gentoo.org</email>
 		<name>Peter Volkov</name>
 	</maintainer>
+	<maintainer>
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
 <use>
 	<flag name='injection'>Adds support for <pkg>net-wireless/aircrack-ng</pkg>
 		 aireplay-ng packet injection</flag>
diff --git a/net-wireless/wepdecrypt/Manifest b/net-wireless/wepdecrypt/Manifest
index 7d1b29134fc5..def1634e3841 100644
--- a/net-wireless/wepdecrypt/Manifest
+++ b/net-wireless/wepdecrypt/Manifest
@@ -1 +1 @@
-DIST wepdecrypt-0.8.tar.gz 90260 SHA256 1c7cef077af4c162df1724d9149a15c231bf6c771380bb5789e66fb03f92c381
+DIST wepdecrypt-0.8.tar.gz 90260 SHA256 1c7cef077af4c162df1724d9149a15c231bf6c771380bb5789e66fb03f92c381 SHA512 68278e44055354eaf85640fdefc8d97a1155e6f022ed3d708db7d32e0fe8a8306a34fd80aae81eb9aa3ef51a069f8fe5ef060847163774184d4181c62853300f WHIRLPOOL 334c07e4f69bcaf78760a1c5991a1f527cfa0da63b1a583d0ab63bc779da6d775d702694aae4d2b739882c16debe8d45e14bd6a76fe653276526f09fc6aa4a62
diff --git a/net-wireless/wepdecrypt/files/wepdecrypt-0.8-dyn.patch b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-dyn.patch
new file mode 100644
index 000000000000..ab3181340759
--- /dev/null
+++ b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-dyn.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Makefile b/src/Makefile
+index a779cb7..f32e65e 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -8,7 +8,7 @@ wepdecrypt: 	wepdecrypt.o rc4.o wepfilter.o log.o modes.o misc.o verify.o keygen
+ 	modes.o misc.o md5_digest.o  wepserver.o wepclient.o verify.o keygen.o localkeygen.o $(LIBS)
+ 
+ gwepdecrypt: gwepdecrypt.cpp
+-	$(FLTK) --compile gwepdecrypt.cpp
++	$(CC) $(LDFLAGS) $(CFLAGS) -I. -o $@ gwepdecrypt.cpp $(shell fltk-config --cflags --ldflags) $(LIBS)
+ 
+ wkeygen: wkeygen.c
+ 	$(LD) $(LDFLAGS) $(CFLAGS) -o $@ wkeygen.c $(LIBS)
diff --git a/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild b/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild
new file mode 100644
index 000000000000..b9548e1f019a
--- /dev/null
+++ b/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild,v 1.1 2012/12/21 23:25:01 alonbl Exp $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Enhanced version of WepAttack a tool for breaking 802.11 WEP keys"
+HOMEPAGE="http://wepdecrypt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/wepdecrypt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X"
+RDEPEND="
+	dev-libs/openssl
+	net-libs/libpcap
+	sys-libs/zlib
+	X? ( x11-libs/fltk:1 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-fltk.patch
+
+	#Fix buffer size wrt bug 340148.
+	epatch "${FILESDIR}/${P}-buffer.patch"
+
+	epatch "${FILESDIR}/${P}-dyn.patch"
+
+	#Fix respect for jobserver
+	sed -i 's/make/$(MAKE)/g' Makefile || die "Sed failed"
+}
+
+src_configure() {
+	# build system is broken and --enabled-gui doesn't work
+	local myconf=""
+	! use X && myconf="--disable-gui"
+
+	econf ${myconf}
+}
diff --git a/perl-core/File-Path/File-Path-2.08.ebuild b/perl-core/File-Path/File-Path-2.08.ebuild
index a6f0a82f76e1..5a5be1963390 100644
--- a/perl-core/File-Path/File-Path-2.08.ebuild
+++ b/perl-core/File-Path/File-Path-2.08.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Path/File-Path-2.08.ebuild,v 1.4 2012/09/01 12:06:38 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Path/File-Path-2.08.ebuild,v 1.5 2012/12/22 18:26:19 ago Exp $
 
 MODULE_AUTHOR="DLAND"
 
@@ -12,4 +12,4 @@ IUSE=""
 
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="amd64 ~ia64 ~sparc x86 ~ppc-aix"
+KEYWORDS="amd64 ~ia64 ~ppc ~sparc x86 ~ppc-aix"
diff --git a/perl-core/Thread-Queue/Thread-Queue-3.10.0.ebuild b/perl-core/Thread-Queue/Thread-Queue-3.10.0.ebuild
index a94e113f0fa6..358922b8ba61 100644
--- a/perl-core/Thread-Queue/Thread-Queue-3.10.0.ebuild
+++ b/perl-core/Thread-Queue/Thread-Queue-3.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/perl-core/Thread-Queue/Thread-Queue-3.10.0.ebuild,v 1.1 2012/11/17 19:42:01 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Thread-Queue/Thread-Queue-3.10.0.ebuild,v 1.2 2012/12/22 18:26:02 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Thread-safe queues"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="test"
 
 RDEPEND="dev-lang/perl[ithreads]
diff --git a/perl-core/threads-shared/threads-shared-1.420.0.ebuild b/perl-core/threads-shared/threads-shared-1.420.0.ebuild
index 13a2c61055e8..bb86a472f9ea 100644
--- a/perl-core/threads-shared/threads-shared-1.420.0.ebuild
+++ b/perl-core/threads-shared/threads-shared-1.420.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/perl-core/threads-shared/threads-shared-1.420.0.ebuild,v 1.1 2012/10/03 18:05:13 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/threads-shared/threads-shared-1.420.0.ebuild,v 1.2 2012/12/22 18:27:31 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Extension for sharing data structures between threads"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl[ithreads]
diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask
index 9e38634bfe23..154a711f7e97 100644
--- a/profiles/arch/powerpc/use.mask
+++ b/profiles/arch/powerpc/use.mask
@@ -2,6 +2,7 @@
 #
 # Masking out llvm
 llvm
+clang
 
 # These flags should only be used for ppc
 -ppcsha1
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 3f7dc97a02a3..ded08d1d5a49 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,11 +1,15 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.418 2012/12/19 10:59:01 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.419 2012/12/22 09:01:57 zmedico Exp $
 
 # This file requires >=portage-2.1.1
 # New entries go on top.
 #
 
+# Zac Medico <zmedico@gentoo.org> (13 Jun 2012)
+# Mask USE=pypy2_0 for sys-apps/portage, since pypy has limited KEYWORDS.
+sys-apps/portage pypy2_0
+
 # Jory A. Pratt <anarchy@gentoo.org> (15 Dec 2012)
 # PGO is known to be busted with most configurations
 www-client/firefox pgo
@@ -114,10 +118,6 @@ sys-boot/grub libzfs
 =media-libs/mesa-8.0.4-r1 wayland
 =media-libs/mesa-9.0 wayland
 
-# Zac Medico <zmedico@gentoo.org> (13 Jun 2012)
-# Mask USE=pypy1_9 for sys-apps/portage, since pypy has limited KEYWORDS.
-sys-apps/portage pypy1_9
-
 # Andreas K. Huettel <dilfridge@gentoo.org> (03 Jun 2012)
 # needs libpqxx-3* which is not in the tree anymore
 app-office/calligra postgres
diff --git a/profiles/license_groups b/profiles/license_groups
index 850793ada5bd..e3e26fcc1405 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -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/license_groups,v 1.155 2012/12/18 06:15:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.158 2012/12/22 13:39:58 ulm Exp $
 
 # Please report bugs or other requests at bugs.gentoo.org and assign to
 # licenses@gentoo.org
@@ -25,7 +25,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artist
 # Licenses in this list should NOT appear directly or indirectly in @FSF-APPROVED or @OSI-APPROVED
 # TODO: maybe add a category for BSD-alike MISC-FREE licenses for easy seperation?
 # BSD-4 alikes: dom4j FastCGI icu jaxen JDOM saxpath
-MISC-FREE Allegro ANTLR as-is bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution BZIP2 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB cryptopp czyborra docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI FLEX FLTK freemarker FVWM gnuplot gsm HTML-Tidy htmlc iASL IBPP-1.1 icu IDPL IJG imagemagick Info-ZIP ipadic Ispell JasPer2.0 jaxen JDOM JNIC JOVE libmng libpng libtiff LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib md2k7-asyouwish mplus-fonts NCSA-HDF noweb openafs-krb5-a OpenSoftware otter perforce PHP-2.02 Princeton psutils pysqlite rc regexp-UofT RSA saxpath Scintilla Sendmail skype-4.0.0.7-third-party_attributions.txt SMAIL SNIA SSLeay Subversion SVFL tcltk tcp_wrappers_license TeX TeX-other-free UbuntuFontLicense-1.0 vlgothic w3m wxWinLL-3 Xdebug xtrs YaTeX zpaq ZSH
+MISC-FREE Allegro ANTLR as-is bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution bufexplorer.vim BZIP2 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB cryptopp czyborra docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh FLEX FLTK freemarker FVWM gnuplot gsm HTML-Tidy htmlc iASL IBPP-1.1 icu IDPL IJG imagemagick Info-ZIP inner-net ipadic Ispell JasPer2.0 jaxen JDOM JNIC JOVE libmng libpng libtiff LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib md2k7-asyouwish mplus-fonts NCSA-HDF noweb openafs-krb5-a OpenSoftware otter PCRE perforce PHP-2.02 Princeton psutils pysqlite rc regexp-UofT RSA saxpath Scintilla Sendmail skype-4.0.0.7-third-party_attributions.txt SMAIL SNIA SSLeay Subversion SVFL tcltk tcp_wrappers_license TeX TeX-other-free UbuntuFontLicense-1.0 vlgothic w3m wxWinLL-3 Xdebug xtrs YaTeX zpaq ZSH
 # The following are NOT valid in @MISC-FREE:
 # arj - usage restrictions
 # freedist - Doesn't grant the right to do modifications.
diff --git a/profiles/package.mask b/profiles/package.mask
index d9bcd42040e4..cbb2f180423d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14315 2012/12/21 16:34:59 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14322 2012/12/22 17:01:46 idl0r 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,20 @@
 
 #--- END OF EXAMPLES ---
 
+# Christian Ruppert <idl0r@gentoo.org> (22 Dec 2012)
+# Experimental
+=net-proxy/haproxy-1.5*
+
+# Sven Wegener <swegener@gentoo.org> (21 Dec 2012)
+# temporary mask for socket location change
+=app-misc/screen-4.0.3-r8
+
+# Rick Farina <zerochaos@gentoo.org> (21 Dec 2012)
+# madwifi has been replaced by ath5k and ath9k in kernel
+# drivers and is subject to numerous long standing bugs
+net-wireless/madwifi-ng-tools
+net-wireless/madwifi-ng
+
 # Pawel Hajdan jr <phajdan.jr@gentoo.org> (21 Dec 2012)
 # Masked for testing to avoid drama like bug #439892 .
 >=dev-libs/icu-50.1.1
@@ -392,7 +406,7 @@ net-analyzer/nbaudit
 
 # Markos Chandras <hwoarang@gentoo.org> (04 Nov 2012)
 # Masked for testing
-=media-video/avidemux-2.6.0
+=media-video/avidemux-2.6*
 
 # Markos Chandras <hwoarang@gentoo.org> (03 Nov 2012)
 # Masked for testing
@@ -626,6 +640,7 @@ gnome-extra/gnome-clocks
 =net-libs/libsoup-gnome-2.40*
 net-libs/libzapojit
 >=net-libs/rest-0.7.90
+=net-im/telepathy-logger-0.6*
 =net-libs/telepathy-glib-0.20*
 =net-libs/webkit-gtk-1.10*
 =net-misc/vinagre-3.6*
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 45b53b9c1077..f48682240b19 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -316,6 +316,7 @@ app-crypt/shishi:des - Enable DES related encryption/checksum types.
 app-crypt/shishi:md - Enable unkeyed MD4/MD5 checksum types.
 app-crypt/shishi:null - Enable dummy NULL encryption/checksum type.
 app-crypt/tpm-tools:pkcs11 - Build Token data management utilities based on OpenCryptoki's (dev-libs/opencryptoki) PKCS#11 implementation.
+app-crypt/truecrypt:asm - Enable assembly for optimization
 app-dicts/aspell-be:classic - Support classic spelling by default
 app-dicts/gwaei:unique - Enable single instance support using dev-libs/libunique.
 app-dicts/myspell-pt:preao - Use the pre ortographic agreement version of the dictionary
@@ -2609,9 +2610,12 @@ media-libs/devil:allegro - Add support for Allegro
 media-libs/devil:nvtt - Add support for dev-util/nvidia-texture-tools
 media-libs/edje:cache - Enable caching
 media-libs/elementary:dbus - Enable integration with dev-libs/e_dbus.
+media-libs/elementary:emotion - Add support for media-libs/emotion
+media-libs/elementary:ethumb - Add support for media-libs/ethumb
 media-libs/elementary:quicklaunch - Enable quick-launch support
 media-libs/elementary:xdg - Enable integration with dev-libs/efreet for cross-desktop standards (freedesktop.org).
 media-libs/esdl:image - Enable image support
+media-libs/ethumb:emotion - Add support for media-libs/emotion
 media-libs/evas:bmp - Support windows bitmap (bmp) image loader
 media-libs/evas:eet - Support dev-libs/eet
 media-libs/evas:gles - Enable gles flavor of gl instead of standard
@@ -3978,7 +3982,6 @@ net-im/telepathy-connection-managers:jabber - Enable XMPP protocol handler (this
 net-im/telepathy-connection-managers:sip - Enable SIP/SIMPLE messaging and calling.
 net-im/telepathy-connection-managers:yahoo - Enable Yahoo! messaging support.
 net-im/telepathy-connection-managers:zeroconf - Enable Link-Local Messaging via the zeroconf or Bonjour protocol.
-net-im/telepathy-logger:introspection - Use dev-libs/gobject-introspection for introspection
 net-im/telepathy-mission-control:connman - Add support for net-misc/connman
 net-im/telepathy-mission-control:upower - Use sys-power/upower to detect suspend and resume
 net-im/tkabber:extras - Enables extra non official patches
@@ -4263,7 +4266,6 @@ net-libs/ptlib:wav - Enable WAVFILE support
 net-libs/qxmpp:extras - Obsolete flag left for compability with leechcraft ebuilds
 net-libs/rest:gnome - Extract proxy information using net-libs/libsoup-gnome
 net-libs/rest:introspection - Use dev-libs/gobject-introspection for introspection
-net-libs/telepathy-glib:introspection - Use dev-libs/gobject-introspection for introspection
 net-libs/telepathy-glib:vala - Enable bindings for dev-lang/vala
 net-libs/telepathy-qt:farsight - Enable support for farsight connection manager
 net-libs/telepathy-qt:farstream - Enable support for audio/video calls via farstream
@@ -4453,6 +4455,7 @@ net-misc/icecast:kate - Add karaoke and text encapsulation support for Ogg files
 net-misc/icecast:yp - Build support for yp public directory listings
 net-misc/iputils:SECURITY_HAZARD - Allow non-root users to flood (ping -f). This is generally a very bad idea.
 net-misc/knock:server - Installs the knockd server daemon.
+net-misc/leechcraft-blogique:metida - Support for the LiveJournal blogging platform
 net-misc/leechcraft-netstoremanager:googledrive - Support Google Drive storage backend
 net-misc/leechcraft-netstoremanager:yandexdisk - Support Yandex.Disk storage backend
 net-misc/lldpd:cdp - Enable Cisco Discovery Protocol
@@ -4885,8 +4888,8 @@ sci-chemistry/gromacs:avx256 - Enable 256bit avx (e.g. Intel Sandy Bridge)
 sci-chemistry/gromacs:cuda - Enable cuda non-bonded kernels
 sci-chemistry/gromacs:double-precision - More precise calculations at the expense of speed
 sci-chemistry/gromacs:fkernels - Enable building of Fortran Kernels for platforms that dont have assembly loops
+sci-chemistry/gromacs:offensive - Enable gromacs partly offensive quotes
 sci-chemistry/gromacs:openmm - Add acceleration through sci-libs/openmm
-sci-chemistry/gromacs:power6 - Enable Power6 optimizations
 sci-chemistry/gromacs:single-precision - Single precision version of gromacs (default)
 sci-chemistry/gromacs:sse41 - Enable sse4.1 acceleration
 sci-chemistry/gsim:emf - Support for .emf export
@@ -4969,7 +4972,7 @@ sci-libs/acml:int64 - Install the 64 bits integer library
 sci-libs/adolc:sparse - Add support for sparse matrix algebra with sci-libs/colpack
 sci-libs/armadillo:atlas - Link with ATLAS libraries for cblas and clapack (needs sci-libs/lapack-atlas)
 sci-libs/arprec:fma - Use the Fused Multiply Add instruction set
-sci-libs/arprec:qd - Use sci-libs/qdfor quad-double datatype
+sci-libs/arprec:qd - Use sci-libs/qd for quad-double datatype
 sci-libs/ceres-solver:gflags - Use dev-cpp/gflags for flag parsing
 sci-libs/ceres-solver:metis - Use METIS via sci-libs/cholmod for matrix partitioning
 sci-libs/ceres-solver:protobuf - Use dev-libs/protobuf to encode structured data
@@ -5264,7 +5267,7 @@ sys-apps/policycoreutils:sesandbox - Enable support for SELinux sandbox applicat
 sys-apps/portage:epydoc - Build html API documentation with epydoc.
 sys-apps/portage:ipc - Use inter-process communication between portage and running ebuilds.
 sys-apps/portage:less - Pull in sys-apps/less as default pager for etc-update.
-sys-apps/portage:pypy1_9 - Use pypy-c1.9 as Python interpreter.
+sys-apps/portage:pypy2_0 - Use pypy-c2.0 as Python interpreter.
 sys-apps/portage:python2 - Use python2 as Python interpreter.
 sys-apps/portage:python3 - Use python3 as Python interpreter.
 sys-apps/pyrenamer:music - Enable support for renaming music
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index b6f31e541815..b45574000ed9 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -2,6 +2,6 @@ DIST 0001-Make-stack-non-executable-for-GAS-assembly.patch.gz 3569527 SHA256 17a
 DIST 0002-Make-stack-non-executable-for-ATT-assembly.patch.gz 3868244 SHA256 af12b3632aaf4e3d0c49ce99e0a4ed5de61c40d293bc592b70f89e08738f2581 SHA512 321d70aaf2c0bc7f9b22155029b0ac8a65c585a92f3473ce3eed3e39d9609f67d3dd28029f04a7d007dc03be9820c1e694ee76630557a6eb0bc875c4302edb8a WHIRLPOOL 47519f2e0a8aa3658841c32b18e8696f32b691236d9378c8ee57668c1762e21b781d24bcdcd903bb1ece66b3667215843610354f88e8647952bb81afb33951d4
 DIST gmxtest-4.0.4.tgz 14845017 SHA256 6a7f787f4bb7cbecb688115ff0854a5ffd2ef33487d7bce4b031e63848b6f361 SHA512 f8165ef1d7e2ed69db0a069a1c85fc5fa440d66e96aa54b474392a6331d2327b60f76b8dceb02f9233ce06eb6b7a4e7c448fc71f666e244efa571cf94f1e86ec WHIRLPOOL dbb122736a588deb7931204b29142dd3d9b074691e94341b04dcad2cdf428eb0aae739aa37ef6f61d1dcd6fb96ddcc1292e76f267694f3c18ee67d17352bfd9b
 DIST gromacs-4.5.5.tar.gz 10398178 SHA256 e0605e4810b0d552a8761fef5540c545beeaf85893f4a6e21df9905a33f871ba SHA512 8af0b81261a6b08c461275bccc4e72d23efd664ed5af12e3579956b5822ab6c6eea2ccbfbfe6ea1f4b30403a3c1367f52638e281cd1d7bc49e9220332c3e2b8c WHIRLPOOL 021a07171c3301184c48d31e2ad2068ce54b7746b9b0f9086d34796ddcfe750006e6f23bc0d8c52942fb491bd047411d7f5f21aaa9d7eb8ab9b7485fcb587f8c
-DIST gromacs-4.6-beta2.tar.gz 10224320 SHA256 6456a79c7322ddfdaf78f0d81350841ef0d738936059f032611c4688b1e71bf8 SHA512 f669180342be95bbf34b4b5fc4a47ce1fdeee13199a64552154ee5d3b61ccf645618f59f1498e45da19ddadcf0e21505b96b55d9e5fb5a3c49ef36a3144996d0 WHIRLPOOL e93f8486065d61023ccb2ae74ea7aea7e91e33c0edf819f37dd8b3ed1c7eeb72aeb4192aa3af43ad333e1a2c6443d0c45ac5b7b1955b4e54f71f31e6649d06ee
+DIST gromacs-4.6-beta3.tar.gz 10238128 SHA256 4ec708c0def71435d513fba01fe0d71f0cb8da71639a42cb9da8bf9e3985cae4 SHA512 862835e6c9fcdfd432d0205558279c775ccbd3fe5a1092728e2a0991a603bc74944ac4ab29fef0552aa4f17d945d1e74f87021533c42bf63d4c07dfcce73b427 WHIRLPOOL ecf080eafaa381ae9b80755a9389bd85e6b93d557e31aedbc385a5c0b32223e081220f44693ac9f5b50d502a908d6203101fd9290bafa190769f1a36ea64fcc2
 DIST gromacs-manual-4.5.4.pdf 2463242 SHA256 dc14504a7072b61e7aa576c48f04df03356824f3a9d9e744dfaf51529ab46252 SHA512 957995333163f6f28568a18d5423a75dc6c315215692da94d0916f09b6221e2a875c5ff4b05385ad6604bd8ae38f0cb61c740cd734c76b360aa4b598cd2c3380 WHIRLPOOL 07077d81ea89bc02207e45e56c77a668375a7284bf6f4a3cc7fe637f1f53ce4ab687c722f13f208cdd2c056b9d766ebfcbe5ea9579ce7649ec9e088371e7db8d
 DIST gromacs-manual-4.6-beta1.pdf 5527287 SHA256 788a424720b149d905d236d3c792d72c3f5af1c054f6ef19192bd12f44fe1fb9 SHA512 5a76aa847a865bfa8ca77bbad67eec18e8328c3db8af411a609a7039f48bcc1973ac6af0201c78f1428ed05040102cbe96638399413520bb1f1c1013031662c6 WHIRLPOOL 1c189bc1cc1da42bcb7332c45c13789ca822e57dbbff6452be7328163a95ed29b678a201250018a214a95e23fb43258d7cc6a58bdde88afcdf718db0c80cf45a
diff --git a/sci-chemistry/gromacs/gromacs-4.6_beta2.ebuild b/sci-chemistry/gromacs/gromacs-4.6_beta3.ebuild
similarity index 86%
rename from sci-chemistry/gromacs/gromacs-4.6_beta2.ebuild
rename to sci-chemistry/gromacs/gromacs-4.6_beta3.ebuild
index 478742a691ff..746dba40ba5b 100644
--- a/sci-chemistry/gromacs/gromacs-4.6_beta2.ebuild
+++ b/sci-chemistry/gromacs/gromacs-4.6_beta3.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/sci-chemistry/gromacs/gromacs-4.6_beta2.ebuild,v 1.2 2012/12/08 22:15:02 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-4.6_beta3.ebuild,v 1.1 2012/12/22 19:41:32 ottxor Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ CMAKE_MIN_VERSION="2.8.5-r2"
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-inherit bash-completion-r1 cmake-utils eutils fortran-2 multilib toolchain-funcs
+inherit bash-completion-r1 cmake-utils eutils multilib toolchain-funcs
 
 SRC_URI="test? ( ftp://ftp.gromacs.org/pub/tests/gmxtest-${TEST_PV}.tgz )"
 
@@ -23,14 +23,14 @@ if [[ $PV = *9999* ]]; then
 		http://repo.or.cz/r/gromacs.git"
 	EGIT_BRANCH="release-4-6"
 	inherit git-2
-	PDEPEND="doc? ( ~app-doc/gromacs-manual-${PV} )"
+	PDEPEND="doc? ( ~app-doc/${PN}-manual-${PV} )"
 else
 	S="${WORKDIR}/${P//_/-}"
 	SRC_URI="${SRC_URI} ftp://ftp.gromacs.org/pub/${PN}/${P//_/-}.tar.gz
-		doc? (  ftp://ftp.gromacs.org/pub/manual/gromacs-manual-${MANUAL_PV}.pdf )"
+		doc? (  ftp://ftp.gromacs.org/pub/manual/${PN}-manual-${MANUAL_PV}.pdf )"
 fi
 
-ACCE_IUSE="fkernels power6 sse2 sse41 avx128fma avx256"
+ACCE_IUSE="sse2 sse41 avx128fma avx256"
 
 DESCRIPTION="The ultimate molecular dynamics simulation package"
 HOMEPAGE="http://www.gromacs.org/"
@@ -38,8 +38,7 @@ HOMEPAGE="http://www.gromacs.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="X blas cuda doc -double-precision +fftw gsl lapack
-mpi openmm openmp +single-precision test +threads zsh-completion ${ACCE_IUSE}"
+IUSE="X blas cuda doc -double-precision +fftw gsl lapack mpi +offensive openmm openmp +single-precision test +threads zsh-completion ${ACCE_IUSE}"
 
 CDEPEND="
 	X? (
@@ -50,7 +49,6 @@ CDEPEND="
 	blas? ( virtual/blas )
 	cuda? ( dev-util/nvidia-cuda-toolkit )
 	fftw? ( sci-libs/fftw:3.0 )
-	fkernels? ( !threads? ( !sse2? ( virtual/fortran ) ) )
 	gsl? ( sci-libs/gsl )
 	lapack? ( virtual/lapack )
 	mpi? ( virtual/mpi )
@@ -69,22 +67,11 @@ pkg_pretend() {
 		die "Please switch to an openmp compatible compiler"
 }
 
-pkg_setup() {
+src_prepare() {
 	#notes/todos
 	# -on apple: there is framework support
 	# -mkl support
-	# -there are power6 kernels
-	if use fkernels; then
-		if use threads; then
-			ewarn "Fortran kernels and threads do not work together, disabling"
-			ewarn "fortran kernels"
-		else
-			fortran-2_pkg_setup
-		fi
-	fi
-}
 
-src_prepare() {
 	#add user patches from /etc/portage/patches/sci-chemistry/gromacs
 	epatch_user
 
@@ -106,8 +93,6 @@ src_configure() {
 
 	#go from slowest to fastest acceleration
 	local acce="None"
-	use fkernels && use !threads && acce="Fortran"
-	use power6 && acce="Power6"
 	use sse2 && acce="SSE2"
 	use sse41 && acce="SSE4.1"
 	use avx128fma && acce="AVX_128_FMA"
@@ -124,6 +109,7 @@ src_configure() {
 		$(cmake-utils_use gsl GMX_GSL)
 		$(cmake-utils_use lapack GMX_EXTERNAL_LAPACK)
 		$(cmake-utils_use openmp GMX_OPENMP)
+		$(cmake-utils_use !offensive GMX_NO_QUOTES)
 		-DGMX_DEFAULT_SUFFIX=off
 		-DGMX_ACCELERATION="$acce"
 		-DGMXLIB="$(get_libdir)"
@@ -221,7 +207,7 @@ src_install() {
 			ls -1 "${ED}"/usr/bin | sed -e '/_d$/d' > "${T}"/programs.list
 			doins "${T}"/programs.list
 		else
-			dodoc "${DISTDIR}/gromacs-manual-${MANUAL_PV}.pdf"
+			dodoc "${DISTDIR}/${PN}-manual-${MANUAL_PV}.pdf"
 		fi
 	fi
 	rm -rf "${ED}usr/share/gromacs/html/"
@@ -232,9 +218,11 @@ pkg_postinst() {
 	einfo  "Please read and cite:"
 	einfo  "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). "
 	einfo  "http://dx.doi.org/10.1021/ct700301q"
-	einfo
-	einfo  $(g_luck)
-	einfo  "For more Gromacs cool quotes (gcq) add g_luck to your .bashrc"
+	if use offensive; then
+		einfo
+		einfo  $(g_luck)
+		einfo  "For more Gromacs cool quotes (gcq) add g_luck to your .bashrc"
+	fi
 	einfo
 	elog  "Gromacs can use sci-chemistry/vmd to read additional file formats"
 }
diff --git a/sci-chemistry/gromacs/metadata.xml b/sci-chemistry/gromacs/metadata.xml
index 41931c0c7a95..24ddf421224b 100644
--- a/sci-chemistry/gromacs/metadata.xml
+++ b/sci-chemistry/gromacs/metadata.xml
@@ -15,7 +15,7 @@
 		<flag name="sse41">Enable sse4.1 acceleration</flag>
 		<flag name="avx128fma">Enable 128bit avx with fma (e.g. AMD BullDozer)</flag>
 		<flag name="avx256">Enable 256bit avx (e.g. Intel Sandy Bridge)</flag>
+		<flag name="offensive">Enable gromacs partly offensive quotes</flag>
 		<flag name="openmm">Add acceleration through <pkg>sci-libs/openmm</pkg></flag>
-		<flag name="power6">Enable Power6 optimizations</flag>
 	</use>
 </pkgmetadata>
diff --git a/sci-electronics/gtkwave/Manifest b/sci-electronics/gtkwave/Manifest
index 897addffa57d..e678f9c7126a 100644
--- a/sci-electronics/gtkwave/Manifest
+++ b/sci-electronics/gtkwave/Manifest
@@ -1,5 +1,6 @@
-DIST gtkwave-3.3.14.tar.gz 3164195 RMD160 841bb296b1cb8b8ef6a77e733785c867caf24814 SHA1 2722b5769b41033bdc6c02ac0e8f534f59c097dc SHA256 75a475b55a173474e2952323327564e49324ce867009c449066be988918388e0
-DIST gtkwave-3.3.23.tar.gz 3344597 RMD160 e60c623ffeb190aa0b6535e70a9aa2254910a15f SHA1 f75e006e4ef8051b226d8ed3213fcb923b375e70 SHA256 fbe614d3fbc2446ef1b3b55c30e1b9e799359a4522ce2d1500ff91c77f431811
-DIST gtkwave-3.3.28.tar.gz 3225502 RMD160 ff0d2a2da18b967aa6e25fbaee5f08998f692bfd SHA1 05a502daba0532468af31576dd17971a7f276027 SHA256 e0b3f2091aaa5b8734b424a0a2d19cec76fcd2dd7d4aee86a883f19e46af6d78
-DIST gtkwave-3.3.31.tar.gz 3768375 RMD160 7b469bc1fe5536fa5ce8cd9fb5309586114c49aa SHA1 fc7d75b076175a311dfc622e3ba41c44312a8b56 SHA256 7835d89007830ea3caa34e3b56522a50a83b15f7571d2eaf3262f6212cf7a64d
-DIST gtkwave-3.3.37.tar.gz 3779175 RMD160 85dbc819968ade47b79c708f91e34da72ef88a8e SHA1 34c1e91cc23ac11df21c469297008c33acf21ab2 SHA256 fa9de01feca901054b566f0f687f5c4944361d0028222705b2a1f54db0d9573a
+DIST gtkwave-3.3.14.tar.gz 3164195 SHA256 75a475b55a173474e2952323327564e49324ce867009c449066be988918388e0 SHA512 6751e848da11824ecf19e6b5ac87086df42e2cf29740c620c78caea807dd41c1adf3cdb640dd1ea64eb59671d6fe8a8ff1511b8d46b25b9fa246ce5c840809ee WHIRLPOOL 9622a5ee68e18fc144e067944413dd8fa66e40b1aaed5112fbca5af700d129878171e626d682e580cf9b43bcc0b6c4e6b39eed7c6fa27a7b20dbd9cd1246e7e9
+DIST gtkwave-3.3.23.tar.gz 3344597 SHA256 fbe614d3fbc2446ef1b3b55c30e1b9e799359a4522ce2d1500ff91c77f431811 SHA512 ebff2a09c445547f754629b76dd16447e03af04dc56ba2ebf081e5a4597b9ff34ebfb84d250b607e7bbb9e20adc64cc71ba65a15f563c414174bb21694d1bb9f WHIRLPOOL 3cd4fa6b9a026de544b50c163b1649e21223c3086c5eec39f0893df4e56f9f0ab5b4f7bb6f586458d805e179f725eb04c654313abbedff0dab5ebee182a4d46d
+DIST gtkwave-3.3.28.tar.gz 3225502 SHA256 e0b3f2091aaa5b8734b424a0a2d19cec76fcd2dd7d4aee86a883f19e46af6d78 SHA512 d4cdd166272c47e3f67889d074ad020e486eb5ea3a24ccc5894862790b588b9f715822bc5398ba19abb0dd37cd2054dc88076330973a9387497e5c11548f2034 WHIRLPOOL ae929c0172107eb8be93d07638a14cf8cf52433aee21f55c9778f7fa2c401c3d428164ea41d512312ebb1dc2fe9eb4aa160a7876583b64dd88b60628429aefb1
+DIST gtkwave-3.3.31.tar.gz 3768375 SHA256 7835d89007830ea3caa34e3b56522a50a83b15f7571d2eaf3262f6212cf7a64d SHA512 0a6bbdc167ed7e4f4a787c4fb49414761264fe23d0f5a10773becb1a5c92dfba7f8a7791f11fe356749452e0d9ea68ba94e32f9c1a45ca4f5980a21b46451302 WHIRLPOOL 4619fee789fa07206773ca17fdf552f2e14fe313956a80ef4a5907881f03f9c314c609449cc6fe440075e69d77d23a270b1bd8e174e7d33c2d5bb8acc578e6c3
+DIST gtkwave-3.3.37.tar.gz 3779175 SHA256 fa9de01feca901054b566f0f687f5c4944361d0028222705b2a1f54db0d9573a SHA512 11a5078ab3c42ebae0e87a1565d96956dbfb221dcbd7d08e2ef2dae3a3605553209905521b72fd5083858fb9545ed4b34fd958aaebd3ea3fa9e4cae95bc35998 WHIRLPOOL f648160366ff21e9eec98a01888dedc8736606acf6f1980ee17ab818bc6b982b1c1992ae22d34f65afe10c9dde4e0abf5bbc60215f9ed428ce52103ef420008c
+DIST gtkwave-3.3.41.tar.gz 3805393 SHA256 ef19f2906941a79762ea5047e42eb1a4d660cb8f5f832fb7707ce81377c760e2 SHA512 23c4c578080a369a9b3b74d7576eb008801bc15a989c066f29c246d288c5fc73085edd9301a84852e51f44e2edcc08f9094cf37299a95aba2910621e3d0529d8 WHIRLPOOL a1782ead92294025b0b7068e2d2c78554f3874c6bd1936dc687f5ca84aeee9b1e46373440c9d7a77511370f9a55e4a22680354f1f8f01c62b14b8fd3733e0cf8
diff --git a/sci-electronics/gtkwave/gtkwave-3.3.41.ebuild b/sci-electronics/gtkwave/gtkwave-3.3.41.ebuild
new file mode 100644
index 000000000000..7d5ee5fb7f5f
--- /dev/null
+++ b/sci-electronics/gtkwave/gtkwave-3.3.41.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gtkwave/gtkwave-3.3.41.ebuild,v 1.1 2012/12/22 17:17:16 tomjbe Exp $
+
+EAPI="4"
+
+inherit fdo-mime
+
+DESCRIPTION="A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files"
+HOMEPAGE="http://gtkwave.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+IUSE="doc examples fasttree fatlines judy lzma packed tcl"
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:2
+	x11-libs/pango
+	sys-libs/zlib
+	judy? ( dev-libs/judy )
+	tcl? ( dev-lang/tcl dev-lang/tk )
+	lzma? ( app-arch/xz-utils )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/gperf"
+
+src_prepare(){
+	# do not install doc and examples by default
+	sed -i -e 's/doc examples//' Makefile.in || die
+}
+
+src_configure(){
+	econf --disable-local-libz \
+		--disable-local-libbz2 \
+		--disable-mime-update \
+		--enable-largefile \
+		$(use_enable packed struct-pack) \
+		$(use_enable fatlines) \
+		$(use_enable tcl) \
+		$(use_enable lzma xz) \
+		$(use_enable fasttree) \
+		$(use_enable judy)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ANALOG_README.TXT SYSTEMVERILOG_README.TXT CHANGELOG.TXT
+	if use doc ; then
+		insinto /usr/share/doc/${PF}
+		doins "doc/${PN}.odt"
+	fi
+	if use examples ; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/sci-libs/arprec/metadata.xml b/sci-libs/arprec/metadata.xml
index df8c0e32337a..89e643863468 100644
--- a/sci-libs/arprec/metadata.xml
+++ b/sci-libs/arprec/metadata.xml
@@ -11,6 +11,6 @@
 </longdescription>
 <use>
   <flag name="fma">Use the Fused Multiply Add instruction set</flag>
-  <flag name="qd">Use <pkg>sci-libs/qd</pkg>for quad-double datatype</flag>
+  <flag name="qd">Use <pkg>sci-libs/qd</pkg> for quad-double datatype</flag>
 </use>
 </pkgmetadata>
diff --git a/sec-policy/selinux-acct/Manifest b/sec-policy/selinux-acct/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-acct/Manifest
+++ b/sec-policy/selinux-acct/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20120725-r9.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..d8946765eb4d
--- /dev/null
+++ b/sec-policy/selinux-acct/selinux-acct-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-acct/selinux-acct-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:26 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="acct"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for acct"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ada/Manifest b/sec-policy/selinux-ada/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-ada/Manifest
+++ b/sec-policy/selinux-ada/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20120725-r9.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..db514a26e907
--- /dev/null
+++ b/sec-policy/selinux-ada/selinux-ada-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ada/selinux-ada-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:17 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="ada"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ada"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-afs/Manifest b/sec-policy/selinux-afs/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-afs/Manifest
+++ b/sec-policy/selinux-afs/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20120725-r9.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..579fbc4727d7
--- /dev/null
+++ b/sec-policy/selinux-afs/selinux-afs-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-afs/selinux-afs-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:06 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="afs"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for afs"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-aide/Manifest b/sec-policy/selinux-aide/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-aide/Manifest
+++ b/sec-policy/selinux-aide/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20120725-r9.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..d67b83a84445
--- /dev/null
+++ b/sec-policy/selinux-aide/selinux-aide-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-aide/selinux-aide-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:18 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="aide"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for aide"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-alsa/Manifest b/sec-policy/selinux-alsa/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-alsa/Manifest
+++ b/sec-policy/selinux-alsa/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20120725-r9.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..2fd0a52ff1a7
--- /dev/null
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-alsa/selinux-alsa-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:07 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="alsa"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for alsa"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-amanda/Manifest b/sec-policy/selinux-amanda/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-amanda/Manifest
+++ b/sec-policy/selinux-amanda/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20120725-r9.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..bd992826b185
--- /dev/null
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-amanda/selinux-amanda-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:31 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="amanda"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for amanda"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-amavis/Manifest b/sec-policy/selinux-amavis/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-amavis/Manifest
+++ b/sec-policy/selinux-amavis/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20120725-r9.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..db6d52997d81
--- /dev/null
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-amavis/selinux-amavis-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:14 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="amavis"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for amavis"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-apache/Manifest b/sec-policy/selinux-apache/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-apache/Manifest
+++ b/sec-policy/selinux-apache/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20120725-r9.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..77b2f192de5f
--- /dev/null
+++ b/sec-policy/selinux-apache/selinux-apache-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apache/selinux-apache-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:25 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="apache"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for apache"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-kerberos
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-apcupsd/Manifest b/sec-policy/selinux-apcupsd/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-apcupsd/Manifest
+++ b/sec-policy/selinux-apcupsd/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20120725-r9.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..b414bc7f03fd
--- /dev/null
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:55 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="apcupsd"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for apcupsd"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-apm/Manifest b/sec-policy/selinux-apm/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-apm/Manifest
+++ b/sec-policy/selinux-apm/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20120725-r9.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..22e4b1657b5c
--- /dev/null
+++ b/sec-policy/selinux-apm/selinux-apm-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apm/selinux-apm-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:23 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="apm"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for apm"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-arpwatch/Manifest b/sec-policy/selinux-arpwatch/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-arpwatch/Manifest
+++ b/sec-policy/selinux-arpwatch/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20120725-r9.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..966bae0cb397
--- /dev/null
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:24 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="arpwatch"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for arpwatch"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-asterisk/Manifest b/sec-policy/selinux-asterisk/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-asterisk/Manifest
+++ b/sec-policy/selinux-asterisk/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20120725-r9.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..ed226d03cb92
--- /dev/null
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-asterisk/selinux-asterisk-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:01 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="asterisk"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for asterisk"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-at/Manifest b/sec-policy/selinux-at/Manifest
index e69de29bb2d1..3917e4896b17 100644
--- a/sec-policy/selinux-at/Manifest
+++ b/sec-policy/selinux-at/Manifest
@@ -0,0 +1,2 @@
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
+DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-at/selinux-at-2.20120725-r9.ebuild b/sec-policy/selinux-at/selinux-at-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..f990957c8b69
--- /dev/null
+++ b/sec-policy/selinux-at/selinux-at-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-at/selinux-at-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:27 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="at"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for at"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-automount/Manifest b/sec-policy/selinux-automount/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-automount/Manifest
+++ b/sec-policy/selinux-automount/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20120725-r9.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..88991f482ce2
--- /dev/null
+++ b/sec-policy/selinux-automount/selinux-automount-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-automount/selinux-automount-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:59 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="automount"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for automount"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-avahi/Manifest b/sec-policy/selinux-avahi/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-avahi/Manifest
+++ b/sec-policy/selinux-avahi/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20120725-r9.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..4fd953257f54
--- /dev/null
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-avahi/selinux-avahi-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:30 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="avahi"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for avahi"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-awstats/Manifest b/sec-policy/selinux-awstats/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-awstats/Manifest
+++ b/sec-policy/selinux-awstats/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20120725-r9.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..0c280157a45e
--- /dev/null
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-awstats/selinux-awstats-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:03 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="awstats"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for awstats"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-bacula/Manifest b/sec-policy/selinux-bacula/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-bacula/Manifest
+++ b/sec-policy/selinux-bacula/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20120725-r9.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..c056edb393be
--- /dev/null
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bacula/selinux-bacula-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:23 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="bacula"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bacula"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20120725-r9.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..646f2cbeb0b1
--- /dev/null
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20120725-r9.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:01 swift Exp $
+EAPI="4"
+
+inherit eutils
+
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/"
+DESCRIPTION="SELinux policy for core modules"
+
+IUSE="unconfined"
+BASEPOL="${PVR}"
+
+RDEPEND=">=sec-policy/selinux-base-${PVR}
+		unconfined? ( sec-policy/selinux-unconfined )"
+DEPEND=""
+SRC_URI="http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2
+		http://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${BASEPOL}.tar.bz2"
+KEYWORDS="~amd64 ~x86"
+
+MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil ssh staff storage su sysadm sysnetwork udev userdomain usermanage unprivuser xdg"
+LICENSE="GPL-2"
+SLOT="0"
+S="${WORKDIR}/"
+PATCHBUNDLE="${DISTDIR}/patchbundle-selinux-base-policy-${BASEPOL}.tar.bz2"
+
+# Code entirely copied from selinux-eclass (cannot inherit due to dependency on
+# itself), when reworked reinclude it. Only postinstall (where -b base.pp is
+# added) needs to remain then.
+
+src_prepare() {
+	local modfiles
+
+	# Patch the sources with the base patchbundle
+	if [[ -n ${BASEPOL} ]];
+	then
+		cd "${S}"
+		EPATCH_MULTI_MSG="Applying SELinux policy updates ... " \
+		EPATCH_SUFFIX="patch" \
+		EPATCH_SOURCE="${WORKDIR}" \
+		EPATCH_FORCE="yes" \
+		epatch
+	fi
+
+	# Apply the additional patches refered to by the module ebuild.
+	# But first some magic to differentiate between bash arrays and strings
+	if [[ "$(declare -p POLICY_PATCH 2>/dev/null 2>&1)" == "declare -a"* ]];
+	then
+		cd "${S}/refpolicy/policy/modules"
+		for POLPATCH in "${POLICY_PATCH[@]}";
+		do
+			epatch "${POLPATCH}"
+		done
+	else
+		if [[ -n ${POLICY_PATCH} ]];
+		then
+			cd "${S}/refpolicy/policy/modules"
+			for POLPATCH in ${POLICY_PATCH};
+			do
+				epatch "${POLPATCH}"
+			done
+		fi
+	fi
+
+	# Collect only those files needed for this particular module
+	for i in ${MODS}; do
+		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles"
+		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
+	done
+
+	for i in ${POLICY_TYPES}; do
+		mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}"
+		cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \
+			|| die "Failed to copy Makefile.example to ${S}/${i}/Makefile"
+
+		cp ${modfiles} "${S}"/${i} \
+			|| die "Failed to copy the module files to ${S}/${i}"
+	done
+}
+
+src_compile() {
+	for i in ${POLICY_TYPES}; do
+		# Parallel builds are broken, so we need to force -j1 here
+		emake -j1 NAME=$i -C "${S}"/${i} || die "${i} compile failed"
+	done
+}
+
+src_install() {
+	local BASEDIR="/usr/share/selinux"
+
+	for i in ${POLICY_TYPES}; do
+		for j in ${MODS}; do
+			einfo "Installing ${i} ${j} policy package"
+			insinto ${BASEDIR}/${i}
+			doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
+		done
+	done
+}
+
+pkg_postinst() {
+	# Override the command from the eclass, we need to load in base as well here
+	local COMMAND
+	for i in ${MODS}; do
+		COMMAND="-i ${i}.pp ${COMMAND}"
+	done
+
+	for i in ${POLICY_TYPES}; do
+		einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
+
+		cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}"
+
+		semodule -s ${i} -b base.pp ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store"
+	done
+}
diff --git a/sec-policy/selinux-base/Manifest b/sec-policy/selinux-base/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-base/Manifest
+++ b/sec-policy/selinux-base/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-base/selinux-base-2.20120725-r9.ebuild b/sec-policy/selinux-base/selinux-base-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..e9d9c88ed357
--- /dev/null
+++ b/sec-policy/selinux-base/selinux-base-2.20120725-r9.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:00 swift Exp $
+EAPI="4"
+
+inherit eutils
+
+IUSE="+peer_perms +open_perms +ubac unconfined doc"
+
+DESCRIPTION="Gentoo base policy for SELinux"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/"
+SRC_URI="http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2
+	http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sys-apps/policycoreutils-2.1.10
+	>=sys-fs/udev-151
+	!<=sec-policy/selinux-base-policy-2.20120725"
+DEPEND="${RDEPEND}
+	sys-devel/m4
+	>=sys-apps/checkpolicy-2.1.8"
+
+S=${WORKDIR}/
+
+src_prepare() {
+	# Apply the gentoo patches to the policy. These patches are only necessary
+	# for base policies, or for interface changes on modules.
+	EPATCH_MULTI_MSG="Applying SELinux policy updates ... " \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}" \
+	EPATCH_FORCE="yes" \
+	epatch
+
+	cd "${S}/refpolicy"
+	# Fix bug 257111 - Correct the initial sid for cron-started jobs in the
+	# system_r role
+	sed -i -e 's:system_crond_t:system_cronjob_t:g' \
+		"${S}/refpolicy/config/appconfig-standard/default_contexts"
+	sed -i -e 's|system_r:cronjob_t|system_r:system_cronjob_t|g' \
+		"${S}/refpolicy/config/appconfig-mls/default_contexts"
+	sed -i -e 's|system_r:cronjob_t|system_r:system_cronjob_t|g' \
+		"${S}/refpolicy/config/appconfig-mcs/default_contexts"
+}
+
+src_configure() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	# Update the SELinux refpolicy capabilities based on the users' USE flags.
+
+	if ! use peer_perms; then
+		sed -i -e '/network_peer_controls/d' \
+			"${S}/refpolicy/policy/policy_capabilities"
+	fi
+
+	if ! use open_perms; then
+		sed -i -e '/open_perms/d' \
+			"${S}/refpolicy/policy/policy_capabilities"
+	fi
+
+	if ! use ubac; then
+		sed -i -e '/^UBAC/s/y/n/' "${S}/refpolicy/build.conf" \
+			|| die "Failed to disable User Based Access Control"
+	fi
+
+	echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf"
+
+	# Prepare initial configuration
+	cd "${S}/refpolicy";
+	make conf || die "Make conf failed"
+
+	# Setup the policies based on the types delivered by the end user.
+	# These types can be "targeted", "strict", "mcs" and "mls".
+	for i in ${POLICY_TYPES}; do
+		cp -a "${S}/refpolicy" "${S}/${i}"
+		cd "${S}/${i}";
+
+		#cp "${FILESDIR}/modules-2.20120215.conf" "${S}/${i}/policy/modules.conf"
+		sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf"
+
+		sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \
+			"${S}/${i}/build.conf" || die "build.conf setup failed."
+
+		if [[ "${i}" == "mls" ]] || [[ "${i}" == "mcs" ]];
+		then
+			# MCS/MLS require additional settings
+			sed -i -e "/^TYPE/s/standard/${i}/" "${S}/${i}/build.conf" \
+				|| die "failed to set type to mls"
+		fi
+
+		if [ "${i}" == "targeted" ]; then
+			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
+			"${S}/${i}/config/appconfig-standard/seusers" \
+			|| die "targeted seusers setup failed."
+		fi
+
+		if [ "${i}" != "targeted" ] && [ "${i}" != "strict" ] && use unconfined; then
+			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
+			"${S}/${i}/config/appconfig-${i}/seusers" \
+			|| die "policy seusers setup failed."
+		fi
+	done
+}
+
+src_compile() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	for i in ${POLICY_TYPES}; do
+		cd "${S}/${i}"
+		make base || die "${i} compile failed"
+		if use doc; then
+			make html || die
+		fi
+	done
+}
+
+src_install() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	for i in ${POLICY_TYPES}; do
+		cd "${S}/${i}"
+
+		make DESTDIR="${D}" install \
+			|| die "${i} install failed."
+
+		make DESTDIR="${D}" install-headers \
+			|| die "${i} headers install failed."
+
+		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type"
+
+		echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types"
+
+		# libsemanage won't make this on its own
+		keepdir "/etc/selinux/${i}/policy"
+
+		if use doc; then
+			dohtml doc/html/*;
+		fi
+
+		insinto /usr/share/selinux/devel;
+		doins doc/policy.xml;
+
+	done
+
+	dodoc doc/Makefile.example doc/example.{te,fc,if}
+
+	insinto /etc/selinux
+	doins "${FILESDIR}/config"
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-2.20101213-r13"
+	previous_less_than_r13=$?
+}
diff --git a/sec-policy/selinux-bind/Manifest b/sec-policy/selinux-bind/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-bind/Manifest
+++ b/sec-policy/selinux-bind/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20120725-r9.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..4610aee78775
--- /dev/null
+++ b/sec-policy/selinux-bind/selinux-bind-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bind/selinux-bind-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:56 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="bind"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bind"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-bitlbee/Manifest b/sec-policy/selinux-bitlbee/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-bitlbee/Manifest
+++ b/sec-policy/selinux-bitlbee/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20120725-r9.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..23020e89a140
--- /dev/null
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:01 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="bitlbee"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bitlbee"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-bluetooth/Manifest b/sec-policy/selinux-bluetooth/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-bluetooth/Manifest
+++ b/sec-policy/selinux-bluetooth/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20120725-r9.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..4ce89bf0699e
--- /dev/null
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:22 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="bluetooth"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bluetooth"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-brctl/Manifest b/sec-policy/selinux-brctl/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-brctl/Manifest
+++ b/sec-policy/selinux-brctl/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20120725-r9.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..7a85aba01d7c
--- /dev/null
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-brctl/selinux-brctl-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:23 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="brctl"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for brctl"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-calamaris/Manifest b/sec-policy/selinux-calamaris/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-calamaris/Manifest
+++ b/sec-policy/selinux-calamaris/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20120725-r9.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..e27202ad4b89
--- /dev/null
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-calamaris/selinux-calamaris-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:21 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="calamaris"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for calamaris"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-canna/Manifest b/sec-policy/selinux-canna/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-canna/Manifest
+++ b/sec-policy/selinux-canna/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20120725-r9.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..6243a4e11890
--- /dev/null
+++ b/sec-policy/selinux-canna/selinux-canna-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-canna/selinux-canna-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:58 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="canna"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for canna"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ccs/Manifest b/sec-policy/selinux-ccs/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-ccs/Manifest
+++ b/sec-policy/selinux-ccs/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20120725-r9.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..a85294943368
--- /dev/null
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ccs/selinux-ccs-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:57 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="ccs"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ccs"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-cdrecord/Manifest b/sec-policy/selinux-cdrecord/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-cdrecord/Manifest
+++ b/sec-policy/selinux-cdrecord/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20120725-r9.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..1cda4aeade5a
--- /dev/null
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:21 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="cdrecord"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cdrecord"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-cgroup/Manifest b/sec-policy/selinux-cgroup/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-cgroup/Manifest
+++ b/sec-policy/selinux-cgroup/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20120725-r9.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..36564884bb73
--- /dev/null
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cgroup/selinux-cgroup-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:16 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="cgroup"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cgroup"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-chromium/Manifest b/sec-policy/selinux-chromium/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-chromium/Manifest
+++ b/sec-policy/selinux-chromium/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20120725-r9.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..fdfaaa3e6c9e
--- /dev/null
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-chromium/selinux-chromium-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:17 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="chromium"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for chromium"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-chronyd/Manifest b/sec-policy/selinux-chronyd/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-chronyd/Manifest
+++ b/sec-policy/selinux-chronyd/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20120725-r9.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..abf2b1a77025
--- /dev/null
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-chronyd/selinux-chronyd-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:58 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="chronyd"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for chronyd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-clamav/Manifest b/sec-policy/selinux-clamav/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-clamav/Manifest
+++ b/sec-policy/selinux-clamav/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20120725-r9.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..ef144d3c40bd
--- /dev/null
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-clamav/selinux-clamav-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:05 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="clamav"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for clamav"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-clockspeed/Manifest b/sec-policy/selinux-clockspeed/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-clockspeed/Manifest
+++ b/sec-policy/selinux-clockspeed/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20120725-r9.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..a48473809e06
--- /dev/null
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:25 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="clockspeed"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for clockspeed"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-consolekit/Manifest b/sec-policy/selinux-consolekit/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-consolekit/Manifest
+++ b/sec-policy/selinux-consolekit/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20120725-r9.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..b254b91bafaf
--- /dev/null
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-consolekit/selinux-consolekit-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:13 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="consolekit"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for consolekit"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-corosync/Manifest b/sec-policy/selinux-corosync/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-corosync/Manifest
+++ b/sec-policy/selinux-corosync/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20120725-r9.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..92f49f553d33
--- /dev/null
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-corosync/selinux-corosync-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:08 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="corosync"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for corosync"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-courier/Manifest b/sec-policy/selinux-courier/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-courier/Manifest
+++ b/sec-policy/selinux-courier/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20120725-r9.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..a078d82331f3
--- /dev/null
+++ b/sec-policy/selinux-courier/selinux-courier-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-courier/selinux-courier-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:16 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="courier"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for courier"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-cpucontrol/Manifest b/sec-policy/selinux-cpucontrol/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-cpucontrol/Manifest
+++ b/sec-policy/selinux-cpucontrol/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20120725-r9.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..3b81cf3072ce
--- /dev/null
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:28 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="cpucontrol"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cpucontrol"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-cpufreqselector/Manifest b/sec-policy/selinux-cpufreqselector/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-cpufreqselector/Manifest
+++ b/sec-policy/selinux-cpufreqselector/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20120725-r9.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..7881bfb0aa47
--- /dev/null
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:02 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="cpufreqselector"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cpufreqselector"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-cups/Manifest b/sec-policy/selinux-cups/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-cups/Manifest
+++ b/sec-policy/selinux-cups/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20120725-r9.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..6d3a01c71539
--- /dev/null
+++ b/sec-policy/selinux-cups/selinux-cups-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cups/selinux-cups-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:25 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="cups"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cups"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-lpd
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-cvs/Manifest b/sec-policy/selinux-cvs/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-cvs/Manifest
+++ b/sec-policy/selinux-cvs/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20120725-r9.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..f4d3bffb2c50
--- /dev/null
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20120725-r9.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cvs/selinux-cvs-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:05 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="cvs"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cvs"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+	sec-policy/selinux-inetd
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-cyphesis/Manifest b/sec-policy/selinux-cyphesis/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-cyphesis/Manifest
+++ b/sec-policy/selinux-cyphesis/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20120725-r9.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..0849b1630d83
--- /dev/null
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:09 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="cyphesis"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cyphesis"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-daemontools/Manifest b/sec-policy/selinux-daemontools/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-daemontools/Manifest
+++ b/sec-policy/selinux-daemontools/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20120725-r9.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..4896731ba2b1
--- /dev/null
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-daemontools/selinux-daemontools-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:22 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="daemontools"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for daemontools"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dante/Manifest b/sec-policy/selinux-dante/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-dante/Manifest
+++ b/sec-policy/selinux-dante/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20120725-r9.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..f83f270bbc21
--- /dev/null
+++ b/sec-policy/selinux-dante/selinux-dante-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dante/selinux-dante-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:55 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="dante"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dante"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dbadm/Manifest b/sec-policy/selinux-dbadm/Manifest
index 06747cbdd1e3..05f8d3f80da8 100644
--- a/sec-policy/selinux-dbadm/Manifest
+++ b/sec-policy/selinux-dbadm/Manifest
@@ -1,3 +1,4 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20120725-r9.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..8c089c4d402b
--- /dev/null
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbadm/selinux-dbadm-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:55 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="dbadm"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dbadm"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dbskk/Manifest b/sec-policy/selinux-dbskk/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-dbskk/Manifest
+++ b/sec-policy/selinux-dbskk/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20120725-r9.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..1f590109349a
--- /dev/null
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbskk/selinux-dbskk-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:11 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="dbskk"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dbskk"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-dbus/Manifest b/sec-policy/selinux-dbus/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-dbus/Manifest
+++ b/sec-policy/selinux-dbus/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20120725-r9.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..9c7dd764f485
--- /dev/null
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbus/selinux-dbus-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:30 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="dbus"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dbus"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dcc/Manifest b/sec-policy/selinux-dcc/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-dcc/Manifest
+++ b/sec-policy/selinux-dcc/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20120725-r9.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..dc2d91c2fc1a
--- /dev/null
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dcc/selinux-dcc-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:00 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="dcc"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dcc"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ddclient/Manifest b/sec-policy/selinux-ddclient/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-ddclient/Manifest
+++ b/sec-policy/selinux-ddclient/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20120725-r9.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..355207893efa
--- /dev/null
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ddclient/selinux-ddclient-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:18 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="ddclient"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ddclient"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ddcprobe/Manifest b/sec-policy/selinux-ddcprobe/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-ddcprobe/Manifest
+++ b/sec-policy/selinux-ddcprobe/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20120725-r9.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..a6d9c387f885
--- /dev/null
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:02 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="ddcprobe"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ddcprobe"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-denyhosts/Manifest b/sec-policy/selinux-denyhosts/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-denyhosts/Manifest
+++ b/sec-policy/selinux-denyhosts/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20120725-r9.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..7797f05ff6cd
--- /dev/null
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:19 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="denyhosts"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for denyhosts"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-devicekit/Manifest b/sec-policy/selinux-devicekit/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-devicekit/Manifest
+++ b/sec-policy/selinux-devicekit/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20120725-r9.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..2cf84b1948da
--- /dev/null
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-devicekit/selinux-devicekit-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:18 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="devicekit"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for devicekit"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-dhcp/Manifest b/sec-policy/selinux-dhcp/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-dhcp/Manifest
+++ b/sec-policy/selinux-dhcp/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20120725-r9.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..5790e807abb4
--- /dev/null
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dhcp/selinux-dhcp-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:08 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="dhcp"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dhcp"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dictd/Manifest b/sec-policy/selinux-dictd/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-dictd/Manifest
+++ b/sec-policy/selinux-dictd/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20120725-r9.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..cc9f42f85dcc
--- /dev/null
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dictd/selinux-dictd-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:06 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="dictd"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dictd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dirsrv/Manifest b/sec-policy/selinux-dirsrv/Manifest
index e69de29bb2d1..3917e4896b17 100644
--- a/sec-policy/selinux-dirsrv/Manifest
+++ b/sec-policy/selinux-dirsrv/Manifest
@@ -0,0 +1,2 @@
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
+DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20120725-r9.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..8ac6e3bbc3c1
--- /dev/null
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:06 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="dirsrv"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dirsrv"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-distcc/Manifest b/sec-policy/selinux-distcc/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-distcc/Manifest
+++ b/sec-policy/selinux-distcc/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20120725-r9.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..12ccae30a4ac
--- /dev/null
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-distcc/selinux-distcc-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:04 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="distcc"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for distcc"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-djbdns/Manifest b/sec-policy/selinux-djbdns/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-djbdns/Manifest
+++ b/sec-policy/selinux-djbdns/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20120725-r9.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..5209c51c78e7
--- /dev/null
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20120725-r9.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-djbdns/selinux-djbdns-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:28 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="djbdns"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for djbdns"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-daemontools
+	sec-policy/selinux-ucspitcp
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-dkim/Manifest b/sec-policy/selinux-dkim/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-dkim/Manifest
+++ b/sec-policy/selinux-dkim/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20120725-r9.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..54ea2fe9b452
--- /dev/null
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dkim/selinux-dkim-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:08 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="dkim"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dkim"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-milter
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-dmidecode/Manifest b/sec-policy/selinux-dmidecode/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-dmidecode/Manifest
+++ b/sec-policy/selinux-dmidecode/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20120725-r9.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..5ff96c66603e
--- /dev/null
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:16 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="dmidecode"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dmidecode"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dnsmasq/Manifest b/sec-policy/selinux-dnsmasq/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-dnsmasq/Manifest
+++ b/sec-policy/selinux-dnsmasq/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20120725-r9.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..0c7538cda6da
--- /dev/null
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:00 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="dnsmasq"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dnsmasq"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dovecot/Manifest b/sec-policy/selinux-dovecot/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-dovecot/Manifest
+++ b/sec-policy/selinux-dovecot/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20120725-r9.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..7c12813b0cee
--- /dev/null
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dovecot/selinux-dovecot-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:13 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="dovecot"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dovecot"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dpkg/Manifest b/sec-policy/selinux-dpkg/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-dpkg/Manifest
+++ b/sec-policy/selinux-dpkg/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20120725-r9.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..6ca405a3fe9e
--- /dev/null
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dpkg/selinux-dpkg-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:04 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="dpkg"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dpkg"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dracut/Manifest b/sec-policy/selinux-dracut/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-dracut/Manifest
+++ b/sec-policy/selinux-dracut/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20120725-r9.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..9d1619c19b97
--- /dev/null
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dracut/selinux-dracut-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:20 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="dracut"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dracut"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-entropyd/Manifest b/sec-policy/selinux-entropyd/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-entropyd/Manifest
+++ b/sec-policy/selinux-entropyd/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20120725-r9.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..b1f377dfa70e
--- /dev/null
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-entropyd/selinux-entropyd-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:09 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="entropyd"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for entropyd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-evolution/Manifest b/sec-policy/selinux-evolution/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-evolution/Manifest
+++ b/sec-policy/selinux-evolution/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20120725-r9.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..c389880865ae
--- /dev/null
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-evolution/selinux-evolution-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:27 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="evolution"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for evolution"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-exim/Manifest b/sec-policy/selinux-exim/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-exim/Manifest
+++ b/sec-policy/selinux-exim/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20120725-r9.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..e866f2276dd7
--- /dev/null
+++ b/sec-policy/selinux-exim/selinux-exim-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-exim/selinux-exim-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:04 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="exim"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for exim"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-fail2ban/Manifest b/sec-policy/selinux-fail2ban/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-fail2ban/Manifest
+++ b/sec-policy/selinux-fail2ban/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20120725-r9.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..b24d74800842
--- /dev/null
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:26 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="fail2ban"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for fail2ban"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-fetchmail/Manifest b/sec-policy/selinux-fetchmail/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-fetchmail/Manifest
+++ b/sec-policy/selinux-fetchmail/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20120725-r9.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..4f48dba9b2ee
--- /dev/null
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:11 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="fetchmail"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for fetchmail"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-finger/Manifest b/sec-policy/selinux-finger/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-finger/Manifest
+++ b/sec-policy/selinux-finger/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20120725-r9.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..c4b80ba45015
--- /dev/null
+++ b/sec-policy/selinux-finger/selinux-finger-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-finger/selinux-finger-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:18 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="finger"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for finger"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-flash/Manifest b/sec-policy/selinux-flash/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-flash/Manifest
+++ b/sec-policy/selinux-flash/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20120725-r9.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..b8d29eefb994
--- /dev/null
+++ b/sec-policy/selinux-flash/selinux-flash-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-flash/selinux-flash-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:12 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="flash"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for flash"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-fprintd/Manifest b/sec-policy/selinux-fprintd/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-fprintd/Manifest
+++ b/sec-policy/selinux-fprintd/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20120725-r9.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..918837d80991
--- /dev/null
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-fprintd/selinux-fprintd-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:00 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="fprintd"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for fprintd"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-ftp/Manifest b/sec-policy/selinux-ftp/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-ftp/Manifest
+++ b/sec-policy/selinux-ftp/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20120725-r9.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..4195f7184cb8
--- /dev/null
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ftp/selinux-ftp-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:54 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="ftp"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ftp"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-games/Manifest b/sec-policy/selinux-games/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-games/Manifest
+++ b/sec-policy/selinux-games/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-games/selinux-games-2.20120725-r9.ebuild b/sec-policy/selinux-games/selinux-games-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..b3b60fc6ecb3
--- /dev/null
+++ b/sec-policy/selinux-games/selinux-games-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-games/selinux-games-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:12 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="games"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for games"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-gatekeeper/Manifest b/sec-policy/selinux-gatekeeper/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-gatekeeper/Manifest
+++ b/sec-policy/selinux-gatekeeper/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20120725-r9.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..3b0ffd34069d
--- /dev/null
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:05 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="gatekeeper"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gatekeeper"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-gift/Manifest b/sec-policy/selinux-gift/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-gift/Manifest
+++ b/sec-policy/selinux-gift/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-gift/selinux-gift-2.20120725-r9.ebuild b/sec-policy/selinux-gift/selinux-gift-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..d9dd3f4b1bd1
--- /dev/null
+++ b/sec-policy/selinux-gift/selinux-gift-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gift/selinux-gift-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:00 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="gift"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gift"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-gitosis/Manifest b/sec-policy/selinux-gitosis/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-gitosis/Manifest
+++ b/sec-policy/selinux-gitosis/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20120725-r9.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..a0e1c2077dc9
--- /dev/null
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gitosis/selinux-gitosis-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:29 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="gitosis"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gitosis"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-gnome/Manifest b/sec-policy/selinux-gnome/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-gnome/Manifest
+++ b/sec-policy/selinux-gnome/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20120725-r9.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..021ada6d2364
--- /dev/null
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gnome/selinux-gnome-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:04 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="gnome"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gnome"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-gorg/Manifest b/sec-policy/selinux-gorg/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-gorg/Manifest
+++ b/sec-policy/selinux-gorg/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20120725-r9.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..c61e5655cbc7
--- /dev/null
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gorg/selinux-gorg-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:20 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="gorg"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gorg"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-gpg/Manifest b/sec-policy/selinux-gpg/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-gpg/Manifest
+++ b/sec-policy/selinux-gpg/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20120725-r9.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..359433f02ef0
--- /dev/null
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpg/selinux-gpg-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:20 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="gpg"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gpg"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-gpm/Manifest b/sec-policy/selinux-gpm/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-gpm/Manifest
+++ b/sec-policy/selinux-gpm/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20120725-r9.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..59f910388b85
--- /dev/null
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpm/selinux-gpm-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:59 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="gpm"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gpm"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-gpsd/Manifest b/sec-policy/selinux-gpsd/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-gpsd/Manifest
+++ b/sec-policy/selinux-gpsd/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20120725-r9.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..0f1982109e4f
--- /dev/null
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpsd/selinux-gpsd-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:00 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="gpsd"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gpsd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-hddtemp/Manifest b/sec-policy/selinux-hddtemp/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-hddtemp/Manifest
+++ b/sec-policy/selinux-hddtemp/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20120725-r9.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..db59a8785497
--- /dev/null
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:27 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="hddtemp"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for hddtemp"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-howl/Manifest b/sec-policy/selinux-howl/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-howl/Manifest
+++ b/sec-policy/selinux-howl/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20120725-r9.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..ffbb8b6330ee
--- /dev/null
+++ b/sec-policy/selinux-howl/selinux-howl-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-howl/selinux-howl-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:08 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="howl"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for howl"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-icecast/Manifest b/sec-policy/selinux-icecast/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-icecast/Manifest
+++ b/sec-policy/selinux-icecast/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20120725-r9.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..c5e1c72c8d17
--- /dev/null
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-icecast/selinux-icecast-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:55 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="icecast"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for icecast"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ifplugd/Manifest b/sec-policy/selinux-ifplugd/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-ifplugd/Manifest
+++ b/sec-policy/selinux-ifplugd/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20120725-r9.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..c97bda1d85a3
--- /dev/null
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:12 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="ifplugd"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ifplugd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-imaze/Manifest b/sec-policy/selinux-imaze/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-imaze/Manifest
+++ b/sec-policy/selinux-imaze/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20120725-r9.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..485d2e98407e
--- /dev/null
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-imaze/selinux-imaze-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:17 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="imaze"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for imaze"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-inetd/Manifest b/sec-policy/selinux-inetd/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-inetd/Manifest
+++ b/sec-policy/selinux-inetd/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20120725-r9.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..23ea91e39e04
--- /dev/null
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-inetd/selinux-inetd-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:59 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="inetd"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for inetd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-inn/Manifest b/sec-policy/selinux-inn/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-inn/Manifest
+++ b/sec-policy/selinux-inn/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20120725-r9.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..2dd9bb9a91ef
--- /dev/null
+++ b/sec-policy/selinux-inn/selinux-inn-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-inn/selinux-inn-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:58 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="inn"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for inn"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ipsec/Manifest b/sec-policy/selinux-ipsec/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-ipsec/Manifest
+++ b/sec-policy/selinux-ipsec/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20120725-r9.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..074a9202b259
--- /dev/null
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ipsec/selinux-ipsec-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:03 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="ipsec"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ipsec"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-irc/Manifest b/sec-policy/selinux-irc/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-irc/Manifest
+++ b/sec-policy/selinux-irc/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20120725-r9.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..89d6b6d50b4c
--- /dev/null
+++ b/sec-policy/selinux-irc/selinux-irc-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-irc/selinux-irc-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:02 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="irc"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for irc"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ircd/Manifest b/sec-policy/selinux-ircd/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-ircd/Manifest
+++ b/sec-policy/selinux-ircd/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20120725-r9.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..b02ab71f7b82
--- /dev/null
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ircd/selinux-ircd-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:19 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="ircd"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ircd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-irqbalance/Manifest b/sec-policy/selinux-irqbalance/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-irqbalance/Manifest
+++ b/sec-policy/selinux-irqbalance/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20120725-r9.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..c809b8b9e7f3
--- /dev/null
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:07 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="irqbalance"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for irqbalance"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-jabber/Manifest b/sec-policy/selinux-jabber/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-jabber/Manifest
+++ b/sec-policy/selinux-jabber/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20120725-r9.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..018f8db3ada7
--- /dev/null
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-jabber/selinux-jabber-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:26 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="jabber"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for jabber"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-java/Manifest b/sec-policy/selinux-java/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-java/Manifest
+++ b/sec-policy/selinux-java/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-java/selinux-java-2.20120725-r9.ebuild b/sec-policy/selinux-java/selinux-java-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..f1a690bf3e2f
--- /dev/null
+++ b/sec-policy/selinux-java/selinux-java-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-java/selinux-java-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:24 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="java"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for java"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-kdump/Manifest b/sec-policy/selinux-kdump/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-kdump/Manifest
+++ b/sec-policy/selinux-kdump/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20120725-r9.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..d94c24abf295
--- /dev/null
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kdump/selinux-kdump-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:58 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="kdump"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kdump"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-kerberos/Manifest b/sec-policy/selinux-kerberos/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-kerberos/Manifest
+++ b/sec-policy/selinux-kerberos/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20120725-r9.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..c875026b7f6d
--- /dev/null
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kerberos/selinux-kerberos-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:03 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="kerberos"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kerberos"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-kerneloops/Manifest b/sec-policy/selinux-kerneloops/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-kerneloops/Manifest
+++ b/sec-policy/selinux-kerneloops/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20120725-r9.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..231617e4a70b
--- /dev/null
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:54 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="kerneloops"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kerneloops"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-kismet/Manifest b/sec-policy/selinux-kismet/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-kismet/Manifest
+++ b/sec-policy/selinux-kismet/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20120725-r9.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..d01980a0aa3f
--- /dev/null
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kismet/selinux-kismet-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:21 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="kismet"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kismet"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ksmtuned/Manifest b/sec-policy/selinux-ksmtuned/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-ksmtuned/Manifest
+++ b/sec-policy/selinux-ksmtuned/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20120725-r9.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..58baf1bb01ba
--- /dev/null
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:18 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="ksmtuned"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ksmtuned"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-kudzu/Manifest b/sec-policy/selinux-kudzu/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-kudzu/Manifest
+++ b/sec-policy/selinux-kudzu/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20120725-r9.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..851825278da4
--- /dev/null
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kudzu/selinux-kudzu-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:30 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="kudzu"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kudzu"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ldap/Manifest b/sec-policy/selinux-ldap/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-ldap/Manifest
+++ b/sec-policy/selinux-ldap/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20120725-r9.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..b5d3f2a7924c
--- /dev/null
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ldap/selinux-ldap-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:56 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="ldap"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ldap"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-links/Manifest b/sec-policy/selinux-links/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-links/Manifest
+++ b/sec-policy/selinux-links/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-links/selinux-links-2.20120725-r9.ebuild b/sec-policy/selinux-links/selinux-links-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..9789e87c26db
--- /dev/null
+++ b/sec-policy/selinux-links/selinux-links-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-links/selinux-links-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:11 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="links"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for links"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-lircd/Manifest b/sec-policy/selinux-lircd/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-lircd/Manifest
+++ b/sec-policy/selinux-lircd/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20120725-r9.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..80ff054049f0
--- /dev/null
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lircd/selinux-lircd-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:30 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="lircd"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for lircd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-loadkeys/Manifest b/sec-policy/selinux-loadkeys/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-loadkeys/Manifest
+++ b/sec-policy/selinux-loadkeys/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20120725-r9.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..fca95d8058a1
--- /dev/null
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:17 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="loadkeys"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for loadkeys"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-lockdev/Manifest b/sec-policy/selinux-lockdev/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-lockdev/Manifest
+++ b/sec-policy/selinux-lockdev/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20120725-r9.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..5b08cfb51a30
--- /dev/null
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lockdev/selinux-lockdev-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:25 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="lockdev"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for lockdev"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-logrotate/Manifest b/sec-policy/selinux-logrotate/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-logrotate/Manifest
+++ b/sec-policy/selinux-logrotate/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20120725-r9.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..52a5a940a647
--- /dev/null
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logrotate/selinux-logrotate-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:01 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="logrotate"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for logrotate"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-logsentry/Manifest b/sec-policy/selinux-logsentry/Manifest
index 6238a885c04d..da5e2937a365 100644
--- a/sec-policy/selinux-logsentry/Manifest
+++ b/sec-policy/selinux-logsentry/Manifest
@@ -1,2 +1,3 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20120725-r9.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..732fcb601afb
--- /dev/null
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logsentry/selinux-logsentry-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:07 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="logsentry"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for logsentry"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-logwatch/Manifest b/sec-policy/selinux-logwatch/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-logwatch/Manifest
+++ b/sec-policy/selinux-logwatch/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20120725-r9.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..eb9aac1a0824
--- /dev/null
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logwatch/selinux-logwatch-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:30 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="logwatch"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for logwatch"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-lpd/Manifest b/sec-policy/selinux-lpd/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-lpd/Manifest
+++ b/sec-policy/selinux-lpd/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20120725-r9.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..36ce3dbc6255
--- /dev/null
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lpd/selinux-lpd-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:16 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="lpd"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for lpd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-mailman/Manifest b/sec-policy/selinux-mailman/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-mailman/Manifest
+++ b/sec-policy/selinux-mailman/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20120725-r9.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..fcd332376fd8
--- /dev/null
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mailman/selinux-mailman-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:13 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="mailman"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mailman"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-makewhatis/Manifest b/sec-policy/selinux-makewhatis/Manifest
index 6238a885c04d..da5e2937a365 100644
--- a/sec-policy/selinux-makewhatis/Manifest
+++ b/sec-policy/selinux-makewhatis/Manifest
@@ -1,2 +1,3 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20120725-r9.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..743cfaf8eedd
--- /dev/null
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:29 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="makewhatis"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for makewhatis"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-mcelog/Manifest b/sec-policy/selinux-mcelog/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-mcelog/Manifest
+++ b/sec-policy/selinux-mcelog/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20120725-r9.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..b266c6348080
--- /dev/null
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mcelog/selinux-mcelog-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:19 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="mcelog"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mcelog"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-memcached/Manifest b/sec-policy/selinux-memcached/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-memcached/Manifest
+++ b/sec-policy/selinux-memcached/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20120725-r9.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..b4ab06f24159
--- /dev/null
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-memcached/selinux-memcached-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:15 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="memcached"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for memcached"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-milter/Manifest b/sec-policy/selinux-milter/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-milter/Manifest
+++ b/sec-policy/selinux-milter/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20120725-r9.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..cc729e9637f8
--- /dev/null
+++ b/sec-policy/selinux-milter/selinux-milter-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-milter/selinux-milter-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:10 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="milter"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for milter"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-modemmanager/Manifest b/sec-policy/selinux-modemmanager/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-modemmanager/Manifest
+++ b/sec-policy/selinux-modemmanager/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20120725-r9.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..7878d71dd595
--- /dev/null
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20120725-r9.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:06 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="modemmanager"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for modemmanager"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+	sec-policy/selinux-networkmanager
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-mono/Manifest b/sec-policy/selinux-mono/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-mono/Manifest
+++ b/sec-policy/selinux-mono/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20120725-r9.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..0255dd55cfbf
--- /dev/null
+++ b/sec-policy/selinux-mono/selinux-mono-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mono/selinux-mono-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:14 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="mono"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mono"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-mozilla/Manifest b/sec-policy/selinux-mozilla/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-mozilla/Manifest
+++ b/sec-policy/selinux-mozilla/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20120725-r9.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..3be3ce6aa86c
--- /dev/null
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mozilla/selinux-mozilla-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:21 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="mozilla"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mozilla"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-mpd/Manifest b/sec-policy/selinux-mpd/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-mpd/Manifest
+++ b/sec-policy/selinux-mpd/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20120725-r9.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..09dd889076f7
--- /dev/null
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mpd/selinux-mpd-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:13 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="mpd"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mpd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-mplayer/Manifest b/sec-policy/selinux-mplayer/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-mplayer/Manifest
+++ b/sec-policy/selinux-mplayer/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20120725-r9.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..2ae3fcb6014e
--- /dev/null
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mplayer/selinux-mplayer-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:12 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="mplayer"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mplayer"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-mrtg/Manifest b/sec-policy/selinux-mrtg/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-mrtg/Manifest
+++ b/sec-policy/selinux-mrtg/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20120725-r9.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..7a0e1c37bdab
--- /dev/null
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mrtg/selinux-mrtg-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:12 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="mrtg"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mrtg"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-munin/Manifest b/sec-policy/selinux-munin/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-munin/Manifest
+++ b/sec-policy/selinux-munin/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20120725-r9.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..11bc18134b6f
--- /dev/null
+++ b/sec-policy/selinux-munin/selinux-munin-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-munin/selinux-munin-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:28 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="munin"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for munin"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-mutt/Manifest b/sec-policy/selinux-mutt/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-mutt/Manifest
+++ b/sec-policy/selinux-mutt/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20120725-r9.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..a61c9515a1d0
--- /dev/null
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mutt/selinux-mutt-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:59 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="mutt"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mutt"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-mysql/Manifest b/sec-policy/selinux-mysql/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-mysql/Manifest
+++ b/sec-policy/selinux-mysql/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20120725-r9.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..7cf08fe0e8ab
--- /dev/null
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mysql/selinux-mysql-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:06 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="mysql"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mysql"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-nagios/Manifest b/sec-policy/selinux-nagios/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-nagios/Manifest
+++ b/sec-policy/selinux-nagios/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20120725-r9.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..90e05cadbb46
--- /dev/null
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nagios/selinux-nagios-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:56 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="nagios"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nagios"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-ncftool/Manifest b/sec-policy/selinux-ncftool/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-ncftool/Manifest
+++ b/sec-policy/selinux-ncftool/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20120725-r9.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..d8c7f641ae49
--- /dev/null
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ncftool/selinux-ncftool-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:01 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="ncftool"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ncftool"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-nessus/Manifest b/sec-policy/selinux-nessus/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-nessus/Manifest
+++ b/sec-policy/selinux-nessus/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20120725-r9.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..afe36e30d7be
--- /dev/null
+++ b/sec-policy/selinux-nessus/selinux-nessus-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nessus/selinux-nessus-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:26 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="nessus"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nessus"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-networkmanager/Manifest b/sec-policy/selinux-networkmanager/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-networkmanager/Manifest
+++ b/sec-policy/selinux-networkmanager/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20120725-r9.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..e92e9e316669
--- /dev/null
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:24 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="networkmanager"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for networkmanager"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-nginx/Manifest b/sec-policy/selinux-nginx/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-nginx/Manifest
+++ b/sec-policy/selinux-nginx/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20120725-r9.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..4a4f84e32c38
--- /dev/null
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nginx/selinux-nginx-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:15 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="nginx"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nginx"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-nslcd/Manifest b/sec-policy/selinux-nslcd/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-nslcd/Manifest
+++ b/sec-policy/selinux-nslcd/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20120725-r9.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..54fb9f6b5e72
--- /dev/null
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nslcd/selinux-nslcd-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:21 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="nslcd"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nslcd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ntop/Manifest b/sec-policy/selinux-ntop/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-ntop/Manifest
+++ b/sec-policy/selinux-ntop/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20120725-r9.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..3c41bfab5802
--- /dev/null
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntop/selinux-ntop-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:08 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="ntop"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ntop"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ntp/Manifest b/sec-policy/selinux-ntp/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-ntp/Manifest
+++ b/sec-policy/selinux-ntp/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20120725-r9.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..bedce20500f5
--- /dev/null
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntp/selinux-ntp-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:56 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="ntp"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ntp"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-nut/Manifest b/sec-policy/selinux-nut/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-nut/Manifest
+++ b/sec-policy/selinux-nut/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20120725-r9.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..99c8b1ec7d82
--- /dev/null
+++ b/sec-policy/selinux-nut/selinux-nut-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nut/selinux-nut-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:29 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="nut"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nut"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-nx/Manifest b/sec-policy/selinux-nx/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-nx/Manifest
+++ b/sec-policy/selinux-nx/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20120725-r9.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..60b087b1beb7
--- /dev/null
+++ b/sec-policy/selinux-nx/selinux-nx-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nx/selinux-nx-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:17 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="nx"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nx"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-oddjob/Manifest b/sec-policy/selinux-oddjob/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-oddjob/Manifest
+++ b/sec-policy/selinux-oddjob/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20120725-r9.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..4b851aae1d3b
--- /dev/null
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-oddjob/selinux-oddjob-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:08 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="oddjob"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for oddjob"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-oident/Manifest b/sec-policy/selinux-oident/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-oident/Manifest
+++ b/sec-policy/selinux-oident/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20120725-r9.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..78b393698c0f
--- /dev/null
+++ b/sec-policy/selinux-oident/selinux-oident-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-oident/selinux-oident-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:11 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="oident"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for oident"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-openct/Manifest b/sec-policy/selinux-openct/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-openct/Manifest
+++ b/sec-policy/selinux-openct/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20120725-r9.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..d83d775e43b8
--- /dev/null
+++ b/sec-policy/selinux-openct/selinux-openct-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-openct/selinux-openct-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:28 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="openct"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for openct"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-openrc/Manifest b/sec-policy/selinux-openrc/Manifest
index e69de29bb2d1..3917e4896b17 100644
--- a/sec-policy/selinux-openrc/Manifest
+++ b/sec-policy/selinux-openrc/Manifest
@@ -0,0 +1,2 @@
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
+DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20120725-r9.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..914d01d1cdb0
--- /dev/null
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-openrc/selinux-openrc-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:07 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="openrc"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for openrc"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-openvpn/Manifest b/sec-policy/selinux-openvpn/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-openvpn/Manifest
+++ b/sec-policy/selinux-openvpn/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20120725-r9.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..9e30aa49830c
--- /dev/null
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-openvpn/selinux-openvpn-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:26 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="openvpn"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for openvpn"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-pan/Manifest b/sec-policy/selinux-pan/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-pan/Manifest
+++ b/sec-policy/selinux-pan/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20120725-r9.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..d9e4ec29db1b
--- /dev/null
+++ b/sec-policy/selinux-pan/selinux-pan-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pan/selinux-pan-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:56 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="pan"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pan"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-pcmcia/Manifest b/sec-policy/selinux-pcmcia/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-pcmcia/Manifest
+++ b/sec-policy/selinux-pcmcia/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20120725-r9.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..be87fd16d2cb
--- /dev/null
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:15 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="pcmcia"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pcmcia"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-perdition/Manifest b/sec-policy/selinux-perdition/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-perdition/Manifest
+++ b/sec-policy/selinux-perdition/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20120725-r9.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..0159f02ab61a
--- /dev/null
+++ b/sec-policy/selinux-perdition/selinux-perdition-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-perdition/selinux-perdition-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:13 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="perdition"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for perdition"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-phpfpm/Manifest b/sec-policy/selinux-phpfpm/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-phpfpm/Manifest
+++ b/sec-policy/selinux-phpfpm/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20120725-r9.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..5772000478fb
--- /dev/null
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:03 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="phpfpm"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for phpfpm"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-plymouthd/Manifest b/sec-policy/selinux-plymouthd/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-plymouthd/Manifest
+++ b/sec-policy/selinux-plymouthd/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20120725-r9.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..e50aa73f2d2a
--- /dev/null
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:18 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="plymouthd"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for plymouthd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-podsleuth/Manifest b/sec-policy/selinux-podsleuth/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-podsleuth/Manifest
+++ b/sec-policy/selinux-podsleuth/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20120725-r9.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..bae90bb18eef
--- /dev/null
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:19 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="podsleuth"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for podsleuth"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-policykit/Manifest b/sec-policy/selinux-policykit/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-policykit/Manifest
+++ b/sec-policy/selinux-policykit/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20120725-r9.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..97b180753089
--- /dev/null
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-policykit/selinux-policykit-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:16 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="policykit"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for policykit"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-portmap/Manifest b/sec-policy/selinux-portmap/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-portmap/Manifest
+++ b/sec-policy/selinux-portmap/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20120725-r9.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..038f36b86f32
--- /dev/null
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-portmap/selinux-portmap-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:27 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="portmap"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for portmap"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-postfix/Manifest b/sec-policy/selinux-postfix/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-postfix/Manifest
+++ b/sec-policy/selinux-postfix/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20120725-r9.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..5ad4310c65d8
--- /dev/null
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postfix/selinux-postfix-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:28 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="postfix"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for postfix"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-postgresql/Manifest b/sec-policy/selinux-postgresql/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-postgresql/Manifest
+++ b/sec-policy/selinux-postgresql/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20120725-r9.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..8329c695b05b
--- /dev/null
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgresql/selinux-postgresql-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:07 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="postgresql"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for postgresql"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-postgrey/Manifest b/sec-policy/selinux-postgrey/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-postgrey/Manifest
+++ b/sec-policy/selinux-postgrey/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20120725-r9.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..630551de8c16
--- /dev/null
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgrey/selinux-postgrey-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:22 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="postgrey"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for postgrey"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ppp/Manifest b/sec-policy/selinux-ppp/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-ppp/Manifest
+++ b/sec-policy/selinux-ppp/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20120725-r9.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..200cc78cd46a
--- /dev/null
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ppp/selinux-ppp-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:24 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="ppp"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ppp"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-prelink/Manifest b/sec-policy/selinux-prelink/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-prelink/Manifest
+++ b/sec-policy/selinux-prelink/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20120725-r9.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..cb4252b55ca2
--- /dev/null
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-prelink/selinux-prelink-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:12 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="prelink"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for prelink"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-prelude/Manifest b/sec-policy/selinux-prelude/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-prelude/Manifest
+++ b/sec-policy/selinux-prelude/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20120725-r9.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..1be71ff63106
--- /dev/null
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-prelude/selinux-prelude-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:25 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="prelude"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for prelude"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-privoxy/Manifest b/sec-policy/selinux-privoxy/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-privoxy/Manifest
+++ b/sec-policy/selinux-privoxy/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20120725-r9.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..e96ac6e35bb8
--- /dev/null
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-privoxy/selinux-privoxy-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:24 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="privoxy"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for privoxy"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-procmail/Manifest b/sec-policy/selinux-procmail/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-procmail/Manifest
+++ b/sec-policy/selinux-procmail/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20120725-r9.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..750a87fe8e2c
--- /dev/null
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-procmail/selinux-procmail-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:58 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="procmail"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for procmail"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-psad/Manifest b/sec-policy/selinux-psad/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-psad/Manifest
+++ b/sec-policy/selinux-psad/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20120725-r9.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..9d87a9b350fd
--- /dev/null
+++ b/sec-policy/selinux-psad/selinux-psad-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-psad/selinux-psad-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:10 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="psad"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for psad"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-publicfile/Manifest b/sec-policy/selinux-publicfile/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-publicfile/Manifest
+++ b/sec-policy/selinux-publicfile/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20120725-r9.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..b0437de33035
--- /dev/null
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-publicfile/selinux-publicfile-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:14 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="publicfile"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for publicfile"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-pulseaudio/Manifest b/sec-policy/selinux-pulseaudio/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-pulseaudio/Manifest
+++ b/sec-policy/selinux-pulseaudio/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20120725-r9.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..6c58ac36b9a9
--- /dev/null
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:23 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="pulseaudio"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pulseaudio"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-puppet/Manifest b/sec-policy/selinux-puppet/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-puppet/Manifest
+++ b/sec-policy/selinux-puppet/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20120725-r9.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..304bdd819972
--- /dev/null
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-puppet/selinux-puppet-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:22 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="puppet"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for puppet"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-pyicqt/Manifest b/sec-policy/selinux-pyicqt/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-pyicqt/Manifest
+++ b/sec-policy/selinux-pyicqt/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20120725-r9.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..0f28a63d14e4
--- /dev/null
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:55 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="pyicqt"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pyicqt"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-pyzor/Manifest b/sec-policy/selinux-pyzor/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-pyzor/Manifest
+++ b/sec-policy/selinux-pyzor/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20120725-r9.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..3cd0aef29341
--- /dev/null
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pyzor/selinux-pyzor-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:02 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="pyzor"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pyzor"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-qemu/Manifest b/sec-policy/selinux-qemu/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-qemu/Manifest
+++ b/sec-policy/selinux-qemu/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20120725-r9.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..ea851411aab4
--- /dev/null
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-qemu/selinux-qemu-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:56 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="qemu"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for qemu"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-virt
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-qmail/Manifest b/sec-policy/selinux-qmail/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-qmail/Manifest
+++ b/sec-policy/selinux-qmail/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20120725-r9.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..b3312b3aa83c
--- /dev/null
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-qmail/selinux-qmail-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:02 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="qmail"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for qmail"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-quota/Manifest b/sec-policy/selinux-quota/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-quota/Manifest
+++ b/sec-policy/selinux-quota/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20120725-r9.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..0aee2d8ed896
--- /dev/null
+++ b/sec-policy/selinux-quota/selinux-quota-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-quota/selinux-quota-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:17 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="quota"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for quota"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-radius/Manifest b/sec-policy/selinux-radius/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-radius/Manifest
+++ b/sec-policy/selinux-radius/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20120725-r9.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..b961c6cc1155
--- /dev/null
+++ b/sec-policy/selinux-radius/selinux-radius-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-radius/selinux-radius-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:14 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="radius"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for radius"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-radvd/Manifest b/sec-policy/selinux-radvd/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-radvd/Manifest
+++ b/sec-policy/selinux-radvd/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20120725-r9.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..c95704a46e49
--- /dev/null
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-radvd/selinux-radvd-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:02 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="radvd"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for radvd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-razor/Manifest b/sec-policy/selinux-razor/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-razor/Manifest
+++ b/sec-policy/selinux-razor/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20120725-r9.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..d1ce7f9f01a3
--- /dev/null
+++ b/sec-policy/selinux-razor/selinux-razor-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-razor/selinux-razor-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:24 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="razor"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for razor"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-remotelogin/Manifest b/sec-policy/selinux-remotelogin/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-remotelogin/Manifest
+++ b/sec-policy/selinux-remotelogin/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20120725-r9.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..c7b1c58f4231
--- /dev/null
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:21 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="remotelogin"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for remotelogin"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-rgmanager/Manifest b/sec-policy/selinux-rgmanager/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-rgmanager/Manifest
+++ b/sec-policy/selinux-rgmanager/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20120725-r9.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..7767a7b07fe1
--- /dev/null
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:10 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="rgmanager"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rgmanager"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-roundup/Manifest b/sec-policy/selinux-roundup/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-roundup/Manifest
+++ b/sec-policy/selinux-roundup/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20120725-r9.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..4b7eef773447
--- /dev/null
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-roundup/selinux-roundup-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:19 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="roundup"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for roundup"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-rpc/Manifest b/sec-policy/selinux-rpc/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-rpc/Manifest
+++ b/sec-policy/selinux-rpc/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20120725-r9.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..ac22625f5c6a
--- /dev/null
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rpc/selinux-rpc-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:23 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="rpc"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rpc"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-rpcbind/Manifest b/sec-policy/selinux-rpcbind/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-rpcbind/Manifest
+++ b/sec-policy/selinux-rpcbind/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20120725-r9.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..d2809dccd554
--- /dev/null
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:55 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="rpcbind"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rpcbind"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-rpm/Manifest b/sec-policy/selinux-rpm/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-rpm/Manifest
+++ b/sec-policy/selinux-rpm/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20120725-r9.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..3219b1550ecc
--- /dev/null
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rpm/selinux-rpm-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:22 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="rpm"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rpm"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-rssh/Manifest b/sec-policy/selinux-rssh/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-rssh/Manifest
+++ b/sec-policy/selinux-rssh/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20120725-r9.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..4c662ded77b3
--- /dev/null
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rssh/selinux-rssh-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:57 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="rssh"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rssh"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-rtkit/Manifest b/sec-policy/selinux-rtkit/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-rtkit/Manifest
+++ b/sec-policy/selinux-rtkit/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20120725-r9.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..3a45327f45ac
--- /dev/null
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rtkit/selinux-rtkit-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:14 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="rtkit"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rtkit"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-rtorrent/Manifest b/sec-policy/selinux-rtorrent/Manifest
index 06747cbdd1e3..05f8d3f80da8 100644
--- a/sec-policy/selinux-rtorrent/Manifest
+++ b/sec-policy/selinux-rtorrent/Manifest
@@ -1,3 +1,4 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20120725-r9.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..23c64e89a8c4
--- /dev/null
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:11 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="rtorrent"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rtorrent"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-samba/Manifest b/sec-policy/selinux-samba/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-samba/Manifest
+++ b/sec-policy/selinux-samba/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20120725-r9.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..1162d0f55898
--- /dev/null
+++ b/sec-policy/selinux-samba/selinux-samba-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-samba/selinux-samba-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:04 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="samba"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for samba"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-sasl/Manifest b/sec-policy/selinux-sasl/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-sasl/Manifest
+++ b/sec-policy/selinux-sasl/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20120725-r9.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..5bf5ff290114
--- /dev/null
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sasl/selinux-sasl-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:28 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="sasl"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sasl"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-screen/Manifest b/sec-policy/selinux-screen/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-screen/Manifest
+++ b/sec-policy/selinux-screen/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20120725-r9.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..1926a9817e66
--- /dev/null
+++ b/sec-policy/selinux-screen/selinux-screen-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-screen/selinux-screen-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:03 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="screen"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for screen"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-sendmail/Manifest b/sec-policy/selinux-sendmail/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-sendmail/Manifest
+++ b/sec-policy/selinux-sendmail/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20120725-r9.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..39574c0b5adb
--- /dev/null
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sendmail/selinux-sendmail-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:15 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="sendmail"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sendmail"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-shorewall/Manifest b/sec-policy/selinux-shorewall/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-shorewall/Manifest
+++ b/sec-policy/selinux-shorewall/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20120725-r9.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..21a36deed849
--- /dev/null
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-shorewall/selinux-shorewall-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:11 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="shorewall"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for shorewall"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-shutdown/Manifest b/sec-policy/selinux-shutdown/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-shutdown/Manifest
+++ b/sec-policy/selinux-shutdown/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20120725-r9.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..8af62900b5cf
--- /dev/null
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-shutdown/selinux-shutdown-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:13 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="shutdown"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for shutdown"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-skype/Manifest b/sec-policy/selinux-skype/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-skype/Manifest
+++ b/sec-policy/selinux-skype/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20120725-r9.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..152fb04c12d0
--- /dev/null
+++ b/sec-policy/selinux-skype/selinux-skype-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-skype/selinux-skype-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:57 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="skype"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for skype"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-slocate/Manifest b/sec-policy/selinux-slocate/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-slocate/Manifest
+++ b/sec-policy/selinux-slocate/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20120725-r9.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..7fc078018332
--- /dev/null
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-slocate/selinux-slocate-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:59 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="slocate"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for slocate"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-slrnpull/Manifest b/sec-policy/selinux-slrnpull/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-slrnpull/Manifest
+++ b/sec-policy/selinux-slrnpull/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20120725-r9.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..ce7959f8712a
--- /dev/null
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:15 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="slrnpull"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for slrnpull"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-smartmon/Manifest b/sec-policy/selinux-smartmon/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-smartmon/Manifest
+++ b/sec-policy/selinux-smartmon/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20120725-r9.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..ce2ec1d0d458
--- /dev/null
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-smartmon/selinux-smartmon-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:20 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="smartmon"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for smartmon"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-smokeping/Manifest b/sec-policy/selinux-smokeping/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-smokeping/Manifest
+++ b/sec-policy/selinux-smokeping/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20120725-r9.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..2a9bb97891d4
--- /dev/null
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-smokeping/selinux-smokeping-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:19 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="smokeping"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for smokeping"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-snmp/Manifest b/sec-policy/selinux-snmp/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-snmp/Manifest
+++ b/sec-policy/selinux-snmp/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20120725-r9.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..2e26f65fbd24
--- /dev/null
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snmp/selinux-snmp-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:03 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="snmp"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for snmp"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-snort/Manifest b/sec-policy/selinux-snort/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-snort/Manifest
+++ b/sec-policy/selinux-snort/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20120725-r9.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..fdb0c03f4ae2
--- /dev/null
+++ b/sec-policy/selinux-snort/selinux-snort-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snort/selinux-snort-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:57 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="snort"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for snort"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-soundserver/Manifest b/sec-policy/selinux-soundserver/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-soundserver/Manifest
+++ b/sec-policy/selinux-soundserver/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20120725-r9.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..24bcaf84fd7b
--- /dev/null
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-soundserver/selinux-soundserver-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:17 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="soundserver"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for soundserver"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-spamassassin/Manifest b/sec-policy/selinux-spamassassin/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-spamassassin/Manifest
+++ b/sec-policy/selinux-spamassassin/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20120725-r9.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..f5a63a5fc1ac
--- /dev/null
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:09 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="spamassassin"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for spamassassin"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-speedtouch/Manifest b/sec-policy/selinux-speedtouch/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-speedtouch/Manifest
+++ b/sec-policy/selinux-speedtouch/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20120725-r9.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..dc0758790216
--- /dev/null
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:30 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="speedtouch"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for speedtouch"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-squid/Manifest b/sec-policy/selinux-squid/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-squid/Manifest
+++ b/sec-policy/selinux-squid/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20120725-r9.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..f9734202729d
--- /dev/null
+++ b/sec-policy/selinux-squid/selinux-squid-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/selinux-squid-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:54 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="squid"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for squid"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-sssd/Manifest b/sec-policy/selinux-sssd/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-sssd/Manifest
+++ b/sec-policy/selinux-sssd/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20120725-r9.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..6e36736f2a3e
--- /dev/null
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sssd/selinux-sssd-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:04 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="sssd"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sssd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-stunnel/Manifest b/sec-policy/selinux-stunnel/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-stunnel/Manifest
+++ b/sec-policy/selinux-stunnel/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20120725-r9.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..dab93b777b48
--- /dev/null
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-stunnel/selinux-stunnel-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:57 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="stunnel"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for stunnel"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-sudo/Manifest b/sec-policy/selinux-sudo/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-sudo/Manifest
+++ b/sec-policy/selinux-sudo/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20120725-r9.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..4a4768720df0
--- /dev/null
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sudo/selinux-sudo-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:26 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="sudo"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sudo"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-sxid/Manifest b/sec-policy/selinux-sxid/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-sxid/Manifest
+++ b/sec-policy/selinux-sxid/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20120725-r9.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..00f0abd0df40
--- /dev/null
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sxid/selinux-sxid-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:58 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="sxid"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sxid"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-sysstat/Manifest b/sec-policy/selinux-sysstat/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-sysstat/Manifest
+++ b/sec-policy/selinux-sysstat/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20120725-r9.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..f4b380ef1fb9
--- /dev/null
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sysstat/selinux-sysstat-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:27 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="sysstat"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sysstat"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-tcpd/Manifest b/sec-policy/selinux-tcpd/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-tcpd/Manifest
+++ b/sec-policy/selinux-tcpd/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20120725-r9.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..ae2c9f240e28
--- /dev/null
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tcpd/selinux-tcpd-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:19 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="tcpd"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tcpd"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-telnet/Manifest b/sec-policy/selinux-telnet/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-telnet/Manifest
+++ b/sec-policy/selinux-telnet/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20120725-r9.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..0f7994cf5021
--- /dev/null
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20120725-r9.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-telnet/selinux-telnet-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:15 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="telnet"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for telnet"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-remotelogin
+	sec-policy/selinux-inetd
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-tftp/Manifest b/sec-policy/selinux-tftp/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-tftp/Manifest
+++ b/sec-policy/selinux-tftp/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20120725-r9.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..b17f72318de6
--- /dev/null
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tftp/selinux-tftp-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:25 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="tftp"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tftp"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-tgtd/Manifest b/sec-policy/selinux-tgtd/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-tgtd/Manifest
+++ b/sec-policy/selinux-tgtd/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20120725-r9.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..f1d3c4bd3143
--- /dev/null
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tgtd/selinux-tgtd-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:13 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="tgtd"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tgtd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-thunderbird/Manifest b/sec-policy/selinux-thunderbird/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-thunderbird/Manifest
+++ b/sec-policy/selinux-thunderbird/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20120725-r9.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..fcd87f287177
--- /dev/null
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:22 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="thunderbird"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for thunderbird"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-timidity/Manifest b/sec-policy/selinux-timidity/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-timidity/Manifest
+++ b/sec-policy/selinux-timidity/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20120725-r9.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..424ab9907a12
--- /dev/null
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-timidity/selinux-timidity-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:59 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="timidity"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for timidity"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-tmpreaper/Manifest b/sec-policy/selinux-tmpreaper/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-tmpreaper/Manifest
+++ b/sec-policy/selinux-tmpreaper/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20120725-r9.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..48b459df2216
--- /dev/null
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:06 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="tmpreaper"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tmpreaper"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-tor/Manifest b/sec-policy/selinux-tor/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-tor/Manifest
+++ b/sec-policy/selinux-tor/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20120725-r9.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..302e3bc2a3c8
--- /dev/null
+++ b/sec-policy/selinux-tor/selinux-tor-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tor/selinux-tor-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:16 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="tor"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tor"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-tripwire/Manifest b/sec-policy/selinux-tripwire/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-tripwire/Manifest
+++ b/sec-policy/selinux-tripwire/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20120725-r9.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..068806477c2f
--- /dev/null
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tripwire/selinux-tripwire-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:55 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="tripwire"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tripwire"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-tvtime/Manifest b/sec-policy/selinux-tvtime/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-tvtime/Manifest
+++ b/sec-policy/selinux-tvtime/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-tvtime/selinux-tvtime-2.20120725-r9.ebuild b/sec-policy/selinux-tvtime/selinux-tvtime-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..72e9612c8851
--- /dev/null
+++ b/sec-policy/selinux-tvtime/selinux-tvtime-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tvtime/selinux-tvtime-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:28 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="tvtime"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tvtime"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ucspitcp/Manifest b/sec-policy/selinux-ucspitcp/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-ucspitcp/Manifest
+++ b/sec-policy/selinux-ucspitcp/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20120725-r9.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..b4cff5153944
--- /dev/null
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:14 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="ucspitcp"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ucspitcp"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ulogd/Manifest b/sec-policy/selinux-ulogd/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-ulogd/Manifest
+++ b/sec-policy/selinux-ulogd/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20120725-r9.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..9824db2fc37d
--- /dev/null
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ulogd/selinux-ulogd-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:02 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="ulogd"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ulogd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-uml/Manifest b/sec-policy/selinux-uml/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-uml/Manifest
+++ b/sec-policy/selinux-uml/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20120725-r9.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..c1c9de1b5d27
--- /dev/null
+++ b/sec-policy/selinux-uml/selinux-uml-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uml/selinux-uml-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:10 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="uml"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uml"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-unconfined/Manifest b/sec-policy/selinux-unconfined/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-unconfined/Manifest
+++ b/sec-policy/selinux-unconfined/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20120725-r9.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..26a197b4cc12
--- /dev/null
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-unconfined/selinux-unconfined-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:54 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="unconfined"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for unconfined"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-uptime/Manifest b/sec-policy/selinux-uptime/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-uptime/Manifest
+++ b/sec-policy/selinux-uptime/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20120725-r9.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..493be4e4550d
--- /dev/null
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uptime/selinux-uptime-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:05 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="uptime"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uptime"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-usbmuxd/Manifest b/sec-policy/selinux-usbmuxd/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-usbmuxd/Manifest
+++ b/sec-policy/selinux-usbmuxd/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20120725-r9.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..bfc21f700c66
--- /dev/null
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:16 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="usbmuxd"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for usbmuxd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-uucp/Manifest b/sec-policy/selinux-uucp/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-uucp/Manifest
+++ b/sec-policy/selinux-uucp/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20120725-r9.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..57096c77a5f3
--- /dev/null
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uucp/selinux-uucp-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:54 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="uucp"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uucp"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-uwimap/Manifest b/sec-policy/selinux-uwimap/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-uwimap/Manifest
+++ b/sec-policy/selinux-uwimap/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20120725-r9.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..79ff9f9da928
--- /dev/null
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uwimap/selinux-uwimap-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:04 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="uwimap"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uwimap"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-varnishd/Manifest b/sec-policy/selinux-varnishd/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-varnishd/Manifest
+++ b/sec-policy/selinux-varnishd/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20120725-r9.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..aee20122c3c7
--- /dev/null
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-varnishd/selinux-varnishd-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:05 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="varnishd"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for varnishd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-vbetool/Manifest b/sec-policy/selinux-vbetool/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-vbetool/Manifest
+++ b/sec-policy/selinux-vbetool/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20120725-r9.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..5ce9ccedd39c
--- /dev/null
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vbetool/selinux-vbetool-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:21 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="vbetool"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vbetool"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-vdagent/Manifest b/sec-policy/selinux-vdagent/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-vdagent/Manifest
+++ b/sec-policy/selinux-vdagent/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20120725-r9.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..1b16396c29e3
--- /dev/null
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vdagent/selinux-vdagent-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:08 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="vdagent"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vdagent"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-vde/Manifest b/sec-policy/selinux-vde/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-vde/Manifest
+++ b/sec-policy/selinux-vde/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20120725-r9.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..f3f490657d10
--- /dev/null
+++ b/sec-policy/selinux-vde/selinux-vde-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vde/selinux-vde-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:57 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="vde"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vde"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-virt/Manifest b/sec-policy/selinux-virt/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-virt/Manifest
+++ b/sec-policy/selinux-virt/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20120725-r9.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..7441926ab40d
--- /dev/null
+++ b/sec-policy/selinux-virt/selinux-virt-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-virt/selinux-virt-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:01 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="virt"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for virt"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-vlock/Manifest b/sec-policy/selinux-vlock/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-vlock/Manifest
+++ b/sec-policy/selinux-vlock/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20120725-r9.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..908ba47ff0da
--- /dev/null
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vlock/selinux-vlock-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:25 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="vlock"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vlock"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-vmware/Manifest b/sec-policy/selinux-vmware/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-vmware/Manifest
+++ b/sec-policy/selinux-vmware/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20120725-r9.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..6a2fef565686
--- /dev/null
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vmware/selinux-vmware-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:15 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="vmware"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vmware"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-vnstatd/Manifest b/sec-policy/selinux-vnstatd/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-vnstatd/Manifest
+++ b/sec-policy/selinux-vnstatd/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20120725-r9.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..250102c66e8e
--- /dev/null
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:30 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="vnstatd"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vnstatd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-vpn/Manifest b/sec-policy/selinux-vpn/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-vpn/Manifest
+++ b/sec-policy/selinux-vpn/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20120725-r9.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..bcd1d4b23d4f
--- /dev/null
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vpn/selinux-vpn-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:11 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="vpn"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vpn"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-watchdog/Manifest b/sec-policy/selinux-watchdog/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-watchdog/Manifest
+++ b/sec-policy/selinux-watchdog/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20120725-r9.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..d8e003deacf4
--- /dev/null
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-watchdog/selinux-watchdog-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:20 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="watchdog"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for watchdog"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-webalizer/Manifest b/sec-policy/selinux-webalizer/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-webalizer/Manifest
+++ b/sec-policy/selinux-webalizer/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20120725-r9.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..ae1446afc9bb
--- /dev/null
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-webalizer/selinux-webalizer-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:12 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="webalizer"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for webalizer"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-wine/Manifest b/sec-policy/selinux-wine/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-wine/Manifest
+++ b/sec-policy/selinux-wine/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20120725-r9.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..8e66b82e5420
--- /dev/null
+++ b/sec-policy/selinux-wine/selinux-wine-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-wine/selinux-wine-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:46:59 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="wine"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for wine"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-wireshark/Manifest b/sec-policy/selinux-wireshark/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-wireshark/Manifest
+++ b/sec-policy/selinux-wireshark/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20120725-r9.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..20bfb1fbdac0
--- /dev/null
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-wireshark/selinux-wireshark-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:27 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="wireshark"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for wireshark"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-wm/Manifest b/sec-policy/selinux-wm/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-wm/Manifest
+++ b/sec-policy/selinux-wm/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20120725-r9.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..dc6668635305
--- /dev/null
+++ b/sec-policy/selinux-wm/selinux-wm-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-wm/selinux-wm-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:07 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="wm"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for wm"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-xen/Manifest b/sec-policy/selinux-xen/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-xen/Manifest
+++ b/sec-policy/selinux-xen/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20120725-r9.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..a44ca952003e
--- /dev/null
+++ b/sec-policy/selinux-xen/selinux-xen-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xen/selinux-xen-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:00 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="xen"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xen"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-xfs/Manifest b/sec-policy/selinux-xfs/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-xfs/Manifest
+++ b/sec-policy/selinux-xfs/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20120725-r9.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..a7b5d4d7b96a
--- /dev/null
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xfs/selinux-xfs-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:05 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="xfs"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xfs"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-xprint/Manifest b/sec-policy/selinux-xprint/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-xprint/Manifest
+++ b/sec-policy/selinux-xprint/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20120725-r9.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..7caa83c18cc6
--- /dev/null
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xprint/selinux-xprint-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:22 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="xprint"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xprint"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-xscreensaver/Manifest b/sec-policy/selinux-xscreensaver/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-xscreensaver/Manifest
+++ b/sec-policy/selinux-xscreensaver/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20120725-r9.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..2cb5d25eeb8f
--- /dev/null
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20120725-r9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:23 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="xscreensaver"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xscreensaver"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-xserver/Manifest b/sec-policy/selinux-xserver/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-xserver/Manifest
+++ b/sec-policy/selinux-xserver/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20120725-r9.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..81323782f722
--- /dev/null
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xserver/selinux-xserver-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:20 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="xserver"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xserver"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-zabbix/Manifest b/sec-policy/selinux-zabbix/Manifest
index 40de087c5129..345d7e91d3e0 100644
--- a/sec-policy/selinux-zabbix/Manifest
+++ b/sec-policy/selinux-zabbix/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
 DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
+DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc4939838f69ad26100dc5f43358c5d9465db78acb0d343f59d59a02160591 SHA512 819075bb38f5a05f8eb1bb76157f911be5b71bb02d4789369e09b134241a9f776e660d02cea1cd2f5aae7aa93cfbc25cd3abe42fb1f9e4ccd9fdff8e6a45babe WHIRLPOOL 4ba77ea6e18f090d1e8a9d382adf28378d54bc5a6e1477733b46a3eef337b8159d5bdf702264aa54b3cb0881f1756790da906806d6fa5382424de95aeb864cec
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20120725-r9.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20120725-r9.ebuild
new file mode 100644
index 000000000000..9c8d7be77893
--- /dev/null
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20120725-r9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-zabbix/selinux-zabbix-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:09 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="zabbix"
+BASEPOL="2.20120725-r9"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for zabbix"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index d08a4bccc961..18c3bda8dd20 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,11 +1,8 @@
 DIST portage-2.1.11.31.tar.bz2 848585 SHA256 3013e9ba1fc3f87a5fedff8e5a1d2b36d6a9e06538fdebee6ab7b4cf61d273ce SHA512 12222ecb8e3f3b239c7616568475d87f2ef705b83cb72311c0d70df49c7eef1f1bb4e898afb6f17023b40077a80f9ae26129aef0a52f9f16e22140e5ea8d8522 WHIRLPOOL b3d3b0fc90476c6bd6c41a1dea17999ca21598db547c8e691fdd378e9bbacb991954f03378a033755008d7bc27d15b2505f62e6408ec914e840ead4edc0a5c9a
-DIST portage-2.1.11.37.tar.bz2 861499 SHA256 eafb5be7c9bf8c05bfef0d317c835047fc4015e007196112c1ab927bbe755ccd SHA512 f76a29d14fa6a649493368486a0cbad6098c2baefc9a8a4f665e267a30a6d866169ad1d4aa3ecf90a00fe3eef5aaad334583f1d929ceff749c7ae3bdf49c7ea2 WHIRLPOOL 5abec26bf88e568238c8338ee92b3130753feb7276931c5ae8d8182d411f90f9f6e8bd30eefe13717f21ce22996de68becee4b4c310e65534acf6020df5a5e5c
 DIST portage-2.1.11.38.tar.bz2 862196 SHA256 e66839e52b70a69635be2115b448f89bd70f73b872ee269ea07ebf473c9e0c12 SHA512 cc1d1e22c6c5c0ae0ff35f52997b2a830ae6fe722b4fc5782b026a283cc6e5fc0a084433014b8dde47d678a01a86cce9b9fd8e6bd25da20dcaeee22a36546398 WHIRLPOOL 0c2c87371b96f4c19ca2b214e31a6fecda3c068a85a648635abe8439519d8a7c13e2c03853ef8507362e8172a482c9d58a1aea8492446dd49e3b5287e50087c0
-DIST portage-2.1.11.9.tar.bz2 844344 SHA256 590ecdae12581e0ead0eca6e4b8e0ca6bc5f1ecaafb98a5d3b684db5b1af7a05 SHA512 64919b833a719f6f1de5bc3ec8a921dd5fca75ea8c4535ce21faa608ff2bf811632ef627845e9b050fcd1ebf56f5792c7bd471925e75c1264d01277979d704a8 WHIRLPOOL d325c2b5ec50cde40f4b2ce127728b3712321febef58897b3141287776424610bd12701c159f15c5cec41f2eb35569e302a5692045406205e833f8e4cfd3d9fd
 DIST portage-2.1.6.7.patch.bz2 50118 SHA256 5f0605b51a24d23703330b040d2f7154322284db3e0cefa7499002ff1fa733c0 SHA512 dd2acc1d436cad77cfc83c4dec79316763c1fb88d61b7702e8e47e6f31b2b9fe49e8a4cf4a947614a2acd6db2ef080ed8b4ae5fce9d9be29d7e218a0ec1576c0 WHIRLPOOL 050f923249fde7c4774a2a8a944889e4270a89b00441f1923c01ab0be38f107503e018d7ab7a7f42615e7e375f0f6c0eb3bdbf3ff4ce1ce226957238a729b1ee
 DIST portage-2.1.6.7_p1.patch.bz2 4741 SHA256 ddaae2ad8c01e6477bfe22e23a4da57eb9d079a27a17a08385d56fe2c49eec30 SHA512 39058d815827b340787d813515ed4fb8c52c4fb0caa12ae70c8a9a97b9ba16c2bf4177190cb7d1c508055ce8a7aaa390ba9b31642c7d74bfb4a14d729e720617 WHIRLPOOL 8eab9574ed2e6cabac593d93f8b6ff71465c01376e7eec4cf357c336b5ed3d4f3fb3521991148ba4e34ba00c56bec5534c98311167c03866812277a8d88b0494
 DIST portage-2.1.6.tar.bz2 518771 SHA256 b1c507445b3858449c861568f477e1cfab8b2326ded906b852c5193fb3839647 SHA512 d035f84601802ecaea3c0edea037a783fec743733bd40895eb5bb8a220449eb24cf1e2623cbca2e378197caba63a833d8cc54f1e49d886266307288b0adcfbdc WHIRLPOOL 25b6a6e3810f428c630ec7a6dc3cf2cfbe6bfdf276553786e1436b2630532ab442186e427bc75f249a224c5171b508a92303ce352b07be1a8a4d805c568ec10f
 DIST portage-2.2.0_alpha142.tar.bz2 848765 SHA256 c2fb4499fbf747ad11a297f2ab0340f6af7958868cc72530627dd46596e88ff5 SHA512 f0fb016503d1e7998cc295c07ea83d4210075ea3d8c9421e2e9fe4256dde4138a073c60c6f11dc1dd0b3a362404810dea84ee878eec8a0c74bd43ef8e3741d2c WHIRLPOOL 34f1f5ebd2f18e52b1d441d763fda335cdbcc879aa89e36ca5a8e344567c8ab30d7a88864f97a332ba4b2a9d226eae89a41302e73ebe7eb2d33d2a9a0a3211be
-DIST portage-2.2.0_alpha148.patch.bz2 51041 SHA256 4e658d2081ff11cb4765fbe8c304795aabacbb7498d04233c072b890f58e2146 SHA512 f32e947bdf88aa37106abe56572d8a1d2204b96cf7276b115adcf7ff8994192dd499744643b96a582b15a5a80159f0263a33a45f3dd7f48ff7a939ef06f2ca63 WHIRLPOOL f5d23916708c83317491ed489c52ed889f4d60d0b48c2c2717943dfe76c19c4dd061ca059350ad18fee982bbb075b6312c966e48ee4020903eed4f7937018f49
 DIST portage-2.2.0_alpha149.patch.bz2 52923 SHA256 ceb46857ba3f8cb50b5ee262377ec9fd14c7e606dec11b34e3e604b38a2b1497 SHA512 d1d206a4507351656d7b508238c484c0c619a44fad40ce0ce3847ed011a4fc75805d8143b45dcce6e51db41374597b53e41b63bca716773ffcb3c5e9d987260f WHIRLPOOL 75914b8354ff7b3ae463a617b6ad5fe87e02a7740a2a1dd61b8f2d435af95cc09552533a47d75899a1d3f09134747a70d05d2b0b51b09ec5301c08a8d06b5865
 DIST portage-man-pl-2.1.2.tar.bz2 53893 SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f SHA512 5f5c8dd1559048546633b1e7291ff8c0f5d637595f1a4c98405424b08c30c089fc9359e0214f78fbe358754f20d327794f4692b9b67639585c29b755975ee853 WHIRLPOOL 756e267b84077501d976f46fa448cda5368cd52aeca6ec43d109c81fe8e2364e0cd0f35630d68a4186c70e3b440b7c870b86ac7ef83cc0afa43e10f9f8e1f422
diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
index 0802c62f61b7..90e04cd81997 100644
--- a/sys-apps/portage/metadata.xml
+++ b/sys-apps/portage/metadata.xml
@@ -11,7 +11,7 @@
 		<flag name="epydoc">Build html API documentation with epydoc.</flag>
 		<flag name="ipc">Use inter-process communication between portage and running ebuilds.</flag>
 		<flag name="less">Pull in sys-apps/less as default pager for etc-update.</flag>
-		<flag name="pypy1_9">Use pypy-c1.9 as Python interpreter.</flag>
+		<flag name="pypy2_0">Use pypy-c2.0 as Python interpreter.</flag>
 		<flag name="python2">Use python2 as Python interpreter.</flag>
 		<flag name="python3">Use python3 as Python interpreter.</flag>
 	</use>
diff --git a/sys-apps/portage/portage-2.1.11.31.ebuild b/sys-apps/portage/portage-2.1.11.31.ebuild
index 002b10ee9aae..b6f7bcda6b67 100644
--- a/sys-apps/portage/portage-2.1.11.31.ebuild
+++ b/sys-apps/portage/portage-2.1.11.31.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/portage/portage-2.1.11.31.ebuild,v 1.9 2012/12/11 19:24:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.31.ebuild,v 1.10 2012/12/22 09:14:27 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -12,15 +12,15 @@ HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl pypy1_9 python2 python3 selinux xattr"
+IUSE="build doc epydoc +ipc linguas_pl pypy2_0 python2 python3 selinux xattr"
 
 # Import of the io module in python-2.6 raises ImportError for the
 # thread module if threading is disabled.
 python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
-	!pypy1_9? ( !python2? ( !python3? (
+	!pypy2_0? ( !python2? ( !python3? (
 		|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
 	) ) )
-	pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) )
+	pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2,ssl] ) ) )
 	python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )"
 python_dep="${python_dep_ssl//\[ssl\]}"
 python_dep="${python_dep//,ssl}"
@@ -103,15 +103,15 @@ pkg_setup() {
 		ewarn "Both python2 and python3 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python3."
 	fi
-	if use pypy1_9 && use python3 ; then
-		ewarn "Both pypy1_9 and python3 USE flags are enabled, but only one"
+	if use pypy2_0 && use python3 ; then
+		ewarn "Both pypy2_0 and python3 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python3."
 	fi
-	if use pypy1_9 && use python2 ; then
-		ewarn "Both pypy1_9 and python2 USE flags are enabled, but only one"
+	if use pypy2_0 && use python2 ; then
+		ewarn "Both pypy2_0 and python2 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python2"
 	fi
-	if ! use pypy1_9 && ! use python2 && ! use python3 && \
+	if ! use pypy2_0 && ! use python2 && ! use python3 && \
 		! compatible_python_is_selected ; then
 		ewarn "Attempting to select a compatible default python interpreter"
 		local x success=0
@@ -136,8 +136,8 @@ pkg_setup() {
 		python_set_active_version 3
 	elif use python2; then
 		python_set_active_version 2
-	elif use pypy1_9; then
-		python_set_active_version 2.7-pypy-1.9
+	elif use pypy2_0; then
+		python_set_active_version 2.7-pypy-2.0
 	fi
 }
 
@@ -176,9 +176,9 @@ src_prepare() {
 	elif use python2; then
 		einfo "Converting shebangs for python2..."
 		python_convert_shebangs -r 2 .
-	elif use pypy1_9; then
-		einfo "Converting shebangs for pypy-c1.9..."
-		python_convert_shebangs -r 2.7-pypy-1.9 .
+	elif use pypy2_0; then
+		einfo "Converting shebangs for pypy-c2.0..."
+		python_convert_shebangs -r 2.7-pypy-2.0 .
 	fi
 
 	cd "${S}/cnf" || die
diff --git a/sys-apps/portage/portage-2.1.11.37.ebuild b/sys-apps/portage/portage-2.1.11.37.ebuild
deleted file mode 100644
index f7731fc8b8f2..000000000000
--- a/sys-apps/portage/portage-2.1.11.37.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.37.ebuild,v 1.1 2012/12/11 22:03:02 zmedico Exp $
-
-# Require EAPI 2 since we now require at least python-2.6 (for python 3
-# syntax support) which also requires EAPI 2.
-EAPI=2
-inherit eutils python
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl pypy1_9 python2 python3 selinux xattr"
-
-# Import of the io module in python-2.6 raises ImportError for the
-# thread module if threading is disabled.
-python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
-	!pypy1_9? ( !python2? ( !python3? (
-		|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
-	) ) )
-	pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) )
-	python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )"
-python_dep="${python_dep_ssl//\[ssl\]}"
-python_dep="${python_dep//,ssl}"
-python_dep="${python_dep//ssl,}"
-
-# The pysqlite blocker is for bug #282760.
-DEPEND="${python_dep}
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] or python-mhash (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-RDEPEND="${python_dep}
-	!build? ( >=sys-apps/sed-4.0.5
-		|| ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) )
-		>=app-admin/eselect-1.2
-		|| ( ${python_dep_ssl} dev-python/python-mhash )
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) )
-	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
-	!<app-shells/bash-3.2_p17
-	!<app-admin/logrotate-3.8.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=install-sources requires debugedit and rsync
-
-SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-PV_PL="2.1.2"
-PATCHVER_PL=""
-TARBALL_PV=$PV
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
-	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
-		$(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )"
-
-PATCHVER=
-[[ $TARBALL_PV = $PV ]] || PATCHVER=$PV
-if [ -n "${PATCHVER}" ]; then
-	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
-	$(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)"
-fi
-
-S="${WORKDIR}"/${PN}-${TARBALL_PV}
-S_PL="${WORKDIR}"/${PN}-${PV_PL}
-
-compatible_python_is_selected() {
-	[[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
-}
-
-current_python_has_xattr() {
-	[[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \
-	/usr/bin/python -c 'import xattr' 2>/dev/null
-}
-
-pkg_setup() {
-	if use python2 && use python3 ; then
-		ewarn "Both python2 and python3 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python3."
-	fi
-	if use pypy1_9 && use python3 ; then
-		ewarn "Both pypy1_9 and python3 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python3."
-	fi
-	if use pypy1_9 && use python2 ; then
-		ewarn "Both pypy1_9 and python2 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python2"
-	fi
-	if ! use pypy1_9 && ! use python2 && ! use python3 && \
-		! compatible_python_is_selected ; then
-		ewarn "Attempting to select a compatible default python interpreter"
-		local x success=0
-		for x in /usr/bin/python2.* ; do
-			x=${x#/usr/bin/python2.}
-			if [[ $x -ge 6 ]] 2>/dev/null ; then
-				eselect python set python2.$x
-				if compatible_python_is_selected ; then
-					elog "Default python interpreter is now set to python-2.$x"
-					success=1
-					break
-				fi
-			fi
-		done
-		if [ $success != 1 ] ; then
-			eerror "Unable to select a compatible default python interpreter!"
-			die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
-		fi
-	fi
-
-	if use python3; then
-		python_set_active_version 3
-	elif use python2; then
-		python_set_active_version 2
-	elif use pypy1_9; then
-		python_set_active_version 2.7-pypy-1.9
-	fi
-}
-
-src_prepare() {
-	if [ -n "${PATCHVER}" ] ; then
-		if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
-			rm "$S/bin/ebuild-helpers/portageq" \
-				|| die "failed to remove portageq helper symlink"
-		fi
-		epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
-	fi
-	einfo "Setting portage.VERSION to ${PVR} ..."
-	sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
-		die "Failed to patch portage.VERSION"
-	sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
-		die "Failed to patch VERSION in doc/fragment/version"
-	sed -e "1s/VERSION/${PVR}/" -i man/* || \
-		die "Failed to patch VERSION in man page headers"
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use python3; then
-		einfo "Converting shebangs for python3..."
-		python_convert_shebangs -r 3 .
-	elif use python2; then
-		einfo "Converting shebangs for python2..."
-		python_convert_shebangs -r 2 .
-	elif use pypy1_9; then
-		einfo "Converting shebangs for pypy-c1.9..."
-		python_convert_shebangs -r 2.7-pypy-1.9 .
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.${ARCH}".diff ]; then
-		patch make.conf "make.conf.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-src_compile() {
-	if use doc; then
-		emake docbook || die
-	fi
-
-	if use epydoc; then
-		einfo "Generating api docs"
-		emake epydoc || die
-	fi
-}
-
-src_test() {
-	emake test || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		sysconfdir="/etc" \
-		prefix="/usr" \
-		install || die
-
-	# Extended set config is currently disabled in portage-2.1.x.
-	rm -rf "${D}/usr/share/portage/config/sets" || die
-
-	# Use dodoc for compression, since the Makefile doesn't do that.
-	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die
-
-	if use linguas_pl; then
-		doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] || die
-		doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] || die
-	fi
-
-	# Set PYTHONPATH for portage API consumers. This way we don't have
-	# to rely on patched python having the correct path, since it has
-	# been known to incorrectly add /usr/libx32/portage/pym to sys.path.
-	echo "PYTHONPATH=\"/usr/lib/portage/pym\"" > \
-		"${T}/05portage" || die
-	doenvd "${T}/05portage" || die
-}
-
-pkg_preinst() {
-	if [[ $ROOT == / ]] ; then
-		# Run some minimal tests as a sanity check.
-		local test_runner=$(find "$D" -name runTests)
-		if [[ -n $test_runner && -x $test_runner ]] ; then
-			einfo "Running preinst sanity tests..."
-			"$test_runner" || die "preinst sanity tests failed"
-		fi
-	fi
-
-	if use xattr && ! current_python_has_xattr ; then
-		ewarn "For optimal performance in xattr handling, install"
-		ewarn "dev-python/pyxattr, or install >=dev-lang/python-3.3 and"
-		ewarn "enable USE=python3 for $CATEGORY/$PN."
-	fi
-
-	if ! use build && ! has_version dev-python/pycrypto && \
-		! has_version '>=dev-lang/python-2.6[ssl]' ; then
-		ewarn "If you are an ebuild developer and you plan to commit ebuilds"
-		ewarn "with this system then please install dev-python/pycrypto or"
-		ewarn "enable the ssl USE flag for >=dev-lang/python-2.6 in order"
-		ewarn "to enable RMD160 hash support."
-		ewarn "See bug #198398 for more information."
-	fi
-
-	if [[ -d ${ROOT}var/log/portage && \
-		$(ls -ld "${ROOT}var/log/portage") != *" portage portage "* ]] && \
-		has_version '<sys-apps/portage-2.1.10.11' ; then
-		# Initialize permissions for bug #378451 and bug #377177, since older
-		# portage does not create /var/log/portage with the desired default
-		# permissions.
-		einfo "Applying portage group permission to ${ROOT}var/log/portage for bug #378451"
-		chown portage:portage "${ROOT}var/log/portage"
-		chmod g+ws "${ROOT}var/log/portage"
-	fi
-
-	if has_version '<sys-apps/portage-2.1.10.61' ; then
-		ewarn "FEATURES=config-protect-if-modified is now enabled by default."
-		ewarn "This causes the CONFIG_PROTECT behavior to be skipped for"
-		ewarn "files that have not been modified since they were installed."
-	fi
-}
-
-pkg_postinst() {
-	# Compile all source files recursively. Any orphans
-	# will be identified and removed in postrm.
-	python_mod_optimize /usr/lib/portage/pym
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/lib/portage/pym
-}
diff --git a/sys-apps/portage/portage-2.1.11.38.ebuild b/sys-apps/portage/portage-2.1.11.38.ebuild
index e387cabdb1c5..ae3305179ee0 100644
--- a/sys-apps/portage/portage-2.1.11.38.ebuild
+++ b/sys-apps/portage/portage-2.1.11.38.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/portage/portage-2.1.11.38.ebuild,v 1.1 2012/12/16 00:08:49 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.38.ebuild,v 1.2 2012/12/22 09:14:27 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -12,15 +12,15 @@ HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl pypy1_9 python2 python3 selinux xattr"
+IUSE="build doc epydoc +ipc linguas_pl pypy2_0 python2 python3 selinux xattr"
 
 # Import of the io module in python-2.6 raises ImportError for the
 # thread module if threading is disabled.
 python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
-	!pypy1_9? ( !python2? ( !python3? (
+	!pypy2_0? ( !python2? ( !python3? (
 		|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
 	) ) )
-	pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) )
+	pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2,ssl] ) ) )
 	python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )"
 python_dep="${python_dep_ssl//\[ssl\]}"
 python_dep="${python_dep//,ssl}"
@@ -103,15 +103,15 @@ pkg_setup() {
 		ewarn "Both python2 and python3 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python3."
 	fi
-	if use pypy1_9 && use python3 ; then
-		ewarn "Both pypy1_9 and python3 USE flags are enabled, but only one"
+	if use pypy2_0 && use python3 ; then
+		ewarn "Both pypy2_0 and python3 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python3."
 	fi
-	if use pypy1_9 && use python2 ; then
-		ewarn "Both pypy1_9 and python2 USE flags are enabled, but only one"
+	if use pypy2_0 && use python2 ; then
+		ewarn "Both pypy2_0 and python2 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python2"
 	fi
-	if ! use pypy1_9 && ! use python2 && ! use python3 && \
+	if ! use pypy2_0 && ! use python2 && ! use python3 && \
 		! compatible_python_is_selected ; then
 		ewarn "Attempting to select a compatible default python interpreter"
 		local x success=0
@@ -136,8 +136,8 @@ pkg_setup() {
 		python_set_active_version 3
 	elif use python2; then
 		python_set_active_version 2
-	elif use pypy1_9; then
-		python_set_active_version 2.7-pypy-1.9
+	elif use pypy2_0; then
+		python_set_active_version 2.7-pypy-2.0
 	fi
 }
 
@@ -176,9 +176,9 @@ src_prepare() {
 	elif use python2; then
 		einfo "Converting shebangs for python2..."
 		python_convert_shebangs -r 2 .
-	elif use pypy1_9; then
-		einfo "Converting shebangs for pypy-c1.9..."
-		python_convert_shebangs -r 2.7-pypy-1.9 .
+	elif use pypy2_0; then
+		einfo "Converting shebangs for pypy-c2.0..."
+		python_convert_shebangs -r 2.7-pypy-2.0 .
 	fi
 
 	cd "${S}/cnf" || die
diff --git a/sys-apps/portage/portage-2.1.11.9.ebuild b/sys-apps/portage/portage-2.1.11.9.ebuild
deleted file mode 100644
index 1d3de1f0b893..000000000000
--- a/sys-apps/portage/portage-2.1.11.9.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.9.ebuild,v 1.12 2012/12/05 02:19:14 zmedico Exp $
-
-# Require EAPI 2 since we now require at least python-2.6 (for python 3
-# syntax support) which also requires EAPI 2.
-EAPI=2
-inherit eutils multilib python
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl pypy1_9 python2 python3 selinux xattr"
-
-# Import of the io module in python-2.6 raises ImportError for the
-# thread module if threading is disabled.
-python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
-	!pypy1_9? ( !python2? ( !python3? (
-		|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
-	) ) )
-	pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) )
-	python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )"
-python_dep="${python_dep_ssl//\[ssl\]}"
-python_dep="${python_dep//,ssl}"
-python_dep="${python_dep//ssl,}"
-
-# The pysqlite blocker is for bug #282760.
-DEPEND="${python_dep}
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] or python-mhash (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-RDEPEND="${python_dep}
-	!build? ( >=sys-apps/sed-4.0.5
-		|| ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) )
-		>=app-admin/eselect-1.2
-		|| ( ${python_dep_ssl} dev-python/python-mhash )
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) )
-	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
-	!<app-shells/bash-3.2_p17
-	!<app-admin/logrotate-3.8.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=install-sources requires debugedit and rsync
-
-SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-PV_PL="2.1.2"
-PATCHVER_PL=""
-TARBALL_PV=$PV
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
-	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
-		$(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )"
-
-PATCHVER=
-[[ $TARBALL_PV = $PV ]] || PATCHVER=$PV
-if [ -n "${PATCHVER}" ]; then
-	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
-	$(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)"
-fi
-
-S="${WORKDIR}"/${PN}-${TARBALL_PV}
-S_PL="${WORKDIR}"/${PN}-${PV_PL}
-
-compatible_python_is_selected() {
-	[[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
-}
-
-current_python_has_xattr() {
-	[[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \
-	/usr/bin/python -c 'import xattr' 2>/dev/null
-}
-
-pkg_setup() {
-	# Bug #359731 - Die early if get_libdir fails.
-	[[ -z $(get_libdir) ]] && \
-		die "get_libdir returned an empty string"
-
-	if use python2 && use python3 ; then
-		ewarn "Both python2 and python3 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python3."
-	fi
-	if use pypy1_9 && use python3 ; then
-		ewarn "Both pypy1_9 and python3 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python3."
-	fi
-	if use pypy1_9 && use python2 ; then
-		ewarn "Both pypy1_9 and python2 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python2"
-	fi
-	if ! use pypy1_9 && ! use python2 && ! use python3 && \
-		! compatible_python_is_selected ; then
-		ewarn "Attempting to select a compatible default python interpreter"
-		local x success=0
-		for x in /usr/bin/python2.* ; do
-			x=${x#/usr/bin/python2.}
-			if [[ $x -ge 6 ]] 2>/dev/null ; then
-				eselect python set python2.$x
-				if compatible_python_is_selected ; then
-					elog "Default python interpreter is now set to python-2.$x"
-					success=1
-					break
-				fi
-			fi
-		done
-		if [ $success != 1 ] ; then
-			eerror "Unable to select a compatible default python interpreter!"
-			die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
-		fi
-	fi
-
-	if use python3; then
-		python_set_active_version 3
-	elif use python2; then
-		python_set_active_version 2
-	elif use pypy1_9; then
-		python_set_active_version 2.7-pypy-1.9
-	fi
-}
-
-src_prepare() {
-	if [ -n "${PATCHVER}" ] ; then
-		if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
-			rm "$S/bin/ebuild-helpers/portageq" \
-				|| die "failed to remove portageq helper symlink"
-		fi
-		epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
-	fi
-	einfo "Setting portage.VERSION to ${PVR} ..."
-	sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
-		die "Failed to patch portage.VERSION"
-	sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
-		die "Failed to patch VERSION in doc/fragment/version"
-	sed -e "1s/VERSION/${PVR}/" -i man/* || \
-		die "Failed to patch VERSION in man page headers"
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use python3; then
-		einfo "Converting shebangs for python3..."
-		python_convert_shebangs -r 3 .
-	elif use python2; then
-		einfo "Converting shebangs for python2..."
-		python_convert_shebangs -r 2 .
-	elif use pypy1_9; then
-		einfo "Converting shebangs for pypy-c1.9..."
-		python_convert_shebangs -r 2.7-pypy-1.9 .
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.${ARCH}".diff ]; then
-		patch make.conf "make.conf.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-
-	# BSD and OSX need a sed wrapper so that find/xargs work properly
-	if use userland_GNU; then
-		rm -f "${S}"/bin/ebuild-helpers/sed || \
-			die "Failed to remove sed wrapper"
-	fi
-}
-
-src_compile() {
-	if use doc; then
-		emake docbook || die
-	fi
-
-	if use epydoc; then
-		einfo "Generating api docs"
-		emake epydoc || die
-	fi
-}
-
-src_test() {
-	emake test || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		sysconfdir="/etc" \
-		prefix="/usr" \
-		libdir="/usr/$(get_libdir)" \
-		install || die
-
-	# Use dodoc for compression, since the Makefile doesn't do that.
-	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die
-
-	if use linguas_pl; then
-		doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] || die
-		doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] || die
-	fi
-}
-
-pkg_preinst() {
-	if [[ $ROOT == / ]] ; then
-		# Run some minimal tests as a sanity check.
-		local test_runner=$(find "$D" -name runTests)
-		if [[ -n $test_runner && -x $test_runner ]] ; then
-			einfo "Running preinst sanity tests..."
-			"$test_runner" || die "preinst sanity tests failed"
-		fi
-	fi
-
-	if use xattr && ! current_python_has_xattr ; then
-		ewarn "For optimal performance in xattr handling, install"
-		ewarn "dev-python/pyxattr, or install >=dev-lang/python-3.3 and"
-		ewarn "enable USE=python3 for $CATEGORY/$PN."
-	fi
-
-	if ! use build && ! has_version dev-python/pycrypto && \
-		! has_version '>=dev-lang/python-2.6[ssl]' ; then
-		ewarn "If you are an ebuild developer and you plan to commit ebuilds"
-		ewarn "with this system then please install dev-python/pycrypto or"
-		ewarn "enable the ssl USE flag for >=dev-lang/python-2.6 in order"
-		ewarn "to enable RMD160 hash support."
-		ewarn "See bug #198398 for more information."
-	fi
-	if [[ ! -L "${ROOT}/etc/make.globals" && -f "${ROOT}/etc/make.globals" ]]; then
-		rm "${ROOT}/etc/make.globals"
-	fi
-
-	if [[ -d ${ROOT}var/log/portage && \
-		$(ls -ld "${ROOT}var/log/portage") != *" portage portage "* ]] && \
-		has_version '<sys-apps/portage-2.1.10.11' ; then
-		# Initialize permissions for bug #378451 and bug #377177, since older
-		# portage does not create /var/log/portage with the desired default
-		# permissions.
-		einfo "Applying portage group permission to ${ROOT}var/log/portage for bug #378451"
-		chown portage:portage "${ROOT}var/log/portage"
-		chmod g+ws "${ROOT}var/log/portage"
-	fi
-
-	if has_version '<sys-apps/portage-2.1.10.61' ; then
-		ewarn "FEATURES=config-protect-if-modified is now enabled by default."
-		ewarn "This causes the CONFIG_PROTECT behavior to be skipped for"
-		ewarn "files that have not been modified since they were installed."
-	fi
-}
-
-pkg_postinst() {
-	# Compile all source files recursively. Any orphans
-	# will be identified and removed in postrm.
-	python_mod_optimize /usr/$(get_libdir)/portage/pym
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/portage/pym
-}
diff --git a/sys-apps/portage/portage-2.2.0_alpha142.ebuild b/sys-apps/portage/portage-2.2.0_alpha142.ebuild
index 6b527cc5edba..d6cb3a1ef7f9 100644
--- a/sys-apps/portage/portage-2.2.0_alpha142.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha142.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/portage/portage-2.2.0_alpha142.ebuild,v 1.3 2012/12/05 02:19:14 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha142.ebuild,v 1.4 2012/12/22 09:14:27 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -12,15 +12,15 @@ HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"
 KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl pypy1_9 python2 python3 selinux xattr"
+IUSE="build doc epydoc +ipc linguas_pl pypy2_0 python2 python3 selinux xattr"
 
 # Import of the io module in python-2.6 raises ImportError for the
 # thread module if threading is disabled.
 python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
-	!pypy1_9? ( !python2? ( !python3? (
+	!pypy2_0? ( !python2? ( !python3? (
 		|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
 	) ) )
-	pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) )
+	pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2,ssl] ) ) )
 	python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )"
 python_dep="${python_dep_ssl//\[ssl\]}"
 python_dep="${python_dep//,ssl}"
@@ -103,15 +103,15 @@ pkg_setup() {
 		ewarn "Both python2 and python3 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python3."
 	fi
-	if use pypy1_9 && use python3 ; then
-		ewarn "Both pypy1_9 and python3 USE flags are enabled, but only one"
+	if use pypy2_0 && use python3 ; then
+		ewarn "Both pypy2_0 and python3 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python3."
 	fi
-	if use pypy1_9 && use python2 ; then
-		ewarn "Both pypy1_9 and python2 USE flags are enabled, but only one"
+	if use pypy2_0 && use python2 ; then
+		ewarn "Both pypy2_0 and python2 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python2"
 	fi
-	if ! use pypy1_9 && ! use python2 && ! use python3 && \
+	if ! use pypy2_0 && ! use python2 && ! use python3 && \
 		! compatible_python_is_selected ; then
 		ewarn "Attempting to select a compatible default python interpreter"
 		local x success=0
@@ -136,8 +136,8 @@ pkg_setup() {
 		python_set_active_version 3
 	elif use python2; then
 		python_set_active_version 2
-	elif use pypy1_9; then
-		python_set_active_version 2.7-pypy-1.9
+	elif use pypy2_0; then
+		python_set_active_version 2.7-pypy-2.0
 	fi
 }
 
@@ -176,9 +176,9 @@ src_prepare() {
 	elif use python2; then
 		einfo "Converting shebangs for python2..."
 		python_convert_shebangs -r 2 .
-	elif use pypy1_9; then
-		einfo "Converting shebangs for pypy-c1.9..."
-		python_convert_shebangs -r 2.7-pypy-1.9 .
+	elif use pypy2_0; then
+		einfo "Converting shebangs for pypy-c2.0..."
+		python_convert_shebangs -r 2.7-pypy-2.0 .
 	fi
 
 	if [[ -n ${EPREFIX} ]] ; then
diff --git a/sys-apps/portage/portage-2.2.0_alpha148.ebuild b/sys-apps/portage/portage-2.2.0_alpha148.ebuild
deleted file mode 100644
index 3b7ed521078d..000000000000
--- a/sys-apps/portage/portage-2.2.0_alpha148.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha148.ebuild,v 1.1 2012/12/11 22:04:03 zmedico Exp $
-
-# Require EAPI 2 since we now require at least python-2.6 (for python 3
-# syntax support) which also requires EAPI 2.
-EAPI=3
-inherit eutils python
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
-LICENSE="GPL-2"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl pypy1_9 python2 python3 selinux xattr"
-
-# Import of the io module in python-2.6 raises ImportError for the
-# thread module if threading is disabled.
-python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
-	!pypy1_9? ( !python2? ( !python3? (
-		|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
-	) ) )
-	pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) )
-	python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )"
-python_dep="${python_dep_ssl//\[ssl\]}"
-python_dep="${python_dep//,ssl}"
-python_dep="${python_dep//ssl,}"
-
-# The pysqlite blocker is for bug #282760.
-DEPEND="${python_dep}
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] or python-mhash (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-RDEPEND="${python_dep}
-	!build? ( >=sys-apps/sed-4.0.5
-		|| ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) )
-		>=app-admin/eselect-1.2
-		|| ( ${python_dep_ssl} dev-python/python-mhash )
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) )
-	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
-	!<app-shells/bash-3.2_p17
-	!<app-admin/logrotate-3.8.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=install-sources requires debugedit and rsync
-
-SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-PV_PL="2.1.2"
-PATCHVER_PL=""
-TARBALL_PV=2.2.0_alpha142
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
-	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
-		$(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )"
-
-PATCHVER=
-[[ $TARBALL_PV = $PV ]] || PATCHVER=$PV
-if [ -n "${PATCHVER}" ]; then
-	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
-	$(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)"
-fi
-
-S="${WORKDIR}"/${PN}-${TARBALL_PV}
-S_PL="${WORKDIR}"/${PN}-${PV_PL}
-
-compatible_python_is_selected() {
-	[[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
-}
-
-current_python_has_xattr() {
-	[[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \
-	"${EPREFIX}/usr/bin/python" -c 'import xattr' 2>/dev/null
-}
-
-pkg_setup() {
-	if use python2 && use python3 ; then
-		ewarn "Both python2 and python3 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python3."
-	fi
-	if use pypy1_9 && use python3 ; then
-		ewarn "Both pypy1_9 and python3 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python3."
-	fi
-	if use pypy1_9 && use python2 ; then
-		ewarn "Both pypy1_9 and python2 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python2"
-	fi
-	if ! use pypy1_9 && ! use python2 && ! use python3 && \
-		! compatible_python_is_selected ; then
-		ewarn "Attempting to select a compatible default python interpreter"
-		local x success=0
-		for x in /usr/bin/python2.* ; do
-			x=${x#/usr/bin/python2.}
-			if [[ $x -ge 6 ]] 2>/dev/null ; then
-				eselect python set python2.$x
-				if compatible_python_is_selected ; then
-					elog "Default python interpreter is now set to python-2.$x"
-					success=1
-					break
-				fi
-			fi
-		done
-		if [ $success != 1 ] ; then
-			eerror "Unable to select a compatible default python interpreter!"
-			die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
-		fi
-	fi
-
-	if use python3; then
-		python_set_active_version 3
-	elif use python2; then
-		python_set_active_version 2
-	elif use pypy1_9; then
-		python_set_active_version 2.7-pypy-1.9
-	fi
-}
-
-src_prepare() {
-	if [ -n "${PATCHVER}" ] ; then
-		if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
-			rm "$S/bin/ebuild-helpers/portageq" \
-				|| die "failed to remove portageq helper symlink"
-		fi
-		epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
-	fi
-	einfo "Setting portage.VERSION to ${PVR} ..."
-	sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
-		die "Failed to patch portage.VERSION"
-	sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
-		die "Failed to patch VERSION in doc/fragment/version"
-	sed -e "1s/VERSION/${PVR}/" -i man/* || \
-		die "Failed to patch VERSION in man page headers"
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use python3; then
-		einfo "Converting shebangs for python3..."
-		python_convert_shebangs -r 3 .
-	elif use python2; then
-		einfo "Converting shebangs for python2..."
-		python_convert_shebangs -r 2 .
-	elif use pypy1_9; then
-		einfo "Converting shebangs for pypy-c1.9..."
-		python_convert_shebangs -r 2.7-pypy-1.9 .
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		find . -type f -print0 | \
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done
-
-		einfo "Adjusting make.globals ..."
-		sed -e 's|^SYNC=.*|SYNC="rsync://rsync.prefix.freens.org/gentoo-portage-prefix"|' \
-			-e "s|^\(PORTDIR=\)\(/usr/portage\)|\\1\"${EPREFIX}\\2\"|" \
-			-e "s|^\(PORTAGE_TMPDIR=\)\(/var/tmp\)|\\1\"${EPREFIX}\\2\"|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	echo -e '\nFEATURES="${FEATURES} preserve-libs"' >> cnf/make.globals \
-		|| die "failed to append to make.globals"
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.${ARCH}".diff ]; then
-		patch make.conf "make.conf.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-src_compile() {
-	if use doc; then
-		emake docbook || die
-	fi
-
-	if use epydoc; then
-		einfo "Generating api docs"
-		emake epydoc || die
-	fi
-}
-
-src_test() {
-	# make files executable, in case they were created by patch
-	find bin -type f | xargs chmod +x
-	emake test || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		sysconfdir="${EPREFIX}/etc" \
-		prefix="${EPREFIX}/usr" \
-		install || die
-
-	# Use dodoc for compression, since the Makefile doesn't do that.
-	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die
-
-	if use linguas_pl; then
-		doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] || die
-		doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] || die
-	fi
-
-	# Set PYTHONPATH for portage API consumers. This way we don't have
-	# to rely on patched python having the correct path, since it has
-	# been known to incorrectly add /usr/libx32/portage/pym to sys.path.
-	echo "PYTHONPATH=\"${EPREFIX}/usr/lib/portage/pym\"" > \
-		"${T}/05portage" || die
-	doenvd "${T}/05portage" || die
-}
-
-pkg_preinst() {
-	if [[ $ROOT == / ]] ; then
-		# Run some minimal tests as a sanity check.
-		local test_runner=$(find "$ED" -name runTests)
-		if [[ -n $test_runner && -x $test_runner ]] ; then
-			einfo "Running preinst sanity tests..."
-			"$test_runner" || die "preinst sanity tests failed"
-		fi
-	fi
-
-	if use xattr && ! current_python_has_xattr ; then
-		ewarn "For optimal performance in xattr handling, install"
-		ewarn "dev-python/pyxattr, or install >=dev-lang/python-3.3 and"
-		ewarn "enable USE=python3 for $CATEGORY/$PN."
-	fi
-
-	if ! use build && ! has_version dev-python/pycrypto && \
-		! has_version '>=dev-lang/python-2.6[ssl]' ; then
-		ewarn "If you are an ebuild developer and you plan to commit ebuilds"
-		ewarn "with this system then please install dev-python/pycrypto or"
-		ewarn "enable the ssl USE flag for >=dev-lang/python-2.6 in order"
-		ewarn "to enable RMD160 hash support."
-		ewarn "See bug #198398 for more information."
-	fi
-
-	has_version "<=${CATEGORY}/${PN}-2.2_pre5" \
-		&& WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false
-
-	# If portage-2.1.6 is installed and the preserved_libs_registry exists,
-	# assume that the NEEDED.ELF.2 files have already been generated.
-	has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \
-		! ( [ -e "${EROOT}"var/lib/portage/preserved_libs_registry ] && \
-		has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ) \
-		&& NEEDED_REBUILD_UPGRADE=true || NEEDED_REBUILD_UPGRADE=false
-}
-
-pkg_postinst() {
-	# Compile all source files recursively. Any orphans
-	# will be identified and removed in postrm.
-	python_mod_optimize /usr/lib/portage/pym
-
-	if $WORLD_MIGRATION_UPGRADE && \
-		grep -q "^@" "${EROOT}/var/lib/portage/world"; then
-		einfo "moving set references from the worldfile into world_sets"
-		cd "${EROOT}/var/lib/portage/"
-		grep "^@" world >> world_sets
-		sed -i -e '/^@/d' world
-	fi
-
-	if $NEEDED_REBUILD_UPGRADE ; then
-		einfo "rebuilding NEEDED.ELF.2 files"
-		for cpv in "${EROOT}/var/db/pkg"/*/*; do
-			if [ -f "${cpv}/NEEDED" ]; then
-				rm -f "${cpv}/NEEDED.ELF.2"
-				while read line; do
-					filename=${line% *}
-					needed=${line#* }
-					needed=${needed//+/++}
-					needed=${needed//#/##}
-					needed=${needed//%/%%}
-					newline=$(scanelf -BF "%a;%F;%S;%r;${needed}" $filename)
-					newline=${newline//  -  }
-					echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2"
-				done < "${cpv}/NEEDED"
-			fi
-		done
-	fi
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/lib/portage/pym
-}
diff --git a/sys-apps/portage/portage-2.2.0_alpha149.ebuild b/sys-apps/portage/portage-2.2.0_alpha149.ebuild
index f8c557ea6bdd..d06969d1294f 100644
--- a/sys-apps/portage/portage-2.2.0_alpha149.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha149.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/portage/portage-2.2.0_alpha149.ebuild,v 1.1 2012/12/16 00:09:57 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha149.ebuild,v 1.2 2012/12/22 09:14:27 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -12,15 +12,15 @@ HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"
 KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl pypy1_9 python2 python3 selinux xattr"
+IUSE="build doc epydoc +ipc linguas_pl pypy2_0 python2 python3 selinux xattr"
 
 # Import of the io module in python-2.6 raises ImportError for the
 # thread module if threading is disabled.
 python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
-	!pypy1_9? ( !python2? ( !python3? (
+	!pypy2_0? ( !python2? ( !python3? (
 		|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
 	) ) )
-	pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) )
+	pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2,ssl] ) ) )
 	python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )"
 python_dep="${python_dep_ssl//\[ssl\]}"
 python_dep="${python_dep//,ssl}"
@@ -103,15 +103,15 @@ pkg_setup() {
 		ewarn "Both python2 and python3 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python3."
 	fi
-	if use pypy1_9 && use python3 ; then
-		ewarn "Both pypy1_9 and python3 USE flags are enabled, but only one"
+	if use pypy2_0 && use python3 ; then
+		ewarn "Both pypy2_0 and python3 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python3."
 	fi
-	if use pypy1_9 && use python2 ; then
-		ewarn "Both pypy1_9 and python2 USE flags are enabled, but only one"
+	if use pypy2_0 && use python2 ; then
+		ewarn "Both pypy2_0 and python2 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python2"
 	fi
-	if ! use pypy1_9 && ! use python2 && ! use python3 && \
+	if ! use pypy2_0 && ! use python2 && ! use python3 && \
 		! compatible_python_is_selected ; then
 		ewarn "Attempting to select a compatible default python interpreter"
 		local x success=0
@@ -136,8 +136,8 @@ pkg_setup() {
 		python_set_active_version 3
 	elif use python2; then
 		python_set_active_version 2
-	elif use pypy1_9; then
-		python_set_active_version 2.7-pypy-1.9
+	elif use pypy2_0; then
+		python_set_active_version 2.7-pypy-2.0
 	fi
 }
 
@@ -176,9 +176,9 @@ src_prepare() {
 	elif use python2; then
 		einfo "Converting shebangs for python2..."
 		python_convert_shebangs -r 2 .
-	elif use pypy1_9; then
-		einfo "Converting shebangs for pypy-c1.9..."
-		python_convert_shebangs -r 2.7-pypy-1.9 .
+	elif use pypy2_0; then
+		einfo "Converting shebangs for pypy-c2.0..."
+		python_convert_shebangs -r 2.7-pypy-2.0 .
 	fi
 
 	if [[ -n ${EPREFIX} ]] ; then
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 07eaa919f42d..237ceb1bb084 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.62 2012/12/05 02:19:14 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.63 2012/12/22 09:14:27 zmedico Exp $
 
 EAPI=3
 inherit git-2 eutils python
@@ -10,15 +10,15 @@ HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"
 KEYWORDS=""
 SLOT="0"
-IUSE="build doc epydoc +ipc pypy1_9 python2 python3 selinux xattr"
+IUSE="build doc epydoc +ipc pypy2_0 python2 python3 selinux xattr"
 
 # Import of the io module in python-2.6 raises ImportError for the
 # thread module if threading is disabled.
 python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
-	!pypy1_9? ( !python2? ( !python3? (
+	!pypy2_0? ( !python2? ( !python3? (
 		|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
 	) ) )
-	pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) )
+	pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2,ssl] ) ) )
 	python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )"
 python_dep="${python_dep_ssl//\[ssl\]}"
 python_dep="${python_dep//,ssl}"
@@ -86,15 +86,15 @@ pkg_setup() {
 		ewarn "Both python2 and python3 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python3."
 	fi
-	if use pypy1_9 && use python3 ; then
-		ewarn "Both pypy1_9 and python3 USE flags are enabled, but only one"
+	if use pypy2_0 && use python3 ; then
+		ewarn "Both pypy2_0 and python3 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python3."
 	fi
-	if use pypy1_9 && use python2 ; then
-		ewarn "Both pypy1_9 and python2 USE flags are enabled, but only one"
+	if use pypy2_0 && use python2 ; then
+		ewarn "Both pypy2_0 and python2 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python2"
 	fi
-	if ! use pypy1_9 && ! use python2 && ! use python3 && \
+	if ! use pypy2_0 && ! use python2 && ! use python3 && \
 		! compatible_python_is_selected ; then
 		ewarn "Attempting to select a compatible default python interpreter"
 		local x success=0
@@ -119,8 +119,8 @@ pkg_setup() {
 		python_set_active_version 3
 	elif use python2; then
 		python_set_active_version 2
-	elif use pypy1_9; then
-		python_set_active_version 2.7-pypy-1.9
+	elif use pypy2_0; then
+		python_set_active_version 2.7-pypy-2.0
 	fi
 }
 
@@ -162,9 +162,9 @@ src_prepare() {
 	elif use python2; then
 		einfo "Converting shebangs for python2..."
 		python_convert_shebangs -r 2 .
-	elif use pypy1_9; then
-		einfo "Converting shebangs for pypy-c1.9..."
-		python_convert_shebangs -r 2.7-pypy-1.9 .
+	elif use pypy2_0; then
+		einfo "Converting shebangs for pypy-c2.0..."
+		python_convert_shebangs -r 2.7-pypy-2.0 .
 	fi
 
 	if [[ -n ${EPREFIX} ]] ; then
diff --git a/sys-devel/autoconf/autoconf-2.69.ebuild b/sys-devel/autoconf/autoconf-2.69.ebuild
index ec19036ca7e0..33ad517d11e1 100644
--- a/sys-devel/autoconf/autoconf-2.69.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69.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-devel/autoconf/autoconf-2.69.ebuild,v 1.4 2012/12/19 22:49:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.69.ebuild,v 1.5 2012/12/22 13:49:29 ago Exp $
 
 EAPI="3"
 
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz"
-	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"
 fi
 
 DESCRIPTION="Used to create autoconfiguration files"
diff --git a/sys-devel/flex/flex-2.5.37.ebuild b/sys-devel/flex/flex-2.5.37.ebuild
index 141ed11963a7..d84eacf03be8 100644
--- a/sys-devel/flex/flex-2.5.37.ebuild
+++ b/sys-devel/flex/flex-2.5.37.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-devel/flex/flex-2.5.37.ebuild,v 1.2 2012/08/11 16:06:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.37.ebuild,v 1.4 2012/12/22 14:04:02 ago Exp $
 
 EAPI="3"
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/flex/${MY_P}.tar.bz2
 
 LICENSE="FLEX"
 SLOT="0"
-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="nls static test"
 
 # We want bison explicitly and not yacc in general #381273
diff --git a/sys-fs/e4rat/Manifest b/sys-fs/e4rat/Manifest
index 24e7713bb343..49ac8ef26e37 100644
--- a/sys-fs/e4rat/Manifest
+++ b/sys-fs/e4rat/Manifest
@@ -1,3 +1 @@
-DIST e4rat_0.2.1_src.tar.gz 71943 SHA256 c509f165eff317f80f5d13d7b370514c457df4542ff3b31bee4c26f97ce89769
-DIST e4rat_0.2.2_src.tar.gz 72257 SHA256 ec40740ac05fb0470edd682232fb6c7be0bb57420b70f6c39d1df234753f3ec9 SHA512 f8b8e7465ec3237b205081daa6f8a9ccd21f77743834decf1513745c59bde47ce6e7ce6da4daeb7504e7854f7e6487cafd9ea635e68c4026e5cd9c8b830a3d62 WHIRLPOOL 86f1b96d0df7244d7577e9bbbc3d81eee2ac0b0c65c257af51025102059423e4a9ea62a14b2a4c717949e7dd09a16ff9a1b7b56c2e56fd637337532482ba2d52
 DIST e4rat_0.2.3_src.tar.gz 72459 SHA256 f6feda9618eff0f9442baf771b4776b634e5a2f39e678c10e4c7946b2c6a96a0 SHA512 e1b78b7d84e17f0ded494217f2eb5912401d365844bc966d649682979e1d3deaceab6e9d820fb7fbec819e15133aa2af61131325204620d9b16a3c7638d7fdb7 WHIRLPOOL 912632a516bcefe2171bd1bc207394396ecec9cc74351b2afa511258cb1dfdbb38d2e5fe41a7af747addb92a5f8ff8b2b2321dee8f51d8e8bf7f919183e80c8c
diff --git a/sys-fs/e4rat/e4rat-0.2.1-r2.ebuild b/sys-fs/e4rat/e4rat-0.2.1-r2.ebuild
deleted file mode 100644
index a64855ff88dd..000000000000
--- a/sys-fs/e4rat/e4rat-0.2.1-r2.ebuild
+++ /dev/null
@@ -1,56 +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/e4rat/e4rat-0.2.1-r2.ebuild,v 1.1 2012/01/08 11:38:11 hwoarang Exp $
-
-EAPI=4
-
-inherit cmake-utils linux-info
-
-DESCRIPTION="Toolset to accelerate the boot process and application startup"
-HOMEPAGE="http://e4rat.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
-	>=dev-libs/boost-1.42
-	sys-fs/e2fsprogs
-	sys-process/audit"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~AUDITSYSCALL"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-shared-build.patch
-	"${FILESDIR}"/${PN}-libdir.patch
-)
-
-pkg_setup() {
-	check_extra_config
-}
-
-src_install() {
-	cmake-utils_src_install
-	# relocate binaries to /sbin. If someone knows of a better way to do it
-	# please do tell me
-	dodir sbin
-	find "${D}"/usr/sbin -type f -exec mv {} "${D}"/sbin/. \; \
-		|| die
-}
-
-pkg_postinst() {
-	elog
-	elog "Please consult the upstream wiki if you need help"
-	elog "configuring your system"
-	elog "http://e4rat.sourceforge.net/wiki/index.php/Main_Page"
-	elog
-	if has_version sys-apps/preload; then
-		elog "It appears you have sys-apps/preload installed. This may"
-		elog "has negative effects on ${PN}. You may want to disable preload"
-		elog "when using ${PN}."
-		elog "http://e4rat.sourceforge.net/wiki/index.php/Main_Page#Debian.2FUbuntu"
-	fi
-}
diff --git a/sys-fs/e4rat/e4rat-0.2.2.ebuild b/sys-fs/e4rat/e4rat-0.2.2.ebuild
deleted file mode 100644
index 6552177d4308..000000000000
--- a/sys-fs/e4rat/e4rat-0.2.2.ebuild
+++ /dev/null
@@ -1,56 +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/e4rat/e4rat-0.2.2.ebuild,v 1.1 2012/05/05 10:08:17 hwoarang Exp $
-
-EAPI=4
-
-inherit cmake-utils linux-info
-
-DESCRIPTION="Toolset to accelerate the boot process and application startup"
-HOMEPAGE="http://e4rat.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
-	>=dev-libs/boost-1.42
-	sys-fs/e2fsprogs
-	sys-process/audit"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~AUDITSYSCALL"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-shared-build.patch
-	"${FILESDIR}"/${P}-libdir.patch
-)
-
-pkg_setup() {
-	check_extra_config
-}
-
-src_install() {
-	cmake-utils_src_install
-	# relocate binaries to /sbin. If someone knows of a better way to do it
-	# please do tell me
-	dodir sbin
-	find "${D}"/usr/sbin -type f -exec mv {} "${D}"/sbin/. \; \
-		|| die
-}
-
-pkg_postinst() {
-	elog
-	elog "Please consult the upstream wiki if you need help"
-	elog "configuring your system"
-	elog "http://e4rat.sourceforge.net/wiki/index.php/Main_Page"
-	elog
-	if has_version sys-apps/preload; then
-		elog "It appears you have sys-apps/preload installed. This may"
-		elog "has negative effects on ${PN}. You may want to disable preload"
-		elog "when using ${PN}."
-		elog "http://e4rat.sourceforge.net/wiki/index.php/Main_Page#Debian.2FUbuntu"
-	fi
-}
diff --git a/sys-fs/e4rat/e4rat-0.2.3-r1.ebuild b/sys-fs/e4rat/e4rat-0.2.3-r1.ebuild
index 79d6f14ce903..92afef09bce2 100644
--- a/sys-fs/e4rat/e4rat-0.2.3-r1.ebuild
+++ b/sys-fs/e4rat/e4rat-0.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e4rat/e4rat-0.2.3-r1.ebuild,v 1.1 2012/11/06 20:55:32 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e4rat/e4rat-0.2.3-r1.ebuild,v 1.3 2012/12/22 11:00:03 ago Exp $
 
 EAPI=4
 
@@ -12,13 +12,14 @@ SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-lang/perl
 	>=dev-libs/boost-1.42
 	sys-fs/e2fsprogs
-	sys-process/audit"
+	sys-process/audit
+	sys-process/lsof"
 RDEPEND="${DEPEND}"
 
 CONFIG_CHECK="~AUDITSYSCALL"
diff --git a/sys-fs/e4rat/metadata.xml b/sys-fs/e4rat/metadata.xml
index 77bb27ac694d..dc45721d77db 100644
--- a/sys-fs/e4rat/metadata.xml
+++ b/sys-fs/e4rat/metadata.xml
@@ -5,6 +5,8 @@
 <email>hwoarang@gentoo.org</email>
 <name>Markos Chandras</name>
 </maintainer>
-<longdescription lang="en">
-</longdescription>
+<maintainer>
+<email>pacho@gentoo.org</email>
+<name>Pacho Ramos</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 9548d53bf895..1ec429162118 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,2 +1,2 @@
-DIST linux-3.6.tar.bz2 82296001 SHA256 88ae0a20fd39ecae79db0ce8f9397922fae33c8b06a54ed2c883c861126c9771 SHA512 cbaefc2c4c8ab2251c3345b7b2c88d55a49e3468d8b177b05dd6d96a802efa9a052b1a1ecab8b71298bac97f45259516d88253838332b4fdb4307780ebcddce9 WHIRLPOOL e17e3800951f0c3af21015d1a1c99698d0ef70815bd4f131dd60b30baef70d4c255988857533a9a7c058388c2febfcf02d12cde2a7ed46b24fa85aeb260c0251
-DIST patch-3.7-rc8.bz2 16551678 SHA256 9b262ceaae8bf0ec44fc043e4e354847d2999e722d58e00f94543f0aab332740 SHA512 1baddde540d354707c0964ed56ac905f550cc4b03f53e271e914c7fb5927ded0942c7800762e5ea15f6eff95871b714ae5a2ee1bf716df05c1e3af40d87614c7 WHIRLPOOL 90e78a2b2bd3d7d1afc2172abc15d6e3e6e96dd29fdf0080ae08d48c228e61bdad1455956bba1a659d35d6fa76b7adea8e0e3cafa4870372116e4fa2d4e88305
+DIST linux-3.7.tar.bz2 83671392 SHA256 dc08d87a579fe2918362e6666e503a95a76296419195cb499aa9dd4dbe171a9e SHA512 dad07e23b5d05a1a12092b59ea25c514ff9e89803ecf65b08f09b82aebc511fd06d2a492dea6364c3740a517f0a06a0ddb1c6847658d158205ad88995d69aaf3 WHIRLPOOL 572514032d7d64cc6a2b6ceeae7489e4b3fb48b5b63543d041ad675cd0569549ed88dc9c04ffdf91e78b8424d00b62384af78d7a41b7f399c31c056f0aa0344b
+DIST patch-3.8-rc1.bz2 7030947 SHA256 e425e7f5cf47a8d8a507dfb56dd2e9af1c9c4f6470c65ff4189ea81b106920c6 SHA512 1a90ed2be56a68648e64d53ea377f337c1ee4459303ba7a6ed00691cc4e38369252e1102bf49f05b3f4eec1c3e526408158ecefcafb715085bd79a682721292e WHIRLPOOL 4011dcaac28fc80338977a97d92641bf09982d48a29ab90152fda800f6635d3acdf3e57a6ab437399005337bf732d90f2aa27ff69f3f4316d96e95ff764cddac
diff --git a/sys-kernel/git-sources/git-sources-3.7_rc8.ebuild b/sys-kernel/git-sources/git-sources-3.8_rc1.ebuild
similarity index 94%
rename from sys-kernel/git-sources/git-sources-3.7_rc8.ebuild
rename to sys-kernel/git-sources/git-sources-3.8_rc1.ebuild
index 24cc3a0ae9ed..5dddd59e6351 100644
--- a/sys-kernel/git-sources/git-sources-3.7_rc8.ebuild
+++ b/sys-kernel/git-sources/git-sources-3.8_rc1.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-kernel/git-sources/git-sources-3.7_rc8.ebuild,v 1.1 2012/12/04 18:41:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/git-sources/git-sources-3.8_rc1.ebuild,v 1.1 2012/12/22 17:06:02 mpagano Exp $
 
 EAPI="4"
 UNIPATCH_STRICTORDER="yes"
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 4f576c84f7e4..bae80cd7abdc 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -31,6 +31,7 @@ DIST linux-3.3.tar.bz2 78963640 SHA256 8fd669b4e48181b8d44644a45bf421a84bb8d5ec2
 DIST linux-3.4.tar.bz2 80173484 SHA256 a797a15d0b6228381507c14ecf4eec4a6cc5c77cfd521ba3b3e1325e85b5b16d SHA512 597002fa82b70b5052f9e05c1d8547bc5f89d8e1aecfd1765f4033f6d2c5c02d51b6372dbeef12c2eb070ae318a04c39925050cb37a39399961c8b263479fca1 WHIRLPOOL 57e6dd7094db2bc41175d7bb551e8237ea96eacf3710a734e8413915c54304e84ca11455e41c7752882ce81048459555d44d1798bf0775b79c3d74b13aa3a9f2
 DIST linux-3.5.tar.bz2 80978443 SHA256 6ab82beb8cbb895b7523daed7ec3ec5850cf460b96788056f1ef5135c852fd23 SHA512 f6de5aaff351097dbe4b7186baea63004ef9efb73a85ccfd718c5856b282c22fb1431dce8588cb823eb75d1f09cd89f20e4936501e2c536f53ea4aa705e09ecc WHIRLPOOL 227c73e187370f2f5be34041c99ff2ff1bc99de4685d29801558a96d7d128c6f09c4a2ce81ce33cd87148c301e43319b42a8a77443e5db37f604fd97d101b7e7
 DIST linux-3.6.tar.bz2 82296001 SHA256 88ae0a20fd39ecae79db0ce8f9397922fae33c8b06a54ed2c883c861126c9771 SHA512 cbaefc2c4c8ab2251c3345b7b2c88d55a49e3468d8b177b05dd6d96a802efa9a052b1a1ecab8b71298bac97f45259516d88253838332b4fdb4307780ebcddce9 WHIRLPOOL e17e3800951f0c3af21015d1a1c99698d0ef70815bd4f131dd60b30baef70d4c255988857533a9a7c058388c2febfcf02d12cde2a7ed46b24fa85aeb260c0251
+DIST linux-3.7.tar.bz2 83671392 SHA256 dc08d87a579fe2918362e6666e503a95a76296419195cb499aa9dd4dbe171a9e SHA512 dad07e23b5d05a1a12092b59ea25c514ff9e89803ecf65b08f09b82aebc511fd06d2a492dea6364c3740a517f0a06a0ddb1c6847658d158205ad88995d69aaf3 WHIRLPOOL 572514032d7d64cc6a2b6ceeae7489e4b3fb48b5b63543d041ad675cd0569549ed88dc9c04ffdf91e78b8424d00b62384af78d7a41b7f399c31c056f0aa0344b
 DIST patch-2.6.31-pf9.bz2 358306 SHA256 55106f8f17d7987e8789254d52f44e093a2ab520292d0106288d14ea4f3a1e9c SHA512 97edc491768686b868f0cb0bac5fbbec365629dc883a60a9419d34f6be2f9a7bc445d51cf935f8c54fb6f0ba1699e7b6a6d1c9a13e3145718e565802930f5bf6 WHIRLPOOL fbeb6b18e677c1e27e1c9bb894409e1b7fb6bab8d4c00d91979911616233fb5391be9a3b9a43124df7b3adc2512d2dba9ebc7118fd4385637f61b2304a507a35
 DIST patch-2.6.32-pf16.bz2 445921 SHA256 72ba0a9eb0c0dda1e553b9d0d7e450eec96cbfa625f3a3c2a8397d1ce12f7f20 SHA512 e90f12ea8527d68a96d27bcb53bc7a34a907f43dc42b60f3e09139a9b6ecd9da493f737b1a188c6e0fbd2e1d5183a653f4cf6c7045b648d9bb1d2dfdabd36721 WHIRLPOOL 442306ef06f20cabfe7b35b672f413060154ba160c5921a60200a87617e5f750ba835c239877d4899c5457c9c01e59d2027555571ca40271b86e97e764ef0369
 DIST patch-2.6.33-pf4.bz2 378325 SHA256 4b6b641746e30983ac51a20b3098053f69591861bdf0b43e3bed9df8ccf6ff70 SHA512 8769e24b55539e95b570ba933bd80edf37da0eb18e00bd290c3a793871fa7f465a14f8a763201fb24c0d9e6185722dade5d63f66da170e6a38422add84a2f057 WHIRLPOOL 32fcc05977365019473de700579a3858592e6a94e7d3baa88850722de7a57c36f17860e11c5e6fc065cc3cb0158ca49ded48562b13de77b1e2fd5d446dc41e2b
@@ -46,6 +47,6 @@ DIST patch-3.2.7-pf.bz2 456810 SHA256 d657ad9afa1dd7aa3b2d09c5bd75adc409cb02ac64
 DIST patch-3.3.6-pf.bz2 462804 SHA256 ae3b6eb1aa940541f99e5b4d0286e4e5f56c6134c861c064bdf91d54cf38d262 SHA512 d56860e0e2a6a4bad22b578aa68512654356877d1bdf614ba1ccf50ca24cf9c59d71a0ccab60df2caac8d593982f82e5db09827649890cc263d53ad98784f413 WHIRLPOOL ebf6504f5863f3a5b134e63f994a6f1229c0955d1980d85c29f9125341d38155effbeb35a8222b8ebed3b1451082327fa6999b5c52c5b3f84404b551a8897806
 DIST patch-3.4.6-pf.bz2 440602 SHA256 5fc96dd1c1e9d3ac214ed322edf9798b406f1b1fc61db9e5d53fe10c1587ee19 SHA512 411d07a30302382ca2bfcc8b5d609c2f434d547ef85bced3bc39fc9a2cea0dec5ab147977edb12ebce96d4693fdbb965e1e48d5f406612f244f12f34118ebe12 WHIRLPOOL 4be07284041097a20f66b7cbbecb2de3e4bca62398aae0039c1623c9e1cf02d593290c6994455bfbd50079dc5ba7f2903456184b4d97969227f721f41ce8dfff
 DIST patch-3.5.4-pf.bz2 431483 SHA256 16424a61130244802cc01112af2cc1e49be8e152bc9d236c9298d9f4edac2cef SHA512 2f081a9635bec4f28dafce436c79c08a267704696eba5bbf94ac4145c85b1d832d003a810999950a8a6f0773123dd7d569434bfedaf3a1a181959b44babfb597 WHIRLPOOL 3bd97047d485a38a8f10c9f4750b5ec4f73ebefbf828314702d50918d90990ecfd6396a2b27f80a32204a02fac18e8ceb908030cbe69aaf9652472fcce5b1312
-DIST patch-3.6.10-pf.bz2 517996 SHA256 36149f90332c84b54b23c48d37db677337908766f683fb64346087f0a14232fc SHA512 025f17c0baac970ad5107a0ba495010e83f44a98a9f5c943e7f40e00c3aeee599081eec7bb851604153d30b90f01ead301559043682cdb8438d34e4d5dd083e9 WHIRLPOOL cd212693f73a6688d5ff1710a5a35b948032bf1e0c019a135d42c7479d5147cd5f5aaf6bdd162bcb3edceb80a1fd1c21755d6b587b6e1e45a8333569c9e08af8
 DIST patch-3.6.11-pf.bz2 530916 SHA256 14cbce82b2da7571112a4804b11d83ae27fe31c41f8914d6347284830786e029 SHA512 8f70cf9c8d9300f9d62a736e1e332c8c64727581553dbe431eedd64fbae186f07cde1c621dc9c46421587ea3a05391d507c48b1e27b154a3f0fb8d4d08fffde6 WHIRLPOOL 44df216ac3360ff6b04bb4ab8bdfbafb739e51ddc4ebb0f879b4b49ad0e257aefda9f3b933972116e9d85c503dd8312bfce1ad714a42c6087e13535e0c90b2e7
-DIST patch-3.6.9-pf.bz2 497164 SHA256 4f0ee881dbfa7680cf2e9a2de3dc6d71b2e65e7446b33db661f0e4d0bfbedaea SHA512 c48860f510e5c028aeeb408531f77866b9f505c55470abc9e85bf63f27cc730c7ac236fa215ad6cd45a54c80befd433944c39ac1e24f03b30e25e977addad384 WHIRLPOOL 81f086302054abfb33c5c7ec3b08328d6a4d57d199045eacd169b3e2e0f46c2bc4b46408354de0eda79990022b96fe873b7a03986eae30b4be246a7941e64af2
+DIST patch-3.6.12-pf.bz2 551922 SHA256 7f6faacebc171cba80aaeb2e040501df32ca06afcea85e90a64a976bfe9d5dbf SHA512 1b692f17139ab3c9a27c154dba657eac8c9ac8c8fcb796e010405a43b6ce5505f45dcfc5e7c255ed36d5b67aadda3739fced398b5a59b8d9b292ff1149a6a71e WHIRLPOOL 4b30ccc4c3edce169ec277279c8518a0bd2dc48512d871835e3f3369c05526f16768889864068a749f1100ed4e8244cca5395092e524cac730f3037c209e2024
+DIST patch-3.7.1-pf.bz2 322775 SHA256 835a759f5310523a2b52d291b350d64637581c750c5119a931ad7c3f225ba3cd SHA512 5611c7eeb25ed1d72e439be3f2ae820b1294cbc2d6f57c8b6a38d878acfecbdb886b050e8d918d1f59dbcd2d97c305ed1ad63eaac3ea194755be619fd25066a2 WHIRLPOOL 6cb78b45f6ccf916628d4b598fb0d5111c54db32bfdfaface1d65e8cd5ed24ac6b4abbdfdc645aa0f63c07992fbb63725a862d07b7b7efb9fb371f8a1af3d39c
diff --git a/sys-kernel/pf-sources/pf-sources-3.6.10.ebuild b/sys-kernel/pf-sources/pf-sources-3.6.12.ebuild
similarity index 97%
rename from sys-kernel/pf-sources/pf-sources-3.6.10.ebuild
rename to sys-kernel/pf-sources/pf-sources-3.6.12.ebuild
index 3639bb28fe4c..fcee2e1872fe 100644
--- a/sys-kernel/pf-sources/pf-sources-3.6.10.ebuild
+++ b/sys-kernel/pf-sources/pf-sources-3.6.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pf-sources/pf-sources-3.6.10.ebuild,v 1.1 2012/11/29 20:16:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pf-sources/pf-sources-3.6.12.ebuild,v 1.1 2012/12/22 00:27:19 hwoarang Exp $
 
 EAPI="2"
 
diff --git a/sys-kernel/pf-sources/pf-sources-3.6.9.ebuild b/sys-kernel/pf-sources/pf-sources-3.7.1.ebuild
similarity index 97%
rename from sys-kernel/pf-sources/pf-sources-3.6.9.ebuild
rename to sys-kernel/pf-sources/pf-sources-3.7.1.ebuild
index 391e2b4f873b..5b6701d3417d 100644
--- a/sys-kernel/pf-sources/pf-sources-3.6.9.ebuild
+++ b/sys-kernel/pf-sources/pf-sources-3.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pf-sources/pf-sources-3.6.9.ebuild,v 1.1 2012/11/19 10:39:56 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pf-sources/pf-sources-3.7.1.ebuild,v 1.1 2012/12/22 00:27:19 hwoarang Exp $
 
 EAPI="2"
 
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index d62cf77305df..bdd7b792c274 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -3,3 +3,4 @@ DIST audit-1.7.18.tar.gz 1566698 SHA256 c3e9e7df9e0776c3f90acfde7432ed362ff3ae5c
 DIST audit-1.7.4.tar.gz 840298 SHA256 db5412852aa36ee25eb174e4f4a4676cc2d0b93cbe41a740eebf903b49b4d593 SHA512 89c99d0f9caebd3285535b3237e23499216a80e571175e16169ee0154e1581e885c1b3ee0c11a97b16db6569d6b91b05edfb3371f03b199ec52a510074834060 WHIRLPOOL 7ad1a63ce5b21a983bb6c36ab845d2cca22935d5b62343e00fb91c43d6e4c7eb18333bacdda0bacc32e0e340c8b70db39ff117edb686878bf82787723fc4c6cf
 DIST audit-2.0.5.tar.gz 810519 SHA256 1ef85e606a0fda21596577f5c205c0df7eb56d7cffbb84aeeeb72ce44e61a83b SHA512 5e5e7f6af79792aa4f8577b6a5975440167b19e35d555c7c60c51d0af20f6bfeafb78a89f8b546efe9b9c79296ee5872fa0056f34a61650c66f34ceedc8b15c4 WHIRLPOOL d5ec4d00555858f8d8e5d42400ce0775b9db1d7fc1efc995dbfb45fc59c34d2b0268879d2fd35b60af3b07498e166b2afc6dbbc23f5943a50e1da9898d7aeb4b
 DIST audit-2.1.3.tar.gz 833647 SHA256 1c61858d8ed299128aa6bd8e85bac758bfe33e61358d259e52acb7d961fee90e SHA512 0f5c02ee3eb35687e85cfea0cae2bc11c35d2de5c44347f8f3cde4d268aeef215547cfb4b577afffc737ce5944219f46b4594ac122479d8b2e185efe3cdb069b WHIRLPOOL c83ac2bf929f524c4bc34ffcd503db9687a2c8affe3b5bb0a908e40ba8e98beced6fee6f3212db7267cf11cef3dbd13915a1ee09334f2cf58a686a1acfff0946
+DIST audit-2.2.2.tar.gz 907066 SHA256 8bc2b45a5f08f5df6cebcd5543f24b7e68e28b64da4b23f08de2c6616384302b SHA512 98d83162e69816611dfac3d3ecc19235403ea5809d7a5cd9f13444c2085f03e46657802addb58ee31c251749f89417926ae40bcd99a77d64f062712830fde9bb WHIRLPOOL f127d3b9645d4e679a83767d688b83c7d59d4a35a166bc9f5038df89852768b695bc0c30e26fea0930aa29fed4583aa5218a42d5898d2a7c542e04cf58b9a9e9
diff --git a/sys-process/audit/audit-2.1.3-r1.ebuild b/sys-process/audit/audit-2.1.3-r1.ebuild
index e102f986290c..b3faf3249d08 100644
--- a/sys-process/audit/audit-2.1.3-r1.ebuild
+++ b/sys-process/audit/audit-2.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-2.1.3-r1.ebuild,v 1.10 2012/12/21 13:47:44 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-2.1.3-r1.ebuild,v 1.12 2012/12/22 07:36:33 robbat2 Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -68,9 +68,14 @@ src_prepare() {
 	# Don't build static version of Python module.
 	epatch "${FILESDIR}"/${PN}-2.1.3-python.patch
 
+	# glibc/kernel upstreams suck with both defining ia64_fpreg
+	# This patch is a horribly workaround that is only valid as long as you
+	# don't need the OTHER definitions in fpu.h.
+	epatch "${FILESDIR}"/${PN}-2.1.3-ia64-compile-fix.patch
+
 	# Python bindings are built/installed manually.
 	sed -e "/^SUBDIRS =/s/ python//" -i bindings/Makefile.am
-	sed -e "/^SUBDIRS =/s/ swig//" -i Makefile.am
+	sed -e "/^SUBDIRS .*=/s/ swig//" -i Makefile.am
 
 	# Regenerate autotooling
 	eautoreconf
@@ -137,6 +142,9 @@ src_install() {
 	# things like shadow use this so we need to be in /
 	gen_usr_ldscript -a audit auparse
 
+	[ -f "${D}"/sbin/audisp-remote ] && \
+	mv "${D}"/{sbin,usr/sbin}/audisp-remote || die
+
 	# remove RedHat garbage
 	rm -r "${D}"/etc/{rc.d,sysconfig} || die
 
diff --git a/sys-process/audit/audit-2.2.2.ebuild b/sys-process/audit/audit-2.2.2.ebuild
new file mode 100644
index 000000000000..660171dd9447
--- /dev/null
+++ b/sys-process/audit/audit-2.2.2.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-2.2.2.ebuild,v 1.2 2012/12/22 07:36:33 robbat2 Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+
+inherit autotools multilib toolchain-funcs python linux-info eutils
+
+DESCRIPTION="Userspace utilities for storing and processing auditing records"
+HOMEPAGE="http://people.redhat.com/sgrubb/audit/"
+SRC_URI="http://people.redhat.com/sgrubb/audit/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ldap prelude python"
+# Testcases are pretty useless as they are built for RedHat users/groups and
+# kernels.
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap )
+		 prelude? ( dev-libs/libprelude )
+		 sys-libs/libcap-ng"
+DEPEND="${RDEPEND}
+	python? ( dev-lang/swig )
+	>=sys-kernel/linux-headers-2.6.34"
+# Do not use os-headers as this is linux specific
+
+CONFIG_CHECK="~AUDIT"
+PYTHON_DIRS="bindings/python swig"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	use python && python_pkg_setup
+}
+
+src_prepare() {
+	# Old patch applies fine
+	#EPATCH_OPTS="-p0 -d${S}" epatch "${FILESDIR}"/${PN}-1.5.4-build.patch
+
+	# Applied by upstream
+	#EPATCH_OPTS="-p1 -d${S}" epatch "${FILESDIR}"/${PN}-1.5.4-swig-gcc-attribute.patch
+
+	# Do not build GUI tools
+	sed -i \
+		-e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \
+		"${S}"/configure.ac || die
+	sed -i \
+		-e 's,system-config-audit,,g' \
+		"${S}"/Makefile.am || die
+	rm -rf "${S}"/system-config-audit
+
+	# Probably goes away in 1.6.9
+	#EPATCH_OPTS="-p1 -d${S}" epatch "${FILESDIR}"/audit-1.6.8-subdirs-fix.patch
+
+	if ! use ldap; then
+		sed -i \
+			-e '/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \
+			"${S}"/configure.ac || die
+		sed -i \
+			-e '/^SUBDIRS/s,zos-remote,,g' \
+			"${S}"/audisp/plugins/Makefile.am || die
+	fi
+
+	# Don't build static version of Python module.
+	epatch "${FILESDIR}"/${PN}-2.1.3-python.patch
+
+	# glibc/kernel upstreams suck with both defining ia64_fpreg
+	# This patch is a horribly workaround that is only valid as long as you
+	# don't need the OTHER definitions in fpu.h.
+	epatch "${FILESDIR}"/${PN}-2.1.3-ia64-compile-fix.patch
+
+	# Python bindings are built/installed manually.
+	sed -e "/^SUBDIRS =/s/ python//" -i bindings/Makefile.am
+	sed -e "/^SUBDIRS .*=/s/ swig//" -i Makefile.am
+
+	# Regenerate autotooling
+	eautoreconf
+
+	# Disable byte-compilation of Python modules.
+	echo "#!/bin/sh" > py-compile
+
+	# Bug 352198: Avoid parallel build fail
+	cd "${S}"/src/mt
+	[[ ! -s private.h ]] && ln -s ../../lib/private.h .
+}
+
+src_configure() {
+	#append-flags -D'__attribute__(x)='
+	econf --sbindir=/sbin $(use_with prelude)
+}
+
+src_compile_python() {
+	python_copy_sources ${PYTHON_DIRS}
+
+	building() {
+		emake \
+			PYTHON_VERSION="$(python_get_version)" \
+			pyexecdir="$(python_get_sitedir)"
+	}
+	local dir
+	for dir in ${PYTHON_DIRS}; do
+		python_execute_function -s --source-dir ${dir} building
+	done
+}
+
+src_compile() {
+	default
+	use python && src_compile_python
+}
+
+src_install_python() {
+	installation() {
+		emake \
+			DESTDIR="${D}" \
+			PYTHON_VERSION="$(python_get_version)" \
+			pyexecdir="$(python_get_sitedir)" \
+			install
+	}
+	local dir
+	for dir in ${PYTHON_DIRS}; do
+		python_execute_function -s --source-dir ${dir} installation
+	done
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	use python && src_install_python
+
+	dodoc AUTHORS ChangeLog README* THANKS TODO
+	docinto contrib
+	dodoc contrib/{*.rules,avc_snap,skeleton.c}
+	docinto contrib/plugin
+	dodoc contrib/plugin/*
+
+	newinitd "${FILESDIR}"/auditd-init.d-2.1.3 auditd
+	newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd
+
+	# things like shadow use this so we need to be in /
+	gen_usr_ldscript -a audit auparse
+
+	[ -f "${D}"/sbin/audisp-remote ] && \
+	mv "${D}"/{sbin,usr/sbin}/audisp-remote || die
+
+	# remove RedHat garbage
+	rm -r "${D}"/etc/{rc.d,sysconfig} || die
+
+	# Gentoo rules
+	insinto /etc/audit/
+	newins "${FILESDIR}"/audit.rules-2.1.3 audit.rules
+	doins "${FILESDIR}"/audit.rules.stop*
+
+	# audit logs go here
+	keepdir /var/log/audit/
+
+	# Security
+	lockdown_perms "${D}"
+
+	# Don't install .la files in Python directories.
+	use python && python_clean_installation_image
+}
+
+pkg_preinst() {
+	default
+	# Preserve from the audit-1 series
+	preserve_old_lib /$(get_libdir)/libau{dit,parse}.so.0
+}
+
+pkg_postinst() {
+	lockdown_perms "${ROOT}"
+	use python && python_mod_optimize audit.py
+	# Preserve from the audit-1 series
+	preserve_old_lib_notify /$(get_libdir)/libau{dit,parse}.so.0
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup audit.py
+}
+
+lockdown_perms() {
+	# upstream wants these to have restrictive perms
+	basedir="$1"
+	chmod 0750 "${basedir}"/sbin/au{ditctl,report,dispd,ditd,search,trace} 2>/dev/null
+	chmod 0750 "${basedir}"/var/log/audit/ 2>/dev/null
+	chmod 0640 "${basedir}"/etc/{audit/,}{auditd.conf,audit.rules*} 2>/dev/null
+}
diff --git a/sys-process/audit/files/audit-2.1.3-ia64-compile-fix.patch b/sys-process/audit/files/audit-2.1.3-ia64-compile-fix.patch
new file mode 100644
index 000000000000..3ec60fbc48ec
--- /dev/null
+++ b/sys-process/audit/files/audit-2.1.3-ia64-compile-fix.patch
@@ -0,0 +1,212 @@
+diff -Nuar -X exclude audit-2.1.3.orig/configure.ac audit-2.1.3/configure.ac
+--- audit-2.1.3.orig/configure.ac	2011-08-15 17:30:58.000000000 +0000
++++ audit-2.1.3/configure.ac	2012-12-18 20:03:22.000000000 +0000
+@@ -79,6 +79,9 @@
+     esac
+ fi
+ 
++AC_CHECK_HEADER([asm/ptrace.h], [AC_DEFINE([HAVE_ASM_PTRACE_H],[],[Define to 1 if you have asm/ptrace.h])], [])
++AC_CHECK_HEADER([linux/ptrace.h], [AC_DEFINE([HAVE_LINUX_PTRACE_H],[],[Define to 1 if you have linux/ptrace.h])], [])
++
+ #gssapi
+ AC_ARG_ENABLE(gssapi_krb5,
+ 	[AS_HELP_STRING([--enable-gssapi-krb5],[Enable GSSAPI Kerberos 5 support @<:@default=no@:>@])],
+diff -Nuar -X exclude audit-2.1.3.orig/src/auditctl.c audit-2.1.3/src/auditctl.c
+--- audit-2.1.3.orig/src/auditctl.c	2011-08-15 17:31:00.000000000 +0000
++++ audit-2.1.3/src/auditctl.c	2012-12-18 20:21:21.000000000 +0000
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>	/* strdup needs xopen define */
+diff -Nuar -X exclude audit-2.1.3.orig/src/auditd-config.c audit-2.1.3/src/auditd-config.c
+--- audit-2.1.3.orig/src/auditd-config.c	2011-08-15 17:31:00.000000000 +0000
++++ audit-2.1.3/src/auditd-config.c	2012-12-18 20:21:23.000000000 +0000
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+diff -Nuar -X exclude audit-2.1.3.orig/src/auditd-dispatch.c audit-2.1.3/src/auditd-dispatch.c
+--- audit-2.1.3.orig/src/auditd-dispatch.c	2011-08-15 17:31:00.000000000 +0000
++++ audit-2.1.3/src/auditd-dispatch.c	2012-12-18 20:21:27.000000000 +0000
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <unistd.h>
+ #include <sys/uio.h>
+ #include <fcntl.h>
+diff -Nuar -X exclude audit-2.1.3.orig/src/auditd-event.c audit-2.1.3/src/auditd-event.c
+--- audit-2.1.3.orig/src/auditd-event.c	2011-08-15 17:31:00.000000000 +0000
++++ audit-2.1.3/src/auditd-event.c	2012-12-18 20:21:29.000000000 +0000
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+diff -Nuar -X exclude audit-2.1.3.orig/src/auditd-listen.c audit-2.1.3/src/auditd-listen.c
+--- audit-2.1.3.orig/src/auditd-listen.c	2011-08-15 17:31:00.000000000 +0000
++++ audit-2.1.3/src/auditd-listen.c	2012-12-18 20:21:31.000000000 +0000
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+diff -Nuar -X exclude audit-2.1.3.orig/src/auditd-reconfig.c audit-2.1.3/src/auditd-reconfig.c
+--- audit-2.1.3.orig/src/auditd-reconfig.c	2011-08-15 17:31:00.000000000 +0000
++++ audit-2.1.3/src/auditd-reconfig.c	2012-12-18 20:21:33.000000000 +0000
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <pthread.h>
+ #include <signal.h>
+ #include <stdlib.h>
+diff -Nuar -X exclude audit-2.1.3.orig/src/auditd-sendmail.c audit-2.1.3/src/auditd-sendmail.c
+--- audit-2.1.3.orig/src/auditd-sendmail.c	2011-08-15 17:31:00.000000000 +0000
++++ audit-2.1.3/src/auditd-sendmail.c	2012-12-18 20:21:34.000000000 +0000
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <unistd.h>		// for access()
+ #include <string.h>
+diff -Nuar -X exclude audit-2.1.3.orig/src/auditd.c audit-2.1.3/src/auditd.c
+--- audit-2.1.3.orig/src/auditd.c	2011-08-15 17:31:00.000000000 +0000
++++ audit-2.1.3/src/auditd.c	2012-12-18 20:21:38.000000000 +0000
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+diff -Nuar -X exclude audit-2.1.3.orig/src/autrace.c audit-2.1.3/src/autrace.c
+--- audit-2.1.3.orig/src/autrace.c	2011-08-15 17:31:00.000000000 +0000
++++ audit-2.1.3/src/autrace.c	2012-12-18 20:21:43.000000000 +0000
+@@ -21,6 +21,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <string.h>
+ #include <sys/wait.h>
+diff -Nuar -X exclude audit-2.1.3.orig/src/delete_all.c audit-2.1.3/src/delete_all.c
+--- audit-2.1.3.orig/src/delete_all.c	2011-08-15 17:31:00.000000000 +0000
++++ audit-2.1.3/src/delete_all.c	2012-12-18 20:21:48.000000000 +0000
+@@ -20,6 +20,7 @@
+  *      Steve Grubb <sgrubb@redhat.com>
+  */
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <string.h>
+ #include <errno.h>
+diff -Nuar -X exclude audit-2.1.3.orig/lib/fixup.h audit-2.1.3/lib/fixup.h
+--- audit-2.1.3.orig/lib/fixup.h	1970-01-01 00:00:00.000000000 +0000
++++ audit-2.1.3/lib/fixup.h	2012-12-18 20:21:02.000000000 +0000
+@@ -0,0 +1,17 @@
++#ifndef _AUDIT_IA64_FIXUP_H_
++#define _AUDIT_IA64_FIXUP_H_
++
++#ifdef __ia64__ /* what a pos */
++# include <linux/types.h>
++# define _ASM_IA64_FPU_H
++#endif
++#include <signal.h>
++/*
++#ifdef HAVE_ASM_PTRACE_H
++# include <asm/ptrace.h>
++#endif
++#ifdef HAVE_LINUX_PTRACE_H
++# include <linux/ptrace.h>
++#endif
++*/
++#endif
+--- audit-2.1.3/src/ausearch.c	2012-12-22 03:09:54.000000000 +0000
++++ audit-2.1.3/src/ausearch.c	2012-12-22 03:10:02.000000000 +0000
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <stdio_ext.h>
+ #include <string.h>
+diff -Nuar audit-2.1.3.orig/audisp/audispd.c audit-2.1.3/audisp/audispd.c
+--- audit-2.1.3.orig/audisp/audispd.c	2011-08-15 17:30:59.000000000 +0000
++++ audit-2.1.3/audisp/audispd.c	2012-12-22 03:25:15.000000000 +0000
+@@ -21,6 +21,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+diff -Nuar audit-2.1.3.orig/audisp/plugins/prelude/audisp-prelude.c audit-2.1.3/audisp/plugins/prelude/audisp-prelude.c
+--- audit-2.1.3.orig/audisp/plugins/prelude/audisp-prelude.c	2011-08-15 17:30:59.000000000 +0000
++++ audit-2.1.3/audisp/plugins/prelude/audisp-prelude.c	2012-12-22 03:25:20.000000000 +0000
+@@ -21,6 +21,8 @@
+  *
+  */
+ 
++#include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <signal.h>
+diff -Nuar audit-2.1.3.orig/audisp/plugins/remote/audisp-remote.c audit-2.1.3/audisp/plugins/remote/audisp-remote.c
+--- audit-2.1.3.orig/audisp/plugins/remote/audisp-remote.c	2011-08-15 17:30:59.000000000 +0000
++++ audit-2.1.3/audisp/plugins/remote/audisp-remote.c	2012-12-22 03:25:22.000000000 +0000
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <signal.h>
+ #include <syslog.h>
+diff -Nuar audit-2.1.3.orig/contrib/plugin/audisp-example.c audit-2.1.3/contrib/plugin/audisp-example.c
+--- audit-2.1.3.orig/contrib/plugin/audisp-example.c	2011-08-15 17:31:02.000000000 +0000
++++ audit-2.1.3/contrib/plugin/audisp-example.c	2012-12-22 03:25:27.000000000 +0000
+@@ -37,6 +37,8 @@
+  */
+ 
+ #define _GNU_SOURCE
++#include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <signal.h>
+ #include <string.h>
+diff -Nuar audit-2.1.3.orig/contrib/skeleton.c audit-2.1.3/contrib/skeleton.c
+--- audit-2.1.3.orig/contrib/skeleton.c	2011-08-15 17:31:02.000000000 +0000
++++ audit-2.1.3/contrib/skeleton.c	2012-12-22 03:25:40.000000000 +0000
+@@ -7,6 +7,8 @@
+  * gcc skeleton.c -o skeleton -laudit
+  */
+ 
++#include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/uio.h>
diff --git a/virtual/leechcraft-wysiwyg-editor/Manifest b/virtual/leechcraft-wysiwyg-editor/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/virtual/leechcraft-wysiwyg-editor/leechcraft-wysiwyg-editor-9999.ebuild b/virtual/leechcraft-wysiwyg-editor/leechcraft-wysiwyg-editor-9999.ebuild
new file mode 100644
index 000000000000..87df83866f10
--- /dev/null
+++ b/virtual/leechcraft-wysiwyg-editor/leechcraft-wysiwyg-editor-9999.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/leechcraft-wysiwyg-editor/leechcraft-wysiwyg-editor-9999.ebuild,v 1.1 2012/12/22 15:31:26 maksbotan Exp $
+
+EAPI="4"
+
+DESCRIPTION="Virtual for LeechCraft plugins providing WYSIWYG text editor"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="~x11-plugins/leechcraft-lhtr-${PV}"
+DEPEND=""
diff --git a/virtual/leechcraft-wysiwyg-editor/metadata.xml b/virtual/leechcraft-wysiwyg-editor/metadata.xml
new file mode 100644
index 000000000000..2c857dda08d3
--- /dev/null
+++ b/virtual/leechcraft-wysiwyg-editor/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>leechcraft</herd>
+</pkgmetadata>
diff --git a/virtual/perl-File-Path/perl-File-Path-2.08.ebuild b/virtual/perl-File-Path/perl-File-Path-2.08.ebuild
index fe9a8ba934b3..4c56bc53d1df 100644
--- a/virtual/perl-File-Path/perl-File-Path-2.08.ebuild
+++ b/virtual/perl-File-Path/perl-File-Path-2.08.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-File-Path/perl-File-Path-2.08.ebuild,v 1.5 2012/09/01 12:12:38 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-File-Path/perl-File-Path-2.08.ebuild,v 1.6 2012/12/22 18:24:50 ago Exp $
 
 DESCRIPTION="Virtual for File-Path"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~sparc x86 ~ppc-aix"
+KEYWORDS="amd64 ~ia64 ~ppc ~sparc x86 ~ppc-aix"
 IUSE=""
 
 RDEPEND="~perl-core/File-Path-${PV}"
diff --git a/virtual/perl-Thread-Queue/perl-Thread-Queue-3.10.0.ebuild b/virtual/perl-Thread-Queue/perl-Thread-Queue-3.10.0.ebuild
index b23d4651a547..6933057b57a9 100644
--- a/virtual/perl-Thread-Queue/perl-Thread-Queue-3.10.0.ebuild
+++ b/virtual/perl-Thread-Queue/perl-Thread-Queue-3.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/virtual/perl-Thread-Queue/perl-Thread-Queue-3.10.0.ebuild,v 1.1 2012/11/17 19:42:21 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Thread-Queue/perl-Thread-Queue-3.10.0.ebuild,v 1.2 2012/12/22 18:24:33 ago Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.120.0-r2.ebuild b/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.120.0-r2.ebuild
index 2ca07599167e..28853f2484fb 100644
--- a/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.120.0-r2.ebuild
+++ b/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.120.0-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/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.120.0-r2.ebuild,v 1.1 2012/05/21 11:50:34 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.120.0-r2.ebuild,v 1.2 2012/12/22 18:27:16 ago Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="|| ( =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~perl-core/${PN#perl-}-${PV}  )"
diff --git a/virtual/perl-threads-shared/perl-threads-shared-1.420.0.ebuild b/virtual/perl-threads-shared/perl-threads-shared-1.420.0.ebuild
index 009e6040a923..44f19166597b 100644
--- a/virtual/perl-threads-shared/perl-threads-shared-1.420.0.ebuild
+++ b/virtual/perl-threads-shared/perl-threads-shared-1.420.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/virtual/perl-threads-shared/perl-threads-shared-1.420.0.ebuild,v 1.1 2012/10/03 18:05:23 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-threads-shared/perl-threads-shared-1.420.0.ebuild,v 1.2 2012/12/22 18:27:02 ago Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-threads/perl-threads-1.860.0-r1.ebuild b/virtual/perl-threads/perl-threads-1.860.0-r1.ebuild
index f3a2509b35bb..69e9293bf65e 100644
--- a/virtual/perl-threads/perl-threads-1.860.0-r1.ebuild
+++ b/virtual/perl-threads/perl-threads-1.860.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/virtual/perl-threads/perl-threads-1.860.0-r1.ebuild,v 1.1 2012/05/21 11:50:34 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-threads/perl-threads-1.860.0-r1.ebuild,v 1.2 2012/12/22 18:27:47 ago Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="|| ( =dev-lang/perl-5.16* ~perl-core/${PN#perl-}-${PV} )"
diff --git a/virtual/pyparsing/Manifest b/virtual/pyparsing/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/virtual/pyparsing/metadata.xml b/virtual/pyparsing/metadata.xml
new file mode 100644
index 000000000000..301d2207cc29
--- /dev/null
+++ b/virtual/pyparsing/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/virtual/pyparsing/pyparsing-0.ebuild b/virtual/pyparsing/pyparsing-0.ebuild
new file mode 100644
index 000000000000..b3d24dba1b5f
--- /dev/null
+++ b/virtual/pyparsing/pyparsing-0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/pyparsing/pyparsing-0.ebuild,v 1.1 2012/12/21 21:58:01 mgorny Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9} )
+inherit python-r1
+
+DESCRIPTION="A virtual for pyparsing, for Python 2 & 3"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="<dev-python/pyparsing-1.5.6-r2"
diff --git a/virtual/pyparsing/pyparsing-1.ebuild b/virtual/pyparsing/pyparsing-1.ebuild
new file mode 100644
index 000000000000..467a146a021e
--- /dev/null
+++ b/virtual/pyparsing/pyparsing-1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/pyparsing/pyparsing-1.ebuild,v 1.1 2012/12/21 21:58:01 mgorny Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9} )
+inherit python-r1
+
+DESCRIPTION="A virtual for pyparsing, for Python 2 & 3"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="<dev-python/pyparsing-1.5.7[${PYTHON_USEDEP}]"
diff --git a/www-apps/horde-pear/horde-pear-1.3-r3.ebuild b/www-apps/horde-pear/horde-pear-1.3-r3.ebuild
index ba16301f6c92..e0c0319fae30 100644
--- a/www-apps/horde-pear/horde-pear-1.3-r3.ebuild
+++ b/www-apps/horde-pear/horde-pear-1.3-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-pear/horde-pear-1.3-r3.ebuild,v 1.13 2006/04/10 22:49:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-pear/horde-pear-1.3-r3.ebuild,v 1.14 2012/12/22 17:32:26 ulm Exp $
 
 DESCRIPTION="Meta package for the PEAR packages required by Horde."
 HOMEPAGE="http://pear.php.net/"
 
-LICENSE="as-is"
+LICENSE="metapackage"
 SLOT="1"
 # when unmasking for an arch
 # double check none of the deps are still masked!
diff --git a/www-apps/phpsysinfo/Manifest b/www-apps/phpsysinfo/Manifest
index 9c22a8f75e3b..b1aa27df27d6 100644
--- a/www-apps/phpsysinfo/Manifest
+++ b/www-apps/phpsysinfo/Manifest
@@ -1 +1,2 @@
 DIST phpsysinfo-3.0.19.tar.gz 495301 SHA256 1387ff95cff8686ea95f99c2dc6fd6b9fcd655fd5832b8b75b8ad3595e07b888 SHA512 03b8d56436f5f6284b3d404287bdacc23ce31f8029eed819fc8e06f22b39bcb95bbb09b65c1c1d60d563471edb7960debc276ee59c093c9ea05371c5a0b775a3 WHIRLPOOL 62faef18570b104acb54a57afec7bb44b631e18c92f82d80f196a2ab3b86807667e22178dee6025bba52afbbeb48998a32bcf50d3ef75b08f82e4644ac06135c
+DIST phpsysinfo-3.0.20.tar.gz 499573 SHA256 029889ba102848dfa33be2472e9f06472eff1b4c05017c9e9cb48a022c900660 SHA512 81853f94cc0b4ef8d0e394179b82b51f69dd3c9f0d9dbeb5c702d2824984a03e0caaa92682d6177c57181fcaaf55b1708e3c0a578cc4eddeb00b4530ba866d11 WHIRLPOOL c8872685ccafc0a6f7c208fffa280dc24d497085bd79d3b5a8a44e9fef8b2113b167bddbcd550d85b4adf081717e112988cc5bed70379e5c7f21ffeba2ba47a5
diff --git a/www-apps/phpsysinfo/phpsysinfo-3.0.20.ebuild b/www-apps/phpsysinfo/phpsysinfo-3.0.20.ebuild
new file mode 100644
index 000000000000..19e7d7d8ca91
--- /dev/null
+++ b/www-apps/phpsysinfo/phpsysinfo-3.0.20.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpsysinfo/phpsysinfo-3.0.20.ebuild,v 1.1 2012/12/22 10:09:36 radhermit Exp $
+
+EAPI="5"
+
+inherit webapp
+
+DESCRIPTION="phpSysInfo is a nice package that will display your system stats via PHP."
+HOMEPAGE="http://rk4an.github.com/phpsysinfo/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="virtual/httpd-php
+	dev-lang/php[simplexml,xml,xsl,unicode]"
+
+need_httpd_cgi
+
+S="${WORKDIR}/${PN}"
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc ChangeLog README*
+	rm ChangeLog COPYING README* || die
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	newins config.php{.new,}
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php
+	webapp_src_install
+}
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index c207b0512743..96adb468253b 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -1,3 +1,4 @@
 DIST VirtualBox-4.1.22.tar.bz2 73385514 SHA256 7abb506203dd0d69b4b408fd999b5b9a479a9adce5f80e9b5569641c053dd153 SHA512 1bc2e33f6ce1ab417887241ee95bc3042b5c6072b3babc221c349b36b923f0655e776e98468cc63f65662e5ae3819c974bc8b5c97bae531a2c4a0ebb1c1ebba6 WHIRLPOOL e52ee58fdf1b3d1e1323cb26df1791dbc4c9375061467191a73f12071ac99a5c2791ddb65eeff9af5a645ba39fe88d4f7bc4362c919c9c14ba10a99d1b6c3776
-DIST VirtualBox-4.2.2.tar.bz2 75655741 SHA256 943daa13694605d5d0a23ffef27c398b5e72ada669de89bad4b98f000f029700 SHA512 d6a85175e15d3dc49aab825aeb9aa4fb9b2640e6bb3c65dfeaaf492fe8589abe70ad5dbf8ed07d502f337c243b469a7da35d4bf23bb26f5ad3b0ee0a06a51a10 WHIRLPOOL ad45932ca5ea7e990af975a1c3823d58cc9b180a9f1e0c23576e1c6fb2aead39cdd2d0303b830f334d811c1f4b6b8b585d243a177253f13b53735303ae247c33
+DIST VirtualBox-4.1.24.tar.bz2 74612732 SHA256 74008b8e8942045668c1b7d06b0a4bb5fe8464066e343e3a2e1ba30b94ce8a7f SHA512 b4967621f848ff50d23e5f1afa63c2109cd10a602e6c742966ae7eef882417808cdc93edad67f55a0005fe3e4905034b08a1d21dcf242a9cc1e653ebef459174 WHIRLPOOL 0544cd637bfcc6cf7a502aa6fe27cb697ba4d570400ee2f7055406fca6deaed1b4b31e80de8e7d09a15152bfabe311d56a4ff256ae8f8f2940aa842c1701f941
 DIST VirtualBox-4.2.4.tar.bz2 75625513 SHA256 a7c607523c1c10b7b978ab39a92bb646517316548aa4a1a74b6e434ac2bf0adc SHA512 8238afd440e20842de27c8c68296c88bd18f561a45497ee97364d5720d73a9fe99eba9af3ad851d89e02540e304bcc3f48847704207ce2c8cdced8fa10dc4aa6 WHIRLPOOL 875184cc836ab65a368d1d9fea6eaed7deeea782d9d149a8f568ec372e190730e92ca13858fff51089bf0632136200909c49cf5ba1b9b5bb0fec3ec69293bade
+DIST VirtualBox-4.2.6.tar.bz2 76291326 SHA256 54526091bc2aa66b88ca878dd9ecc4466f96d607db2f6678a9d673ecf6646ae3 SHA512 b8b35f7777cc1386cb61720619a8df1b7adbc573da0bfa1e364887dd8680012ecabc57d7dd5848943be5e676430a66ae6d0ddf1654299891d89b82dadea3b78f WHIRLPOOL 1e95c4d1136e0c2e7740cb443a4effecf0b018a6c1492d13e61d81ae0a74f35d5f9b0adf89f52c0e36794512c6c001e01f775755c9a182581d0c36874b401be6
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.24.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.24.ebuild
new file mode 100644
index 000000000000..0cf4cc1b3742
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.24.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.24.ebuild,v 1.1 2012/12/22 12:27:27 polynomial-c Exp $
+
+EAPI=2
+
+inherit eutils linux-mod multilib python versionator toolchain-funcs
+
+MY_P=VirtualBox-${PV}
+DESCRIPTION="VirtualBox video driver"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dri"
+
+RDEPEND="<x11-base/xorg-server-1.12.99[-minimal]
+	x11-libs/libXcomposite"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.999
+	=dev-lang/python-2*
+	>=dev-lang/yasm-0.6.2
+	sys-devel/dev86
+	sys-power/iasl
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	x11-libs/libXdmcp
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXfixes
+	x11-libs/libXext
+	dri? (  x11-proto/xf86driproto
+		>=x11-libs/libdrm-2.4.5 )"
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxvideo(misc:${WORKDIR}/vboxvideo_drm:${WORKDIR}/vboxvideo_drm)"
+
+S="${WORKDIR}/${MY_P}"
+
+QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# Prepare the vboxvideo_drm sources and Makefile in ${WORKDIR}
+	cp -a "${S}"/src/VBox/Additions/linux/drm "${WORKDIR}/vboxvideo_drm" \
+		|| die "cannot copy vboxvideo_drm directory"
+	cp "${FILESDIR}/${PN}-3-vboxvideo_drm.makefile" \
+		"${WORKDIR}/vboxvideo_drm/Makefile" \
+			|| die "cannot copy vboxvideo_drm Makefile"
+
+	# stupid new header references...
+	for vboxheader in {product,version}-generated.h ; do
+		ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+			"${WORKDIR}/vboxvideo_drm/${vboxheader}"
+	done
+
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -rf kBuild/bin tools
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
+
+	# Ugly hack to build the opengl part of the video driver
+	epatch "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
+
+	# unset useless/problematic checks in configure
+	epatch "${FILESDIR}/${PN}-3.2.8-mesa-check.patch" \
+		"${FILESDIR}/${PN}-4-makeself-check.patch" \
+		"${FILESDIR}/${PN}-4-mkisofs-check.patch"
+
+	# Patch to link with lazy on hardened #394757
+	if gcc-specs-now ; then
+		epatch "${FILESDIR}/${PN}-link-lazy.patch"
+	fi
+}
+
+src_configure() {
+	# build the user-space tools, warnings are harmless
+	./configure \
+		--nofatal \
+		--disable-xpcom \
+		--disable-sdl-ttf \
+		--disable-pulse \
+		--disable-alsa \
+		--build-headless || die "configure failed"
+	source ./env.sh
+}
+
+src_compile() {
+	for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
+		/src/VBox/{GuestHost/OpenGL,Additions/x11/x11stubs,Additions/common/crOpenGL} \
+		/src/VBox/Additions/x11/vboxvideo ; do
+			cd "${S}"${each}
+			MAKE="kmk" emake TOOL_YASM_AS=yasm \
+			KBUILD_PATH="${S}/kBuild" \
+				|| die "kmk failed"
+	done
+
+	if use dri; then
+		# Now creating the kernel modules. We must do this _after_
+		# we compiled the user-space tools as we need two of the
+		# automatically generated header files. (>=3.2.0)
+		linux-mod_src_compile
+	fi
+}
+
+src_install() {
+	if use dri; then
+		linux-mod_src_install
+	fi
+
+	cd "${S}/out/linux.${ARCH}/release/bin/additions"
+	insinto /usr/$(get_libdir)/xorg/modules/drivers
+
+	# xorg-server-1.12.x
+	if has_version ">=x11-base/xorg-server-1.12" ; then
+		newins vboxvideo_drv_112.so vboxvideo_drv.so
+	# xorg-server-1.11.x
+	elif has_version ">=x11-base/xorg-server-1.11" ; then
+		newins vboxvideo_drv_111.so vboxvideo_drv.so
+	# xorg-server-1.10.x
+	elif has_version ">=x11-base/xorg-server-1.10" ; then
+		newins vboxvideo_drv_110.so vboxvideo_drv.so
+	# xorg-server-1.9.x
+	else
+		newins vboxvideo_drv_19.so vboxvideo_drv.so
+	fi
+
+	# Guest OpenGL driver
+	insinto /usr/$(get_libdir)
+	doins -r VBoxOGL* || die
+
+	if use dri ; then
+		dosym /usr/$(get_libdir)/VBoxOGL.so /usr/$(get_libdir)/dri/vboxvideo_dri.so
+	fi
+}
+
+pkg_postinst() {
+	elog "You need to edit the file /etc/X11/xorg.conf and set:"
+	elog ""
+	elog "  Driver  \"vboxvideo\""
+	elog ""
+	elog "in the Graphics device section (Section \"Device\")"
+	elog ""
+	if use dri; then
+		elog "To use the kernel drm video driver, please add:"
+		elog "\"vboxvideo\" to:"
+		if has_version sys-apps/openrc ; then
+			elog "/etc/conf.d/modules"
+		else
+			elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
+		fi
+		elog ""
+	fi
+}
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.2.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.6.ebuild
similarity index 98%
rename from x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.2.ebuild
rename to x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.6.ebuild
index 7d22f549e68f..49dbd4dfe8cd 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.2.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.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/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.2.ebuild,v 1.3 2012/12/01 11:50:07 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.6.ebuild,v 1.1 2012/12/22 12:27:27 polynomial-c Exp $
 
 EAPI=2
 
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index ceac81e15256..29d4b27b20ed 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -1,2 +1,3 @@
 DIST shutter-0.88.1.tar.gz 3155525 SHA256 8e7946cc188fd28005ea7eb6d65121e5c52f2e2dc9e2b2f6bb1c1bcdb3538098 SHA512 3b9859ee47bdaec260a5fc49495538f2141492af305513415cafd107d1e790774da7af370b57496bf1880545091e8320513ac80f4f6d75649ee04145b04cd769 WHIRLPOOL c78009e57804edced93bc09392e50381c4b892fc7bc45f975f9bca650228fa22b1bf862e575e13f9f49dd6142cec796fa9e44163b9efa53378c479d4fbf8d789
 DIST shutter-0.89.1.tar.gz 3364889 SHA256 9b0e8f61d0dae738890c6b02f41a9b37c72f5e74184a57f1fef40843ea4feca7 SHA512 6e6a1a163929970e28121804927843bacf8671a9cc9a68fe2a43e7f21be8a0e4f751245e51154d93317db88622fafd752897e6d7d3c8cbc6891d9e86a63f26fd WHIRLPOOL 5097ce2ae0f45befcb0b631f2c742e88ecc5fd735919c49888f824620f375a44953ec0db684f6ed8ddcca968f96aba0a0d03f90bf6846b846020978af8cc036d
+DIST shutter-0.90.tar.gz 3281329 SHA256 7001b872f1723f58ec27289ceeb1fe9e3a75d82236250dc466076d30d7137a7d SHA512 f27912f2b1a2d9469e20870c79f8cd11671ce9559510149f3806e2d1d3fd00d25e1f1216f9aac226aef1d7f6d543078d1a03ade912a4797d1342aad739ef6999 WHIRLPOOL 5c57ee654aa01f6bdfe8d7d69903a7fcc5186a88d0e1172326425c945796b3fc1f28929af97c67d065ddb1029f9a42b0fe86b71cef31fcae5aae3d19a3e0a36d
diff --git a/x11-misc/shutter/files/disable_webphoto.patch b/x11-misc/shutter/files/disable_webphoto.patch
deleted file mode 100644
index d09f30395737..000000000000
--- a/x11-misc/shutter/files/disable_webphoto.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: bin/shutter
-===================================================================
---- bin/shutter
-+++ bin/shutter
-@@ -6034,11 +6034,7 @@ sub fct_init_depend {
- 		die "ERROR: imagemagick is missing --> aborting!\n\n";
- 	}
- 
--	#gnome-web-photo
--	unless ( File::Which::which('gnome-web-photo') ) {
--		warn "WARNING: gnome-web-photo is missing --> screenshots of websites will be disabled!\n\n";
--		$gnome_web_photo = FALSE;
--	}
-+	$gnome_web_photo = FALSE;
- 
- 	#goocanvas
- 	eval { require Goo::Canvas };
diff --git a/x11-misc/shutter/files/shutter-0.90-goocanvas.patch b/x11-misc/shutter/files/shutter-0.90-goocanvas.patch
new file mode 100644
index 000000000000..3a811635a988
--- /dev/null
+++ b/x11-misc/shutter/files/shutter-0.90-goocanvas.patch
@@ -0,0 +1,18 @@
+Index: shutter-0.90/bin/shutter
+===================================================================
+--- shutter-0.90.orig/bin/shutter
++++ shutter-0.90/bin/shutter
+@@ -9407,12 +9407,7 @@ else {
+             $nautilus_sendto = FALSE;
+         }
+ 
+-        #goocanvas
+-        eval { require Goo::Canvas };
+-        if ($@) {
+-            warn "WARNING: Goo::Canvas/libgoo-canvas-perl is missing --> drawing tool will be disabled!\n\n";
+-            $goocanvas = FALSE;
+-        }
++        $goocanvas = FALSE;
+ 
+         #net-dbus-glib-perl
+         eval { require Net::DBus::GLib };
diff --git a/x11-misc/shutter/files/shutter-0.90-webphoto.patch b/x11-misc/shutter/files/shutter-0.90-webphoto.patch
new file mode 100644
index 000000000000..647e53aa5e04
--- /dev/null
+++ b/x11-misc/shutter/files/shutter-0.90-webphoto.patch
@@ -0,0 +1,17 @@
+Index: shutter-0.90/bin/shutter
+===================================================================
+--- shutter-0.90.orig/bin/shutter
++++ shutter-0.90/bin/shutter
+@@ -9396,11 +9396,7 @@ else {
+             die "ERROR: imagemagick is missing --> aborting!\n\n";
+         }
+ 
+-        #gnome-web-photo
+-        unless ( File::Which::which('gnome-web-photo') ) {
+-            warn "WARNING: gnome-web-photo is missing --> screenshots of websites will be disabled!\n\n";
+-            $gnome_web_photo = FALSE;
+-        }
++        $gnome_web_photo = FALSE;
+ 
+         #nautilus-sendto
+         unless ( File::Which::which('nautilus-sendto') ) {
diff --git a/x11-misc/shutter/shutter-0.90.ebuild b/x11-misc/shutter/shutter-0.90.ebuild
new file mode 100644
index 000000000000..4a5e97016705
--- /dev/null
+++ b/x11-misc/shutter/shutter-0.90.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shutter/shutter-0.90.ebuild,v 1.1 2012/12/22 00:44:00 hwoarang Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Feature-rich screenshot program"
+HOMEPAGE="http://shutter-project.org/"
+SRC_URI="http://shutter-project.org/wp-content/uploads/releases/tars/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="drawing webphoto"
+
+RDEPEND="dev-lang/perl
+	drawing? ( dev-perl/Goo-Canvas  )
+	webphoto? ( gnome-extra/gnome-web-photo )
+	|| ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] )
+	dev-perl/libxml-perl
+	dev-perl/gnome2-wnck
+	dev-perl/gnome2-canvas
+	dev-perl/gnome2-perl
+	dev-perl/Gtk2-Unique
+	dev-perl/Gtk2-ImageView
+	dev-perl/File-DesktopEntry
+	dev-perl/File-HomeDir
+	dev-perl/File-Which
+	dev-perl/JSON
+	dev-perl/File-Copy-Recursive
+	dev-perl/File-MimeInfo
+	dev-perl/Locale-gettext
+	dev-perl/Net-DBus
+	dev-perl/Proc-Simple
+	dev-perl/Proc-ProcessTable
+	dev-perl/Sort-Naturally
+	dev-perl/WWW-Mechanize
+	dev-perl/X11-Protocol
+	dev-perl/XML-Simple
+	dev-perl/libwww-perl"
+
+src_prepare() {
+	use webphoto || epatch "${FILESDIR}"/${P}-webphoto.patch
+	use drawing || epatch "${FILESDIR}"/${P}-goocanvas.patch
+	#Fix tray icon because it doesn't pick the right icon using various themes
+	sed -i -e "/\$tray->set_from_icon_name/s:set_from_icon_name:set_from_file:" \
+	-e "s:shutter-panel:/usr/share/icons/hicolor/scalable/apps/&.svg:" \
+	bin/shutter || die "failed to fix trayicon"
+}
+
+src_install() {
+	dobin bin/${PN} || die "dobin failed"
+	insinto /usr/share/${PN}
+	doins -r share/${PN}/* || die "doins failed"
+	dodoc README || die "dodoc failed"
+	domenu share/applications/${PN}.desktop
+	# mapage is broken. Reconstruct it.
+	mv share/man/man1/${PN}.1.gz share/man/man1/${PN}.1
+	bzip2 share/man/man1/${PN}.1
+	doman share/man/man1/${PN}.1.bz2 || die "doman failed"
+	doicon share/pixmaps/${PN}.png
+	doins -r share/locale || die "doins failed"
+	insinto /usr/share/icons/hicolor
+	doins -r share/icons/hicolor/* || die "doins failed"
+	find "${D}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \
+		|| die "failed to make plugins executables"
+	find "${D}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \
+		-name "*.pm" -exec chmod 755 {} \; || die "failed to make upload plugins executables"
+}
diff --git a/x11-plugins/echievements/echievements-2.ebuild b/x11-plugins/echievements/echievements-2.ebuild
index 562ba372d0cd..4c3490ac2650 100644
--- a/x11-plugins/echievements/echievements-2.ebuild
+++ b/x11-plugins/echievements/echievements-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/x11-plugins/echievements/echievements-2.ebuild,v 1.1 2012/12/21 14:54:06 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/echievements/echievements-2.ebuild,v 1.2 2012/12/21 20:59:23 tommy Exp $
 
 EAPI=5
 
@@ -9,12 +9,13 @@ inherit enlightenment
 DESCRIPTION="Show enlightenment echievements"
 
 SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-LICENSE="LGPL-2.1"
+LICENSE="BSD-2"
 
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-libs/e_dbus
+RDEPEND=">=dev-games/etrophy-0.5.1
+	dev-libs/e_dbus
 	media-libs/edje
 	x11-wm/enlightenment:0.17="
 DEPEND="${RDEPEND}
diff --git a/x11-plugins/leechcraft-lhtr/Manifest b/x11-plugins/leechcraft-lhtr/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/x11-plugins/leechcraft-lhtr/leechcraft-lhtr-9999.ebuild b/x11-plugins/leechcraft-lhtr/leechcraft-lhtr-9999.ebuild
new file mode 100644
index 000000000000..d36c10306df5
--- /dev/null
+++ b/x11-plugins/leechcraft-lhtr/leechcraft-lhtr-9999.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/leechcraft-lhtr/leechcraft-lhtr-9999.ebuild,v 1.1 2012/12/22 15:28:04 maksbotan Exp $
+
+EAPI="4"
+
+inherit leechcraft
+
+DESCRIPTION="LeechCraft HTML Text editoR component"
+
+SLOT="0"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="~net-misc/leechcraft-core-${PV}
+	x11-libs/qt-webkit
+	"
+RDEPEND="${DEPEND}"
diff --git a/x11-plugins/leechcraft-lhtr/metadata.xml b/x11-plugins/leechcraft-lhtr/metadata.xml
new file mode 100644
index 000000000000..2c857dda08d3
--- /dev/null
+++ b/x11-plugins/leechcraft-lhtr/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>leechcraft</herd>
+</pkgmetadata>
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index bc09427f3c42..b55831c390a7 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -5,5 +5,4 @@ DIST e16-1.0.6.tar.gz 2212263 SHA256 6ab09e326420982a3b828538bae3f1ea4a2e45b8d5f
 DIST e16-1.0.7.tar.gz 2223518 SHA256 d36cf57e4125b173608a6f4cbfa53d91f59f047579fe6a40939874293cfe71bc SHA512 ce9c6108e2d87fa669f774577ed48b9a35e5e9b52d0703f20563bfd23918a542b3833023fc5f98967cc1a3da864d47de4747bbd228c49e53b6e9dc505c3a6b0b WHIRLPOOL 33e0bd6cf6f36a7b1af60b92dd6fccb4805ea2ac9daa47d54902cfdba6338cb2a170d6f3afd0fa0f5a335e994c7d564e2a2eb1816ed6b32f6f53102a8ed35fc4
 DIST e16-1.0.8.tar.gz 2243485 SHA256 794d842ec30a29e0d6a85a3bd40120151c27419d77d2fd5759b49862063be27f SHA512 f8d8687a40defdbec385ab007351501a2bd5d39addc6d096655ee57b0384e59aa374c9d1860fa81f5405751e706015b920712c9607b04182916d9a5b7bfe22e7 WHIRLPOOL a558555b955951c9ccd039898d6e8b2219ae284f839ca921fe89bfebbf1ae9257826187c65ab81564cb074b1cb17cfd75bddfea7e02492796be6d05be62c237c
 DIST e16-1.0.9.tar.gz 2256543 SHA256 d435840a4a429cb22f241d7889e82827061f6ef5ccd9bbc8720af51dee053d27 SHA512 75dc4c784bb70a22b5baa6462024164a10bcea325aa479d2c856f8d214910f36fba865f78017f5c71847991015e7164ecb3959b9ee6d8e531c1b938bd5f61d2a WHIRLPOOL 1c11956dee0905a5465bbc900c3e5fb5ded702b091d3e1bb93738101a82efda82270e5b1fb530e3980077a53fecdb6136bbc4b9c564136bf82ec475fc851cdbc
-DIST enlightenment-0.17.0-lucky.tar.bz2 21725785 SHA256 f0e348286d8289b1cdd1513383bd37070a037507278c949e904554cb23bee75d SHA512 70bf10a8f5aa4e5c2c8e04583570d4c278a545c2e8c7a7edb64b61178123b1a75843501bbd141aa995b50ae8d558e6b36a0f2139f05a6d739a0ee03f66ac2bac WHIRLPOOL 1ff8f9f33877259909887d301d59b5535c2c201626fb3ca851c0e6b9d3741ffefc77ef1b31a8b7fbe8e5f1e2c75eda41cde8793206ea8f67b4b55f833203d9d2
-DIST enlightenment-0.17.0-omega.tar.bz2 27477318 SHA256 6bea99c99567d56ea1ace993a1b9555098d9fb9ffa078e1b0e3f21ced9eb0753 SHA512 282703a0030a120634e21e6d553844fe1cba26c38b1057e9c5c0440841ca77d1bd97856f0ecfe2628b3713665e681daab7e9b4f8ba5f4608465469662a952ae5 WHIRLPOOL f0df8cce2a335c10716f6cab2182f0c06415bec97507f389f89420da7aac287b119a33168e1b2f67f648edc47c7bd023b51e57d87e8fa732597938a60b1272eb
+DIST enlightenment-0.17.0.tar.bz2 29213523 SHA256 0b1dbeb28b5c114816a7d2a3567b90ffe6eb9f49ab4939cad797ba59f35e525a SHA512 2eea1fdc0d02cb50441ac362bebe3d6300da8f2c30db80e8a9af539f0e6c904d509594075beaa6a50fdd88c0a6c238d5c031f55bfaaef422e1b01887c5e567cb WHIRLPOOL e52803a938c76fb21a74f29354ad95b6574118fbcb79f012ac9f09aad5a887b72bd62a3e55551f208bfb09dcf94c62b49b1c0a79833e1a75c7cfd38765ab1bfd
diff --git a/x11-wm/enlightenment/enlightenment-0.17.0_beta3.ebuild b/x11-wm/enlightenment/enlightenment-0.17.0.ebuild
similarity index 93%
rename from x11-wm/enlightenment/enlightenment-0.17.0_beta3.ebuild
rename to x11-wm/enlightenment/enlightenment-0.17.0.ebuild
index fff127b452e5..f66b091c91bc 100644
--- a/x11-wm/enlightenment/enlightenment-0.17.0_beta3.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.17.0.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.17.0_beta3.ebuild,v 1.1 2012/12/19 18:28:10 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.17.0.ebuild,v 1.1 2012/12/22 00:47:09 tommy Exp $
 
 EAPI=5
 
 MY_P=${P/_beta3/-omega}
 
-inherit autotools enlightenment
+inherit enlightenment
 
 DESCRIPTION="Enlightenment DR17 window manager"
 SRC_URI="http://download.enlightenment.org/releases/${MY_P}.tar.bz2"
 
+LICENSE="BSD-2"
 KEYWORDS="~amd64 ~x86"
 SLOT="0.17/${PV}"
 
@@ -53,8 +54,6 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	epatch "${FILESDIR}"/quickstart.diff
-	sed -i 's:efl_version="1.7.3":efl_version="1.7.1":g' configure.ac
-	eautoreconf
 	enlightenment_src_prepare
 }
 
diff --git a/x11-wm/enlightenment/enlightenment-0.17.0_beta2.ebuild b/x11-wm/enlightenment/enlightenment-0.17.0_beta2.ebuild
deleted file mode 100644
index e81613b92512..000000000000
--- a/x11-wm/enlightenment/enlightenment-0.17.0_beta2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.17.0_beta2.ebuild,v 1.1 2012/12/14 20:13:45 tommy Exp $
-
-EAPI="2"
-
-MY_P=${P/_beta2/-lucky}
-
-inherit autotools enlightenment
-
-DESCRIPTION="Enlightenment DR17 window manager"
-SRC_URI="http://download.enlightenment.org/releases/${MY_P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0.17"
-
-# The @ is just an anchor to expand from
-__EVRY_MODS=""
-__CONF_MODS="
-	+@applications +@dialogs +@display +@edgebindings
-	+@interaction +@intl +@keybindings +@menus
-	+@paths +@performance +@randr +@shelves +@theme
-	+@window-manipulation +@window-remembers"
-__NORM_MODS="
-	@access +@backlight +@battery +@clock +@comp +@connman +@cpufreq +@dropshadow
-	+@everything +@fileman +@fileman-opinfo +@gadman +@ibar +@ibox +@illume2
-	+@mixer	+@msgbus +@notification +@pager +@quickaccess @shot +@start
-	+@syscon +@systray +@tasks +@temperature +@tiling +@winlist +@wizard +@xkbswitch"
-IUSE_E_MODULES="
-	${__CONF_MODS//@/enlightenment_modules_conf-}
-	${__NORM_MODS//@/enlightenment_modules_}"
-
-IUSE="emotion pam spell static-libs +udev ukit ${IUSE_E_MODULES}"
-
-RDEPEND="
-	pam? ( sys-libs/pam )
-	>=dev-libs/efreet-1.7.3
-	>=dev-libs/eio-1.7.3
-	>=dev-libs/eina-1.7.3[mempool-chained]
-	|| ( >=dev-libs/ecore-1.7.3[X,evas,inotify] >=dev-libs/ecore-1.7.3[xcb,evas,inotify] )
-	>=media-libs/edje-1.7.3
-	>=dev-libs/e_dbus-1.7.1[libnotify,udev?]
-	ukit? ( >=dev-libs/e_dbus-1.7.1[udev] )
-	enlightenment_modules_connman? ( >=dev-libs/e_dbus-1.7.1[connman] )
-	enlightenment_modules_shot? ( >=dev-libs/ecore-1.7.3[curl] )
-	|| ( >=media-libs/evas-1.7.3[eet,X,jpeg,png] >=media-libs/evas-1.7.3[eet,xcb,jpeg,png] )
-	>=dev-libs/eeze-1.7.1
-	emotion? ( >=media-libs/emotion-1.7.3 )
-	x11-libs/xcb-util-keysyms"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/quickstart.diff
-	sed -i 's:efl_version="1.7.3":efl_version="1.7.1":g' configure.ac
-	eautoreconf
-	enlightenment_src_prepare
-}
-
-src_configure() {
-	export MY_ECONF="
-		--disable-install-sysactions
-		--disable-elementary
-		$(use_enable doc)
-		--disable-device-hal
-		$(use_enable emotion)
-		--disable-mount-hal
-		$(use_enable nls)
-		$(use_enable pam)
-		--enable-device-udev
-		$(use_enable udev mount-eeze)
-		$(use_enable ukit mount-udisks)
-		--disable-physics
-	"
-	local u c
-	for u in ${IUSE_E_MODULES} ; do
-		u=${u#+}
-		c=${u#enlightenment_modules_}
-		MY_ECONF+=" $(use_enable ${u} ${c})"
-	done
-	enlightenment_src_configure
-}
-
-src_install() {
-	enlightenment_src_install
-	insinto /etc/enlightenment
-	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf || die
-}
diff --git a/x11-wm/matchbox/matchbox-1.0.ebuild b/x11-wm/matchbox/matchbox-1.0.ebuild
index b2c87253cbc5..1b7bf5687f6f 100644
--- a/x11-wm/matchbox/matchbox-1.0.ebuild
+++ b/x11-wm/matchbox/matchbox-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/x11-wm/matchbox/matchbox-1.0.ebuild,v 1.12 2012/06/04 00:38:11 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox/matchbox-1.0.ebuild,v 1.13 2012/12/22 17:52:22 ulm Exp $
 
 DESCRIPTION="Light weight WM designed for use on PDA computers"
 HOMEPAGE="http://matchbox-project.org/"
-LICENSE="as-is"
+LICENSE="metapackage"
 SLOT="0"
 IUSE="minimal"