diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index f669340fec01..2f40306f2dcc 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -1,5 +1 @@
-DIST sshguard-1.0.tar.bz2 118988 RMD160 436516e14a72845e7eb5325d6f55496eec9d1762 SHA1 968275288a1aec06737e70cde61fe99063081adc SHA256 33a9fe9d2360e9a5c357e269353d4157270171ff975bcf649f5f99b1aa8dcc08
-DIST sshguard-1.1.tar.bz2 233308 RMD160 e6e7d6e54b32d67583b0f4140ef8905ef5f5567f SHA1 912c151232bc6b23ce400ef92270c9a7f87a60d1 SHA256 c1b2fcd7c402725958e62808829c82bb4445dcf6a9b27ee07e2ab8a3417bb96f
-DIST sshguard-1.3.tar.bz2 140745 RMD160 792431d6d1c7437734bccca4ec6e1ae1b9c4891c SHA1 4c073086406901bbd55ab669b295a3f12f67994e SHA256 1ff0ea3349c67fdab8f8046eeae6a96046a752ae7458c2259cb31b78c2de08ac
-DIST sshguard-1.4.tar.bz2 152303 RMD160 1a34d29d8849ea279049a8eb24ddef839dafdbf7 SHA1 afd1134199ba41721b3d4032239529040e5dd367 SHA256 d9228c9399c0fffa847ea25d3b4b59c0f23dd72c7cf89b52380fee46e92a0ecf
 DIST sshguard-1.5.tar.bz2 303767 RMD160 7b4625b3b2e0cf974bc935d868b89bd0d8c189e8 SHA1 f8f713bfb3f5c9877b34f6821426a22a7eec8df3 SHA256 b537f8765455fdf8424f87d4bd695e5b675b88e5d164865452137947093e7e19
diff --git a/app-admin/sshguard/sshguard-1.0.ebuild b/app-admin/sshguard/sshguard-1.0.ebuild
deleted file mode 100644
index a4f49226e2e2..000000000000
--- a/app-admin/sshguard/sshguard-1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sshguard/sshguard-1.0.ebuild,v 1.6 2008/07/18 23:16:24 cla Exp $
-
-DESCRIPTION="protects hosts from brute force attacks against ssh"
-HOMEPAGE="http://sshguard.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE="ipfilter kernel_FreeBSD kernel_linux"
-
-DEPEND="kernel_linux? ( net-firewall/iptables )
-	kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) )"
-RDEPEND="${DEPEND}
-	virtual/logger"
-
-src_compile() {
-	local myconf
-	if use kernel_linux; then
-		myconf="--with-firewall=iptables"
-	elif use kernel_FreeBSD; then
-		use ipfilter && myconf="--with-firewall=ipfw" \
-			|| myconf="--with-firewall=pf"
-	fi
-
-	econf ${myconf}
-	emake CFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README Changes || die "dodoc failed"
-	dodoc examples/* || die "dodoc failed"
-}
diff --git a/app-admin/sshguard/sshguard-1.1.ebuild b/app-admin/sshguard/sshguard-1.1.ebuild
deleted file mode 100644
index 8200c16395e3..000000000000
--- a/app-admin/sshguard/sshguard-1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sshguard/sshguard-1.1.ebuild,v 1.1 2008/08/31 10:12:51 hawking Exp $
-
-DESCRIPTION="protects hosts from brute force attacks against ssh"
-HOMEPAGE="http://sshguard.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="ipfilter kernel_FreeBSD kernel_linux"
-
-DEPEND="kernel_linux? ( net-firewall/iptables )
-	kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) )"
-RDEPEND="${DEPEND}
-	virtual/logger"
-
-src_compile() {
-	local myconf
-	if use kernel_linux; then
-		myconf="--with-firewall=iptables"
-	elif use kernel_FreeBSD; then
-		use ipfilter && myconf="--with-firewall=ipfw" \
-			|| myconf="--with-firewall=pf"
-	fi
-
-	econf ${myconf}
-	emake CFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README Changes || die "dodoc failed"
-	dodoc examples/* || die "dodoc failed"
-}
diff --git a/app-admin/sshguard/sshguard-1.3.ebuild b/app-admin/sshguard/sshguard-1.3.ebuild
deleted file mode 100644
index 0db5eca517e3..000000000000
--- a/app-admin/sshguard/sshguard-1.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sshguard/sshguard-1.3.ebuild,v 1.1 2008/12/22 02:03:00 vanquirius Exp $
-
-DESCRIPTION="protects hosts from brute force attacks against ssh"
-HOMEPAGE="http://sshguard.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="ipfilter kernel_FreeBSD kernel_linux"
-
-DEPEND="kernel_linux? ( net-firewall/iptables )
-	kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) )"
-RDEPEND="${DEPEND}
-	virtual/logger"
-
-src_compile() {
-	local myconf
-	if use kernel_linux; then
-		myconf="--with-firewall=iptables"
-	elif use kernel_FreeBSD; then
-		use ipfilter && myconf="--with-firewall=ipfw" \
-			|| myconf="--with-firewall=pf"
-	fi
-
-	econf ${myconf}
-	emake CFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README Changes || die "dodoc failed"
-	dodoc examples/* || die "dodoc failed"
-}
diff --git a/app-admin/sshguard/sshguard-1.4.ebuild b/app-admin/sshguard/sshguard-1.4.ebuild
deleted file mode 100644
index 3ecd7c656276..000000000000
--- a/app-admin/sshguard/sshguard-1.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sshguard/sshguard-1.4.ebuild,v 1.1 2009/11/12 19:40:18 pva Exp $
-
-EAPI="2"
-
-DESCRIPTION="protects hosts from brute force attacks against ssh"
-HOMEPAGE="http://sshguard.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="ipfilter kernel_FreeBSD kernel_linux"
-
-CDEPEND="kernel_linux? ( net-firewall/iptables )
-	kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) )"
-DEPEND="${CDEPEND}
-	sys-devel/flex"
-RDEPEND="${CDEPEND}
-	virtual/logger"
-
-src_configure() {
-	local myconf
-	if use kernel_linux; then
-		myconf="--with-firewall=iptables"
-	elif use kernel_FreeBSD; then
-		use ipfilter && myconf="--with-firewall=ipfw" \
-			|| myconf="--with-firewall=pf"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README Changes || die "dodoc failed"
-	dodoc examples/* || die "dodoc failed"
-}
diff --git a/app-admin/sudo/sudo-1.8.2-r1.ebuild b/app-admin/sudo/sudo-1.8.2-r1.ebuild
index d117f0d8331a..90ee3249efbd 100644
--- a/app-admin/sudo/sudo-1.8.2-r1.ebuild
+++ b/app-admin/sudo/sudo-1.8.2-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/app-admin/sudo/sudo-1.8.2-r1.ebuild,v 1.1 2011/10/12 18:50:26 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.2-r1.ebuild,v 1.3 2012/01/17 16:43:33 jer Exp $
 
 EAPI=4
 
@@ -28,7 +28,7 @@ SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 LICENSE="as-is BSD"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="pam offensive ldap selinux skey"
 
 DEPEND="pam? ( virtual/pam )
diff --git a/app-arch/libarchive/libarchive-2.8.5.ebuild b/app-arch/libarchive/libarchive-2.8.5.ebuild
index e3af42ef8ae0..670bb4076ab5 100644
--- a/app-arch/libarchive/libarchive-2.8.5.ebuild
+++ b/app-arch/libarchive/libarchive-2.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.8.5.ebuild,v 1.5 2012/01/16 20:33:26 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.8.5.ebuild,v 1.6 2012/01/17 05:16:21 jer Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="static static-libs acl xattr kernel_linux +bzip2 +lzma +zlib expat"
 
 COMPRESS_LIBS_DEPEND="lzma? ( app-arch/xz-utils )
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 0c79c3dcfee7..4ad2243b40d8 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -1,5 +1,2 @@
-DIST heimdal-1.3.3.tar.gz 5744155 RMD160 ce97ac415e7c27912ba148b81c46e756dc54ba3e SHA1 a385d959e3edd144aee79e9df585e44347342049 SHA256 8c8d2b272529c87ae9800825e2f266821b696ae6b56837edf0d19e17fc2a8630
-DIST heimdal-1.4.1_pre20110304.tar.bz2 10404973 RMD160 ff0161ceb82e60925ac53fae1ad547b6993616fe SHA1 ffa6b04deb1fa3b22a094d31735342906e6bd982 SHA256 af120ed7c20d12275966682a49ffc5607a393f61c411a00ebac563614b241b38
 DIST heimdal-1.5.1.tar.gz 6800347 RMD160 d66b09bddcd762e91092f862ea084abbcc3670ca SHA1 78421d3f80d3bd1f2eccfa0e5a690e964842b2fb SHA256 bd69940e67ce985589451d868354a959eebf96d8a059f513b23d40e4aa101d5f
 DIST heimdal-1.5.2.tar.gz 6798615 RMD160 1ab2f835309a916dfbba667d3d0d38a57c312fde SHA1 dd0920a181d18236432e4b3e5eab6e468cda4b89 SHA256 22603f282f31173533b939d289f3374258aa1ccccbe51ee088d7568d321279ec
-DIST heimdal-1.5.tar.gz 6594801 RMD160 308ef50e804402aab2fd3d8f25a798bec692c597 SHA1 fdf29096a1fa71a275881d64d178c211f148f0fc SHA256 8fe69a90e7ddbf5989054f899071365476689b7aed82bf0443b5bf85f934d53a
diff --git a/app-crypt/heimdal/files/heimdal-kadmind.initd b/app-crypt/heimdal/files/heimdal-kadmind.initd
deleted file mode 100644
index da90485873bf..000000000000
--- a/app-crypt/heimdal/files/heimdal-kadmind.initd
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kadmind.initd,v 1.1 2010/05/09 03:50:52 darkside Exp $
-
-depend() {
-	need net
-	use heimdal-kdc
-	after logger
-}
-
-start() {
-	ebegin "Starting Heimdal kadmind"
-		/usr/sbin/kadmind  &
-		echo $! > /var/run/heimdal-kadmind.pid
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Heimdal kadmind"
-	start-stop-daemon --stop --quiet --exec \
-		/usr/sbin/kadmind
-	eend $?
-}
-
-restart() {
-	svc_stop
-	svc_start
-}
-
diff --git a/app-crypt/heimdal/files/heimdal-kcm.initd b/app-crypt/heimdal/files/heimdal-kcm.initd
deleted file mode 100644
index 9e46d03e4745..000000000000
--- a/app-crypt/heimdal/files/heimdal-kcm.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kcm.initd,v 1.1 2010/05/09 03:50:52 darkside Exp $
-
-depend() {
-	after heimdal-kdc
-}
-
-start() {
-	ebegin "Starting Heimdal KCM..."
-	start-stop-daemon --start --pidfile /var/run/kcm.pid --exec /usr/sbin/kcm -- --detach
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Heimdal KCM..."
-	start-stop-daemon --stop --pidfile /var/run/kcm.pid
-	eend $?
-}
-
-restart() {
-	svc_stop
-	svc_start
-}
diff --git a/app-crypt/heimdal/files/heimdal-kdc.initd b/app-crypt/heimdal/files/heimdal-kdc.initd
deleted file mode 100644
index c56f9c5fb697..000000000000
--- a/app-crypt/heimdal/files/heimdal-kdc.initd
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kdc.initd,v 1.1 2010/05/09 03:50:52 darkside Exp $
-
-depend() {
-	need net
-	after logger
-}
-
-start() {
-	ebegin "Starting Heimdal kdc"
-	start-stop-daemon --start --quiet --exec \
-		/usr/sbin/kdc -- --detach
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Heimdal kdc"
-	start-stop-daemon --stop --quiet --exec \
-		/usr/sbin/kdc
-	eend $?
-}
-
-restart() {
-	svc_stop
-	svc_start
-}
-
diff --git a/app-crypt/heimdal/files/heimdal-kpasswdd.initd b/app-crypt/heimdal/files/heimdal-kpasswdd.initd
deleted file mode 100644
index 905522d0eba6..000000000000
--- a/app-crypt/heimdal/files/heimdal-kpasswdd.initd
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kpasswdd.initd,v 1.1 2010/05/09 03:50:52 darkside Exp $
-
-depend() {
-	need net
-	use heimdal-kdc
-	after logger
-}
-
-start() {
-	ebegin "Starting Heimdal kpasswdd"
-	start-stop-daemon --background --start --quiet --exec \
-		/usr/sbin/kpasswdd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Heimdal kpasswdd"
-	start-stop-daemon --stop --quiet --exec \
-		/usr/sbin/kpasswdd
-	eend $?
-}
-
-restart() {
-	svc_stop
-	svc_start
-}
diff --git a/app-crypt/heimdal/files/heimdal_openssl-1.patch b/app-crypt/heimdal/files/heimdal_openssl-1.patch
deleted file mode 100644
index 548056c8588c..000000000000
--- a/app-crypt/heimdal/files/heimdal_openssl-1.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=blob_plain;f=source/lib/heimdal/drop_md2_support.diff;hb=HEAD
-
---- include/crypto-headers.h
-+++ include/crypto-headers.h
-@@ -13,7 +13,6 @@
- #include <openssl/des.h>
- #include <openssl/rc4.h>
- #include <openssl/rc2.h>
--#include <openssl/md2.h>
- #include <openssl/md4.h>
- #include <openssl/md5.h>
- #include <openssl/sha.h>
-@@ -39,7 +38,6 @@
- 
- #include <hcrypto/evp.h>
- #include <hcrypto/des.h>
--#include <hcrypto/md2.h>
- #include <hcrypto/md4.h>
- #include <hcrypto/md5.h>
- #include <hcrypto/sha.h>
---- lib/hx509/crypto.c
-+++ lib/hx509/crypto.c
-@@ -148,11 +148,6 @@
-     { 6, rk_UNCONST(md5_oid_tree) }, rk_UNCONST(&null_entry_oid)
- };
- 
--static const unsigned md2_oid_tree[] = { 1, 2, 840, 113549, 2, 2 };
--const AlgorithmIdentifier _hx509_signature_md2_data = {
--    { 6, rk_UNCONST(md2_oid_tree) }, rk_UNCONST(&null_entry_oid)
--};
--
- static const unsigned ecPublicKey[] ={ 1, 2, 840, 10045, 2, 1 };
- const AlgorithmIdentifier _hx509_signature_ecPublicKey = {
-     { 6, rk_UNCONST(ecPublicKey) }, NULL
-@@ -193,11 +188,6 @@
-     { 7, rk_UNCONST(rsa_with_md5_oid) }, NULL
- };
- 
--static const unsigned rsa_with_md2_oid[] ={ 1, 2, 840, 113549, 1, 1, 2 };
--const AlgorithmIdentifier _hx509_signature_rsa_with_md2_data = {
--    { 7, rk_UNCONST(rsa_with_md2_oid) }, NULL
--};
--
- static const unsigned rsa_oid[] ={ 1, 2, 840, 113549, 1, 1, 1 };
- const AlgorithmIdentifier _hx509_signature_rsa_data = {
-     { 7, rk_UNCONST(rsa_oid) }, NULL
-@@ -1289,19 +1279,6 @@
-     rsa_create_signature
- };
- 
--static const struct signature_alg rsa_with_md2_alg = {
--    "rsa-with-md2",
--    &asn1_oid_id_pkcs1_md2WithRSAEncryption,
--    &_hx509_signature_rsa_with_md2_data,
--    &asn1_oid_id_pkcs1_rsaEncryption,
--    &_hx509_signature_md2_data,
--    PROVIDE_CONF|REQUIRE_SIGNER|RA_RSA_USES_DIGEST_INFO|SIG_PUBLIC_SIG,
--    1230739889,
--    NULL,
--    rsa_verify_signature,
--    rsa_create_signature
--};
--
- static const struct signature_alg dsa_sha1_alg = {
-     "dsa-with-sha1",
-     &asn1_oid_id_dsa_with_sha1,
-@@ -1354,19 +1331,6 @@
-     NULL
- };
- 
--static const struct signature_alg md2_alg = {
--    "rsa-md2",
--    &asn1_oid_id_rsa_digest_md2,
--    &_hx509_signature_md2_data,
--    NULL,
--    NULL,
--    SIG_DIGEST,
--    0,
--    EVP_md2,
--    evp_md_verify_signature,
--    NULL
--};
--
- /*
-  * Order matter in this structure, "best" first for each "key
-  * compatible" type (type is ECDSA, RSA, DSA, none, etc)
-@@ -1381,13 +1345,11 @@
-     &rsa_with_sha1_alg,
-     &pkcs1_rsa_sha1_alg,
-     &rsa_with_md5_alg,
--    &rsa_with_md2_alg,
-     &heim_rsa_pkcs1_x509,
-     &dsa_sha1_alg,
-     &sha256_alg,
-     &sha1_alg,
-     &md5_alg,
--    &md2_alg,
-     NULL
- };
- 
-@@ -1823,10 +1785,6 @@
- { return &_hx509_signature_md5_data; }
- 
- const AlgorithmIdentifier *
--hx509_signature_md2(void)
--{ return &_hx509_signature_md2_data; }
--
--const AlgorithmIdentifier *
- hx509_signature_ecPublicKey(void)
- { return &_hx509_signature_ecPublicKey; }
- 
-@@ -1859,10 +1817,6 @@
- { return &_hx509_signature_rsa_with_md5_data; }
- 
- const AlgorithmIdentifier *
--hx509_signature_rsa_with_md2(void)
--{ return &_hx509_signature_rsa_with_md2_data; }
--
--const AlgorithmIdentifier *
- hx509_signature_rsa(void)
- { return &_hx509_signature_rsa_data; }
- 
---- lib/hx509/hx509-protos.h
-+++ lib/hx509/hx509-protos.h
-@@ -976,9 +976,6 @@
- hx509_signature_ecdsa_with_sha256 (void);
- 
- const AlgorithmIdentifier *
--hx509_signature_md2 (void);
--
--const AlgorithmIdentifier *
- hx509_signature_md5 (void);
- 
- const AlgorithmIdentifier *
-@@ -988,9 +985,6 @@
- hx509_signature_rsa_pkcs1_x509 (void);
- 
- const AlgorithmIdentifier *
--hx509_signature_rsa_with_md2 (void);
--
--const AlgorithmIdentifier *
- hx509_signature_rsa_with_md5 (void);
- 
- const AlgorithmIdentifier *
---- lib/hx509/ks_p11.c
-+++ lib/hx509/ks_p11.c
-@@ -1139,7 +1139,6 @@
- 		MECHNAME(CKM_SHA256, "sha256");
- 		MECHNAME(CKM_SHA_1, "sha1");
- 		MECHNAME(CKM_MD5, "md5");
--		MECHNAME(CKM_MD2, "md2");
- 		MECHNAME(CKM_RIPEMD160, "ripemd-160");
- 		MECHNAME(CKM_DES_ECB, "des-ecb");
- 		MECHNAME(CKM_DES_CBC, "des-cbc");
---- lib/hx509/tst-crypto-available2
-+++ lib/hx509/tst-crypto-available2
-@@ -1,4 +1,3 @@
- 2.16.840.1.101.3.4.2.1
- 1.3.14.3.2.26
- 1.2.840.113549.2.5
--1.2.840.113549.2.2
---- lib/hx509/version-script.map
-+++ lib/hx509/version-script.map
-@@ -200,10 +200,8 @@
- 		hx509_revoke_verify;
- 		hx509_set_error_string;
- 		hx509_set_error_stringv;
--		hx509_signature_md2;
- 		hx509_signature_md5;
- 		hx509_signature_rsa;
--		hx509_signature_rsa_with_md2;
- 		hx509_signature_rsa_with_md5;
- 		hx509_signature_rsa_with_sha1;
- 		hx509_signature_rsa_with_sha256;
diff --git a/app-crypt/heimdal/files/heimdal_testsuite.patch b/app-crypt/heimdal/files/heimdal_testsuite.patch
deleted file mode 100644
index f860ec358448..000000000000
--- a/app-crypt/heimdal/files/heimdal_testsuite.patch
+++ /dev/null
@@ -1,307 +0,0 @@
-diff --git a/tests/bin/Makefile.am b/tests/bin/Makefile.am
-index 49accb0..3d54a97 100644
---- a/tests/bin/Makefile.am
-+++ b/tests/bin/Makefile.am
-@@ -8,7 +8,8 @@ do_subst = \
- 	sed $(do_dlopen) \
- 	-e "s,[@]EGREP[@],$(EGREP),g" \
- 	-e "s,[@]top_srcdir[@],$${top_srcdir},g" \
--	-e "s,[@]top_builddir[@],$${top_builddir},g"
-+	-e "s,[@]top_builddir[@],$${top_builddir},g" \
-+	-e "s,[@]NO_AFS[@],$${NO_AFS},g"
- 
- setup-env: setup-env.in Makefile
- 	$(do_subst) < $(srcdir)/setup-env.in > setup-env.tmp
-diff --git a/tests/bin/setup-env.in b/tests/bin/setup-env.in
-index a848482..4857e17 100644
---- a/tests/bin/setup-env.in
-+++ b/tests/bin/setup-env.in
-@@ -6,6 +6,7 @@ unset KRB5CCNAME
- top_builddir="@top_builddir@"
- top_srcdir="@top_srcdir@"
- EGREP="@EGREP@"
-+NO_AFS="@NO_AFS@"
- 
- # Meant to be sourced (source or .) by the tester application, offers
- # most commands in heimdal as variables
-@@ -42,6 +43,14 @@ have_db="${top_builddir}/tests/db/have-db"
- leaks_kill="${top_srcdir}/tests/kdc/leaks-kill.sh"
- wait_kdc="${top_srcdir}/tests/kdc/wait-kdc.sh"
- 
-+if [ ! "${NO_AFS}" ] ; then
-+    afs_no_unlog="--no-unlog"
-+    afs_no_afslog="--no-afslog"
-+else
-+    afs_no_unlog=""
-+    afs_no_afslog=""
-+fi
-+
- # data
- hx509_data="${top_srcdir}/lib/hx509/data"
- 
-diff --git a/tests/gss/check-basic.in b/tests/gss/check-basic.in
-index 5599e5f..ef63097 100644
---- a/tests/gss/check-basic.in
-+++ b/tests/gss/check-basic.in
-@@ -51,8 +51,8 @@ cache="FILE:krb5ccfile"
- cache2="FILE:krb5ccfile2"
- nocache="FILE:no-such-cache"
- 
--kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache --no-afslog"
--kdestroy="${TESTS_ENVIRONMENT} ../../kuser/kdestroy -c $cache --no-unlog"
-+kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache ${afs_no_afslog}"
-+kdestroy="${TESTS_ENVIRONMENT} ../../kuser/kdestroy -c $cache ${afs_no_unlog}"
- klist="${TESTS_ENVIRONMENT} ../../kuser/klist -c $cache"
- kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R"
- kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port"
-diff --git a/tests/gss/check-context.in b/tests/gss/check-context.in
-index 06f7774..1b01e49 100644
---- a/tests/gss/check-context.in
-+++ b/tests/gss/check-context.in
-@@ -49,7 +49,7 @@ keytab="FILE:${keytabfile}"
- nokeytab="FILE:no-such-keytab"
- cache="FILE:krb5ccfile"
- 
--kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache --no-afslog"
-+kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache ${afs_no_afslog}"
- klist="${TESTS_ENVIRONMENT} ../../kuser/klist -c $cache"
- kgetcred="${TESTS_ENVIRONMENT} ../../kuser/kgetcred -c $cache"
- kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R"
-diff --git a/tests/gss/check-ntlm.in b/tests/gss/check-ntlm.in
-index c76f63d..a929e66 100644
---- a/tests/gss/check-ntlm.in
-+++ b/tests/gss/check-ntlm.in
-@@ -49,8 +49,8 @@ keytab="FILE:${keytabfile}"
- cache="FILE:krb5ccfile"
- cacheds="FILE:krb5ccfile-ds"
- 
--kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache --no-afslog"
--kinitds="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cacheds --no-afslog"
-+kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache ${afs_no_afslog}"
-+kinitds="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cacheds ${afs_no_afslog}"
- kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R"
- kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port"
- kdigest="${TESTS_ENVIRONMENT} ../../kuser/kdigest"
-diff --git a/tests/gss/check-spnego.in b/tests/gss/check-spnego.in
-index 3284715..7e90f5b 100644
---- a/tests/gss/check-spnego.in
-+++ b/tests/gss/check-spnego.in
-@@ -49,8 +49,8 @@ keytab="FILE:${keytabfile}"
- cache="FILE:krb5ccfile"
- cacheds="FILE:krb5ccfile-ds"
- 
--kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache --no-afslog --forwardable"
--kinitds="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cacheds --no-afslog"
-+kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache ${afs_no_afslog} --forwardable"
-+kinitds="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cacheds ${afs_no_afslog}"
- kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R"
- kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port"
- 
-diff --git a/tests/kdc/check-cc.in b/tests/kdc/check-cc.in
-index 0a37703..aef5e16 100644
---- a/tests/kdc/check-cc.in
-+++ b/tests/kdc/check-cc.in
-@@ -51,8 +51,8 @@ R=TEST.H5L.SE
- port=@port@
- pwport=@pwport@
- 
--kinit="${kinit} --password-file=${objdir}/foopassword --no-afslog"
--kdestroy="${kdestroy} --no-unlog"
-+kinit="${kinit} --password-file=${objdir}/foopassword ${afs_no_afslog}"
-+kdestroy="${kdestroy} ${afs_no_unlog}"
- kadmin="${kadmin} -l -r $R"
- kdc="${kdc} --addresses=localhost -P $port"
- 
-diff --git a/tests/kdc/check-delegation.in b/tests/kdc/check-delegation.in
-index 7e23157..9cf11c3 100644
---- a/tests/kdc/check-delegation.in
-+++ b/tests/kdc/check-delegation.in
-@@ -54,10 +54,10 @@ kdc="${kdc} --addresses=localhost -P $port"
- server=host/datan.test4.h5l.se@TEST4.H5L.ORG
- cache="FILE:${objdir}/cache.krb5"
- 
--kinit="${kinit} -c $cache --no-afslog"
-+kinit="${kinit} -c $cache ${afs_no_afslog}"
- klist="${klist} -c $cache"
- kgetcred="${kgetcred} -c $cache"
--kdestroy="${kdestroy} -c $cache --no-unlog"
-+kdestroy="${kdestroy} -c $cache ${afs_no_unlog}"
- 
- KRB5_CONFIG="${objdir}/krb5.conf"
- export KRB5_CONFIG
-diff --git a/tests/kdc/check-des.in b/tests/kdc/check-des.in
-index 1eca6c4..77a39b1 100644
---- a/tests/kdc/check-des.in
-+++ b/tests/kdc/check-des.in
-@@ -54,10 +54,10 @@ afsserver=afs/test.h5l.se
- hostserver=host/server.test.h5l.se
- cache="FILE:${objdir}/cache.krb5"
- 
--kinit="${kinit} -c $cache --no-afslog"
-+kinit="${kinit} -c $cache ${afs_no_afslog}"
- klist="${klist} -c $cache"
- kgetcred="${kgetcred} -c $cache"
--kdestroy="${kdestroy} -c $cache --no-unlog"
-+kdestroy="${kdestroy} -c $cache ${afs_no_unlog}"
- 
- KRB5_CONFIG="${objdir}/krb5.conf"
- export KRB5_CONFIG
-diff --git a/tests/kdc/check-digest.in b/tests/kdc/check-digest.in
-index d253d59..90eb130 100644
---- a/tests/kdc/check-digest.in
-+++ b/tests/kdc/check-digest.in
-@@ -56,7 +56,7 @@ ocache="FILE:${objdir}/ocache.krb5"
- keytabfile=${objdir}/server.keytab
- keytab="FILE:${keytabfile}"
- 
--kinit="${kinit} -c $cache --no-afslog"
-+kinit="${kinit} -c $cache ${afs_no_afslog}"
- klist="${klist} -c $cache"
- kdigest="${kdigest} --ccache=$cache"
- 
-diff --git a/tests/kdc/check-iprop.in b/tests/kdc/check-iprop.in
-index 2bc5544..ba9aff1 100644
---- a/tests/kdc/check-iprop.in
-+++ b/tests/kdc/check-iprop.in
-@@ -54,7 +54,7 @@ keytab="FILE:${keytabfile}"
- 
- kdc="${kdc} --addresses=localhost -P $port"
- kadmin="${kadmin} -r $R"
--kinit="${kinit} -c $cache --no-afslog"
-+kinit="${kinit} -c $cache ${afs_no_afslog}"
- 
- KRB5_CONFIG="${objdir}/krb5.conf"
- export KRB5_CONFIG
-diff --git a/tests/kdc/check-kadmin.in b/tests/kdc/check-kadmin.in
-index faba084..b761ef0 100644
---- a/tests/kdc/check-kadmin.in
-+++ b/tests/kdc/check-kadmin.in
-@@ -55,9 +55,9 @@ kadmind="${kadmind} -p $admport"
- 
- server=host/datan.test.h5l.se
- 
--kinit="${kinit} -c $cache --no-afslog"
-+kinit="${kinit} -c $cache ${afs_no_afslog}"
- kgetcred="${kgetcred} -c $cache"
--kdestroy="${kdestroy} -c $cache --no-unlog"
-+kdestroy="${kdestroy} -c $cache ${afs_no_unlog}"
- 
- KRB5_CONFIG="${objdir}/krb5.conf"
- export KRB5_CONFIG
-diff --git a/tests/kdc/check-kdc.in b/tests/kdc/check-kdc.in
-index 0e1f9d7..5fc08fc 100644
---- a/tests/kdc/check-kdc.in
-+++ b/tests/kdc/check-kdc.in
-@@ -70,11 +70,11 @@ keytab="FILE:${keytabfile}"
- ps="proxy-service@${R}"
- aesenctype="aes256-cts-hmac-sha1-96"
- 
--kinit="${kinit} -c $cache --no-afslog"
-+kinit="${kinit} -c $cache ${afs_no_afslog}"
- klist="${klist} -c $cache"
- kgetcred="${kgetcred} -c $cache"
- kgetcred_imp="${kgetcred} -c $cache --out-cache=${ocache}"
--kdestroy="${kdestroy} -c $cache --no-unlog"
-+kdestroy="${kdestroy} -c $cache ${afs_no_unlog}"
- kimpersonate="${kimpersonate} -k ${keytab} --ccache=${ocache}"
- 
- rm -f ${keytabfile}
-diff --git a/tests/kdc/check-kpasswdd.in b/tests/kdc/check-kpasswdd.in
-index dd2162a..355930f 100644
---- a/tests/kdc/check-kpasswdd.in
-+++ b/tests/kdc/check-kpasswdd.in
-@@ -60,10 +60,10 @@ cache="FILE:${objdir}/cache.krb5"
- keytabfile=${objdir}/server.keytab
- keytab="FILE:${keytabfile}"
- 
--kinit="${kinit} -c $cache --no-afslog"
-+kinit="${kinit} -c $cache ${afs_no_afslog}"
- klist="${klist} -c $cache"
- kgetcred="${kgetcred} -c $cache"
--kdestroy="${kdestroy} -c $cache --no-unlog"
-+kdestroy="${kdestroy} -c $cache ${afs_no_unlog}"
- 
- KRB5_CONFIG="${objdir}/krb5.conf"
- export KRB5_CONFIG
-diff --git a/tests/kdc/check-pkinit.in b/tests/kdc/check-pkinit.in
-index 1cb7b50..723cc14 100644
---- a/tests/kdc/check-pkinit.in
-+++ b/tests/kdc/check-pkinit.in
-@@ -54,9 +54,9 @@ cache="FILE:${objdir}/cache.krb5"
- keyfile="${hx509_data}/key.der"
- keyfile2="${hx509_data}/key2.der"
- 
--kinit="${kinit} -c $cache --no-afslog"
-+kinit="${kinit} -c $cache ${afs_no_afslog}"
- kgetcred="${kgetcred} -c $cache"
--kdestroy="${kdestroy} -c $cache --no-unlog"
-+kdestroy="${kdestroy} -c $cache ${afs_no_unlog}"
- 
- KRB5_CONFIG="${objdir}/krb5-pkinit.conf"
- export KRB5_CONFIG
-diff --git a/tests/kdc/check-referral.in b/tests/kdc/check-referral.in
-index b64b06a..8ca2a31 100644
---- a/tests/kdc/check-referral.in
-+++ b/tests/kdc/check-referral.in
-@@ -54,10 +54,10 @@ kdc="${kdc} --addresses=localhost -P $port"
- 
- cache="FILE:${objdir}/cache.krb5"
- 
--kinit="${kinit} -c $cache --no-afslog"
-+kinit="${kinit} -c $cache ${afs_no_afslog}"
- klist="${klist} -c $cache"
- kgetcred="${kgetcred} -c $cache"
--kdestroy="${kdestroy} -c $cache --no-unlog"
-+kdestroy="${kdestroy} -c $cache ${afs_no_unlog}"
- 
- 
- KRB5_CONFIG="${objdir}/krb5.conf"
-diff --git a/tests/kdc/check-uu.in b/tests/kdc/check-uu.in
-index 91e1e64..2670956 100644
---- a/tests/kdc/check-uu.in
-+++ b/tests/kdc/check-uu.in
-@@ -54,10 +54,10 @@ kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port"
- cache1="FILE:${objdir}/cache1.krb5"
- cache2="FILE:${objdir}/cache2.krb5"
- 
--kinit1="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache1 --no-afslog"
--kinit2="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache2 --no-afslog"
--kdestroy1="${TESTS_ENVIRONMENT} ../../kuser/kdestroy -c $cache1 --no-unlog"
--kdestroy2="${TESTS_ENVIRONMENT} ../../kuser/kdestroy -c $cache2 --no-unlog"
-+kinit1="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache1 ${afs_no_afslog}"
-+kinit2="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache2 ${afs_no_afslog}"
-+kdestroy1="${TESTS_ENVIRONMENT} ../../kuser/kdestroy -c $cache1 ${afs_no_unlog}"
-+kdestroy2="${TESTS_ENVIRONMENT} ../../kuser/kdestroy -c $cache2 ${afs_no_unlog}"
- uu_server="${TESTS_ENVIRONMENT} ../../appl/test/uu_server"
- uu_client="${TESTS_ENVIRONMENT} ../../appl/test/uu_client"
- 
-diff --git a/tests/ldap/check-ldap.in b/tests/ldap/check-ldap.in
-index ab61e48..3f706bd 100644
---- a/tests/ldap/check-ldap.in
-+++ b/tests/ldap/check-ldap.in
-@@ -45,7 +45,7 @@ port=@port@
- server=host/datan.test.h5l.se
- cache="FILE:${objdir}/cache.krb5"
- 
--kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache --no-afslog"
-+kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache ${afs_no_afslog}"
- kgetcred="${TESTS_ENVIRONMENT} ../../kuser/kgetcred -c $cache"
- kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R"
- kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port"
-diff --git a/tests/plugin/check-pac.in b/tests/plugin/check-pac.in
-index 8c15309..17f7216 100644
---- a/tests/plugin/check-pac.in
-+++ b/tests/plugin/check-pac.in
-@@ -55,10 +55,10 @@ cache="FILE:${objdir}/cache.krb5"
- keytabfile=${objdir}/server.keytab
- keytab="FILE:${keytabfile}"
- 
--kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache --no-afslog"
-+kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache ${afs_no_afslog}"
- klist="${TESTS_ENVIRONMENT} ../../kuser/klist -c $cache"
- kgetcred="${TESTS_ENVIRONMENT} ../../kuser/kgetcred -c $cache"
--kdestroy="${TESTS_ENVIRONMENT} ../../kuser/kdestroy -c $cache --no-unlog"
-+kdestroy="${TESTS_ENVIRONMENT} ../../kuser/kdestroy -c $cache ${afs_no_unlog}"
- test_apreq="${TESTS_ENVIRONMENT} ../../lib/krb5/test_ap-req"
- 
- KRB5_CONFIG="${objdir}/krb5.conf"
diff --git a/app-crypt/heimdal/files/heimdal_testsuite_extra.patch b/app-crypt/heimdal/files/heimdal_testsuite_extra.patch
deleted file mode 100644
index 40975942ce13..000000000000
--- a/app-crypt/heimdal/files/heimdal_testsuite_extra.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/tests/can/Makefile.am b/tests/can/Makefile.am
-index f881667..12cd2fe 100644
---- a/tests/can/Makefile.am
-+++ b/tests/can/Makefile.am
-@@ -14,7 +14,8 @@ port = 49188
- do_subst = sed -e 's,[@]srcdir[@],$(srcdir),g' \
- 	-e 's,[@]port[@],$(port),g' \
- 	-e 's,[@]objdir[@],$(top_builddir)/tests/can,g' \
--	-e 's,[@]EGREP[@],$(EGREP),g' 
-+	-e 's,[@]EGREP[@],$(EGREP),g' \
-+	-e 's,[@]env_setup[@],$(top_builddir)/tests/bin/setup-env,g'
- 
- test_can: test_can.in Makefile
- 	$(do_subst) < $(srcdir)/test_can.in > test_can.tmp
-diff --git a/tests/can/check-can.in b/tests/can/check-can.in
-index c687bce..70e5d38 100644
---- a/tests/can/check-can.in
-+++ b/tests/can/check-can.in
-@@ -36,12 +36,30 @@
- 
- srcdir="@srcdir@"
- objdir="@objdir@"
-+env_setup="@env_setup@"
-+
-+. ${env_setup}
- 
- # If there is no useful db support compile in, disable test
- ../db/have-db || exit 77
- 
- ./test_can TEST.H5L.SE heim-0.8 || exit 1
- ./test_can TEST.H5L.SE apple-10.4 || exit 1
--./test_can HEIMDAL.CITI.UMICH.EDU mit-pkinit-20070607 || exit 1
-+
-+rsa=yes
-+pkinit=no
-+if ${hxtool} info | grep 'rsa: hx509 null RSA' > /dev/null ; then
-+    rsa=no
-+fi
-+if ${hxtool} info | grep 'rand: not available' > /dev/null ; then
-+    rsa=no
-+fi
-+if ${kinit} --help 2>&1 | grep "CA certificates" > /dev/null; then
-+    pkinit=yes
-+fi
-+
-+if test "$pkinit" = yes -a "$rsa" = yes ; then
-+	./test_can HEIMDAL.CITI.UMICH.EDU mit-pkinit-20070607 || exit 1
-+fi
- 
- exit 0
-diff --git a/tests/ldap/init.ldif b/tests/ldap/init.ldif
-index 9cf39b1..d087172 100644
---- a/tests/ldap/init.ldif
-+++ b/tests/ldap/init.ldif
-@@ -22,7 +22,7 @@ loginShell: /bin/bash
- gecos: Netbios root user
- structuralObjectClass: inetOrgPerson
- creatorsName: cn=root,dc=test,dc=h5l,dc=se
--userPassword:: AAAAAA
-+userPassword:: AAAAAA==
- objectClass: krb5KDCEntry
- krb5KeyVersionNumber: 2
- krb5PrincipalName: suser@TEST.H5L.SE
-diff --git a/tests/can/Makefile.in b/tests/can/Makefile.in
-index e40eeb7..fb274b2 100644
---- a/tests/can/Makefile.in
-+++ b/tests/can/Makefile.in
-@@ -342,7 +342,8 @@ port = 49188
- do_subst = sed -e 's,[@]srcdir[@],$(srcdir),g' \
- 	-e 's,[@]port[@],$(port),g' \
- 	-e 's,[@]objdir[@],$(top_builddir)/tests/can,g' \
--	-e 's,[@]EGREP[@],$(EGREP),g' 
-+	-e 's,[@]EGREP[@],$(EGREP),g' \
-+	-e 's,[@]env_setup[@],$(top_builddir)/tests/bin/setup-env,g'
- 
- CLEANFILES = $(TESTS) *.tmp *.cf \
- 	current-db* \
diff --git a/app-crypt/heimdal/heimdal-1.3.3-r1.ebuild b/app-crypt/heimdal/heimdal-1.3.3-r1.ebuild
deleted file mode 100644
index b19f5d6f0bd1..000000000000
--- a/app-crypt/heimdal/heimdal-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.3.3-r1.ebuild,v 1.10 2011/03/25 07:27:23 eras Exp $
-
-EAPI=2
-VIRTUALX_REQUIRED="manual"
-
-inherit libtool virtualx eutils toolchain-funcs
-
-#RESTRICT="test"
-
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="http://www.h5l.org/dist/src/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="afs +berkdb hdb-ldap ipv6 otp pkinit ssl threads test X"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	berkdb? ( sys-libs/db )
-	!berkdb? ( sys-libs/gdbm )
-	>=dev-db/sqlite-3.5.7
-	>=sys-libs/e2fsprogs-libs-1.41.11
-	afs? ( net-fs/openafs )
-	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
-	!!app-crypt/mit-krb5"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-devel/autoconf-2.62
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-src_prepare() {
-	epatch "${FILESDIR}/heimdal_db5.patch"
-	epatch "${FILESDIR}/heimdal_testsuite.patch"
-	epatch "${FILESDIR}/heimdal_testsuite_extra.patch"
-	epatch "${FILESDIR}/heimdal_disable-check-iprop.patch"
-	epatch "${FILESDIR}/heimdal_openssl-1.patch"
-}
-
-src_configure() {
-	econf \
-		--enable-kcm \
-		--disable-osfc2 \
-		--enable-shared \
-		--with-libintl=/usr \
-		--with-readline=/usr \
-		--with-sqlite3=/usr \
-		--libexecdir=/usr/sbin \
-		$(use_enable afs afs-support) \
-		$(use_enable berkdb berkeley-db) \
-		$(use_enable otp) \
-		$(use_enable pkinit kx509) \
-		$(use_enable pkinit pk-init) \
-		$(use_enable threads pthread-support) \
-		$(use_with hdb-ldap openldap /usr) \
-		$(use_with ipv6) \
-		$(use_with ssl openssl /usr) \
-		$(use_with X x)
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_test() {
-	einfo "Disabled check-iprop which is known to fail.  Other tests should work."
-	default_src_test
-}
-
-src_install() {
-	INSTALL_CATPAGES="no" emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc ChangeLog README NEWS TODO
-
-	# Begin client rename and install
-	for i in {telnetd,ftpd,rshd,popper}
-	do
-		mv "${D}"/usr/share/man/man8/{,k}${i}.8
-		mv "${D}"/usr/sbin/{,k}${i}
-	done
-
-	for i in {rcp,rsh,telnet,ftp,su,login,pagsh,kf}
-	do
-		mv "${D}"/usr/share/man/man1/{,k}${i}.1
-		mv "${D}"/usr/bin/{,k}${i}
-	done
-
-	mv "${D}"/usr/share/man/man5/{,k}ftpusers.5
-	mv "${D}"/usr/share/man/man5/{,k}login.access.5
-
-	newinitd "${FILESDIR}"/heimdal-kdc.initd heimdal-kdc
-	newinitd "${FILESDIR}"/heimdal-kadmind.initd heimdal-kadmind
-	newinitd "${FILESDIR}"/heimdal-kpasswdd.initd heimdal-kpasswdd
-	newinitd "${FILESDIR}"/heimdal-kcm.initd heimdal-kcm
-
-	insinto /etc
-	newins "${FILESDIR}"/krb5.conf krb5.conf.example
-
-	if use hdb-ldap; then
-		insinto /etc/openldap/schema
-		doins "${S}/lib/hdb/hdb.schema"
-	fi
-
-	# default database dir
-	keepdir /var/heimdal
-}
-
-pkg_preinst() {
-
-	if has_version "=${CATEGORY}/${PN}-1.3.2*" ; then
-		if use hdb-ldap ; then
-			ewarn "Schema name changed to hdb.schema to follow upstream."
-			ewarn "Please check you slapd conf file to make sure"
-			ewarn "that the correct schema file is included."
-		fi
-	fi
-}
diff --git a/app-crypt/heimdal/heimdal-1.4.1_pre20110304.ebuild b/app-crypt/heimdal/heimdal-1.4.1_pre20110304.ebuild
deleted file mode 100644
index fbd5aaa87c03..000000000000
--- a/app-crypt/heimdal/heimdal-1.4.1_pre20110304.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.4.1_pre20110304.ebuild,v 1.3 2011/10/23 12:00:45 armin76 Exp $
-
-EAPI=2
-# PYTHON_BDEPEND="2"
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use eutils libtool python toolchain-funcs virtualx
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="http://www.h5l.org/dist/src/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit ssl threads test X"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	berkdb? ( sys-libs/db )
-	!berkdb? ( sys-libs/gdbm )
-	caps? ( sys-libs/libcap-ng )
-	>=dev-db/sqlite-3.5.7
-	>=sys-libs/e2fsprogs-libs-1.41.11
-	afs? ( net-fs/openafs )
-	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
-	!!app-crypt/mit-krb5"
-
-DEPEND="${RDEPEND}
-	=dev-lang/python-2*
-	dev-util/pkgconfig
-	>=sys-devel/autoconf-2.62
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/heimdal_db5.patch"
-	epatch "${FILESDIR}/heimdal_disable-check-iprop.patch"
-	epatch "${FILESDIR}/heimdal_link_order.patch"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-	if use berkdb; then
-		myconf="--with-berkeley-db --with-berkeley-db-include=$(db_includedir)"
-	else
-		myconf="--without-berkeley-db"
-	fi
-	econf \
-		--enable-kcm \
-		--disable-osfc2 \
-		--enable-shared \
-		--with-libintl=/usr \
-		--with-readline=/usr \
-		--with-sqlite3=/usr \
-		--libexecdir=/usr/sbin \
-		$(use_enable afs afs-support) \
-		$(use_enable otp) \
-		$(use_enable pkinit kx509) \
-		$(use_enable pkinit pk-init) \
-		$(use_enable threads pthread-support) \
-		$(use_with caps capng) \
-		$(use_with hdb-ldap openldap /usr) \
-		$(use_with ipv6) \
-		$(use_with ssl openssl /usr) \
-		$(use_with X x) \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_test() {
-	einfo "Disabled check-iprop which is known to fail.  Other tests should work."
-	default_src_test
-}
-
-src_install() {
-	INSTALL_CATPAGES="no" emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc ChangeLog README NEWS TODO
-
-	# Begin client rename and install
-	for i in {telnetd,ftpd,rshd,popper}
-	do
-		mv "${D}"/usr/share/man/man8/{,k}${i}.8
-		mv "${D}"/usr/sbin/{,k}${i}
-	done
-
-	for i in {rcp,rsh,telnet,ftp,su,login,pagsh,kf}
-	do
-		mv "${D}"/usr/share/man/man1/{,k}${i}.1
-		mv "${D}"/usr/bin/{,k}${i}
-	done
-
-	mv "${D}"/usr/share/man/man5/{,k}ftpusers.5
-	mv "${D}"/usr/share/man/man5/{,k}login.access.5
-
-	newinitd "${FILESDIR}"/heimdal-kdc.initd-r1 heimdal-kdc
-	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r1 heimdal-kadmind
-	newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r1 heimdal-kpasswdd
-	newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
-	newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
-	newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
-	newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
-	newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
-	insinto /etc
-	newins "${FILESDIR}"/krb5.conf krb5.conf.example
-
-	if use hdb-ldap; then
-		insinto /etc/openldap/schema
-		doins "${S}/lib/hdb/hdb.schema"
-	fi
-
-	# default database dir
-	keepdir /var/heimdal
-}
-
-pkg_preinst() {
-	if has_version "=${CATEGORY}/${PN}-1.3.2*" ; then
-		if use hdb-ldap ; then
-			ewarn "Schema name changed to hdb.schema to follow upstream."
-			ewarn "Please check your slapd conf file to make sure"
-			ewarn "that the correct schema file is included."
-		fi
-	fi
-}
diff --git a/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild b/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild
index 52494c4fc9e4..198586b813a5 100644
--- a/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-1.5.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-crypt/heimdal/heimdal-1.5.1-r1.ebuild,v 1.7 2012/01/08 17:01:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild,v 1.8 2012/01/17 17:23:52 jer Exp $
 
 EAPI=2
 # PYTHON_BDEPEND="2"
@@ -15,7 +15,7 @@ SRC_URI="http://www.h5l.org/dist/src/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit ssl static-libs threads test X"
 
 RDEPEND="ssl? ( dev-libs/openssl )
diff --git a/app-crypt/heimdal/heimdal-1.5.1.ebuild b/app-crypt/heimdal/heimdal-1.5.1.ebuild
deleted file mode 100644
index 809fcdfcbdb8..000000000000
--- a/app-crypt/heimdal/heimdal-1.5.1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.1.ebuild,v 1.5 2011/11/28 10:05:08 eras Exp $
-
-EAPI=2
-# PYTHON_BDEPEND="2"
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use eutils libtool python toolchain-funcs virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="http://www.h5l.org/dist/src/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit ssl static-libs threads test X"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	berkdb? ( sys-libs/db )
-	!berkdb? ( sys-libs/gdbm )
-	caps? ( sys-libs/libcap-ng )
-	>=dev-db/sqlite-3.5.7
-	>=sys-libs/e2fsprogs-libs-1.41.11
-	afs? ( net-fs/openafs )
-	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
-	!!app-crypt/mit-krb5"
-
-DEPEND="${RDEPEND}
-	=dev-lang/python-2*
-	dev-util/pkgconfig
-	>=sys-devel/autoconf-2.62
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/heimdal_db5.patch"
-	epatch "${FILESDIR}/heimdal_disable-check-iprop.patch"
-	epatch "${FILESDIR}/heimdal_link_order.patch"
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-
-	local myconf=""
-	if use berkdb; then
-		myconf="--with-berkeley-db --with-berkeley-db-include=$(db_includedir)"
-	else
-		myconf="--without-berkeley-db"
-	fi
-	econf \
-		--enable-kcm \
-		--disable-osfc2 \
-		--enable-shared \
-		--with-libintl=/usr \
-		--with-readline=/usr \
-		--with-sqlite3=/usr \
-		--libexecdir=/usr/sbin \
-		$(use_enable afs afs-support) \
-		$(use_enable otp) \
-		$(use_enable pkinit kx509) \
-		$(use_enable pkinit pk-init) \
-		$(use_enable static-libs static) \
-		$(use_enable threads pthread-support) \
-		$(use_with caps capng) \
-		$(use_with hdb-ldap openldap /usr) \
-		$(use_with ipv6) \
-		$(use_with ssl openssl /usr) \
-		$(use_with X x) \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	INSTALL_CATPAGES="no" emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc ChangeLog README NEWS TODO
-
-	# Begin client rename and install
-	for i in {telnetd,ftpd,rshd,popper}
-	do
-		mv "${D}"/usr/share/man/man8/{,k}${i}.8
-		mv "${D}"/usr/sbin/{,k}${i}
-	done
-
-	for i in {rcp,rsh,telnet,ftp,su,login,pagsh,kf}
-	do
-		mv "${D}"/usr/share/man/man1/{,k}${i}.1
-		mv "${D}"/usr/bin/{,k}${i}
-	done
-
-	mv "${D}"/usr/share/man/man5/{,k}ftpusers.5
-	mv "${D}"/usr/share/man/man5/{,k}login.access.5
-
-	newinitd "${FILESDIR}"/heimdal-kdc.initd-r1 heimdal-kdc
-	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r1 heimdal-kadmind
-	newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r1 heimdal-kpasswdd
-	newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
-	newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
-	newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
-	newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
-	newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
-	insinto /etc
-	newins "${FILESDIR}"/krb5.conf krb5.conf.example
-
-	if use hdb-ldap; then
-		insinto /etc/openldap/schema
-		doins "${S}/lib/hdb/hdb.schema"
-	fi
-
-	use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
-
-	# default database dir
-	keepdir /var/heimdal
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libgssapi.so.2
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libgssapi.so.2
-}
diff --git a/app-crypt/heimdal/heimdal-1.5.ebuild b/app-crypt/heimdal/heimdal-1.5.ebuild
deleted file mode 100644
index 6304fd63d37b..000000000000
--- a/app-crypt/heimdal/heimdal-1.5.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.ebuild,v 1.2 2011/10/23 12:00:45 armin76 Exp $
-
-EAPI=2
-# PYTHON_BDEPEND="2"
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use eutils libtool python toolchain-funcs virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="http://www.h5l.org/dist/src/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit ssl threads test X"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	berkdb? ( sys-libs/db )
-	!berkdb? ( sys-libs/gdbm )
-	caps? ( sys-libs/libcap-ng )
-	>=dev-db/sqlite-3.5.7
-	>=sys-libs/e2fsprogs-libs-1.41.11
-	afs? ( net-fs/openafs )
-	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
-	!!app-crypt/mit-krb5"
-
-DEPEND="${RDEPEND}
-	=dev-lang/python-2*
-	dev-util/pkgconfig
-	>=sys-devel/autoconf-2.62
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/heimdal_db5.patch"
-	epatch "${FILESDIR}/heimdal_disable-check-iprop.patch"
-	epatch "${FILESDIR}/heimdal_link_order.patch"
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-
-	local myconf=""
-	if use berkdb; then
-		myconf="--with-berkeley-db --with-berkeley-db-include=$(db_includedir)"
-	else
-		myconf="--without-berkeley-db"
-	fi
-	econf \
-		--enable-kcm \
-		--disable-osfc2 \
-		--enable-shared \
-		--with-libintl=/usr \
-		--with-readline=/usr \
-		--with-sqlite3=/usr \
-		--libexecdir=/usr/sbin \
-		$(use_enable afs afs-support) \
-		$(use_enable otp) \
-		$(use_enable pkinit kx509) \
-		$(use_enable pkinit pk-init) \
-		$(use_enable threads pthread-support) \
-		$(use_with caps capng) \
-		$(use_with hdb-ldap openldap /usr) \
-		$(use_with ipv6) \
-		$(use_with ssl openssl /usr) \
-		$(use_with X x) \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	INSTALL_CATPAGES="no" emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc ChangeLog README NEWS TODO
-
-	# Begin client rename and install
-	for i in {telnetd,ftpd,rshd,popper}
-	do
-		mv "${D}"/usr/share/man/man8/{,k}${i}.8
-		mv "${D}"/usr/sbin/{,k}${i}
-	done
-
-	for i in {rcp,rsh,telnet,ftp,su,login,pagsh,kf}
-	do
-		mv "${D}"/usr/share/man/man1/{,k}${i}.1
-		mv "${D}"/usr/bin/{,k}${i}
-	done
-
-	mv "${D}"/usr/share/man/man5/{,k}ftpusers.5
-	mv "${D}"/usr/share/man/man5/{,k}login.access.5
-
-	newinitd "${FILESDIR}"/heimdal-kdc.initd-r1 heimdal-kdc
-	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r1 heimdal-kadmind
-	newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r1 heimdal-kpasswdd
-	newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
-	newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
-	newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
-	newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
-	newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
-	insinto /etc
-	newins "${FILESDIR}"/krb5.conf krb5.conf.example
-
-	if use hdb-ldap; then
-		insinto /etc/openldap/schema
-		doins "${S}/lib/hdb/hdb.schema"
-	fi
-
-	# default database dir
-	keepdir /var/heimdal
-}
diff --git a/app-crypt/mit-krb5-appl/Manifest b/app-crypt/mit-krb5-appl/Manifest
index d5da6fe25fd0..6b3844c50e8d 100644
--- a/app-crypt/mit-krb5-appl/Manifest
+++ b/app-crypt/mit-krb5-appl/Manifest
@@ -1,3 +1,2 @@
-DIST krb5-appl-1.0.1-signed.tar 645120 RMD160 ca0668b623dcf4dc5a0699fa47d86660aac5544a SHA1 128662c9860f61a51c9bcaf1b6217467faa12324 SHA256 124322481e4f8e0b119b527071f2f707168060e17748cf34c8bf5af747c3e311
 DIST krb5-appl-1.0.2-signed.tar 634880 RMD160 af6e0c8ece7fe3821b373621672ad15e09508a90 SHA1 f9a75c1e3b495ab6b3a4004274ffb35f9fe24756 SHA256 ca82209ba11e37390a7b79b0eb27abac9526442d296d60b752a0a94969bbad7d
 DIST krb5-appl-1.0.3-signed.tar 634880 RMD160 491359af5da2ea3c680811b08d9696eb43794a21 SHA1 6711c1b46633e666e6e707363ffffce5e1c84d9d SHA256 feb88581eba566554ad515a6fcf18cee11e8409a2c4755bf5188db96f0b7f039
diff --git a/app-crypt/mit-krb5-appl/files/CVE-2011-1526.patch b/app-crypt/mit-krb5-appl/files/CVE-2011-1526.patch
deleted file mode 100644
index 9c4466214e53..000000000000
--- a/app-crypt/mit-krb5-appl/files/CVE-2011-1526.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 86e23f1..2fe68ad 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -107,6 +107,7 @@ AC_CHECK_FUNCS(_getpty cgetent getcwd getenv gettosbyname getusershell getutmp)
- AC_CHECK_FUNCS(getutmpx grantpt inet_aton initgroups isatty killpg killpg)
- AC_CHECK_FUNCS(line_push ptsname revoke rmufile rresvport_af)
- AC_CHECK_FUNCS(seteuid setlogin setpgid setpriority setresuid setreuid)
-+AC_CHECK_FUNCS(setegid setregid setresgid)
- AC_CHECK_FUNCS(setutent setutsent setutxent strsave tcgetpgrp tcsetpgrp)
- AC_CHECK_FUNCS(ttyname unsetenv updwtmp updwtmpx utimes utmpname utmpxname)
- AC_CHECK_FUNCS(vhangup vsnprintf waitpid)
-diff --git a/gssftp/ftpd/ftpd.c b/gssftp/ftpd/ftpd.c
-index fe62a9c..a150819 100644
---- a/gssftp/ftpd/ftpd.c
-+++ b/gssftp/ftpd/ftpd.c
-@@ -994,9 +994,14 @@ login(passwd, logincode)
- #endif
- 	}
- 
--	(void) krb5_setegid((gid_t)pw->pw_gid);
--	(void) initgroups(pw->pw_name, pw->pw_gid);
--
-+	if (krb5_setegid((gid_t)pw->pw_gid) < 0) {
-+		reply(550, "Can't set egid.");
-+		goto bad;
-+	}
-+	if (geteuid() == 0 && initgroups(pw->pw_name, pw->pw_gid) < 0) {
-+		reply(550, "Can't initgroups");
-+		goto bad;
-+	}
- 	/* open wtmp before chroot */
- 	(void) snprintf(ttyline, sizeof(ttyline), "ftp%ld", (long) getpid());
- 	pty_logwtmp(ttyline, pw->pw_name, rhost_sane);
-diff --git a/k5-util.h b/k5-util.h
-index 7bb8cfb..64cd53d 100644
---- a/k5-util.h
-+++ b/k5-util.h
-@@ -69,8 +69,7 @@
- #elif defined(HAVE_SETREUID)
- #  define krb5_seteuid(EUID)	setreuid(geteuid(), (uid_t)(EUID))
- #else
--   /* You need to add a case to deal with this operating system.*/
--#  define krb5_seteuid(EUID)	(errno = EPERM, -1)
-+#  error "You need to add a case to deal with this operating system."
- #endif
- 
- #ifdef HAVE_SETEGID
-@@ -80,8 +79,7 @@
- #elif defined(HAVE_SETREGID)
- #  define krb5_setegid(EGID)	(setregid(getegid(), (gid_t)(EGID)))
- #else
--   /* You need to add a case to deal with this operating system.*/
--#  define krb5_setegid(EGID)	(errno = EPERM, -1)
-+#  error "You need to add a case to deal with this operating system."
- #endif
- 
- #endif
diff --git a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.1-r1.ebuild b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.1-r1.ebuild
deleted file mode 100644
index 732fbea1e503..000000000000
--- a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.1-r1.ebuild,v 1.6 2011/07/11 02:00:58 jer Exp $
-
-EAPI=4
-
-inherit flag-o-matic versionator autotools eutils
-
-MY_P=${P/mit-}
-MAJOR_MINOR="$( get_version_component_range 1-2 )"
-DESCRIPTION="Kerberized applications split from the main MIT Kerberos V distribution"
-HOMEPAGE="http://web.mit.edu/kerberos/www/"
-SRC_URI="http://web.mit.edu/kerberos/dist/krb5-appl/${MAJOR_MINOR}/${MY_P}-signed.tar"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-RDEPEND=">=app-crypt/mit-krb5-1.8.0"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	unpack ./"${MY_P}".tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/CVE-2011-1526.patch"
-	eautoreconf
-}
-
-src_configure() {
-	append-flags "-I/usr/include/et"
-	append-flags -fno-strict-aliasing
-	append-flags -fno-strict-overflow
-	econf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	for i in {telnetd,ftpd} ; do
-	    mv "${D}"/usr/share/man/man8/${i}.8 "${D}"/usr/share/man/man8/k${i}.8 \
-		|| die "mv failed (man)"
-	    mv "${D}"/usr/sbin/${i} "${D}"/usr/sbin/k${i} || die "mv failed"
-	done
-
-	for i in {rcp,rlogin,rsh,telnet,ftp} ; do
-		mv "${D}"/usr/share/man/man1/${i}.1 "${D}"/usr/share/man/man1/k${i}.1 \
-		|| die "mv failed (man)"
-		mv "${D}"/usr/bin/${i} "${D}"/usr/bin/k${i} || die "mv failed"
-	done
-
-	rm "${D}"/usr/share/man/man1/tmac.doc
-	dodoc README
-}
diff --git a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.1.ebuild b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.1.ebuild
deleted file mode 100644
index 8704241aca3c..000000000000
--- a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.1.ebuild,v 1.7 2011/04/23 18:24:42 armin76 Exp $
-
-EAPI="2"
-
-inherit flag-o-matic versionator
-
-MY_P=${P/mit-}
-MAJOR_MINOR="$( get_version_component_range 1-2 )"
-DESCRIPTION="Kerberized applications split from the main MIT Kerberos V distribution"
-HOMEPAGE="http://web.mit.edu/kerberos/www/"
-SRC_URI="http://web.mit.edu/kerberos/dist/krb5-appl/${MAJOR_MINOR}/${MY_P}-signed.tar"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-RDEPEND=">=app-crypt/mit-krb5-1.8.0"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	unpack ./"${MY_P}".tar.gz
-}
-
-src_configure() {
-	append-flags "-I/usr/include/et"
-	econf
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die "make install failed"
-	for i in {telnetd,ftpd} ; do
-	    mv "${D}"/usr/share/man/man8/${i}.8 "${D}"/usr/share/man/man8/k${i}.8 \
-		|| die "mv failed (man)"
-	    mv "${D}"/usr/sbin/${i} "${D}"/usr/sbin/k${i} || die "mv failed"
-	done
-
-	for i in {rcp,rlogin,rsh,telnet,ftp} ; do
-		mv "${D}"/usr/share/man/man1/${i}.1 "${D}"/usr/share/man/man1/k${i}.1 \
-		|| die "mv failed (man)"
-		mv "${D}"/usr/bin/${i} "${D}"/usr/bin/k${i} || die "mv failed"
-	done
-
-	rm "${D}"/usr/share/man/man1/tmac.doc
-	dodoc README
-
-}
diff --git a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.2.ebuild b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.2.ebuild
deleted file mode 100644
index 548fb9432a34..000000000000
--- a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.2.ebuild,v 1.1 2011/07/13 10:45:22 eras Exp $
-
-EAPI=4
-
-inherit flag-o-matic versionator eutils
-
-MY_P=${P/mit-}
-MAJOR_MINOR="$( get_version_component_range 1-2 )"
-DESCRIPTION="Kerberized applications split from the main MIT Kerberos V distribution"
-HOMEPAGE="http://web.mit.edu/kerberos/www/"
-SRC_URI="http://web.mit.edu/kerberos/dist/krb5-appl/${MAJOR_MINOR}/${MY_P}-signed.tar"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=app-crypt/mit-krb5-1.8.0"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	unpack ./"${MY_P}".tar.gz
-}
-
-src_configure() {
-	append-flags "-I/usr/include/et"
-	append-flags -fno-strict-aliasing
-	append-flags -fno-strict-overflow
-	econf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	for i in {telnetd,ftpd} ; do
-	    mv "${D}"/usr/share/man/man8/${i}.8 "${D}"/usr/share/man/man8/k${i}.8 \
-		|| die "mv failed (man)"
-	    mv "${D}"/usr/sbin/${i} "${D}"/usr/sbin/k${i} || die "mv failed"
-	done
-
-	for i in {rcp,rlogin,rsh,telnet,ftp} ; do
-		mv "${D}"/usr/share/man/man1/${i}.1 "${D}"/usr/share/man/man1/k${i}.1 \
-		|| die "mv failed (man)"
-		mv "${D}"/usr/bin/${i} "${D}"/usr/bin/k${i} || die "mv failed"
-	done
-
-	rm "${D}"/usr/share/man/man1/tmac.doc
-	dodoc README
-}
diff --git a/app-editors/gummi/gummi-0.6.1.ebuild b/app-editors/gummi/gummi-0.6.1.ebuild
index 48a08b961cff..476e7631cf06 100644
--- a/app-editors/gummi/gummi-0.6.1.ebuild
+++ b/app-editors/gummi/gummi-0.6.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-editors/gummi/gummi-0.6.1.ebuild,v 1.1 2011/12/02 18:30:50 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gummi/gummi-0.6.1.ebuild,v 1.2 2012/01/17 22:42:02 ago Exp $
 
 EAPI=4
 inherit base eutils
@@ -11,7 +11,7 @@ SRC_URI="http://dev.midnightcoding.org/redmine/attachments/download/217/${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 LANGS="ar ca cs da de el es fr it nl pl pt pt_BR ro ru sv zh_TW"
diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest
index 19e7ba41b57b..0f9222b9fb97 100644
--- a/app-emulation/qemu-kvm/Manifest
+++ b/app-emulation/qemu-kvm/Manifest
@@ -1,6 +1,6 @@
-DIST qemu-kvm-0.13.0.tar.gz 5153895 RMD160 7b8f4d8cdbb9730bb9d7fbf4cec165a8703696c4 SHA1 b8cfb8e8dbd403281a98a41f7d3eeaecc0aac8f1 SHA256 6db2600d7e3c1ed12feb6dc7596c23324bc2036a72f101cf580cef252ea9be53
 DIST qemu-kvm-0.14.1-backports-2.tar.bz2 20045 RMD160 a6dfdfc4969ff96d287af389c99c9df9df16ff07 SHA1 4ea70f09ca8d24e30d307319352d9857031d3ccb SHA256 ab0e30b550475b379215d2fdeae9be2b8ad4e66a42bfad406683132892ea5982
 DIST qemu-kvm-0.14.1.tar.gz 5321321 RMD160 e3d69b4756bb0e45d14baad72d85827d949e0ae0 SHA1 7378f10ea04db19e5a5009cae1ecb65517e82877 SHA256 a59c4f6ab8646f2f019d2f9f15443e4db8289cf7cf47743d3c63d18fc584da27
 DIST qemu-kvm-0.15.0-backports-1.tar.bz2 1174 RMD160 4ec6259824f18e7704e88b1c348cb21756345ea3 SHA1 c8788c8d9788fe868ece37c00100a17fe402eb84 SHA256 337810cd52fb8002ae39fcc1d486a224419664a064040c887ce66fe889360969
 DIST qemu-kvm-0.15.0.tar.gz 5916130 RMD160 71e32e95368b84e9441a9a1d051b03ed9b04d3ed SHA1 b009c05461fed20f3f3c3a03b153c457e33683d4 SHA256 828e771bffa540b0fbfe6fa5250adc92d5416720134d1f55a45c7926d83a4478
 DIST qemu-kvm-0.15.1.tar.gz 5915998 RMD160 dba914ca40d6c63e9f3abce409d7daee1d33323b SHA1 2716ddfc49d98fee67a1ff0de9b199d211e72bec SHA256 aed6a3faa76c1e9601b4b5b8adbe5867a70c64567175f44944d88e16bd49733e
+DIST qemu-kvm-1.0.tar.gz 6210473 RMD160 6503b6ec9c8d89b785d644f5c4b47b4716e2fab7 SHA1 c16be4924c30747d93d609b7909e9e9239150c9a SHA256 b711ead5a0a28bf43e7e51ce2082e37120a3527ab012c609bc30fb94d37e116e
diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.15.0.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.15.0.ebuild
index 919fbb1d8718..cbc968d48137 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-0.15.0.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-0.15.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/app-emulation/qemu-kvm/qemu-kvm-0.15.0.ebuild,v 1.5 2011/08/14 13:40:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.0.ebuild,v 1.6 2012/01/17 22:23:53 cardoe Exp $
 
 BACKPORTS=1
 
@@ -93,9 +93,8 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	app-text/texi2html
-	>=sys-kernel/linux-headers-2.6.35
-	ssl? ( dev-util/pkgconfig )
-"
+	dev-util/pkgconfig
+	>=sys-kernel/linux-headers-2.6.35"
 
 kvm_kern_warn() {
 	eerror "Please enable KVM support in your kernel, found at:"
diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild
index 0a8190a8aed2..e7325a7dd545 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild,v 1.2 2011/11/21 18:11:11 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild,v 1.3 2012/01/17 22:23:53 cardoe Exp $
 
 #BACKPORTS=1
 
@@ -93,9 +93,8 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	app-text/texi2html
-	>=sys-kernel/linux-headers-2.6.35
-	ssl? ( dev-util/pkgconfig )
-"
+	dev-util/pkgconfig
+	>=sys-kernel/linux-headers-2.6.35"
 
 kvm_kern_warn() {
 	eerror "Please enable KVM support in your kernel, found at:"
diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.13.0-r2.ebuild b/app-emulation/qemu-kvm/qemu-kvm-1.0.ebuild
similarity index 64%
rename from app-emulation/qemu-kvm/qemu-kvm-0.13.0-r2.ebuild
rename to app-emulation/qemu-kvm/qemu-kvm-1.0.ebuild
index a3eb5504b977..e429c2b55778 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-0.13.0-r2.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-1.0.ebuild
@@ -1,22 +1,28 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.13.0-r2.ebuild,v 1.5 2011/03/28 03:31:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.0.ebuild,v 1.3 2012/01/17 22:23:53 cardoe Exp $
 
-EAPI="2"
+#BACKPORTS=1
+
+EAPI="3"
 
 if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
-	GIT_ECLASS="git"
+#	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
+	EGIT_REPO_URI="git://github.com/avikivity/kvm.git"
+	GIT_ECLASS="git-2"
 fi
 
-inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs multilib
+inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs multilib python
 
 if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 	KEYWORDS=""
 else
-	SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc ~ppc64 x86"
+	SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz
+	${BACKPORTS:+
+		http://dev.gentoo.org/~flameeyes/${PN}/${P}-backports-${BACKPORTS}.tar.bz2
+		http://dev.gentoo.org/~cardoe/distfiles/${P}-backports-${BACKPORTS}.tar.bz2}"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
@@ -25,19 +31,30 @@ HOMEPAGE="http://www.linux-kvm.org"
 LICENSE="GPL-2"
 SLOT="0"
 # xen is disabled until the deps are fixed
-IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses \
-png pulseaudio qemu-ifup sasl sdl ssl static vde"
+IUSE="+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses nss \
+opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads vde \
++vhost-net xattr xen"
+# static, depends on libsdl being built with USE=static-libs, which can not
+# be expressed in current EAPI's
 
 COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
 IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb"
 IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus"
 
+# Setup the default SoftMMU targets, while using the loops
+# below to setup the other targets. x86_64 should be the only
+# defaults on for qemu-kvm
+IUSE="${IUSE} +qemu_softmmu_targets_x86_64"
+
 for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} +qemu_softmmu_targets_${target}"
+	if [ "x${target}" = "xx86_64" ]; then
+		continue
+	fi
+	IUSE="${IUSE} qemu_softmmu_targets_${target}"
 done
 
 for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} +qemu_user_targets_${target}"
+	IUSE="${IUSE} qemu_user_targets_${target}"
 done
 
 RESTRICT="test"
@@ -45,35 +62,67 @@ RESTRICT="test"
 RDEPEND="
 	!app-emulation/kqemu
 	!app-emulation/qemu
-	!app-emulation/qemu-softmmu
 	!app-emulation/qemu-user
-	!app-emulation/qemu-kvm-spice
+	>=dev-libs/glib-2.0
 	sys-apps/pciutils
 	>=sys-apps/util-linux-2.16.0
 	sys-libs/zlib
+	amd64? ( sys-apps/seabios )
+	x86? ( sys-apps/seabios )
 	aio? ( dev-libs/libaio )
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bluetooth? ( net-wireless/bluez )
 	brltty? ( app-accessibility/brltty )
-	curl? ( net-misc/curl )
+	curl? ( >=net-misc/curl-7.15.4 )
 	esd? ( media-sound/esound )
 	fdt? ( >=sys-apps/dtc-1.2.0 )
 	jpeg? ( virtual/jpeg )
 	ncurses? ( sys-libs/ncurses )
+	nss? ( dev-libs/nss )
+	opengl? ( virtual/opengl )
 	png? ( media-libs/libpng )
 	pulseaudio? ( media-sound/pulseaudio )
 	qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils )
+	rbd? ( sys-cluster/ceph )
 	sasl? ( dev-libs/cyrus-sasl )
 	sdl? ( >=media-libs/libsdl-1.2.11[X] )
+	spice? ( >=app-emulation/spice-0.9.0
+			>=app-emulation/spice-protocol-0.8.1 )
 	ssl? ( net-libs/gnutls )
 	vde? ( net-misc/vde )
+	xattr? ( sys-apps/attr )
+	xen? ( app-emulation/xen )
 "
 
 DEPEND="${RDEPEND}
 	app-text/texi2html
-	>=sys-kernel/linux-headers-2.6.29
-	ssl? ( dev-util/pkgconfig )
-"
+	dev-util/pkgconfig
+	>=sys-kernel/linux-headers-2.6.35"
+
+STRIP_MASK="/usr/share/qemu/palcode-clipper"
+
+QA_PRESTRIPPED="
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/palcode-clipper"
+
+QA_WX_LOAD="${QA_PRESTRIPPED}
+	usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus"
 
 kvm_kern_warn() {
 	eerror "Please enable KVM support in your kernel, found at:"
@@ -83,8 +132,14 @@ kvm_kern_warn() {
 	eerror
 }
 
-pkg_setup() {
-	use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
+pkg_pretend() {
+	if ! use qemu_softmmu_targets_x86_64 && use amd64 ; then
+		eerror "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
+	fi
+
+	if ! use qemu_softmmu_targets_x86_64 && use x86 ; then
+		eerror "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
+	fi
 
 	if kernel_is lt 2 6 25; then
 		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
@@ -96,7 +151,16 @@ pkg_setup() {
 		elif ! linux_chkconfig_present KVM; then
 			kvm_kern_warn
 		fi
+		if use vhost-net && ! linux_chkconfig_present VHOST_NET ; then
+			ewarn "You have to enable CONFIG_VHOST_NET in the kernel"
+			ewarn "to have vhost-net support."
+		fi
 	fi
+}
+
+pkg_setup() {
+
+	python_set_active_version 2
 
 	enewgroup kvm
 }
@@ -115,9 +179,11 @@ src_prepare() {
 
 	# ${PN}-guest-hang-on-usb-add.patch was sent by Timothy Jones
 	# to the qemu-devel ml - bug 337988
-	epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch" \
-		"${FILESDIR}/${PN}-0.12.3-include-madvise-defines.patch"
-#		"${FILESDIR}/${PN}-guest-hang-on-usb-add.patch"
+	epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
+
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
 }
 
 src_configure() {
@@ -134,7 +200,8 @@ src_configure() {
 	done
 
 	if [ -z "${softmmu_targets}" ]; then
-		conf_opts="${conf_opts} --disable-system"
+		eerror "All SoftMMU targets are disabled. This is invalid for qemu-kvm"
+		die "At least 1 SoftMMU target must be enabled"
 	else
 		einfo "Building the following softmmu targets: ${softmmu_targets}"
 	fi
@@ -150,7 +217,10 @@ src_configure() {
 	conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
 
 	# Add support for static builds
-	use static && conf_opts="${conf_opts} --static"
+	#use static && conf_opts="${conf_opts} --static"
+
+	# Support debug USE flag
+	use debug && conf_opts="${conf_opts} --enable-debug --disable-strip"
 
 	# Fix the $(prefix)/etc issue
 	conf_opts="${conf_opts} --sysconfdir=/etc"
@@ -161,16 +231,22 @@ src_configure() {
 	conf_opts="${conf_opts} $(use_enable brltty brlapi)"
 	conf_opts="${conf_opts} $(use_enable curl)"
 	conf_opts="${conf_opts} $(use_enable fdt)"
-	conf_opts="${conf_opts} $(use_enable hardened user-pie)"
+	conf_opts="${conf_opts} $(use_enable hardened pie)"
 	conf_opts="${conf_opts} $(use_enable jpeg vnc-jpeg)"
 	conf_opts="${conf_opts} $(use_enable ncurses curses)"
+	conf_opts="${conf_opts} $(use_enable nss smartcard-nss)"
+	conf_opts="${conf_opts} $(use_enable opengl)"
 	conf_opts="${conf_opts} $(use_enable png vnc-png)"
+	conf_opts="${conf_opts} $(use_enable rbd)"
 	conf_opts="${conf_opts} $(use_enable sasl vnc-sasl)"
 	conf_opts="${conf_opts} $(use_enable sdl)"
+	conf_opts="${conf_opts} $(use_enable spice)"
 	conf_opts="${conf_opts} $(use_enable ssl vnc-tls)"
+	conf_opts="${conf_opts} $(use_enable threads vnc-thread)"
 	conf_opts="${conf_opts} $(use_enable vde)"
-#	conf_opts="${conf_opts} $(use_enable xen)"
-	conf_opts="${conf_opts} --disable-xen"
+	conf_opts="${conf_opts} $(use_enable vhost-net)"
+	conf_opts="${conf_opts} $(use_enable xen)"
+	conf_opts="${conf_opts} $(use_enable xattr attr)"
 	conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user"
 
 	# audio options
@@ -199,16 +275,11 @@ src_configure() {
 		# --enable-io-thread \
 }
 
-src_compile() {
-	# Restricting parallel build until we get a patch to fix this
-	emake -j1 || die
-}
-
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 
 	if [ ! -z "${softmmu_targets}" ]; then
-		insinto /$(get_libdir)/udev/rules.d/
+		insinto /lib/udev/rules.d/
 		doins kvm/scripts/65-kvm.rules || die
 
 		if use qemu-ifup; then
@@ -229,6 +300,13 @@ src_install() {
 	dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
 	newdoc pc-bios/README README.pc-bios || die
 	dohtml qemu-doc.html qemu-tech.html || die
+
+	# FIXME: Need to come up with a solution for non-x86 based systems
+	if use x86 || use amd64; then
+		# Remove SeaBIOS since we're using the SeaBIOS packaged one
+		rm "${D}/usr/share/qemu/bios.bin"
+		dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+	fi
 }
 
 pkg_postinst() {
diff --git a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
index a97a4c27bf46..3ae90f446c96 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.25 2011/11/21 18:11:11 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.26 2012/01/17 22:25:48 cardoe Exp $
 
 #BACKPORTS=1
 
@@ -31,7 +31,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # xen is disabled until the deps are fixed
 IUSE="+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses nss \
-png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads vde \
+opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads vde \
 +vhost-net xattr xen"
 # static, depends on libsdl being built with USE=static-libs, which can not
 # be expressed in current EAPI's
@@ -78,13 +78,15 @@ RDEPEND="
 	jpeg? ( virtual/jpeg )
 	ncurses? ( sys-libs/ncurses )
 	nss? ( dev-libs/nss )
+	opengl? ( virtual/opengl )
 	png? ( media-libs/libpng )
 	pulseaudio? ( media-sound/pulseaudio )
 	qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils )
 	rbd? ( sys-cluster/ceph )
 	sasl? ( dev-libs/cyrus-sasl )
 	sdl? ( >=media-libs/libsdl-1.2.11[X] )
-	spice? ( >=app-emulation/spice-0.6.0 )
+	spice? ( >=app-emulation/spice-0.9.0
+			>=app-emulation/spice-protocol-0.8.1 )
 	ssl? ( net-libs/gnutls )
 	vde? ( net-misc/vde )
 	xattr? ( sys-apps/attr )
@@ -93,9 +95,33 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	app-text/texi2html
-	>=sys-kernel/linux-headers-2.6.35
-	ssl? ( dev-util/pkgconfig )
-"
+	dev-util/pkgconfig
+	>=sys-kernel/linux-headers-2.6.35"
+
+STRIP_MASK="/usr/share/qemu/palcode-clipper"
+
+QA_PRESTRIPPED="
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/palcode-clipper"
+
+QA_WX_LOAD="${QA_PRESTRIPPED}
+	usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus"
 
 kvm_kern_warn() {
 	eerror "Please enable KVM support in your kernel, found at:"
@@ -105,8 +131,8 @@ kvm_kern_warn() {
 	eerror
 }
 
-pkg_setup() {
-	if ! use qemu_softmmu_targets_x86_64 && use x86_64 ; then
+pkg_pretend() {
+	if ! use qemu_softmmu_targets_x86_64 && use amd64 ; then
 		eerror "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
 	fi
 
@@ -129,6 +155,9 @@ pkg_setup() {
 			ewarn "to have vhost-net support."
 		fi
 	fi
+}
+
+pkg_setup() {
 
 	python_set_active_version 2
 
@@ -201,10 +230,11 @@ src_configure() {
 	conf_opts="${conf_opts} $(use_enable brltty brlapi)"
 	conf_opts="${conf_opts} $(use_enable curl)"
 	conf_opts="${conf_opts} $(use_enable fdt)"
-	conf_opts="${conf_opts} $(use_enable hardened user-pie)"
+	conf_opts="${conf_opts} $(use_enable hardened pie)"
 	conf_opts="${conf_opts} $(use_enable jpeg vnc-jpeg)"
 	conf_opts="${conf_opts} $(use_enable ncurses curses)"
 	conf_opts="${conf_opts} $(use_enable nss smartcard-nss)"
+	conf_opts="${conf_opts} $(use_enable opengl)"
 	conf_opts="${conf_opts} $(use_enable png vnc-png)"
 	conf_opts="${conf_opts} $(use_enable rbd)"
 	conf_opts="${conf_opts} $(use_enable sasl vnc-sasl)"
@@ -248,7 +278,7 @@ src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 
 	if [ ! -z "${softmmu_targets}" ]; then
-		insinto /$(get_libdir)/udev/rules.d/
+		insinto /lib/udev/rules.d/
 		doins kvm/scripts/65-kvm.rules || die
 
 		if use qemu-ifup; then
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index 3735f05a2ab5..2194502492e0 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,4 +1,4 @@
 DIST virt-manager-0.8.7.tar.gz 1879504 RMD160 e80475270e54018b89e5a1a58c467478c03c71b5 SHA1 fe1565b9836b23cefb37d60b403be5b302e83472 SHA256 1907ec0e5479d6af8b4882fc068b74fa8c04f8d36ab0a503b405a937fe765dd5
 DIST virt-manager-0.9.0-bp-1.tar.bz2 707 RMD160 e4614dd36bd1a334080dcb712d731665944ef705 SHA1 dc007460bb721eb385c02de671045820926626b6 SHA256 823ae2aea4515e47db9791e3edda78530223a48ba2fa0bdb33a328e85e64f284
-DIST virt-manager-0.9.0-bp-2.tar.bz2 18472 RMD160 69525e49850409d67bc40c3cf67a8c1d7e9c7d7a SHA1 c0d223ea5d2359490467b2131ffc78d1cbc8ccca SHA256 83d9580bec5a0b40d0231944e760899b24b5766fddc3fe350e91ecc9f727bd0a
+DIST virt-manager-0.9.0-bp-3.tar.bz2 18189 RMD160 8fc427d55d2167ac4ffa0ae273144f7f7e128924 SHA1 db2e90dffd0888b0397a9fb6438edd4519780889 SHA256 96420d356a0ea4af7be88be6613107e1621ca0cc08bdf7407967422a1c9f45c1
 DIST virt-manager-0.9.0.tar.gz 1951176 RMD160 f3af53591babe3d95c4017d19a292fd6c1bfee97 SHA1 e937b9aedc7c4ebc84fbfa48c622d1918cf7a335 SHA256 db0de808efa5d6bae0bdc2db796e58ea79f9e1db20d9a5a5977b28b4b85d4321
diff --git a/app-emulation/virt-manager/virt-manager-0.9.0-r2.ebuild b/app-emulation/virt-manager/virt-manager-0.9.0-r2.ebuild
index 0805cb9b74c9..1d5724b12f0e 100644
--- a/app-emulation/virt-manager/virt-manager-0.9.0-r2.ebuild
+++ b/app-emulation/virt-manager/virt-manager-0.9.0-r2.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/virt-manager/virt-manager-0.9.0-r2.ebuild,v 1.1 2012/01/16 21:20:12 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.9.0-r2.ebuild,v 1.3 2012/01/17 17:55:18 cardoe Exp $
 
-BACKPORTS=2
+BACKPORTS=3
 
 EAPI=2
 
@@ -27,7 +27,7 @@ else
 	${BACKPORTS:+mirror://gentoo/${P}-bp-${BACKPORTS}.tar.bz2
 		http://dev.gentoo.org/~cardoe/distfiles/${P}-bp-${BACKPORTS}.tar.bz2}"
 	KEYWORDS="~amd64 ~x86"
-	VIRTINSTDEP=">=app-emulation/virtinst-0.600.0"
+	VIRTINSTDEP=">app-emulation/virtinst-0.600.0"
 fi
 
 DESCRIPTION="A graphical tool for administering virtual machines (KVM/Xen)"
diff --git a/app-emulation/virtinst/Manifest b/app-emulation/virtinst/Manifest
index 9bdd4ca639d4..fcdf72ea8707 100644
--- a/app-emulation/virtinst/Manifest
+++ b/app-emulation/virtinst/Manifest
@@ -1,2 +1,3 @@
 DIST virtinst-0.500.6.tar.gz 549365 RMD160 3f2d5865216208326c9ad8b5f6777a6317d189ee SHA1 50a55d34e5f46777e7446254262b30904eb0adc3 SHA256 ed824870f7ec8be1c499065a04c9de04977ef62a2e527db0151fc7a13bf1ce7b
+DIST virtinst-0.600.0-bp-1.tar.bz2 12155 RMD160 e86fea313a0cd3fb8bae2b6de359c972eda0b6f3 SHA1 1fbe1b07c9be3e102cbe4c93ec8db44b12607d25 SHA256 e8f40e54cab1e3c22fbaaabd8b32c3235f13f378271b88b52f1fc8d896eba64d
 DIST virtinst-0.600.0.tar.gz 576764 RMD160 6efb6ce5ad6d6c4d5ffbc95e1695ac125d1ee249 SHA1 c7b14287927969e20ce60e3726bfe7e3dc57a4fe SHA256 92dc8f14d31ffb0e79479fab982203027c45c83d25e73af7627f589f92ca797a
diff --git a/app-emulation/virtinst/virtinst-0.600.0-r1.ebuild b/app-emulation/virtinst/virtinst-0.600.0-r1.ebuild
new file mode 100644
index 000000000000..fd40f9895ff1
--- /dev/null
+++ b/app-emulation/virtinst/virtinst-0.600.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtinst/virtinst-0.600.0-r1.ebuild,v 1.1 2012/01/17 17:51:26 cardoe Exp $
+
+BACKPORTS=1
+
+EAPI=3
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="http://git.fedorahosted.org/git/python-virtinst.git"
+	GIT_ECLASS="git-2"
+fi
+
+PYTHON_DEPEND="2"
+RESTRICT_PYTHON_ABIS="3.*"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils eutils ${GIT_ECLASS}
+
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://virt-manager.et.redhat.com/download/sources/${PN}/${P}.tar.gz
+		${BACKPORTS:+mirror://gentoo/${P}-bp-${BACKPORTS}.tar.bz2
+		http://dev.gentoo.org/~cardoe/distfiles/${P}-bp-${BACKPORTS}.tar.bz2}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Python modules for starting virtualized guest installations"
+HOMEPAGE="http://virt-manager.et.redhat.com/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+RDEPEND=">=app-emulation/libvirt-0.7.0[python]
+	dev-python/urlgrabber
+	dev-libs/libxml2[python]"
+DEPEND="${RDEPEND}"
+
+PYTHON_MODNAME="virtconv virtinst"
+
+src_prepare() {
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+		epatch
+
+	distutils_src_prepare
+}
diff --git a/app-i18n/enca/enca-1.13-r2.ebuild b/app-i18n/enca/enca-1.13-r2.ebuild
index 45aab5b085f3..6478ce1814b4 100644
--- a/app-i18n/enca/enca-1.13-r2.ebuild
+++ b/app-i18n/enca/enca-1.13-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-i18n/enca/enca-1.13-r2.ebuild,v 1.1 2011/12/06 13:53:04 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/enca/enca-1.13-r2.ebuild,v 1.2 2012/01/17 13:02:34 ago Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://dl.cihar.com/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc +recode"
 
 DEPEND="recode? ( >=app-text/recode-3.6_p15 )"
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.60-r1.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.60-r1.ebuild
index 78094df3c884..f89754248cde 100644
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.60-r1.ebuild
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.60-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-laptop/laptop-mode-tools/laptop-mode-tools-1.60-r1.ebuild,v 1.2 2012/01/16 19:23:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/laptop-mode-tools-1.60-r1.ebuild,v 1.4 2012/01/17 12:58:46 ago Exp $
 
 EAPI=4
 
@@ -12,10 +12,11 @@ SRC_URI="http://www.samwel.tk/laptop_mode/tools/downloads/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="acpi apm bluetooth scsi"
 
-RDEPEND="sys-apps/ethtool
+RDEPEND="net-wireless/wireless-tools
+	sys-apps/ethtool
 	sys-apps/hdparm
 	acpi? ( sys-power/acpid )
 	apm? ( sys-apps/apmd )
diff --git a/app-misc/byobu/Manifest b/app-misc/byobu/Manifest
index 4a6a87aa3383..40e6e728248e 100644
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@@ -2,3 +2,4 @@ DIST byobu_4.55.orig.tar.gz 444603 RMD160 0dcfe530095e3b3fdf4217d7e945a3b7ea2c3f
 DIST byobu_5.0.orig.tar.gz 445115 RMD160 e628ff16a1dc46ece54a578d172c1a108ace42eb SHA1 6673d28defbca05fda27c793e992075f9e663240 SHA256 1ae783a8250f846b41f7366feeb806ca94f1d90c3c025899ca1b0c1ac1d5ca67
 DIST byobu_5.1.orig.tar.gz 445194 RMD160 26bb9c52ddda1574ef38e6a8fd71a55a1fca88a9 SHA1 8b27c9028500721879cb1501bf0b8027923ba4e7 SHA256 abdbea19759505092728266d509f333948fe6862cd82db378e5d52518d2ef6fb
 DIST byobu_5.2.orig.tar.gz 334656 RMD160 6a9a006f3b44988d1d5f53c469fb79bd1dd2525e SHA1 c4e5254d35ece10189ee2ef5c9c36a364d7f29ba SHA256 ea1f3af34a74bfe16b350782c289ac6c45ccb6b596f45c47000143712937e2ff
+DIST byobu_5.4.orig.tar.gz 336895 RMD160 d80a65a7e85d5deaa1be1227a123db6aafaae86a SHA1 4d4c22fcf536d75afdde84f720b0eb363c722ad0 SHA256 2f2dd7eaf88d627853de184243d92132db437af1d1c81ac1f4a1639662fad339
diff --git a/app-misc/byobu/byobu-5.4.ebuild b/app-misc/byobu/byobu-5.4.ebuild
new file mode 100644
index 000000000000..7568aa681d27
--- /dev/null
+++ b/app-misc/byobu/byobu-5.4.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-misc/byobu/byobu-5.4.ebuild,v 1.1 2012/01/17 23:42:33 radhermit Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+
+inherit python
+
+DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
+HOMEPAGE="https://launchpad.net/byobu"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="|| ( app-misc/screen app-misc/tmux )
+	dev-libs/newt"
+
+src_prepare() {
+	python_convert_shebangs -r 2 .
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Create symlinks for backends
+	dosym ${PN} /usr/bin/${PN}-screen
+	dosym ${PN} /usr/bin/${PN}-tmux
+}
diff --git a/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild b/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild
index 6d6696991014..1bfc37ab95f1 100644
--- a/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild
+++ b/app-misc/geoclue/geoclue-0.12.0_p20110307.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-misc/geoclue/geoclue-0.12.0_p20110307.ebuild,v 1.5 2011/12/10 10:26:51 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild,v 1.6 2012/01/17 13:53:26 ago Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="http://dev.gentoo.org/~signals/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="geonames gps gsmloc gtk hostip manual networkmanager nominatim plazes
 	skyhook yahoo-geo"
 
diff --git a/app-text/dvipsk/dvipsk-5.991_p20110705-r1.ebuild b/app-text/dvipsk/dvipsk-5.991_p20110705-r1.ebuild
index 8fc94ae14e1d..382884fa5ee4 100644
--- a/app-text/dvipsk/dvipsk-5.991_p20110705-r1.ebuild
+++ b/app-text/dvipsk/dvipsk-5.991_p20110705-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-text/dvipsk/dvipsk-5.991_p20110705-r1.ebuild,v 1.3 2012/01/16 13:15:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvipsk/dvipsk-5.991_p20110705-r1.ebuild,v 1.4 2012/01/17 17:18:39 phajdan.jr Exp $
 
 EAPI=3
 
@@ -29,7 +29,7 @@ SRC_URI="${SRC_URI} ) "
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source"
 
 DEPEND=">=dev-libs/kpathsea-6.0.1_p20110627"
diff --git a/app-text/ps2pkm/ps2pkm-1.5_p20110705.ebuild b/app-text/ps2pkm/ps2pkm-1.5_p20110705.ebuild
index 1520f9281775..619a7defa2dc 100644
--- a/app-text/ps2pkm/ps2pkm-1.5_p20110705.ebuild
+++ b/app-text/ps2pkm/ps2pkm-1.5_p20110705.ebuild
@@ -1,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/ps2pkm/ps2pkm-1.5_p20110705.ebuild,v 1.3 2012/01/16 13:15:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ps2pkm/ps2pkm-1.5_p20110705.ebuild,v 1.4 2012/01/17 17:19:08 phajdan.jr Exp $
 
 EAPI=3
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-libs/kpathsea-6.0.1_p20110627"
diff --git a/app-text/ronn/ronn-0.7.3.ebuild b/app-text/ronn/ronn-0.7.3.ebuild
index 1ec20b5b673f..803f10c375c7 100644
--- a/app-text/ronn/ronn-0.7.3.ebuild
+++ b/app-text/ronn/ronn-0.7.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-text/ronn/ronn-0.7.3.ebuild,v 1.8 2012/01/16 19:21:53 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ronn/ronn-0.7.3.ebuild,v 1.9 2012/01/17 13:55:55 ago Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18"
@@ -15,7 +15,7 @@ HOMEPAGE="http://github.com/rtomayko/ronn/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE=""
 
diff --git a/app-text/texlive-core/texlive-core-2011-r5.ebuild b/app-text/texlive-core/texlive-core-2011-r5.ebuild
index 1e8e62bb4872..ef0b2760c64d 100644
--- a/app-text/texlive-core/texlive-core-2011-r5.ebuild
+++ b/app-text/texlive-core/texlive-core-2011-r5.ebuild
@@ -1,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/texlive-core/texlive-core-2011-r5.ebuild,v 1.3 2012/01/16 13:14:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2011-r5.ebuild,v 1.4 2012/01/17 17:18:00 phajdan.jr Exp $
 
 EAPI=3
 
@@ -61,7 +61,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 done
 SRC_URI="${SRC_URI} )"
 
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="cjk X doc source tk xetex"
 
 MODULAR_X_DEPEND="X? (
diff --git a/app-text/texlive/texlive-2011.ebuild b/app-text/texlive/texlive-2011.ebuild
index d378a587f66d..708c7a19b0c1 100644
--- a/app-text/texlive/texlive-2011.ebuild
+++ b/app-text/texlive/texlive-2011.ebuild
@@ -1,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/texlive/texlive-2011.ebuild,v 1.6 2012/01/16 13:13:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive/texlive-2011.ebuild,v 1.7 2012/01/17 17:16:31 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk context detex doc dvi2tty dvipdfm extra games graphics
 	humanities jadetex luatex music omega pdfannotextractor png pstricks publishers science tex4ht
 	truetype xetex xindy xml X"
diff --git a/dev-lang/php/php-5.3.9.ebuild b/dev-lang/php/php-5.3.9.ebuild
index c513d35b5ab5..53b8a9751c97 100644
--- a/dev-lang/php/php-5.3.9.ebuild
+++ b/dev-lang/php/php-5.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/dev-lang/php/php-5.3.9.ebuild,v 1.7 2012/01/16 20:24:49 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.9.ebuild,v 1.8 2012/01/17 05:18:51 jer Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SUHOSIN_VERSION="5.3.9-0.9.10-gentoo"
 FPM_VERSION="builtin"
 EXPECTED_TEST_FAILURES=""
 
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 
 function php_get_uri ()
 {
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 3019159853db..d5e6383eb309 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -1,2 +1,3 @@
 DIST libnl-1.1.tar.gz 288932 RMD160 ebfc660302f31e5a94f03683f1ba85a3e057cf30 SHA1 54c7d02f93b09b43338e5cbf42f1373e83566577 SHA256 35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b8384299b4b21883e22edc3
 DIST libnl-3.2.3.tar.gz 1123915 RMD160 97eff52f603930c350e2cd093f8c6141d3c3aedf SHA1 a6485f2e2cebde833c678d4541e8c4c7c1776be3 SHA256 69f4a360350ea61f2c988f947c251995c04093c74743eae9eeffba85846ef007
+DIST libnl-3.2.6.tar.gz 1124714 RMD160 188d562b0282b87a728599b37fb1137643b3e164 SHA1 6961bc8dca96442f7203779f4eca59f63005864f SHA256 8b40b67407232e0835e6972da9c319a3aefd60c7a7958c0036486a8969b61a18
diff --git a/dev-libs/libnl/libnl-3.2.6.ebuild b/dev-libs/libnl/libnl-3.2.6.ebuild
new file mode 100644
index 000000000000..026eca63c9ba
--- /dev/null
+++ b/dev-libs/libnl/libnl-3.2.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.6.ebuild,v 1.1 2012/01/17 15:38:50 jer Exp $
+
+EAPI="4"
+
+inherit eutils multilib
+
+DESCRIPTION="A library for applications dealing with netlink socket"
+HOMEPAGE="http://www.infradead.org/~tgr/libnl/"
+SRC_URI="http://www.infradead.org/~tgr/libnl/files/${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="static-libs utils"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.1-vlan-header.patch
+}
+
+src_configure() {
+	econf $(use_enable static-libs static) $(use_enable utils cli)
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		rm -f "${D}"/usr/lib*/lib*.la
+	fi
+
+	dodoc ChangeLog
+}
diff --git a/dev-libs/libofx/libofx-0.9.4.ebuild b/dev-libs/libofx/libofx-0.9.4.ebuild
index a18b910d8b6a..6a26f6a133c8 100644
--- a/dev-libs/libofx/libofx-0.9.4.ebuild
+++ b/dev-libs/libofx/libofx-0.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/dev-libs/libofx/libofx-0.9.4.ebuild,v 1.3 2012/01/15 18:49:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libofx/libofx-0.9.4.ebuild,v 1.4 2012/01/17 21:22:34 jer Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ~ppc ~ppc64 sparc x86"
 IUSE="static-libs test"
 
 RDEPEND=">=app-text/opensp-1.5
diff --git a/dev-libs/libp11/libp11-0.2.8-r1.ebuild b/dev-libs/libp11/libp11-0.2.8-r1.ebuild
index 578247f18ece..2764db9b5f03 100644
--- a/dev-libs/libp11/libp11-0.2.8-r1.ebuild
+++ b/dev-libs/libp11/libp11-0.2.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libp11/libp11-0.2.8-r1.ebuild,v 1.1 2012/01/02 19:40:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libp11/libp11-0.2.8-r1.ebuild,v 1.2 2012/01/17 22:20:49 vapier Exp $
 
 EAPI="4"
 inherit eutils autotools
@@ -17,7 +17,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc"
 
 RDEPEND="dev-libs/openssl"
diff --git a/dev-libs/libp11/libp11-0.2.8.ebuild b/dev-libs/libp11/libp11-0.2.8.ebuild
index aa416c8c9bb5..1c4a7eb46778 100644
--- a/dev-libs/libp11/libp11-0.2.8.ebuild
+++ b/dev-libs/libp11/libp11-0.2.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-libs/libp11/libp11-0.2.8.ebuild,v 1.6 2012/01/01 15:55:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libp11/libp11-0.2.8.ebuild,v 1.7 2012/01/17 22:20:49 vapier Exp $
 
 EAPI="4"
 inherit libtool
@@ -17,7 +17,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86"
 IUSE="doc"
 
 # libtool is required at runtime as it uses libltdl.
diff --git a/dev-libs/libzip/libzip-0.10-r1.ebuild b/dev-libs/libzip/libzip-0.10-r1.ebuild
index 0f464a807a8f..4110289a1a12 100644
--- a/dev-libs/libzip/libzip-0.10-r1.ebuild
+++ b/dev-libs/libzip/libzip-0.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/libzip-0.10-r1.ebuild,v 1.6 2012/01/15 15:48:45 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/libzip-0.10-r1.ebuild,v 1.7 2012/01/17 23:14:46 jer Exp $
 
 EAPI=3
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.nih.at/libzip/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/ptexenc/ptexenc-1.2.0_p20110705.ebuild b/dev-libs/ptexenc/ptexenc-1.2.0_p20110705.ebuild
index 289654a45977..1639c8be2529 100644
--- a/dev-libs/ptexenc/ptexenc-1.2.0_p20110705.ebuild
+++ b/dev-libs/ptexenc/ptexenc-1.2.0_p20110705.ebuild
@@ -1,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/ptexenc/ptexenc-1.2.0_p20110705.ebuild,v 1.5 2012/01/16 13:16:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ptexenc/ptexenc-1.2.0_p20110705.ebuild,v 1.6 2012/01/17 17:19:45 phajdan.jr Exp $
 
 EAPI=3
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
 IUSE="iconv static-libs"
 
 DEPEND="iconv? ( virtual/libiconv )
diff --git a/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.2.0-r1.ebuild b/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.2.0-r1.ebuild
index 5c8068cb557e..8e8bc59c8eea 100644
--- a/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.2.0-r1.ebuild
+++ b/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.2.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-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.2.0-r1.ebuild,v 1.1 2012/01/16 18:11:08 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.2.0-r1.ebuild,v 1.2 2012/01/17 13:00:36 ago Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit php-pear-r1
 DESCRIPTION="An implementation of Integrated Templates API with template 'compilation' added"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-lang/php[ctype]"
diff --git a/dev-python/apptools/Manifest b/dev-python/apptools/Manifest
index 6269d729bc66..b1adf579370a 100644
--- a/dev-python/apptools/Manifest
+++ b/dev-python/apptools/Manifest
@@ -1,2 +1,3 @@
 DIST AppTools-3.4.1.tar.gz 795416 RMD160 f93c65bdc1b7aeb698794c5e8333382c0dd626bf SHA1 9a36a06bbe3d80993cd4b5d40189b8e5716fa76f SHA256 f49b6a73fd9ec108d116b562dc6f862fe14b81035721d6ff9e3a49a3ca504db6
 DIST apptools-4.0.0.tar.gz 274919 RMD160 254d233b8eabf4cb2628a6b15bdf3555d0acc1c9 SHA1 b1ecbec333efeb9ec519ab0d9d6e98e975ad49b6 SHA256 fc1a76e09ab4237314998250bb8f83bd28e44c7c177d0cd43ee1e5dba9535b4e
+DIST apptools-4.0.1.tar.gz 274944 RMD160 6fc5ca5db74185ffca836879a7d9078dd0ed3f10 SHA1 0ffa78ea4857e5192c494a67c93f5a7014df1c0e SHA256 f2f2297855587085fbff389de01453318f7604822ed737d5909e61a4487bfe52
diff --git a/dev-python/apptools/apptools-4.0.0.ebuild b/dev-python/apptools/apptools-4.0.0.ebuild
index 5473ad6aa489..9aa6c70a5f48 100644
--- a/dev-python/apptools/apptools-4.0.0.ebuild
+++ b/dev-python/apptools/apptools-4.0.0.ebuild
@@ -1,11 +1,11 @@
-# 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-python/apptools/apptools-4.0.0.ebuild,v 1.1 2011/08/03 23:51:07 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apptools/apptools-4.0.0.ebuild,v 1.2 2012/01/17 06:16:44 bicatali Exp $
 
-EAPI="3"
+EAPI=4
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
+RESTRICT_PYTHON_ABIS="*-jython"
 DISTUTILS_SRC_TEST="nosetests"
 
 inherit distutils virtualx
@@ -21,7 +21,7 @@ IUSE="doc examples test"
 
 RDEPEND="dev-python/configobj
 	dev-python/numpy
-	>=dev-python/traits-4.0.0"
+	>=dev-python/traits-4.1.0"
 DEPEND="dev-python/setuptools
 	doc? ( dev-python/sphinx )
 	test? (
@@ -33,12 +33,7 @@ DEPEND="dev-python/setuptools
 
 src_compile() {
 	distutils_src_compile
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		emake html || die "Generation of documentation failed"
-		popd > /dev/null
-	fi
+	use doc && emake -C docs html
 }
 
 src_test() {
@@ -49,15 +44,10 @@ src_install() {
 	find -name "*LICENSE*.txt" -delete
 	distutils_src_install
 
-	if use doc; then
-		pushd docs/build/html > /dev/null
-		insinto /usr/share/doc/${PF}/html
-		doins -r [a-z]* _static || die "Installation of documentation failed"
-		popd > /dev/null
-	fi
+	use doc && dohtml -r docs/build/html/*
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/* || die "Installation of examples failed"
+		insinto /usr/share/doc/${PF}
+		doins -r examples
 	fi
 }
diff --git a/dev-python/apptools/apptools-4.0.1.ebuild b/dev-python/apptools/apptools-4.0.1.ebuild
new file mode 100644
index 000000000000..06a55b4d4b9e
--- /dev/null
+++ b/dev-python/apptools/apptools-4.0.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apptools/apptools-4.0.1.ebuild,v 1.1 2012/01/17 06:16:44 bicatali Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+DISTUTILS_SRC_TEST="nosetests"
+
+inherit distutils virtualx
+
+DESCRIPTION="Enthought Tool Suite: Application tools"
+HOMEPAGE="http://code.enthought.com/projects/app_tools/ http://pypi.python.org/pypi/apptools"
+SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="dev-python/configobj
+	dev-python/numpy
+	>=dev-python/traits-4"
+DEPEND="dev-python/setuptools
+	doc? ( dev-python/sphinx )
+	test? (
+		${RDEPEND}
+		>=dev-python/pyface-4
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+	)"
+
+src_compile() {
+	distutils_src_compile
+	use doc && emake -C docs html
+}
+
+src_test() {
+	VIRTUALX_COMMAND="distutils_src_test" virtualmake
+}
+
+src_install() {
+	find -name "*LICENSE*.txt" -delete
+	distutils_src_install
+
+	use doc && dohtml -r docs/build/html/*
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/blockcanvas/Manifest b/dev-python/blockcanvas/Manifest
index 919f9f88570a..605a883cff15 100644
--- a/dev-python/blockcanvas/Manifest
+++ b/dev-python/blockcanvas/Manifest
@@ -1,2 +1,3 @@
 DIST BlockCanvas-3.2.1.tar.gz 1104458 RMD160 8772eaa69c695aa0c9e679444d758a9715aef611 SHA1 e4ee48cbd4c4ed37aba3137eac6c38cd0baee9d0 SHA256 f1d8386947dcb91a17d3ad9f91a58aab50a3c63dcd0a2fc91a99f1fccfaa3155
 DIST blockcanvas-4.0.0.tar.gz 1112614 RMD160 33ea5425faa6e4bc22b46b6e9207069017b109c7 SHA1 488cf10abde6e1b9caa6fffbe0edc80d584cee03 SHA256 8655738863a45a594a73efef4e1badcfb1fc5543ae477267b1cafdcb3ddae700
+DIST blockcanvas-4.0.1.tar.gz 1112631 RMD160 62dd66603eebbfdd67156e8c33b65f657b1015c7 SHA1 90003d92d77f3c7254ea1f5d34c0d00d527dcb77 SHA256 cc6e2c83e3f139c91e10047ae769bec7a96091dc69cb3cd9f388c62204e7b84a
diff --git a/dev-python/blockcanvas/blockcanvas-4.0.1.ebuild b/dev-python/blockcanvas/blockcanvas-4.0.1.ebuild
new file mode 100644
index 000000000000..a4899f08c59a
--- /dev/null
+++ b/dev-python/blockcanvas/blockcanvas-4.0.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/blockcanvas/blockcanvas-4.0.1.ebuild,v 1.1 2012/01/17 06:17:23 bicatali Exp $
+
+EAPI=4
+
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* -jython"
+DISTUTILS_SRC_TEST="nosetests"
+
+inherit distutils virtualx
+
+DESCRIPTION="Enthought Tool Suite: Numerical modeling"
+HOMEPAGE="http://code.enthought.com/projects/block_canvas/ http://pypi.python.org/pypi/blockcanvas"
+SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/apptools-4
+	>=dev-python/chaco-4
+	>=dev-python/codetools-4
+	>=dev-python/etsdevtools-4
+	>=dev-python/pyface-4
+	>=dev-python/scimath-4
+	>=dev-python/traitsui-4
+	dev-python/configobj
+	dev-python/docutils
+	dev-python/greenlet
+	dev-python/imaging
+	dev-python/numpy"
+DEPEND="dev-python/setuptools
+	doc? ( dev-python/sphinx )
+	test? (
+		${RDEPEND}
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+	)"
+
+DOCS="docs/*.txt"
+
+src_compile() {
+	distutils_src_compile
+	use doc && emake -C docs html
+}
+
+src_test() {
+	VIRTUALX_COMMAND="distutils_src_test" virtualmake
+}
+
+src_install() {
+	find -name "*LICENSE*.txt" -delete
+	distutils_src_install
+
+	use doc && dohtml -r docs/build/html/*
+}
diff --git a/dev-python/chaco/Manifest b/dev-python/chaco/Manifest
index 65fee8bffa01..ee3229d17441 100644
--- a/dev-python/chaco/Manifest
+++ b/dev-python/chaco/Manifest
@@ -1,2 +1,3 @@
 DIST Chaco-3.4.0.tar.gz 9009267 RMD160 b4998115841bd55ad0fdfa2e16ecef32a9dc991a SHA1 89ea37dbcf6bb01cfab060b20de3b69850c6a5f9 SHA256 074d86eb22162bd99a3c04e8792a6de49872af5c824340f15cdf40c76d4c7d95
 DIST chaco-4.0.0.tar.gz 9223007 RMD160 fa2e150649d39ffefc8e4239ffab1e68050e25b0 SHA1 896d57a8777be0a6ba27354b2b188a9468966916 SHA256 50f3b11a9c3469217537a518f44e3b46830067490f36360b0226247bc3040763
+DIST chaco-4.1.0.tar.gz 10054001 RMD160 4df41bfbeaffdca4e2213a9a210a3e9ca28a616c SHA1 2b85e76cd368f3f5e5bbf5f483e840927a7eddd1 SHA256 cdc80d77661fa955a4a4466b5b3f55808beedfc48f8f14b33f2ba81ccb360cc7
diff --git a/dev-python/chaco/chaco-4.1.0.ebuild b/dev-python/chaco/chaco-4.1.0.ebuild
new file mode 100644
index 000000000000..86f29d74e5ca
--- /dev/null
+++ b/dev-python/chaco/chaco-4.1.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/chaco/chaco-4.1.0.ebuild,v 1.1 2012/01/17 06:17:57 bicatali Exp $
+
+EAPI=4
+
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+DISTUTILS_SRC_TEST="nosetests"
+
+inherit distutils virtualx
+
+DESCRIPTION="Enthought Tool Suite: Interactive plotting toolkit"
+HOMEPAGE="http://code.enthought.com/projects/chaco/ http://pypi.python.org/pypi/chaco"
+SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-python/enable-4
+	dev-python/numpy"
+DEPEND="dev-python/setuptools
+	dev-python/numpy
+	doc? (
+		>=dev-python/enable-4
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+		!prefix? ( x11-base/xorg-server[xvfb] )
+		x11-apps/xhost
+	)
+	test? (
+		>=dev-python/enable-4
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+	)"
+
+DOCS="docs/*.txt"
+
+src_compile() {
+	distutils_src_compile
+	use doc && virtualmake -C docs html
+}
+
+src_test() {
+	VIRTUALX_COMMAND="distutils_src_test" virtualmake
+}
+
+src_install() {
+	find -name "*LICENSE*.txt" -delete
+	distutils_src_install
+
+	use doc && dohtml -r docs/build/html/*
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/codetools/codetools-4.0.0.ebuild b/dev-python/codetools/codetools-4.0.0.ebuild
index 021cd3607941..1761dfd4cd48 100644
--- a/dev-python/codetools/codetools-4.0.0.ebuild
+++ b/dev-python/codetools/codetools-4.0.0.ebuild
@@ -1,9 +1,9 @@
-# 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-python/codetools/codetools-4.0.0.ebuild,v 1.2 2011/08/04 19:30:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/codetools/codetools-4.0.0.ebuild,v 1.3 2012/01/17 06:19:00 bicatali Exp $
+
+EAPI=4
 
-EAPI="3"
-PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython"
 DISTUTILS_SRC_TEST="nosetests"
@@ -20,8 +20,9 @@ KEYWORDS="~amd64 ~x86"
 LICENSE="BSD"
 
 RDEPEND="dev-python/numpy
-	>=dev-python/scimath-4.0
-	>=dev-python/traits-4.0"
+	>=dev-python/scimath-4
+	>=dev-python/traits-4"
+
 DEPEND="${RDEPEND}
 	dev-python/setuptools
 	doc? ( dev-python/sphinx )
@@ -33,13 +34,7 @@ DEPEND="${RDEPEND}
 
 src_compile() {
 	distutils_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		emake html || die "Generation of documentation failed"
-		popd > /dev/null
-	fi
+	use doc && emake -C docs html
 }
 
 src_test() {
@@ -50,15 +45,10 @@ src_install() {
 	find -name "*LICENSE*.txt" -delete
 	distutils_src_install
 
-	if use doc; then
-		pushd docs/build/html > /dev/null
-		insinto /usr/share/doc/${PF}/html
-		doins -r [a-z]* _images _static || die "Installation of documentation failed"
-		popd > /dev/null
-	fi
+	use doc && dohtml -r docs/build/html/*
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/* || die "Installation of examples failed"
+		insinto /usr/share/doc/${PF}
+		doins -r examples
 	fi
 }
diff --git a/dev-python/cvxopt/cvxopt-1.1.4.ebuild b/dev-python/cvxopt/cvxopt-1.1.4-r1.ebuild
similarity index 94%
rename from dev-python/cvxopt/cvxopt-1.1.4.ebuild
rename to dev-python/cvxopt/cvxopt-1.1.4-r1.ebuild
index 55cf23220331..021019810d22 100644
--- a/dev-python/cvxopt/cvxopt-1.1.4.ebuild
+++ b/dev-python/cvxopt/cvxopt-1.1.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-python/cvxopt/cvxopt-1.1.4.ebuild,v 1.2 2012/01/16 20:35:26 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cvxopt/cvxopt-1.1.4-r1.ebuild,v 1.1 2012/01/17 18:28:45 bicatali Exp $
 
 EAPI=4
 
@@ -49,13 +49,12 @@ src_prepare(){
 	use_cvx() {
 		if use ${1}; then
 			sed -i \
-				-e "s/\(BUILD_${2^^} =\) 0/\1 1/" \
+				-e "s/\(BUILD_${1^^} =\) 0/\1 1/" \
 				setup.py || die
 		fi
 	}
 
 	pkg_lib blas
-	pkg_lib cblas
 	pkg_lib lapack
 	use_cvx gsl && pkg_lib gsl
 	use_cvx fftw && pkg_lib fftw3
diff --git a/dev-python/cvxopt/files/cvxopt-setup.patch b/dev-python/cvxopt/files/cvxopt-setup.patch
index a628cdae9a3a..fcef6e40bfa1 100644
--- a/dev-python/cvxopt/files/cvxopt-setup.patch
+++ b/dev-python/cvxopt/files/cvxopt-setup.patch
@@ -1,6 +1,6 @@
---- setup.py.orig	2012-01-06 04:59:53.000000000 +0000
-+++ setup.py	2012-01-06 06:21:48.000000000 +0000
-@@ -2,58 +2,58 @@
+--- setup.py.orig	2011-12-22 10:53:49.000000000 +1300
++++ setup.py	2012-01-16 11:17:04.207596266 +1300
+@@ -2,73 +2,57 @@
  from glob import glob
  
  # directory containing libblas and liblapack
@@ -13,33 +13,30 @@
  
  # Directory containing libgsl (used only when BUILD_GSL = 1).
 -GSL_LIB_DIR = '/usr/lib'       
-+GSL_LIB_DIR = ''       
- 
- # Directory containing the GSL header files (used only when BUILD_GSL = 1).
+-
+-# Directory containing the GSL header files (used only when BUILD_GSL = 1).
 -GSL_INC_DIR = '/usr/include/gsl'  
-+GSL_INC_DIR = ''  
++GSL_LIB_DIR = ''       
  
  # Set to 1 if you are installing the fftw module.
  BUILD_FFTW = 0
  
  # Directory containing libfftw3 (used only when BUILD_FFTW = 1).
 -FFTW_LIB_DIR = '/usr/lib'       
-+FFTW_LIB_DIR = ''       
- 
- # Directory containing fftw.h (used only when BUILD_FFTW = 1).
+-
+-# Directory containing fftw.h (used only when BUILD_FFTW = 1).
 -FFTW_INC_DIR = '/usr/include'  
-+FFTW_INC_DIR = ''  
++FFTW_LIB_DIR = ''       
  
  # Set to 1 if you are installing the glpk module.
  BUILD_GLPK = 0
  
  # Directory containing libglpk (used only when BUILD_GLPK = 1).
 -GLPK_LIB_DIR = '/usr/lib'       
-+GLPK_LIB_DIR = ''       
- 
- # Directory containing glpk.h (used only when BUILD_GLPK = 1).
+-
+-# Directory containing glpk.h (used only when BUILD_GLPK = 1).
 -GLPK_INC_DIR = '/usr/include'  
-+GLPK_INC_DIR = ''  
++GLPK_LIB_DIR = ''       
  
  # Set to 1 if you are installing the DSDP module.
  BUILD_DSDP = 0
@@ -48,38 +45,44 @@
 -DSDP_LIB_DIR = '/usr/lib'
 +DSDP_LIB_DIR = ''
   
- # Directory containing dsdp5.h (used only when BUILD_DSDP = 1).
+-# Directory containing dsdp5.h (used only when BUILD_DSDP = 1).
 -DSDP_INC_DIR = '/usr/include'
-+DSDP_INC_DIR = ''
- 
+-
  extmods = []
  
  # optional modules
  
  if BUILD_GSL:
 -    gsl = Extension('gsl', libraries = ['m', 'gsl', 'blas'],
+-        include_dirs = [ GSL_INC_DIR ],
 +    gsl = Extension('gsl', libraries = ['gsl'],
-         include_dirs = [ GSL_INC_DIR ],
          library_dirs = [ GSL_LIB_DIR ],
          sources = ['C/gsl.c'] )
      extmods += [gsl];
  
  if BUILD_FFTW:
 -    fftw = Extension('fftw', libraries = ['fftw3', 'blas'],
+-        include_dirs = [ FFTW_INC_DIR ],
 +    fftw = Extension('fftw', libraries = ['fftw3'],
-         include_dirs = [ FFTW_INC_DIR ],
          library_dirs = [ FFTW_LIB_DIR, ATLAS_LIB_DIR ],
          sources = ['C/fftw.c'] )
-@@ -67,7 +67,7 @@
+     extmods += [fftw];
+ 
+ if BUILD_GLPK:
+     glpk = Extension('glpk', libraries = ['glpk'],
+-        include_dirs = [ GLPK_INC_DIR ],
+         library_dirs = [ GLPK_LIB_DIR ],
+         sources = ['C/glpk.c'] )
      extmods += [glpk];
  
  if BUILD_DSDP:
 -    dsdp = Extension('dsdp', libraries = ['dsdp', 'blas', 'lapack'],
+-        include_dirs = [ DSDP_INC_DIR ],
 +    dsdp = Extension('dsdp', libraries = ['dsdp'],
-         include_dirs = [ DSDP_INC_DIR ],
          library_dirs = [ DSDP_LIB_DIR, ATLAS_LIB_DIR ],
          sources = ['C/dsdp.c'] )
-@@ -85,7 +85,7 @@
+     extmods += [dsdp];
+@@ -85,7 +69,7 @@
  else:    
      MACROS = []
  
@@ -88,7 +91,7 @@
      library_dirs = [ ATLAS_LIB_DIR ],
      define_macros = MACROS,
      sources = ['C/base.c','C/dense.c','C/sparse.c']) 
-@@ -95,22 +95,16 @@
+@@ -95,22 +79,16 @@
      define_macros = MACROS,
      sources = ['C/blas.c'] )
  
@@ -114,7 +117,7 @@
  
  # Build for int or long? 
  import sys
-@@ -118,28 +112,16 @@
+@@ -118,28 +96,16 @@
  
  cholmod = Extension('cholmod',
      library_dirs = [ ATLAS_LIB_DIR ],
@@ -122,7 +125,7 @@
 -    include_dirs = [ 'C/SuiteSparse/CHOLMOD/Include', 
 -        'C/SuiteSparse/COLAMD', 'C/SuiteSparse/AMD/Include', 
 -        'C/SuiteSparse/UFconfig', 'C/SuiteSparse/COLAMD/Include' ],
-+    libraries = ['cholmod' ],
++    libraries = ['cholmod','blas'],
      define_macros = MACROS + [('NPARTITION', '1')],
 -    sources = [ 'C/cholmod.c' ] + 
 -        ['C/SuiteSparse/AMD/Source/' + s for s in ['amd_global.c',
diff --git a/dev-python/enable/Manifest b/dev-python/enable/Manifest
index ab530f3651ad..d476a52a100a 100644
--- a/dev-python/enable/Manifest
+++ b/dev-python/enable/Manifest
@@ -1,3 +1,4 @@
 DIST Enable-3.4.0.tar.gz 2703753 RMD160 2abbe3814362ea455faf841ff624f13e9e2528f6 SHA1 f09a62838d424043e570ff98755b348668194642 SHA256 f536541227f3aa7f2d74e24228f9e25a4aed910d10811205c106555b7ee0341c
 DIST Enable-3.4.1.tar.gz 2726048 RMD160 f92441d9c2f8dea49e70b0dafb7149d663edb1a1 SHA1 fd816ee582da6479570b663ce7629b1bdec0bc37 SHA256 0b17c7764bb8e31b0d0c5ba439b6cf9e43810688e869afff826889e0ae3b8b8c
 DIST enable-4.0.0.tar.gz 2471266 RMD160 f2a48ee6283fe5a8ce0befde72c0e6e81ba2cf95 SHA1 4a2b498fd11532173df21bf7e25f8e8fb1df0335 SHA256 c3ec3043fd2ac5837de2575efec985a6fc0ae597aa70d96f6734c78ce3cde01a
+DIST enable-4.1.0.tar.gz 2472676 RMD160 57c7f1cefb1f0d167603e419bafa355fd4c03906 SHA1 680f64a76114192332008dabfd203c9438326a93 SHA256 b0de7a3eda78c5c527d58a98627c8cabadc71c7f1ee4e360fa3a6d8b087da264
diff --git a/dev-python/enable/enable-4.1.0.ebuild b/dev-python/enable/enable-4.1.0.ebuild
new file mode 100644
index 000000000000..ec3ff6eea711
--- /dev/null
+++ b/dev-python/enable/enable-4.1.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-python/enable/enable-4.1.0.ebuild,v 1.1 2012/01/17 06:21:27 bicatali Exp $
+
+EAPI=4
+
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+DISTUTILS_SRC_TEST="nosetests"
+
+inherit distutils eutils virtualx
+
+DESCRIPTION="Enthought Tool Suite: Drawing and interaction packages"
+HOMEPAGE="http://code.enthought.com/projects/enable/ http://pypi.python.org/pypi/enable"
+SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="dev-python/numpy
+	dev-python/reportlab
+	>=dev-python/traitsui-4
+	>=media-libs/freetype-2
+	virtual/opengl
+	x11-libs/libX11"
+DEPEND="dev-python/setuptools
+	dev-lang/swig
+	dev-python/cython
+	doc? ( dev-python/sphinx )
+	test? (
+		${RDEPEND}
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+	)"
+
+DOCS="docs/*.txt"
+
+src_compile() {
+	distutils_src_compile
+	use doc && emake -C docs html
+}
+
+src_test() {
+	VIRTUALX_COMMAND="distutils_src_test" virtualmake
+}
+
+src_install() {
+	find -name "*LICENSE*.txt" -delete
+	distutils_src_install
+
+	use doc && dohtml -r docs/build/html/*
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/envisage/Manifest b/dev-python/envisage/Manifest
index 30192699c483..768928e81a1f 100644
--- a/dev-python/envisage/Manifest
+++ b/dev-python/envisage/Manifest
@@ -1 +1,2 @@
 DIST envisage-4.0.0.tar.gz 486729 RMD160 12957ee5d0976b07b13b1ab7d8a63e9669c365f9 SHA1 79ff15a77cc6891fef5885a2b41432c323dcb696 SHA256 bda4571c5394d070ad853138c0400292e8ea0e8b8ce8c179205c221b247f5580
+DIST envisage-4.1.0.tar.gz 490231 RMD160 73a67deffed70eb5c050b6067b5eb6d8bb7eaae5 SHA1 189b07131daf2f24488bb1bf145545115a809c46 SHA256 51a401f382982e5750c0e4ed8e245fef7f4c2da850bd3241d12c442b6ea7aa05
diff --git a/dev-python/envisage/envisage-4.1.0.ebuild b/dev-python/envisage/envisage-4.1.0.ebuild
new file mode 100644
index 000000000000..ca0d6ec229f0
--- /dev/null
+++ b/dev-python/envisage/envisage-4.1.0.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/dev-python/envisage/envisage-4.1.0.ebuild,v 1.1 2012/01/17 06:21:52 bicatali Exp $
+
+EAPI=4
+
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+DISTUTILS_SRC_TEST="nosetests"
+
+inherit distutils virtualx
+
+DESCRIPTION="Enthought Tool Suite: Extensible application framework"
+HOMEPAGE="http://code.enthought.com/projects/envisage/ http://pypi.python.org/pypi/envisage"
+SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-python/traits-4"
+DEPEND="dev-python/setuptools
+	doc? ( dev-python/sphinx )
+	test? (
+		>=dev-python/traits-4
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+	)"
+
+src_compile() {
+	distutils_src_compile
+	use doc && emake -C docs html
+}
+
+src_test() {
+	VIRTUALX_COMMAND="distutils_src_test" virtualmake
+}
+
+src_install() {
+	find -name "*LICENSE*.txt" -delete
+	distutils_src_install
+
+	use doc && dohtml -r docs/build/html/*
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/ets/Manifest b/dev-python/ets/Manifest
index e69de29bb2d1..62aa8866a69e 100644
--- a/dev-python/ets/Manifest
+++ b/dev-python/ets/Manifest
@@ -0,0 +1 @@
+DIST ets-4.1.0.tar.gz 23352 RMD160 2cb630710b7251b26607e6598c5aecb8f2d523da SHA1 5e714917787334eaa56cf05970c84b26b13a85ae SHA256 393e5b90aabb4ea09a26b54f1afce55f55517adbe957a9297199d634c75a4e5b
diff --git a/dev-python/ets/ets-4.1.0.ebuild b/dev-python/ets/ets-4.1.0.ebuild
new file mode 100644
index 000000000000..73f831ffac38
--- /dev/null
+++ b/dev-python/ets/ets-4.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ets/ets-4.1.0.ebuild,v 1.1 2012/01/17 06:22:22 bicatali Exp $
+
+EAPI=4
+
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+
+inherit distutils
+
+DESCRIPTION="Meta package for the Enthought Tool Suite"
+HOMEPAGE="http://code.enthought.com/projects/ http://pypi.python.org/pypi/ets"
+SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+# see the setup_data.py file for version numbers
+RDEPEND="
+	>=dev-python/apptools-4.0.1[doc?,examples?]
+	>=dev-python/blockcanvas-4.0.1[doc?]
+	>=dev-python/chaco-4.1.0[doc?,examples?]
+	>=dev-python/codetools-4.0.0[doc?,examples?]
+	>=dev-python/enable-4.1.0[doc?,examples?]
+	>=dev-python/envisage-4.1.0[doc?,examples?]
+	>=dev-python/etsdevtools-4.0.0[doc?,examples?]
+	>=dev-python/graphcanvas-4.0.0[examples?]
+	>=sci-visualization/mayavi-4.1.0[doc?,examples?]
+	>=dev-python/pyface-4.1.0[doc?,examples?]
+	>=dev-python/scimath-4.0.1[doc?]
+	>=dev-python/traits-4.1.0[doc?,examples?]
+	>=dev-python/traitsui-4.1.0[doc?,examples?]"
+
+DEPEND=""
diff --git a/dev-python/etsdevtools/etsdevtools-4.0.0.ebuild b/dev-python/etsdevtools/etsdevtools-4.0.0.ebuild
index b4fb09922e56..431b44fa2383 100644
--- a/dev-python/etsdevtools/etsdevtools-4.0.0.ebuild
+++ b/dev-python/etsdevtools/etsdevtools-4.0.0.ebuild
@@ -1,16 +1,16 @@
-# 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-python/etsdevtools/etsdevtools-4.0.0.ebuild,v 1.1 2011/08/03 23:53:21 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/etsdevtools/etsdevtools-4.0.0.ebuild,v 1.2 2012/01/17 06:25:27 bicatali Exp $
+
+EAPI=4
 
-EAPI="3"
-PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython"
 DISTUTILS_SRC_TEST="nosetests"
 
 inherit distutils virtualx
 
-DESCRIPTION="Enthought Tool Suite: tools to support Python development"
+DESCRIPTION="Enthought Tool Suite: Tools to support Python development"
 HOMEPAGE="http://code.enthought.com/projects/dev_tools.php http://pypi.python.org/pypi/etsdevtools"
 SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
 
@@ -20,12 +20,12 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc examples test"
 
 RDEPEND="dev-python/numpy
-	>=dev-python/traits-4.0"
+	>=dev-python/traits-4"
 DEPEND="dev-python/setuptools
 	doc? ( dev-python/sphinx )
 	test? (
 		${RDEPEND}
-		>=dev-python/traitsui-4.0
+		>=dev-python/traitsui-4
 		media-fonts/font-cursor-misc
 		media-fonts/font-misc-misc
 		x11-apps/xhost
@@ -33,13 +33,7 @@ DEPEND="dev-python/setuptools
 
 src_compile() {
 	distutils_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		emake html || die "Generation of documentation failed"
-		popd > /dev/null
-	fi
+	use doc && emake -C docs html
 }
 
 src_test() {
@@ -50,16 +44,10 @@ src_install() {
 	find -name "*LICENSE*.txt" -delete
 	distutils_src_install
 
-	if use doc; then
-		dodoc docs/*/*.pdf || die "Installation of PDF documentation failed"
-		pushd docs/build/html > /dev/null
-		insinto /usr/share/doc/${PF}/html
-		doins -r [a-z]* _static || die "Installation of documentation failed"
-		popd > /dev/null
-	fi
+	use doc && dohtml -r docs/build/html/*
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/* || die "Installation of examples failed"
+		insinto /usr/share/doc/${PF}
+		doins -r examples
 	fi
 }
diff --git a/dev-python/etsproxy/Manifest b/dev-python/etsproxy/Manifest
index 2aaf59fc283a..c372a90e3c99 100644
--- a/dev-python/etsproxy/Manifest
+++ b/dev-python/etsproxy/Manifest
@@ -1 +1,2 @@
 DIST etsproxy-0.1.0.tar.gz 111399 RMD160 ecf729831767c8409a80c16724ee53a2027f2a78 SHA1 2502ad7016fa8c67677f6936eb89b191ae26bf95 SHA256 9a3fcbda8351a90a166046205c7b5d76896eea495469e07607302031c1efd671
+DIST etsproxy-0.1.1.tar.gz 111508 RMD160 e8de667a7cd05534e51020c97f8b60280f3c53b7 SHA1 16aa8e8770bbf2b18915eb64da813e0d0fd27411 SHA256 e2efc6aa990b92ab0c0db51fa46eddbb5f21277791b4be4eac11e197ad40159a
diff --git a/dev-python/etsproxy/etsproxy-0.1.1.ebuild b/dev-python/etsproxy/etsproxy-0.1.1.ebuild
new file mode 100644
index 000000000000..4c2a235e07fa
--- /dev/null
+++ b/dev-python/etsproxy/etsproxy-0.1.1.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/dev-python/etsproxy/etsproxy-0.1.1.ebuild,v 1.1 2012/01/17 06:22:48 bicatali Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+
+inherit distutils
+
+DESCRIPTION="Enthought Tool Suite: Proxy modules for backwards compatibility"
+HOMEPAGE="http://pypi.python.org/pypi/etsproxy"
+SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!<dev-python/apptools-4
+	!<dev-python/blockcanvas-4
+	!<dev-python/chaco-4
+	!<dev-python/codetools-4
+	!<dev-python/enable-4
+	!<dev-python/enthoughtbase-4
+	!<dev-python/envisagecore-4
+	!<dev-python/envisageplugins-4
+	!<dev-python/etsdevtools-4
+	!<dev-python/etsprojecttools-4
+	!<dev-python/graphcanvas-4
+	!<sci-visualization/mayavi-4
+	!<dev-python/scimath-4
+	!<dev-python/traits-4
+	!<dev-python/traitsbackendwx-4
+	!<dev-python/traitsbackendqt-4
+	!<dev-python/traitsgui-4"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools"
+
+PYTHON_MODNAME="enthought"
diff --git a/dev-python/graphcanvas/graphcanvas-4.0.0.ebuild b/dev-python/graphcanvas/graphcanvas-4.0.0.ebuild
index 6105fcbae31f..69b0186fba8f 100644
--- a/dev-python/graphcanvas/graphcanvas-4.0.0.ebuild
+++ b/dev-python/graphcanvas/graphcanvas-4.0.0.ebuild
@@ -1,9 +1,9 @@
-# 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-python/graphcanvas/graphcanvas-4.0.0.ebuild,v 1.1 2011/08/03 23:54:52 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/graphcanvas/graphcanvas-4.0.0.ebuild,v 1.2 2012/01/17 06:25:52 bicatali Exp $
+
+EAPI=4
 
-EAPI="3"
-PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython"
 DISTUTILS_SRC_TEST="nosetests"
@@ -37,12 +37,7 @@ src_install() {
 	find -name "*LICENSE*.txt" -delete
 	distutils_src_install
 
-	if use doc; then
-		pushd docs/build/html > /dev/null
-		insinto /usr/share/doc/${PF}/html
-		doins -r [a-z]* _static || die "Installation of documentation failed"
-		popd > /dev/null
-	fi
+	use doc && dohtml -r docs/build/html/*
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}
diff --git a/dev-python/h5py/h5py-2.0.1.ebuild b/dev-python/h5py/h5py-2.0.1.ebuild
index 6d9e253c2122..a0cdbacb4228 100644
--- a/dev-python/h5py/h5py-2.0.1.ebuild
+++ b/dev-python/h5py/h5py-2.0.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/dev-python/h5py/h5py-2.0.1.ebuild,v 1.1 2011/10/05 19:57:29 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/h5py/h5py-2.0.1.ebuild,v 1.2 2012/01/17 10:10:59 xarthisius Exp $
 
 EAPI="3"
 PYTHON_DEPEND="*"
@@ -12,11 +12,11 @@ inherit distutils
 
 DESCRIPTION="A simple Python interface to HDF5 files."
 HOMEPAGE="http://h5py.alfven.org/ http://code.google.com/p/h5py/ http://pypi.python.org/pypi/h5py"
-SRC_URI="http://h5py.googlecode.com/files/${P}.tar.gz"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="sci-libs/hdf5
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 89bf490b72f2..79ccb3466a56 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,3 +1,4 @@
 DIST matplotlib-1.0.1.tar.gz 13285166 RMD160 e3e326f7f31ef995253da483444cb593b8e6753b SHA1 c7a832f28a66817626e7a8af21e14ea0e15f4008 SHA256 83bc6377373b3f34b18eac1883c27f3f381f5c9b9c422b4d85c91e217a947af6
 DIST matplotlib-1.1.0.tar.gz 35842643 RMD160 9313fc6407271c46f3ac5af4c53df5ea57982711 SHA1 435b4f04a7e099b79f66451d69ad0b5ce66030ae SHA256 be37e1d86c65ecacae6683f8805e051e9904e5f2e02bf2b7a34262c46a6d06a7
 DIST matplotlib-sampledata.tar.bz2 1013421 RMD160 43a06cf7847cfe1ad744bd6444786b16843bb1f3 SHA1 b5335b05b6d3c05dcb052c81385f1304e465d2ee SHA256 0a9d45f1e5f31bee1e6efeb453775153d0553b721971830d6c1657a8d9640a3e
+DIST mpl_sampledata-1.1.0.tar.gz 874730 RMD160 7c1d4e8b66eeaee718540d21b8b3e1404e65a9cf SHA1 2bf93d6131a4a39095eeefd196685a7648c636df SHA256 eee173eaf9bd42bc57fb1bcff7044a184da85e6ea1262c1a7d1fdc2e303e78d8
diff --git a/dev-python/matplotlib/matplotlib-1.1.0.ebuild b/dev-python/matplotlib/matplotlib-1.1.0.ebuild
index c0bb501064d6..513caa2d948a 100644
--- a/dev-python/matplotlib/matplotlib-1.1.0.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.1.0.ebuild
@@ -1,24 +1,25 @@
-# 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-python/matplotlib/matplotlib-1.1.0.ebuild,v 1.2 2011/12/03 18:06:01 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.1.0.ebuild,v 1.4 2012/01/17 15:31:22 bicatali Exp $
 
 EAPI="3"
+
 PYTHON_DEPEND="2"
 PYTHON_USE_WITH="tk"
 PYTHON_USE_WITH_OPT="tk"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
+RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
 WX_GTK_VER="2.8"
 
-inherit distutils eutils
+inherit distutils
 
 DESCRIPTION="Pure python plotting library with matlab like syntax"
 HOMEPAGE="http://matplotlib.sourceforge.net/ http://pypi.python.org/pypi/matplotlib"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? ( mirror://gentoo/${PN}-sampledata.tar.bz2 )
-	examples? ( mirror://gentoo/${PN}-sampledata.tar.bz2 )"
+	doc? ( mirror://sourceforge/${PN}/mpl_sampledata-${PV}.tar.gz )
+	examples? ( mirror://sourceforge/${PN}/mpl_sampledata-${PV}.tar.gz )"
 
-IUSE="cairo doc excel examples fltk gtk latex qt4 traits tk wxwidgets"
+IUSE="cairo doc excel examples fltk gtk latex qt4 tk wxwidgets"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 # Main license: matplotlib
@@ -58,8 +59,7 @@ RDEPEND="${CDEPEND}
 	cairo?  ( dev-python/pycairo )
 	excel?  ( dev-python/xlwt )
 	fltk?   ( dev-python/pyfltk )
-	qt4?    ( dev-python/PyQt4[X] )
-	traits? ( dev-python/traits dev-python/configobj )
+	qt4?    ( || ( dev-python/PyQt4[X] dev-python/pyside[X] ) )
 	latex?  (
 		virtual/latex-base
 		app-text/ghostscript-gpl
@@ -74,8 +74,7 @@ PYTHON_CXXFLAGS=("2.* + -fno-strict-aliasing")
 PYTHON_MODNAME="matplotlib mpl_toolkits pylab.py"
 
 use_setup() {
-	local uword="${2}"
-	[[ -z "${2}" ]] && uword="${1}"
+	local uword="${2:-${1}}"
 	if use ${1}; then
 		echo "${uword} = True"
 		echo "${uword}agg = True"
@@ -91,15 +90,13 @@ src_prepare() {
 		[provide_packages]
 		pytz = False
 		dateutil = False
-		configobj = False
-		enthought.traits = False
 		[gui_support]
+		$(use_setup cairo)
+		$(use_setup fltk)
 		$(use_setup gtk)
+		$(use_setup qt4)
 		$(use_setup tk)
 		$(use_setup wxwidgets wx)
-		$(use_setup qt4)
-		$(use_setup fltk)
-		$(use_setup cairo)
 	EOF
 
 	# avoid checks needing a X display
@@ -116,18 +113,17 @@ src_prepare() {
 		-e "/'mpl-data\/matplotlib.conf',/d" \
 		-e "s:'lib/matplotlib/mpl-data/matplotlibrc':'matplotlibrc':" \
 		-e "s:'lib/matplotlib/mpl-data/matplotlib.conf':'matplotlib.conf':" \
-		setup.py \
-		|| die "sed setup.py for FHS failed"
+		setup.py || die "sed setup.py for FHS failed"
 
 	# remove internal copies of pycxx, pyparsing
 	rm -rf CXX lib/matplotlib/pyparsing.py \
 		|| die "removed internal copies failed"
 
-	# bug #334429 - also see  https://developer.mozilla.org/en/Mozilla_MathML_Project/Fonts
+	# bug #334429 https://developer.mozilla.org/en/Mozilla_MathML_Project/Fonts
 	# which advise against bakoma fonts
 	sed -i \
 		-e '/fontset/s/cm/stix/' \
-		lib/matplotlib/mpl-data/matplotlib.conf || die
+		lib/matplotlib/mpl-data/matplotlib.conf* || die
 
 	sed -i \
 		-e 's/matplotlib.pyparsing/pyparsing/g' \
@@ -135,11 +131,16 @@ src_prepare() {
 		|| die "sed pyparsing failed"
 
 	# some fixes to avoid fetching data while compiling examples in tests
-	mv "${WORKDIR}"/sample_data examples/
-	echo "examples.download : False" >> doc/matplotlibrc
-	echo "examples.directory : ${S}/examples/sample_data" >> doc/matplotlibrc
-	echo "examples.download : False" >> matplotlibrc.template
-	echo "examples.directory : ${EPREFIX}/usr/share/${PF}/examples/sample_data" >> matplotlibrc.template
+	if use doc || use examples; then
+		cat <<-EOF >> doc/matplotlibrc
+			examples.download : False
+			examples.directory : "${WORKDIR}"/mpl_sampledata-${PV}
+		EOF
+		cat <<-EOF >> matplotlibrc.template
+			examples.download : False
+			examples.directory : "${EPREFIX}"/usr/share/${PF}/examples
+		EOF
+	fi
 }
 
 src_compile() {
@@ -151,8 +152,8 @@ src_compile() {
 
 	if use doc; then
 		cd "${S}/doc"
-		export VARTEXFONTS="${T}"/fonts
 		MATPLOTLIBDATA="${S}/lib/matplotlib/mpl-data" \
+			VARTEXFONTS="${T}"/fonts \
 			PYTHONPATH=$(ls -d "${S}"/build-$(PYTHON -f --ABI)/lib*) \
 			"$(PYTHON -f)" make.py --small all
 		[[ -e build/latex/Matplotlib.pdf ]] || die "doc generation failed"
@@ -165,17 +166,19 @@ src_test() {
 	einfo "Tests are quite long, be patient"
 	cd "${S}/examples/tests"
 	testing() {
-		PYTHONPATH=$(ls -d "${S}"/build-${PYTHON_ABI}/lib*) "$(PYTHON)" backend_driver.py agg || return 1
-		PYTHONPATH=$(ls -d "${S}"/build-${PYTHON_ABI}/lib*) "$(PYTHON)" backend_driver.py --clean
+		PYTHONPATH=$(ls -d "${S}"/build-${PYTHON_ABI}/lib*) \
+			"$(PYTHON)" backend_driver.py agg || return 1
+		PYTHONPATH=$(ls -d "${S}"/build-${PYTHON_ABI}/lib*) \
+			"$(PYTHON)" backend_driver.py --clean
 	}
 	python_execute_function testing
 }
 
 src_install() {
 	# remove fonts bundles except some computer modern ones
-	rm lib/matplotlib/mpl-data/fonts/ttf/cm{ex,mi,r,sy}10.ttf
-	rm lib/matplotlib/mpl-data/fonts/ttf/{Vera*,*.TXT}
-	rm lib/matplotlib/mpl-data/fonts/{afm,pdfcorefonts}
+	rm -f lib/matplotlib/mpl-data/fonts/ttf/cm{ex,mi,r,sy}10.ttf || die
+	rm -f lib/matplotlib/mpl-data/fonts/ttf/{Vera*,*.TXT} || die
+	rm -rf lib/matplotlib/mpl-data/fonts/{afm,pdfcorefonts} || die
 
 	# sed only after doc building, to allow using default configs
 	sed -i \
@@ -185,22 +188,23 @@ src_install() {
 		|| die "sed init for FHS failed"
 	distutils_src_install
 
-	# Respect FHS
+	# respect FHS
 	dodir /usr/share/${PN}
 	mv "${ED}$(python_get_sitedir -f)/${PN}/"{mpl-data,backends/Matplotlib.nib} \
 		"${ED}usr/share/${PN}" || die "Renaming failed"
-	rm -fr "${ED}"usr/lib*/python*/site-packages/${PN}/{mpl-data,backends/Matplotlib.nib}
+	rm -fr "${ED}"usr/lib*/*/site-packages/${PN}/{mpl-data,backends/Matplotlib.nib}
 
 	insinto /etc/matplotlib
-	doins matplotlibrc matplotlib.conf || die "installing config files failed"
+	doins matplotlibrc matplotlib.conf
 
 	# doc and examples
-	insinto /usr/share/doc/${PF}
 	if use doc; then
-		doins doc/build/latex/Matplotlib.pdf || die
-		doins -r doc/build/html || die
+		insinto /usr/share/doc/${PF}
+		doins -r doc/build/latex/Matplotlib.pdf doc/build/html || die
 	fi
 	if use examples; then
-		doins -r examples || die
+		insinto /usr/share/doc/${PF}/examples
+		doins -r "${WORKDIR}"/mpl_sampledata-${PV}/* || die
 	fi
+
 }
diff --git a/dev-python/pyface/Manifest b/dev-python/pyface/Manifest
index a24423a5b7e3..c09f6083f779 100644
--- a/dev-python/pyface/Manifest
+++ b/dev-python/pyface/Manifest
@@ -1 +1,2 @@
 DIST pyface-4.0.0.tar.gz 5012118 RMD160 ee80ea886251f111fae9bb9d2046338da42c75a8 SHA1 223e58fb39b3259ef9e294345c5b15e35415f3ce SHA256 3c00d8d9e12978d7656f749cb4c96458096ae3ecfaf55e7d714b8091c3c1a2a5
+DIST pyface-4.1.0.tar.gz 5022317 RMD160 8e73b2cedffadccc37437834ad2f3fa6089090cf SHA1 926c43e953d40d95a1e35a44889b81cec6ea9e6c SHA256 a0b1f823528d27ffc4ed805d4108aca6e4bce0bd71f18fa81ef96e1c93a4bc5e
diff --git a/dev-python/pyface/pyface-4.1.0.ebuild b/dev-python/pyface/pyface-4.1.0.ebuild
new file mode 100644
index 000000000000..4e74ea78d9d9
--- /dev/null
+++ b/dev-python/pyface/pyface-4.1.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyface/pyface-4.1.0.ebuild,v 1.1 2012/01/17 06:23:19 bicatali Exp $
+
+EAPI=4
+
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+DISTUTILS_SRC_TEST="nosetests"
+
+inherit distutils virtualx
+
+DESCRIPTION="Enthought Tool Suite: Traits-capable windowing framework"
+HOMEPAGE="https://github.com/enthought/pyface http://pypi.python.org/pypi/pyface"
+SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-python/traits-4.1
+		|| ( dev-python/wxpython dev-python/PyQt4 dev-python/pyside )"
+DEPEND="dev-python/setuptools
+	doc? ( dev-python/sphinx )
+	test? (
+		${RDEPEND}
+		dev-python/traitsui
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+	)"
+
+DOCS="docs/*.txt"
+
+src_compile() {
+	distutils_src_compile
+	use doc && emake -C docs html
+}
+
+src_test() {
+	VIRTUALX_COMMAND="distutils_src_test" virtualmake
+}
+
+src_install() {
+	find -name "*LICENSE*.txt" -delete
+	distutils_src_install
+
+	use doc && dohtml -r docs/build/html/*
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/pyside/pyside-1.1.0.ebuild b/dev-python/pyside/pyside-1.1.0.ebuild
index 1690d7b3c1f7..40f892425870 100644
--- a/dev-python/pyside/pyside-1.1.0.ebuild
+++ b/dev-python/pyside/pyside-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-1.1.0.ebuild,v 1.1 2012/01/15 22:01:24 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-1.1.0.ebuild,v 1.2 2012/01/17 19:45:33 hwoarang Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ SRC_URI="http://www.pyside.org/files/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="assistant debug declarative help multimedia kde opengl phonon script sql svg test webkit
+IUSE="assistant debug declarative multimedia kde opengl phonon script sql svg test webkit
 X xmlpatterns"
 
 QT_PV="4.7.0"
diff --git a/dev-python/scimath/Manifest b/dev-python/scimath/Manifest
index b350418b31f8..73b5b0036059 100644
--- a/dev-python/scimath/Manifest
+++ b/dev-python/scimath/Manifest
@@ -1,2 +1,3 @@
 DIST SciMath-3.0.7.tar.gz 110976 RMD160 52c8769638259dc585a234835e3e11f457cea406 SHA1 5ad81fa9726171a83740c67d935052f09cc4d95a SHA256 c659a7baa579b40292f36334b8bd12e83375906f1c73542569a0df1f4c1e7d49
 DIST scimath-4.0.0.tar.gz 107851 RMD160 e0e49edf3167e1586bfffb32cf033755987cc251 SHA1 a591fa56e614838554bfc37c12d824efbe0b7c7a SHA256 4c43d4f14009b879d3e4ba3367302c58bfeb6c6bd0b198daab103617f59952d4
+DIST scimath-4.0.1.tar.gz 107936 RMD160 7d5200c69ae6df7bfca38090790d8a45e46dcb50 SHA1 537f65077ccfea2b38f9f17db522f489ac9d3e91 SHA256 c08e4ce4b1772cbf1a5a420cdf49d6fb174f9bb3e0c45ac575c33547b9585777
diff --git a/dev-python/scimath/scimath-4.0.1.ebuild b/dev-python/scimath/scimath-4.0.1.ebuild
new file mode 100644
index 000000000000..7d158a84de9b
--- /dev/null
+++ b/dev-python/scimath/scimath-4.0.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scimath/scimath-4.0.1.ebuild,v 1.1 2012/01/17 06:23:50 bicatali Exp $
+
+EAPI=4
+
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+DISTUTILS_SRC_TEST="nosetests"
+
+inherit distutils virtualx
+
+DESCRIPTION="Enthought Tool Suite: Scientific and mathematical tools"
+HOMEPAGE="http://code.enthought.com/projects/sci_math/ http://pypi.python.org/pypi/scimath"
+SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/traits-4.1
+	>=dev-python/traitsui-4.1
+	sci-libs/scipy"
+DEPEND="dev-python/setuptools
+	doc? ( dev-python/sphinx )
+	test? (
+		${RDEPEND}
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+		x11-apps/xhost
+	)"
+
+src_compile() {
+	distutils_src_compile
+	use doc && emake -C docs html
+}
+
+src_test() {
+	VIRTUALX_COMMAND="distutils_src_test" virtualmake
+}
+
+src_install() {
+	find -name "*LICENSE*.txt" -delete
+	distutils_src_install
+
+	use doc && dohtml -r docs/build/html/*
+}
diff --git a/dev-python/traits/Manifest b/dev-python/traits/Manifest
index 3a917bd4fedc..bdf22334c580 100644
--- a/dev-python/traits/Manifest
+++ b/dev-python/traits/Manifest
@@ -1,2 +1,3 @@
 DIST Traits-3.6.0.tar.gz 10884341 RMD160 43a83ca0006ec854974cd705ebbc2d7dd80361a1 SHA1 7a068371c400bed3aae727575ed18b00188a629a SHA256 f48dcd9bb33bec3389566c3fee43f039ff33fc99e5db5ca8c4967fb8e5db8657
 DIST traits-4.0.0.tar.gz 4823262 RMD160 65ae61e90aa7384664311f118fda5b166f6c94f8 SHA1 392db68690afd94219ae53a956faecb2aa728661 SHA256 20800034591609ef74fcc7c42af41cacdadd31996ea05f024bfe67709be92a35
+DIST traits-4.1.0.tar.gz 4837086 RMD160 2a07dbab6fc763534201b061120e30433e91b0df SHA1 665ccecbaeec99b0923dd4e5206a968b9be0a755 SHA256 72253d17ac8f18c4d017a1d1487cf92e1870831fe3ce7ba23ef2a3123fdb50dd
diff --git a/dev-python/traits/traits-4.1.0.ebuild b/dev-python/traits/traits-4.1.0.ebuild
new file mode 100644
index 000000000000..8e6d1006e6ea
--- /dev/null
+++ b/dev-python/traits/traits-4.1.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/traits/traits-4.1.0.ebuild,v 1.1 2012/01/17 06:15:58 bicatali Exp $
+
+EAPI=4
+
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+DISTUTILS_SRC_TEST="nosetests"
+
+inherit distutils virtualx
+
+DESCRIPTION="Enthought Tool Suite: Explicitly typed attributes for Python"
+HOMEPAGE="http://code.enthought.com/projects/traits/ http://pypi.python.org/pypi/traits"
+SRC_URI="http://www.enthought.com/repo/ETS/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="dev-python/numpy"
+DEPEND="dev-python/setuptools
+	doc? ( dev-python/sphinx )
+	test? ( dev-python/numpy )"
+
+DOCS="docs/*.txt"
+
+src_prepare() {
+	sed -i -e "s/'-O3'//g" setup.py
+}
+
+src_compile() {
+	distutils_src_compile
+	use doc && virtualmake -C docs html
+}
+
+src_install() {
+	find -name "*LICENSE*.txt" -delete
+	distutils_src_install
+
+	use doc && dohtml -r docs/build/html/*
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/traitsui/Manifest b/dev-python/traitsui/Manifest
index ff734c91320e..af68c00011dd 100644
--- a/dev-python/traitsui/Manifest
+++ b/dev-python/traitsui/Manifest
@@ -1 +1,2 @@
 DIST traitsui-4.0.1.tar.gz 6579406 RMD160 a4d7c31458f550b7aa39f50dacbd05941b2f9f0e SHA1 0cb4fe4dc76dadbcf9c1f3171ad91ada82c85aa4 SHA256 46b099c16af8a4dfcb55a595ea30f3a08daee007e43d3efb74081246130a35d7
+DIST traitsui-4.1.0.tar.gz 6689700 RMD160 27fefccfdad307c8fc707f8577c8020ddd6ad215 SHA1 09599f16d2ffe15e1e45d00137a6050199698635 SHA256 2af8980fc4fef557283cbf591479923a1f975c3c4efdd4640f50682fee177e49
diff --git a/dev-python/traitsui/traitsui-4.1.0.ebuild b/dev-python/traitsui/traitsui-4.1.0.ebuild
new file mode 100644
index 000000000000..18e6c97e3c98
--- /dev/null
+++ b/dev-python/traitsui/traitsui-4.1.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/traitsui/traitsui-4.1.0.ebuild,v 1.1 2012/01/17 06:24:19 bicatali Exp $
+
+EAPI=4
+
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+DISTUTILS_SRC_TEST="nosetests"
+
+inherit distutils virtualx
+
+DESCRIPTION="Enthought Tool Suite: Traits-capable user interfaces"
+HOMEPAGE="https://github.com/enthought/traitsui http://pypi.python.org/pypi/traitsui"
+SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="dev-python/pyface
+	dev-python/traits"
+DEPEND="dev-python/setuptools
+	doc? ( dev-python/sphinx )
+	test? (
+		${RDEPEND}
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+	)"
+
+DOCS="docs/*.txt"
+
+src_compile() {
+	distutils_src_compile
+	use doc && emake -C docs html
+}
+
+src_test() {
+	VIRTUALX_COMMAND="distutils_src_test" virtualmake
+}
+
+src_install() {
+	find -name "*LICENSE*.txt" -delete
+	distutils_src_install
+
+	use doc && dohtml -r docs/build/html/*
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-ruby/best_in_place/Manifest b/dev-ruby/best_in_place/Manifest
new file mode 100644
index 000000000000..1bfa427ac738
--- /dev/null
+++ b/dev-ruby/best_in_place/Manifest
@@ -0,0 +1 @@
+DIST best_in_place-1.0.4.gem 56832 RMD160 ccb3c88bd989b73c731987d8dbcae6e224edfa56 SHA1 aba5a95e07513c0b75e5297d61a4fff257bae965 SHA256 9abb4c2e3713bb1a4ded74924fbb23ee48e5abcef21adb245b906453bb1b2acd
diff --git a/dev-ruby/best_in_place/best_in_place-1.0.4.ebuild b/dev-ruby/best_in_place/best_in_place-1.0.4.ebuild
new file mode 100644
index 000000000000..e3b38367b7d8
--- /dev/null
+++ b/dev-ruby/best_in_place/best_in_place-1.0.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/best_in_place/best_in_place-1.0.4.ebuild,v 1.1 2012/01/17 23:48:49 flameeyes Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ree18"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+# if ever needed
+#GITHUB_USER="bernat"
+#GITHUB_PROJECT="${PN}"
+#RUBY_S="${GITHUB_USER}-${GITHUB_PROJECT}-*"
+
+inherit virtualx ruby-fakegem
+
+DESCRIPTION="In-place editor helper for Rails 3o"
+HOMEPAGE="http://github.com/bernat/best_in_place"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/rails:3.1
+	dev-ruby/jquery-rails
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/rspec-rails
+		>=dev-ruby/nokogiri-1.5.0
+		>=dev-ruby/capybara-1.0.1
+		>=dev-ruby/sqlite3-ruby-1.3.4-r1
+		dev-ruby/rdiscount
+	)"
+
+DEPEND+=" test? ( www-client/firefox )"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/git ls-files/d' \
+		-e '/rspec-rails/s:,.*::' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+	rm test_app/Gemfile.lock
+
+	# this disables two tests that seem to be timing-related
+	# https://github.com/bernat/best_in_place/issues/87
+	epatch "${FILESDIR}"/${P}-disable-some-tests.patch
+}
+
+each_ruby_test() {
+	RAILS_ENV=test ${RUBY} -C test_app -S rake db:migrate || die "test_app migration failed"
+	VIRTUALX_COMMAND="${RUBY}" virtualmake -S rake spec || die "Specs failed"
+}
diff --git a/dev-ruby/best_in_place/files/best_in_place-1.0.4-disable-some-tests.patch b/dev-ruby/best_in_place/files/best_in_place-1.0.4-disable-some-tests.patch
new file mode 100644
index 000000000000..8db8554f4617
--- /dev/null
+++ b/dev-ruby/best_in_place/files/best_in_place-1.0.4-disable-some-tests.patch
@@ -0,0 +1,53 @@
+Index: best_in_place-1.0.4/spec/integration/js_spec.rb
+===================================================================
+--- best_in_place-1.0.4.orig/spec/integration/js_spec.rb
++++ best_in_place-1.0.4/spec/integration/js_spec.rb
+@@ -279,23 +279,6 @@ describe "JS behaviour", :js => true do
+         text.should == "Via Roma 99"
+       end
+     end
+-
+-    it "should display the updated content after editing the field two consecutive times" do
+-      @user.save!
+-      retry_on_timeout do
+-        visit user_path(@user)
+-
+-        bip_text @user, :address, "New address"
+-
+-        id = BestInPlace::Utils.build_best_in_place_id @user, :address
+-        page.execute_script <<-JS
+-          $("##{id}").click();
+-        JS
+-
+-        text = page.find("##{id} input").value
+-        text.should == "New address"
+-      end
+-    end
+   end
+ 
+   describe "display_with" do
+@@ -347,24 +330,6 @@ describe "JS behaviour", :js => true do
+       end
+     end
+ 
+-    it "should display the updated content after editing the field two consecutive times" do
+-      @user.save!
+-
+-      retry_on_timeout do
+-        visit user_path(@user)
+-
+-        bip_text @user, :money, "40"
+-
+-        id = BestInPlace::Utils.build_best_in_place_id @user, :money
+-        page.execute_script <<-JS
+-          $("##{id}").click();
+-        JS
+-
+-        text = page.find("##{id} input").value
+-        text.should == "40"
+-      end
+-    end
+-
+     it "should show the money in euros" do
+       @user.save!
+       visit double_init_user_path(@user)
diff --git a/dev-ruby/best_in_place/metadata.xml b/dev-ruby/best_in_place/metadata.xml
new file mode 100644
index 000000000000..852136183369
--- /dev/null
+++ b/dev-ruby/best_in_place/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>ruby</herd>
+</pkgmetadata>
diff --git a/dev-ruby/bundler/bundler-1.0.18.ebuild b/dev-ruby/bundler/bundler-1.0.18.ebuild
index d4ddaf08f30a..8ab1c4ee0657 100644
--- a/dev-ruby/bundler/bundler-1.0.18.ebuild
+++ b/dev-ruby/bundler/bundler-1.0.18.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-ruby/bundler/bundler-1.0.18.ebuild,v 1.3 2011/10/20 17:38:09 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/bundler-1.0.18.ebuild,v 1.4 2012/01/17 13:56:28 ago Exp $
 
 EAPI=2
 
@@ -22,7 +22,7 @@ HOMEPAGE="http://github.com/carlhuda/bundler"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/mongoid/mongoid-2.4.1.ebuild b/dev-ruby/mongoid/mongoid-2.4.1.ebuild
index 5fba95f848fa..e69b5279c116 100644
--- a/dev-ruby/mongoid/mongoid-2.4.1.ebuild
+++ b/dev-ruby/mongoid/mongoid-2.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-ruby/mongoid/mongoid-2.4.1.ebuild,v 1.1 2012/01/16 20:54:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mongoid/mongoid-2.4.1.ebuild,v 1.2 2012/01/17 14:41:02 ago Exp $
 
 EAPI=4
 USE_RUBY="ruby18"
@@ -18,8 +18,8 @@ RUBY_S="${GITHUB_USER}-${GITHUB_PROJECT}-*"
 
 inherit ruby-fakegem
 
-DESCRIPTION="http://mongoid.org/"
-HOMEPAGE="ODM (Object Document Mapper) Framework for MongoDB"
+DESCRIPTION="ODM (Object Document Mapper) Framework for MongoDB"
+HOMEPAGE="http://mongoid.org/"
 SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/tarball/v${PV} -> ${GITHUB_PROJECT}-${PV}.tar.gz"
 LICENSE="MIT"
 
diff --git a/dev-ruby/mustache/mustache-0.99.4.ebuild b/dev-ruby/mustache/mustache-0.99.4.ebuild
index 772e0180e837..70e814e00d1b 100644
--- a/dev-ruby/mustache/mustache-0.99.4.ebuild
+++ b/dev-ruby/mustache/mustache-0.99.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/mustache/mustache-0.99.4.ebuild,v 1.7 2012/01/14 07:13:49 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mustache/mustache-0.99.4.ebuild,v 1.8 2012/01/17 13:55:05 ago Exp $
 
 EAPI=2
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://mustache.github.com/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 ruby_add_bdepend "doc? ( app-text/ronn )"
diff --git a/dev-ruby/pdf-reader/Manifest b/dev-ruby/pdf-reader/Manifest
index cd9c986d8c75..4f720c3db7fc 100644
--- a/dev-ruby/pdf-reader/Manifest
+++ b/dev-ruby/pdf-reader/Manifest
@@ -1,5 +1,2 @@
 DIST pdf-reader-git-0.10.0.tgz 8237635 RMD160 4706f7b1058351d0f7781d3c499cb525e4f0e6da SHA1 40cd058f4dbf0a239e1354ec9e910d488951ebca SHA256 266363e5cb69e4060983d517e80282f300759fa0eb383d7eae24b2d6cb65643d
 DIST pdf-reader-git-0.10.1.tgz 8237457 RMD160 6405dba62cfe8b0f875f14b2fa86400f465afaf8 SHA1 7149cf41c879a292f938750e60e0f414c515b676 SHA256 72438bf94047f4f40d7c59d34d116ba183a70ab9de1628e0e5bd6443c4618f84
-DIST pdf-reader-git-0.8.6.tgz 8205010 RMD160 1cd512d1402d1db8b3f8bbc99747775ea8797b2e SHA1 40d7043e4823d9019a522b52d2c68e332ef57ce1 SHA256 5fc4e0a5e5246d82f57670f1cae340a4cd4b9a9bbf8cc6029e0d67aae45a2361
-DIST pdf-reader-git-0.9.2.tgz 8236981 RMD160 4809e1d4889ceb7258a35dca357c0cf49512a5e7 SHA1 d5a06244fbb5bbc91f1580b36316866a2b0a1d17 SHA256 3e078ee1fc3b2436c03e6513e3ce507864a6d32a9403743fae9ecb157744be5a
-DIST pdf-reader-git-0.9.3.tgz 8237228 RMD160 7b7a013c526e250509e24b51197861082eead073 SHA1 466216bb2e3c7f12887b771133a731d9a39e01c2 SHA256 ebd7a649a283c68006d54d41514a9262ae3cc89cedec44a930aad9fe90ccec16
diff --git a/dev-ruby/pdf-reader/pdf-reader-0.8.6.ebuild b/dev-ruby/pdf-reader/pdf-reader-0.8.6.ebuild
deleted file mode 100644
index fffe8c3411fe..000000000000
--- a/dev-ruby/pdf-reader/pdf-reader-0.8.6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/pdf-reader/pdf-reader-0.8.6.ebuild,v 1.2 2010/10/09 08:39:02 graaff Exp $
-
-EAPI=2
-
-GITHUB_USER=yob
-
-USE_RUBY="ruby18 ruby19 ree18 jruby"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc TODO"
-
-inherit ruby-fakegem
-
-DESCRIPTION="PDF parser conforming as much as possible to the PDF specification from Adobe"
-HOMEPAGE="http://github.com/yob/pdf-reader/"
-
-# We cannot use the gem distributions because they don't contain the
-# tests' data, we have to rely on the git tags.
-SRC_URI="http://github.com/${GITHUB_USER}/${PN}/tarball/v${PV} -> ${PN}-git-${PV}.tgz"
-S="${WORKDIR}/${GITHUB_USER}-${PN}-*"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend dev-ruby/ascii85
-
-# rspec is loaded even during doc generation, so keep it around :(
-ruby_add_bdepend "dev-ruby/rake dev-ruby/rspec:0"
-
-all_ruby_prepare() {
-	# Avoid forcing rcov on, this also seem to resolve a problem in
-	# tests with US_ASCII encoding.
-	sed -i \
-		-e '/rcov/s:true:false:' \
-		Rakefile || die "Rakefile fix failed"
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*jruby)
-			eqawarn "jruby tests hang, reported upstream."
-			;;
-		*)
-			each_fakegem_test
-			;;
-	esac
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/* || die
-}
diff --git a/dev-ruby/pdf-reader/pdf-reader-0.9.2.ebuild b/dev-ruby/pdf-reader/pdf-reader-0.9.2.ebuild
deleted file mode 100644
index 2907c2850ed4..000000000000
--- a/dev-ruby/pdf-reader/pdf-reader-0.9.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/pdf-reader/pdf-reader-0.9.2.ebuild,v 1.1 2011/05/24 09:54:18 graaff Exp $
-
-EAPI=2
-
-GITHUB_USER=yob
-
-USE_RUBY="ruby18 ruby19 ree18 jruby"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc TODO"
-
-inherit ruby-fakegem
-
-DESCRIPTION="PDF parser conforming as much as possible to the PDF specification from Adobe"
-HOMEPAGE="http://github.com/yob/pdf-reader/"
-
-# We cannot use the gem distributions because they don't contain the
-# tests' data, we have to rely on the git tags.
-SRC_URI="http://github.com/${GITHUB_USER}/${PN}/tarball/v${PV} -> ${PN}-git-${PV}.tgz"
-S="${WORKDIR}/${GITHUB_USER}-${PN}-*"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend dev-ruby/ascii85
-
-# rspec is loaded even during doc generation, so keep it around :(
-ruby_add_bdepend ">=dev-ruby/rspec-2.1:2"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die
-	rm Gemfile || die
-
-	# Roodi is not yet available in CVS.
-	sed -i -e '/roodi/d' Rakefile || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/* || die
-}
diff --git a/dev-ruby/pdf-reader/pdf-reader-0.9.3.ebuild b/dev-ruby/pdf-reader/pdf-reader-0.9.3.ebuild
deleted file mode 100644
index a1c71e8290cd..000000000000
--- a/dev-ruby/pdf-reader/pdf-reader-0.9.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/pdf-reader/pdf-reader-0.9.3.ebuild,v 1.1 2011/07/02 06:06:12 graaff Exp $
-
-EAPI=2
-
-GITHUB_USER=yob
-
-USE_RUBY="ruby18 ruby19 ree18 jruby"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc TODO"
-
-inherit ruby-fakegem
-
-DESCRIPTION="PDF parser conforming as much as possible to the PDF specification from Adobe"
-HOMEPAGE="http://github.com/yob/pdf-reader/"
-
-# We cannot use the gem distributions because they don't contain the
-# tests' data, we have to rely on the git tags.
-SRC_URI="http://github.com/${GITHUB_USER}/${PN}/tarball/v${PV} -> ${PN}-git-${PV}.tgz"
-S="${WORKDIR}/${GITHUB_USER}-${PN}-*"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend dev-ruby/ascii85
-
-# rspec is loaded even during doc generation, so keep it around :(
-ruby_add_bdepend ">=dev-ruby/rspec-2.1:2"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die
-	rm Gemfile || die
-
-	# Roodi is not yet available in CVS.
-	sed -i -e '/roodi/d' Rakefile || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/* || die
-}
diff --git a/dev-ruby/rdiscount/rdiscount-1.6.8.ebuild b/dev-ruby/rdiscount/rdiscount-1.6.8.ebuild
index 0f53bd05421c..904bb6f517a1 100644
--- a/dev-ruby/rdiscount/rdiscount-1.6.8.ebuild
+++ b/dev-ruby/rdiscount/rdiscount-1.6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdiscount/rdiscount-1.6.8.ebuild,v 1.7 2012/01/14 07:11:20 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdiscount/rdiscount-1.6.8.ebuild,v 1.8 2012/01/17 13:55:29 ago Exp $
 
 EAPI=2
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://github.com/rtomayko/rdiscount"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 ruby_add_bdepend "doc? ( app-text/ronn )"
diff --git a/dev-ruby/ruby-rc4/Manifest b/dev-ruby/ruby-rc4/Manifest
new file mode 100644
index 000000000000..82d9e40f758a
--- /dev/null
+++ b/dev-ruby/ruby-rc4/Manifest
@@ -0,0 +1 @@
+DIST ruby-rc4-0.1.3-git.tgz 4312 RMD160 c8231a602310cd01264bffa9da2eda6224685768 SHA1 de0bf59de77c5961597e1462d9bf65434d5e09f1 SHA256 68b1d092e393a2e60ee66a66eebbcf69e03a03c5fa940af3eaecd87566bb863c
diff --git a/dev-ruby/ruby-rc4/metadata.xml b/dev-ruby/ruby-rc4/metadata.xml
new file mode 100644
index 000000000000..852136183369
--- /dev/null
+++ b/dev-ruby/ruby-rc4/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>ruby</herd>
+</pkgmetadata>
diff --git a/dev-ruby/ruby-rc4/ruby-rc4-0.1.3.ebuild b/dev-ruby/ruby-rc4/ruby-rc4-0.1.3.ebuild
new file mode 100644
index 000000000000..8a7209bd3324
--- /dev/null
+++ b/dev-ruby/ruby-rc4/ruby-rc4-0.1.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-rc4/ruby-rc4-0.1.3.ebuild,v 1.1 2012/01/17 06:40:16 graaff Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ree18 ruby19 jruby"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pure Ruby implementation of the Rc4 algorithm."
+HOMEPAGE="https://github.com/caiges/Ruby-RC4"
+SRC_URI="https://github.com/caiges/Ruby-RC4/tarball/9e70c22a5f05deb0d19b9f91bac4cf2332acaf28 -> ${P}-git.tgz"
+RUBY_S="caiges-Ruby-RC4-*"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:2 )"
+
+all_ruby_prepare() {
+	sed -i -e 's/"README"/"README.md"/' Rakefile || die
+}
diff --git a/dev-tex/bibtexu/bibtexu-3.71_p20110705.ebuild b/dev-tex/bibtexu/bibtexu-3.71_p20110705.ebuild
index ff9952d3da2c..12f07f0acffa 100644
--- a/dev-tex/bibtexu/bibtexu-3.71_p20110705.ebuild
+++ b/dev-tex/bibtexu/bibtexu-3.71_p20110705.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/bibtexu/bibtexu-3.71_p20110705.ebuild,v 1.3 2012/01/16 13:17:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/bibtexu/bibtexu-3.71_p20110705.ebuild,v 1.4 2012/01/17 17:20:12 phajdan.jr Exp $
 
 EAPI=3
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/kpathsea-6.0.1_p20110627
diff --git a/dev-tex/mh/mh-20111011.ebuild b/dev-tex/mh/mh-20111011.ebuild
index a9ad88d5c434..73a86278ea2a 100644
--- a/dev-tex/mh/mh-20111011.ebuild
+++ b/dev-tex/mh/mh-20111011.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/mh/mh-20111011.ebuild,v 1.3 2012/01/16 13:17:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/mh/mh-20111011.ebuild,v 1.4 2012/01/17 17:20:38 phajdan.jr Exp $
 
 inherit latex-package
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.zip"
 LICENSE="LPPL-1.3"
 SLOT="0"
 IUSE="doc"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="dev-tex/xcolor
 	|| ( >=dev-texlive/texlive-latexrecommended-2011 >=dev-texlive/texlive-latex3-2008 )"
diff --git a/dev-texlive/texlive-basic/texlive-basic-2011-r1.ebuild b/dev-texlive/texlive-basic/texlive-basic-2011-r1.ebuild
index afe12591788b..3e5d1f9ee56e 100644
--- a/dev-texlive/texlive-basic/texlive-basic-2011-r1.ebuild
+++ b/dev-texlive/texlive-basic/texlive-basic-2011-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-texlive/texlive-basic/texlive-basic-2011-r1.ebuild,v 1.3 2012/01/16 13:18:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-basic/texlive-basic-2011-r1.ebuild,v 1.5 2012/01/17 22:16:42 aballier Exp $
 
 EAPI="3"
 
@@ -13,14 +13,14 @@ DESCRIPTION="TeXLive Essential programs and files"
 
 LICENSE="GPL-2 as-is GPL-1 GPL-2 LPPL-1.3 OFL TeX "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 >=dev-tex/luatex-0.70
 !<app-text/texlive-core-2009
 !<dev-texlive/texlive-latex-2009
 !<dev-texlive/texlive-latexrecommended-2009
-!<dev-texlive/texlive-langcjk-2011
+!!<dev-texlive/texlive-langcjk-2011
 "
 RDEPEND="${DEPEND} "
 PATCHES=( "${FILESDIR}/texmfcnflua.patch" )
diff --git a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2011.ebuild b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2011.ebuild
index fb69bbdfda06..8028ff348126 100644
--- a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2011.ebuild
+++ b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2011.ebuild
@@ -1,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-texlive/texlive-bibtexextra/texlive-bibtexextra-2011.ebuild,v 1.3 2012/01/16 13:19:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2011.ebuild,v 1.4 2012/01/17 17:21:52 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Extra BibTeX styles"
 
 LICENSE="GPL-2 Artistic as-is GPL-1 LPPL-1.3 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2011
 !=dev-texlive/texlive-latexextra-2007*
diff --git a/dev-texlive/texlive-context/texlive-context-2011.ebuild b/dev-texlive/texlive-context/texlive-context-2011.ebuild
index a7c49de129a3..9f935aaeb692 100644
--- a/dev-texlive/texlive-context/texlive-context-2011.ebuild
+++ b/dev-texlive/texlive-context/texlive-context-2011.ebuild
@@ -1,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-texlive/texlive-context/texlive-context-2011.ebuild,v 1.3 2012/01/16 13:20:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-context/texlive-context-2011.ebuild,v 1.4 2012/01/17 17:22:40 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive ConTeXt format"
 
 LICENSE="GPL-2 as-is GPL-1 GPL-2 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 >=dev-texlive/texlive-latex-2010
diff --git a/dev-texlive/texlive-documentation-arabic/texlive-documentation-arabic-2011.ebuild b/dev-texlive/texlive-documentation-arabic/texlive-documentation-arabic-2011.ebuild
index 4696f22e4833..aef7d376467a 100644
--- a/dev-texlive/texlive-documentation-arabic/texlive-documentation-arabic-2011.ebuild
+++ b/dev-texlive/texlive-documentation-arabic/texlive-documentation-arabic-2011.ebuild
@@ -1,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-texlive/texlive-documentation-arabic/texlive-documentation-arabic-2011.ebuild,v 1.3 2012/01/16 13:21:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-arabic/texlive-documentation-arabic-2011.ebuild,v 1.4 2012/01/17 17:23:13 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Arabic documentation"
 
 LICENSE="GPL-2 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-base/texlive-documentation-base-2011.ebuild b/dev-texlive/texlive-documentation-base/texlive-documentation-base-2011.ebuild
index 3d75306f7817..6a5476bfce6b 100644
--- a/dev-texlive/texlive-documentation-base/texlive-documentation-base-2011.ebuild
+++ b/dev-texlive/texlive-documentation-base/texlive-documentation-base-2011.ebuild
@@ -1,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-texlive/texlive-documentation-base/texlive-documentation-base-2011.ebuild,v 1.3 2012/01/16 13:21:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-base/texlive-documentation-base-2011.ebuild,v 1.4 2012/01/17 17:23:47 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive TeX Live documentation"
 
 LICENSE="GPL-2 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=""
 RDEPEND="${DEPEND} "
diff --git a/dev-texlive/texlive-documentation-bulgarian/texlive-documentation-bulgarian-2011.ebuild b/dev-texlive/texlive-documentation-bulgarian/texlive-documentation-bulgarian-2011.ebuild
index 7f975678febe..5586cf815166 100644
--- a/dev-texlive/texlive-documentation-bulgarian/texlive-documentation-bulgarian-2011.ebuild
+++ b/dev-texlive/texlive-documentation-bulgarian/texlive-documentation-bulgarian-2011.ebuild
@@ -1,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-texlive/texlive-documentation-bulgarian/texlive-documentation-bulgarian-2011.ebuild,v 1.3 2012/01/16 13:22:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-bulgarian/texlive-documentation-bulgarian-2011.ebuild,v 1.4 2012/01/17 17:24:13 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Bulgarian documentation"
 
 LICENSE="GPL-2 FDL-1.1 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-chinese/texlive-documentation-chinese-2011.ebuild b/dev-texlive/texlive-documentation-chinese/texlive-documentation-chinese-2011.ebuild
index 38e19ec6e69d..bec5fae3ea41 100644
--- a/dev-texlive/texlive-documentation-chinese/texlive-documentation-chinese-2011.ebuild
+++ b/dev-texlive/texlive-documentation-chinese/texlive-documentation-chinese-2011.ebuild
@@ -1,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-texlive/texlive-documentation-chinese/texlive-documentation-chinese-2011.ebuild,v 1.3 2012/01/16 13:23:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-chinese/texlive-documentation-chinese-2011.ebuild,v 1.4 2012/01/17 17:24:40 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Chinese documentation"
 
 LICENSE="GPL-2 FDL-1.1 GPL-1 LGPL-2 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-czechslovak/texlive-documentation-czechslovak-2011.ebuild b/dev-texlive/texlive-documentation-czechslovak/texlive-documentation-czechslovak-2011.ebuild
index 54a915639074..608025ea5b28 100644
--- a/dev-texlive/texlive-documentation-czechslovak/texlive-documentation-czechslovak-2011.ebuild
+++ b/dev-texlive/texlive-documentation-czechslovak/texlive-documentation-czechslovak-2011.ebuild
@@ -1,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-texlive/texlive-documentation-czechslovak/texlive-documentation-czechslovak-2011.ebuild,v 1.3 2012/01/16 13:23:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-czechslovak/texlive-documentation-czechslovak-2011.ebuild,v 1.4 2012/01/17 17:25:10 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Czech/Slovak documentation"
 
 LICENSE="GPL-2 GPL-1 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-dutch/texlive-documentation-dutch-2011.ebuild b/dev-texlive/texlive-documentation-dutch/texlive-documentation-dutch-2011.ebuild
index 0b0af48336d5..166cb88ddecf 100644
--- a/dev-texlive/texlive-documentation-dutch/texlive-documentation-dutch-2011.ebuild
+++ b/dev-texlive/texlive-documentation-dutch/texlive-documentation-dutch-2011.ebuild
@@ -1,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-texlive/texlive-documentation-dutch/texlive-documentation-dutch-2011.ebuild,v 1.3 2012/01/16 13:24:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-dutch/texlive-documentation-dutch-2011.ebuild,v 1.4 2012/01/17 17:25:38 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Dutch documentation"
 
 LICENSE="GPL-2 GPL-1 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-english/texlive-documentation-english-2011.ebuild b/dev-texlive/texlive-documentation-english/texlive-documentation-english-2011.ebuild
index 242e72cc797b..986dec49bb49 100644
--- a/dev-texlive/texlive-documentation-english/texlive-documentation-english-2011.ebuild
+++ b/dev-texlive/texlive-documentation-english/texlive-documentation-english-2011.ebuild
@@ -1,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-texlive/texlive-documentation-english/texlive-documentation-english-2011.ebuild,v 1.3 2012/01/16 13:25:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-english/texlive-documentation-english-2011.ebuild,v 1.4 2012/01/17 17:26:15 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive English documentation"
 
 LICENSE="GPL-2 as-is FDL-1.1 GPL-1 GPL-2 LPPL-1.3 public-domain TeX "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-finnish/texlive-documentation-finnish-2011.ebuild b/dev-texlive/texlive-documentation-finnish/texlive-documentation-finnish-2011.ebuild
index c71be8575e25..212342fce196 100644
--- a/dev-texlive/texlive-documentation-finnish/texlive-documentation-finnish-2011.ebuild
+++ b/dev-texlive/texlive-documentation-finnish/texlive-documentation-finnish-2011.ebuild
@@ -1,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-texlive/texlive-documentation-finnish/texlive-documentation-finnish-2011.ebuild,v 1.3 2012/01/16 13:26:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-finnish/texlive-documentation-finnish-2011.ebuild,v 1.4 2012/01/17 17:26:44 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Finnish documentation"
 
 LICENSE="GPL-2 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-french/texlive-documentation-french-2011.ebuild b/dev-texlive/texlive-documentation-french/texlive-documentation-french-2011.ebuild
index 8a9a563b6388..a9b43d81217f 100644
--- a/dev-texlive/texlive-documentation-french/texlive-documentation-french-2011.ebuild
+++ b/dev-texlive/texlive-documentation-french/texlive-documentation-french-2011.ebuild
@@ -1,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-texlive/texlive-documentation-french/texlive-documentation-french-2011.ebuild,v 1.3 2012/01/16 13:26:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-french/texlive-documentation-french-2011.ebuild,v 1.4 2012/01/17 17:27:09 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive French documentation"
 
 LICENSE="GPL-2 FDL-1.1 GPL-1 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-german/texlive-documentation-german-2011.ebuild b/dev-texlive/texlive-documentation-german/texlive-documentation-german-2011.ebuild
index 5c5eee51de68..8fcc6e11545c 100644
--- a/dev-texlive/texlive-documentation-german/texlive-documentation-german-2011.ebuild
+++ b/dev-texlive/texlive-documentation-german/texlive-documentation-german-2011.ebuild
@@ -1,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-texlive/texlive-documentation-german/texlive-documentation-german-2011.ebuild,v 1.3 2012/01/16 13:27:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-german/texlive-documentation-german-2011.ebuild,v 1.4 2012/01/17 17:27:38 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive German documentation"
 
 LICENSE="GPL-2 as-is FDL-1.1 GPL-1 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-italian/texlive-documentation-italian-2011.ebuild b/dev-texlive/texlive-documentation-italian/texlive-documentation-italian-2011.ebuild
index c2d0bf355079..ca4980ce8566 100644
--- a/dev-texlive/texlive-documentation-italian/texlive-documentation-italian-2011.ebuild
+++ b/dev-texlive/texlive-documentation-italian/texlive-documentation-italian-2011.ebuild
@@ -1,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-texlive/texlive-documentation-italian/texlive-documentation-italian-2011.ebuild,v 1.3 2012/01/16 13:28:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-italian/texlive-documentation-italian-2011.ebuild,v 1.4 2012/01/17 17:28:07 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Italian documentation"
 
 LICENSE="GPL-2 as-is GPL-1 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-japanese/texlive-documentation-japanese-2011.ebuild b/dev-texlive/texlive-documentation-japanese/texlive-documentation-japanese-2011.ebuild
index 361468fc951f..15474a30dd32 100644
--- a/dev-texlive/texlive-documentation-japanese/texlive-documentation-japanese-2011.ebuild
+++ b/dev-texlive/texlive-documentation-japanese/texlive-documentation-japanese-2011.ebuild
@@ -1,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-texlive/texlive-documentation-japanese/texlive-documentation-japanese-2011.ebuild,v 1.3 2012/01/16 13:28:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-japanese/texlive-documentation-japanese-2011.ebuild,v 1.4 2012/01/17 17:28:32 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Japanese documentation"
 
 LICENSE="GPL-2 GPL-1 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-korean/texlive-documentation-korean-2011.ebuild b/dev-texlive/texlive-documentation-korean/texlive-documentation-korean-2011.ebuild
index e83e6fa8d372..728243917e73 100644
--- a/dev-texlive/texlive-documentation-korean/texlive-documentation-korean-2011.ebuild
+++ b/dev-texlive/texlive-documentation-korean/texlive-documentation-korean-2011.ebuild
@@ -1,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-texlive/texlive-documentation-korean/texlive-documentation-korean-2011.ebuild,v 1.3 2012/01/16 13:29:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-korean/texlive-documentation-korean-2011.ebuild,v 1.4 2012/01/17 17:28:57 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Korean documentation"
 
 LICENSE="GPL-2 FDL-1.1 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-mongolian/texlive-documentation-mongolian-2011.ebuild b/dev-texlive/texlive-documentation-mongolian/texlive-documentation-mongolian-2011.ebuild
index 6c880583f5e7..3d4a8f0feb36 100644
--- a/dev-texlive/texlive-documentation-mongolian/texlive-documentation-mongolian-2011.ebuild
+++ b/dev-texlive/texlive-documentation-mongolian/texlive-documentation-mongolian-2011.ebuild
@@ -1,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-texlive/texlive-documentation-mongolian/texlive-documentation-mongolian-2011.ebuild,v 1.3 2012/01/16 13:30:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-mongolian/texlive-documentation-mongolian-2011.ebuild,v 1.4 2012/01/17 17:29:21 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Mongolian documentation"
 
 LICENSE="GPL-2 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-polish/texlive-documentation-polish-2011.ebuild b/dev-texlive/texlive-documentation-polish/texlive-documentation-polish-2011.ebuild
index 6ebae116e6cf..6feff1a2048a 100644
--- a/dev-texlive/texlive-documentation-polish/texlive-documentation-polish-2011.ebuild
+++ b/dev-texlive/texlive-documentation-polish/texlive-documentation-polish-2011.ebuild
@@ -1,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-texlive/texlive-documentation-polish/texlive-documentation-polish-2011.ebuild,v 1.3 2012/01/16 13:31:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-polish/texlive-documentation-polish-2011.ebuild,v 1.4 2012/01/17 17:29:46 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Polish documentation"
 
 LICENSE="GPL-2 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-portuguese/texlive-documentation-portuguese-2011.ebuild b/dev-texlive/texlive-documentation-portuguese/texlive-documentation-portuguese-2011.ebuild
index b8c88aacb0c5..cc8f104838f0 100644
--- a/dev-texlive/texlive-documentation-portuguese/texlive-documentation-portuguese-2011.ebuild
+++ b/dev-texlive/texlive-documentation-portuguese/texlive-documentation-portuguese-2011.ebuild
@@ -1,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-texlive/texlive-documentation-portuguese/texlive-documentation-portuguese-2011.ebuild,v 1.3 2012/01/16 13:31:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-portuguese/texlive-documentation-portuguese-2011.ebuild,v 1.4 2012/01/17 17:30:12 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Portuguese documentation"
 
 LICENSE="GPL-2 GPL-1 LPPL-1.3 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-russian/texlive-documentation-russian-2011.ebuild b/dev-texlive/texlive-documentation-russian/texlive-documentation-russian-2011.ebuild
index d7b0e01164ae..7d5cf943f20d 100644
--- a/dev-texlive/texlive-documentation-russian/texlive-documentation-russian-2011.ebuild
+++ b/dev-texlive/texlive-documentation-russian/texlive-documentation-russian-2011.ebuild
@@ -1,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-texlive/texlive-documentation-russian/texlive-documentation-russian-2011.ebuild,v 1.3 2012/01/16 13:32:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-russian/texlive-documentation-russian-2011.ebuild,v 1.4 2012/01/17 17:30:37 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Russian documentation"
 
 LICENSE="GPL-2 as-is GPL-1 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-serbian/texlive-documentation-serbian-2011.ebuild b/dev-texlive/texlive-documentation-serbian/texlive-documentation-serbian-2011.ebuild
index d5f01913a5df..dba4b9315ed9 100644
--- a/dev-texlive/texlive-documentation-serbian/texlive-documentation-serbian-2011.ebuild
+++ b/dev-texlive/texlive-documentation-serbian/texlive-documentation-serbian-2011.ebuild
@@ -1,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-texlive/texlive-documentation-serbian/texlive-documentation-serbian-2011.ebuild,v 1.3 2012/01/16 13:33:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-serbian/texlive-documentation-serbian-2011.ebuild,v 1.4 2012/01/17 17:31:02 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Serbian documentation"
 
 LICENSE="GPL-2 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-slovenian/texlive-documentation-slovenian-2011.ebuild b/dev-texlive/texlive-documentation-slovenian/texlive-documentation-slovenian-2011.ebuild
index c9e723f34c1c..9b5434baca19 100644
--- a/dev-texlive/texlive-documentation-slovenian/texlive-documentation-slovenian-2011.ebuild
+++ b/dev-texlive/texlive-documentation-slovenian/texlive-documentation-slovenian-2011.ebuild
@@ -1,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-texlive/texlive-documentation-slovenian/texlive-documentation-slovenian-2011.ebuild,v 1.3 2012/01/16 13:34:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-slovenian/texlive-documentation-slovenian-2011.ebuild,v 1.4 2012/01/17 17:31:27 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Slovenian documentation"
 
 LICENSE="GPL-2 GPL-1 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-spanish/texlive-documentation-spanish-2011.ebuild b/dev-texlive/texlive-documentation-spanish/texlive-documentation-spanish-2011.ebuild
index 3572b9a5d89e..f4472a0b2d4d 100644
--- a/dev-texlive/texlive-documentation-spanish/texlive-documentation-spanish-2011.ebuild
+++ b/dev-texlive/texlive-documentation-spanish/texlive-documentation-spanish-2011.ebuild
@@ -1,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-texlive/texlive-documentation-spanish/texlive-documentation-spanish-2011.ebuild,v 1.3 2012/01/16 13:34:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-spanish/texlive-documentation-spanish-2011.ebuild,v 1.4 2012/01/17 17:31:54 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Spanish documentation"
 
 LICENSE="GPL-2 as-is LPPL-1.3 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-thai/texlive-documentation-thai-2011.ebuild b/dev-texlive/texlive-documentation-thai/texlive-documentation-thai-2011.ebuild
index 72ec18f3faa5..1da4c037a22a 100644
--- a/dev-texlive/texlive-documentation-thai/texlive-documentation-thai-2011.ebuild
+++ b/dev-texlive/texlive-documentation-thai/texlive-documentation-thai-2011.ebuild
@@ -1,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-texlive/texlive-documentation-thai/texlive-documentation-thai-2011.ebuild,v 1.3 2012/01/16 13:35:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-thai/texlive-documentation-thai-2011.ebuild,v 1.4 2012/01/17 17:32:21 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Thai documentation"
 
 LICENSE="GPL-2 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-turkish/texlive-documentation-turkish-2011.ebuild b/dev-texlive/texlive-documentation-turkish/texlive-documentation-turkish-2011.ebuild
index 736996d544e6..cf101d2c27b5 100644
--- a/dev-texlive/texlive-documentation-turkish/texlive-documentation-turkish-2011.ebuild
+++ b/dev-texlive/texlive-documentation-turkish/texlive-documentation-turkish-2011.ebuild
@@ -1,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-texlive/texlive-documentation-turkish/texlive-documentation-turkish-2011.ebuild,v 1.3 2012/01/16 13:36:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-turkish/texlive-documentation-turkish-2011.ebuild,v 1.4 2012/01/17 17:32:45 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Turkish documentation"
 
 LICENSE="GPL-2 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-ukrainian/texlive-documentation-ukrainian-2011.ebuild b/dev-texlive/texlive-documentation-ukrainian/texlive-documentation-ukrainian-2011.ebuild
index 076923c44fab..c98cf6966c57 100644
--- a/dev-texlive/texlive-documentation-ukrainian/texlive-documentation-ukrainian-2011.ebuild
+++ b/dev-texlive/texlive-documentation-ukrainian/texlive-documentation-ukrainian-2011.ebuild
@@ -1,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-texlive/texlive-documentation-ukrainian/texlive-documentation-ukrainian-2011.ebuild,v 1.3 2012/01/16 13:37:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-ukrainian/texlive-documentation-ukrainian-2011.ebuild,v 1.4 2012/01/17 17:33:10 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Ukrainian documentation"
 
 LICENSE="GPL-2 as-is "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-vietnamese/texlive-documentation-vietnamese-2011.ebuild b/dev-texlive/texlive-documentation-vietnamese/texlive-documentation-vietnamese-2011.ebuild
index 38dee9a9937d..0d4f616ae255 100644
--- a/dev-texlive/texlive-documentation-vietnamese/texlive-documentation-vietnamese-2011.ebuild
+++ b/dev-texlive/texlive-documentation-vietnamese/texlive-documentation-vietnamese-2011.ebuild
@@ -1,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-texlive/texlive-documentation-vietnamese/texlive-documentation-vietnamese-2011.ebuild,v 1.3 2012/01/16 13:37:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-vietnamese/texlive-documentation-vietnamese-2011.ebuild,v 1.4 2012/01/17 17:33:35 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Vietnamese documentation"
 
 LICENSE="GPL-2 LGPL-2 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-fontsextra/texlive-fontsextra-2011.ebuild b/dev-texlive/texlive-fontsextra/texlive-fontsextra-2011.ebuild
index f34bc29ed798..05b51cd0fa71 100644
--- a/dev-texlive/texlive-fontsextra/texlive-fontsextra-2011.ebuild
+++ b/dev-texlive/texlive-fontsextra/texlive-fontsextra-2011.ebuild
@@ -1,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-texlive/texlive-fontsextra/texlive-fontsextra-2011.ebuild,v 1.3 2012/01/16 13:38:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-fontsextra/texlive-fontsextra-2011.ebuild,v 1.4 2012/01/17 17:34:27 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Extra fonts"
 
 LICENSE="GPL-2 as-is BSD GPL-1 GPL-2 GPL-3 LPPL-1.3 OFL public-domain TeX "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 !=dev-texlive/texlive-langpolish-2007*
diff --git a/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2011.ebuild b/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2011.ebuild
index 041c3cc9ccab..c025eba520e3 100644
--- a/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2011.ebuild
+++ b/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2011.ebuild
@@ -1,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-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2011.ebuild,v 1.3 2012/01/16 13:39:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2011.ebuild,v 1.4 2012/01/17 17:35:05 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Recommended fonts"
 
 LICENSE="GPL-2 as-is GPL-1 LPPL-1.3 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 !=dev-texlive/texlive-basic-2007*
diff --git a/dev-texlive/texlive-fontutils/texlive-fontutils-2011.ebuild b/dev-texlive/texlive-fontutils/texlive-fontutils-2011.ebuild
index 8728edd7e279..6244837bf248 100644
--- a/dev-texlive/texlive-fontutils/texlive-fontutils-2011.ebuild
+++ b/dev-texlive/texlive-fontutils/texlive-fontutils-2011.ebuild
@@ -1,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-texlive/texlive-fontutils/texlive-fontutils-2011.ebuild,v 1.3 2012/01/16 13:40:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-fontutils/texlive-fontutils-2011.ebuild,v 1.4 2012/01/17 17:35:32 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive TeX and Outline font utilities"
 
 LICENSE="GPL-2 as-is GPL-1 LPPL-1.3 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 !dev-texlive/texlive-psutils
diff --git a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2011.ebuild b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2011.ebuild
index 7072c209a1f5..97e7dac421e2 100644
--- a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2011.ebuild
+++ b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2011.ebuild
@@ -1,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-texlive/texlive-formatsextra/texlive-formatsextra-2011.ebuild,v 1.3 2012/01/16 13:40:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-formatsextra/texlive-formatsextra-2011.ebuild,v 1.4 2012/01/17 17:36:02 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Extra formats"
 
 LICENSE="GPL-2 GPL-2 LPPL-1.3 public-domain TeX "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 >=dev-texlive/texlive-latex-2008
diff --git a/dev-texlive/texlive-games/texlive-games-2011.ebuild b/dev-texlive/texlive-games/texlive-games-2011.ebuild
index 4ef2b3bb8b43..a07d8f46fedf 100644
--- a/dev-texlive/texlive-games/texlive-games-2011.ebuild
+++ b/dev-texlive/texlive-games/texlive-games-2011.ebuild
@@ -1,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-texlive/texlive-games/texlive-games-2011.ebuild,v 1.3 2012/01/16 13:41:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-games/texlive-games-2011.ebuild,v 1.4 2012/01/17 17:36:37 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Games typesetting"
 
 LICENSE="GPL-2 as-is GPL-1 LPPL-1.3 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2011
 !<dev-texlive/texlive-latexextra-2009
diff --git a/dev-texlive/texlive-genericextra/texlive-genericextra-2011.ebuild b/dev-texlive/texlive-genericextra/texlive-genericextra-2011.ebuild
index d35cadf712d9..cc97ad03ee8b 100644
--- a/dev-texlive/texlive-genericextra/texlive-genericextra-2011.ebuild
+++ b/dev-texlive/texlive-genericextra/texlive-genericextra-2011.ebuild
@@ -1,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-texlive/texlive-genericextra/texlive-genericextra-2011.ebuild,v 1.3 2012/01/16 13:42:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-genericextra/texlive-genericextra-2011.ebuild,v 1.4 2012/01/17 17:37:12 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Extra generic packages"
 
 LICENSE="GPL-2 as-is GPL-1 GPL-2 LPPL-1.3 public-domain TeX "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-genericrecommended/texlive-genericrecommended-2011.ebuild b/dev-texlive/texlive-genericrecommended/texlive-genericrecommended-2011.ebuild
index 17bff1b08e6c..183162861bd2 100644
--- a/dev-texlive/texlive-genericrecommended/texlive-genericrecommended-2011.ebuild
+++ b/dev-texlive/texlive-genericrecommended/texlive-genericrecommended-2011.ebuild
@@ -1,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-texlive/texlive-genericrecommended/texlive-genericrecommended-2011.ebuild,v 1.3 2012/01/16 13:43:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-genericrecommended/texlive-genericrecommended-2011.ebuild,v 1.4 2012/01/17 17:37:41 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Recommended generic packages"
 
 LICENSE="GPL-2 as-is GPL-1 LPPL-1.3 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 !=dev-texlive/texlive-basic-2007*
diff --git a/dev-texlive/texlive-htmlxml/texlive-htmlxml-2011.ebuild b/dev-texlive/texlive-htmlxml/texlive-htmlxml-2011.ebuild
index 4494c4462d4d..85f3c7799cee 100644
--- a/dev-texlive/texlive-htmlxml/texlive-htmlxml-2011.ebuild
+++ b/dev-texlive/texlive-htmlxml/texlive-htmlxml-2011.ebuild
@@ -1,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-texlive/texlive-htmlxml/texlive-htmlxml-2011.ebuild,v 1.3 2012/01/16 13:44:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-htmlxml/texlive-htmlxml-2011.ebuild,v 1.4 2012/01/17 17:38:06 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive HTML/SGML/XML support"
 
 LICENSE="GPL-2 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 >=dev-texlive/texlive-fontsrecommended-2011
diff --git a/dev-texlive/texlive-humanities/texlive-humanities-2011.ebuild b/dev-texlive/texlive-humanities/texlive-humanities-2011.ebuild
index 466917e6d7e5..6c0aef8e8da2 100644
--- a/dev-texlive/texlive-humanities/texlive-humanities-2011.ebuild
+++ b/dev-texlive/texlive-humanities/texlive-humanities-2011.ebuild
@@ -1,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-texlive/texlive-humanities/texlive-humanities-2011.ebuild,v 1.3 2012/01/16 13:44:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-humanities/texlive-humanities-2011.ebuild,v 1.4 2012/01/17 17:38:38 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Humanities packages"
 
 LICENSE="GPL-2 GPL-1 LPPL-1.2 LPPL-1.3 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2011
 !dev-tex/lineno
diff --git a/dev-texlive/texlive-langafrican/texlive-langafrican-2011.ebuild b/dev-texlive/texlive-langafrican/texlive-langafrican-2011.ebuild
index 36b83b7fef14..7bf6905d8dbf 100644
--- a/dev-texlive/texlive-langafrican/texlive-langafrican-2011.ebuild
+++ b/dev-texlive/texlive-langafrican/texlive-langafrican-2011.ebuild
@@ -1,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-texlive/texlive-langafrican/texlive-langafrican-2011.ebuild,v 1.3 2012/01/16 13:45:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langafrican/texlive-langafrican-2011.ebuild,v 1.4 2012/01/17 17:39:04 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive African scripts"
 
 LICENSE="GPL-2 GPL-1 GPL-2 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langarabic/texlive-langarabic-2011.ebuild b/dev-texlive/texlive-langarabic/texlive-langarabic-2011.ebuild
index befb7457feea..343bf1bd2fbd 100644
--- a/dev-texlive/texlive-langarabic/texlive-langarabic-2011.ebuild
+++ b/dev-texlive/texlive-langarabic/texlive-langarabic-2011.ebuild
@@ -1,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-texlive/texlive-langarabic/texlive-langarabic-2011.ebuild,v 1.3 2012/01/16 13:46:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langarabic/texlive-langarabic-2011.ebuild,v 1.4 2012/01/17 17:39:31 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Arabic"
 
 LICENSE="GPL-2 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 !dev-texlive/texlive-langarab
diff --git a/dev-texlive/texlive-langarmenian/texlive-langarmenian-2011.ebuild b/dev-texlive/texlive-langarmenian/texlive-langarmenian-2011.ebuild
index 1b151cbca4c0..858b9b74427c 100644
--- a/dev-texlive/texlive-langarmenian/texlive-langarmenian-2011.ebuild
+++ b/dev-texlive/texlive-langarmenian/texlive-langarmenian-2011.ebuild
@@ -1,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-texlive/texlive-langarmenian/texlive-langarmenian-2011.ebuild,v 1.3 2012/01/16 13:47:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langarmenian/texlive-langarmenian-2011.ebuild,v 1.4 2012/01/17 17:40:00 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Armenian"
 
 LICENSE="GPL-2 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langcjk/texlive-langcjk-2011.ebuild b/dev-texlive/texlive-langcjk/texlive-langcjk-2011.ebuild
index 7eef212345bd..62a288ac772f 100644
--- a/dev-texlive/texlive-langcjk/texlive-langcjk-2011.ebuild
+++ b/dev-texlive/texlive-langcjk/texlive-langcjk-2011.ebuild
@@ -1,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-texlive/texlive-langcjk/texlive-langcjk-2011.ebuild,v 1.5 2012/01/16 13:47:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langcjk/texlive-langcjk-2011.ebuild,v 1.6 2012/01/17 17:40:32 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Chinese, Japanese, Korean"
 
 LICENSE="GPL-2 as-is BSD LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 >=app-text/texlive-core-2010[cjk]
diff --git a/dev-texlive/texlive-langcroatian/texlive-langcroatian-2011.ebuild b/dev-texlive/texlive-langcroatian/texlive-langcroatian-2011.ebuild
index 637eda7818c8..86908a642566 100644
--- a/dev-texlive/texlive-langcroatian/texlive-langcroatian-2011.ebuild
+++ b/dev-texlive/texlive-langcroatian/texlive-langcroatian-2011.ebuild
@@ -1,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-texlive/texlive-langcroatian/texlive-langcroatian-2011.ebuild,v 1.3 2012/01/16 13:48:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langcroatian/texlive-langcroatian-2011.ebuild,v 1.4 2012/01/17 17:41:01 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Croatian"
 
 LICENSE="GPL-2 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2011.ebuild b/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2011.ebuild
index 24f4dd371215..917612316f52 100644
--- a/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2011.ebuild
+++ b/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2011.ebuild
@@ -1,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-texlive/texlive-langcyrillic/texlive-langcyrillic-2011.ebuild,v 1.3 2012/01/16 13:49:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2011.ebuild,v 1.4 2012/01/17 17:41:29 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Cyrillic"
 
 LICENSE="GPL-2 as-is LPPL-1.3 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 >=dev-texlive/texlive-latex-2011
diff --git a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2011.ebuild b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2011.ebuild
index 30b7e1dea8a0..995e2a4da966 100644
--- a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2011.ebuild
+++ b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2011.ebuild
@@ -1,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-texlive/texlive-langczechslovak/texlive-langczechslovak-2011.ebuild,v 1.3 2012/01/16 13:50:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2011.ebuild,v 1.4 2012/01/17 17:41:58 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Czech/Slovak"
 
 LICENSE="GPL-2 as-is GPL-1 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 >=dev-texlive/texlive-latex-2011
diff --git a/dev-texlive/texlive-langdanish/texlive-langdanish-2011.ebuild b/dev-texlive/texlive-langdanish/texlive-langdanish-2011.ebuild
index 9356870ca6ed..aa7526295673 100644
--- a/dev-texlive/texlive-langdanish/texlive-langdanish-2011.ebuild
+++ b/dev-texlive/texlive-langdanish/texlive-langdanish-2011.ebuild
@@ -1,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-texlive/texlive-langdanish/texlive-langdanish-2011.ebuild,v 1.3 2012/01/16 13:50:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langdanish/texlive-langdanish-2011.ebuild,v 1.4 2012/01/17 17:42:27 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Danish"
 
 LICENSE="GPL-2 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langdutch/texlive-langdutch-2011.ebuild b/dev-texlive/texlive-langdutch/texlive-langdutch-2011.ebuild
index 2ef311cc0bd3..5a4e819fd020 100644
--- a/dev-texlive/texlive-langdutch/texlive-langdutch-2011.ebuild
+++ b/dev-texlive/texlive-langdutch/texlive-langdutch-2011.ebuild
@@ -1,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-texlive/texlive-langdutch/texlive-langdutch-2011.ebuild,v 1.3 2012/01/16 13:51:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langdutch/texlive-langdutch-2011.ebuild,v 1.4 2012/01/17 17:42:52 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Dutch"
 
 LICENSE="GPL-2 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langenglish/texlive-langenglish-2011.ebuild b/dev-texlive/texlive-langenglish/texlive-langenglish-2011.ebuild
index 8714c0860a4d..abc125a2bbe5 100644
--- a/dev-texlive/texlive-langenglish/texlive-langenglish-2011.ebuild
+++ b/dev-texlive/texlive-langenglish/texlive-langenglish-2011.ebuild
@@ -1,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-texlive/texlive-langenglish/texlive-langenglish-2011.ebuild,v 1.3 2012/01/16 13:52:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langenglish/texlive-langenglish-2011.ebuild,v 1.4 2012/01/17 17:43:19 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive US and UK English"
 
 LICENSE="GPL-2 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langfinnish/texlive-langfinnish-2011.ebuild b/dev-texlive/texlive-langfinnish/texlive-langfinnish-2011.ebuild
index d147b0006abe..2fb27ca3f5a6 100644
--- a/dev-texlive/texlive-langfinnish/texlive-langfinnish-2011.ebuild
+++ b/dev-texlive/texlive-langfinnish/texlive-langfinnish-2011.ebuild
@@ -1,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-texlive/texlive-langfinnish/texlive-langfinnish-2011.ebuild,v 1.3 2012/01/16 13:53:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langfinnish/texlive-langfinnish-2011.ebuild,v 1.4 2012/01/17 17:43:44 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Finnish"
 
 LICENSE="GPL-2 as-is public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langfrench/texlive-langfrench-2011.ebuild b/dev-texlive/texlive-langfrench/texlive-langfrench-2011.ebuild
index d3ec0614b38f..7c36123cf334 100644
--- a/dev-texlive/texlive-langfrench/texlive-langfrench-2011.ebuild
+++ b/dev-texlive/texlive-langfrench/texlive-langfrench-2011.ebuild
@@ -1,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-texlive/texlive-langfrench/texlive-langfrench-2011.ebuild,v 1.3 2012/01/16 13:53:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langfrench/texlive-langfrench-2011.ebuild,v 1.4 2012/01/17 17:44:16 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive French"
 
 LICENSE="GPL-2 as-is GPL-1 LPPL-1.3 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langgerman/texlive-langgerman-2011.ebuild b/dev-texlive/texlive-langgerman/texlive-langgerman-2011.ebuild
index 224562781225..2d015f45c3a4 100644
--- a/dev-texlive/texlive-langgerman/texlive-langgerman-2011.ebuild
+++ b/dev-texlive/texlive-langgerman/texlive-langgerman-2011.ebuild
@@ -1,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-texlive/texlive-langgerman/texlive-langgerman-2011.ebuild,v 1.3 2012/01/16 13:54:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langgerman/texlive-langgerman-2011.ebuild,v 1.4 2012/01/17 18:28:41 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive German"
 
 LICENSE="GPL-2 as-is GPL-1 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 !<dev-texlive/texlive-latexextra-2009
diff --git a/dev-texlive/texlive-langgreek/texlive-langgreek-2011.ebuild b/dev-texlive/texlive-langgreek/texlive-langgreek-2011.ebuild
index 88a75dbd9d16..bf12defd5f9e 100644
--- a/dev-texlive/texlive-langgreek/texlive-langgreek-2011.ebuild
+++ b/dev-texlive/texlive-langgreek/texlive-langgreek-2011.ebuild
@@ -1,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-texlive/texlive-langgreek/texlive-langgreek-2011.ebuild,v 1.3 2012/01/16 13:55:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langgreek/texlive-langgreek-2011.ebuild,v 1.4 2012/01/17 18:54:58 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Greek"
 
 LICENSE="GPL-2 as-is GPL-1 GPL-2 LPPL-1.3 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langhebrew/texlive-langhebrew-2011.ebuild b/dev-texlive/texlive-langhebrew/texlive-langhebrew-2011.ebuild
index a22b3017da35..f8adf87c4e1c 100644
--- a/dev-texlive/texlive-langhebrew/texlive-langhebrew-2011.ebuild
+++ b/dev-texlive/texlive-langhebrew/texlive-langhebrew-2011.ebuild
@@ -1,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-texlive/texlive-langhebrew/texlive-langhebrew-2011.ebuild,v 1.3 2012/01/16 13:55:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langhebrew/texlive-langhebrew-2011.ebuild,v 1.4 2012/01/17 18:55:24 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Hebrew"
 
 LICENSE="GPL-2 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langhungarian/texlive-langhungarian-2011.ebuild b/dev-texlive/texlive-langhungarian/texlive-langhungarian-2011.ebuild
index 32ffc0ef51ea..c5ee5a568b8e 100644
--- a/dev-texlive/texlive-langhungarian/texlive-langhungarian-2011.ebuild
+++ b/dev-texlive/texlive-langhungarian/texlive-langhungarian-2011.ebuild
@@ -1,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-texlive/texlive-langhungarian/texlive-langhungarian-2011.ebuild,v 1.3 2012/01/16 13:56:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langhungarian/texlive-langhungarian-2011.ebuild,v 1.4 2012/01/17 18:55:49 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Hungarian"
 
 LICENSE="GPL-2 GPL-1 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langindic/texlive-langindic-2011.ebuild b/dev-texlive/texlive-langindic/texlive-langindic-2011.ebuild
index 4d085eb55197..90981382afb1 100644
--- a/dev-texlive/texlive-langindic/texlive-langindic-2011.ebuild
+++ b/dev-texlive/texlive-langindic/texlive-langindic-2011.ebuild
@@ -1,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-texlive/texlive-langindic/texlive-langindic-2011.ebuild,v 1.3 2012/01/16 13:57:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langindic/texlive-langindic-2011.ebuild,v 1.4 2012/01/17 18:56:17 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Indic scripts"
 
 LICENSE="GPL-2 as-is GPL-1 GPL-2 LPPL-1.3 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langitalian/texlive-langitalian-2011.ebuild b/dev-texlive/texlive-langitalian/texlive-langitalian-2011.ebuild
index 777e8e568cfb..a16bfac5ed80 100644
--- a/dev-texlive/texlive-langitalian/texlive-langitalian-2011.ebuild
+++ b/dev-texlive/texlive-langitalian/texlive-langitalian-2011.ebuild
@@ -1,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-texlive/texlive-langitalian/texlive-langitalian-2011.ebuild,v 1.3 2012/01/16 13:58:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langitalian/texlive-langitalian-2011.ebuild,v 1.4 2012/01/17 18:56:46 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Italian"
 
 LICENSE="GPL-2 LGPL-2 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langlatin/texlive-langlatin-2011.ebuild b/dev-texlive/texlive-langlatin/texlive-langlatin-2011.ebuild
index bb8d572a040f..a031ff74fa9e 100644
--- a/dev-texlive/texlive-langlatin/texlive-langlatin-2011.ebuild
+++ b/dev-texlive/texlive-langlatin/texlive-langlatin-2011.ebuild
@@ -1,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-texlive/texlive-langlatin/texlive-langlatin-2011.ebuild,v 1.3 2012/01/16 13:58:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langlatin/texlive-langlatin-2011.ebuild,v 1.4 2012/01/17 18:57:11 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Latin"
 
 LICENSE="GPL-2 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langlatvian/texlive-langlatvian-2011.ebuild b/dev-texlive/texlive-langlatvian/texlive-langlatvian-2011.ebuild
index d579a3611000..54d5439ec903 100644
--- a/dev-texlive/texlive-langlatvian/texlive-langlatvian-2011.ebuild
+++ b/dev-texlive/texlive-langlatvian/texlive-langlatvian-2011.ebuild
@@ -1,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-texlive/texlive-langlatvian/texlive-langlatvian-2011.ebuild,v 1.3 2012/01/16 13:59:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langlatvian/texlive-langlatvian-2011.ebuild,v 1.4 2012/01/17 18:57:36 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Latvian"
 
 LICENSE="GPL-2 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langlithuanian/texlive-langlithuanian-2011.ebuild b/dev-texlive/texlive-langlithuanian/texlive-langlithuanian-2011.ebuild
index 4d2840085180..e8255e77014d 100644
--- a/dev-texlive/texlive-langlithuanian/texlive-langlithuanian-2011.ebuild
+++ b/dev-texlive/texlive-langlithuanian/texlive-langlithuanian-2011.ebuild
@@ -1,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-texlive/texlive-langlithuanian/texlive-langlithuanian-2011.ebuild,v 1.3 2012/01/16 14:00:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langlithuanian/texlive-langlithuanian-2011.ebuild,v 1.4 2012/01/17 18:58:03 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Lithuanian"
 
 LICENSE="GPL-2 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langmongolian/texlive-langmongolian-2011.ebuild b/dev-texlive/texlive-langmongolian/texlive-langmongolian-2011.ebuild
index f825548e8e23..a10b69a48019 100644
--- a/dev-texlive/texlive-langmongolian/texlive-langmongolian-2011.ebuild
+++ b/dev-texlive/texlive-langmongolian/texlive-langmongolian-2011.ebuild
@@ -1,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-texlive/texlive-langmongolian/texlive-langmongolian-2011.ebuild,v 1.3 2012/01/16 14:01:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langmongolian/texlive-langmongolian-2011.ebuild,v 1.4 2012/01/17 18:58:31 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Mongolian"
 
 LICENSE="GPL-2 GPL-1 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 !=dev-texlive/texlive-langmanju-2007*
diff --git a/dev-texlive/texlive-langnorwegian/texlive-langnorwegian-2011.ebuild b/dev-texlive/texlive-langnorwegian/texlive-langnorwegian-2011.ebuild
index 867f044d6f43..d487e33931ad 100644
--- a/dev-texlive/texlive-langnorwegian/texlive-langnorwegian-2011.ebuild
+++ b/dev-texlive/texlive-langnorwegian/texlive-langnorwegian-2011.ebuild
@@ -1,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-texlive/texlive-langnorwegian/texlive-langnorwegian-2011.ebuild,v 1.3 2012/01/16 14:02:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langnorwegian/texlive-langnorwegian-2011.ebuild,v 1.4 2012/01/17 18:58:57 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Norwegian"
 
 LICENSE="GPL-2 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langother/texlive-langother-2011.ebuild b/dev-texlive/texlive-langother/texlive-langother-2011.ebuild
index 66303942c919..c8736c21591b 100644
--- a/dev-texlive/texlive-langother/texlive-langother-2011.ebuild
+++ b/dev-texlive/texlive-langother/texlive-langother-2011.ebuild
@@ -1,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-texlive/texlive-langother/texlive-langother-2011.ebuild,v 1.3 2012/01/16 14:02:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langother/texlive-langother-2011.ebuild,v 1.4 2012/01/17 18:59:26 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Other hyphenation patterns"
 
 LICENSE="GPL-2 as-is GPL-1 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 !<dev-texlive/texlive-basic-2009
diff --git a/dev-texlive/texlive-langpolish/texlive-langpolish-2011.ebuild b/dev-texlive/texlive-langpolish/texlive-langpolish-2011.ebuild
index 7fd2c107b0d8..63ad062e11dd 100644
--- a/dev-texlive/texlive-langpolish/texlive-langpolish-2011.ebuild
+++ b/dev-texlive/texlive-langpolish/texlive-langpolish-2011.ebuild
@@ -1,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-texlive/texlive-langpolish/texlive-langpolish-2011.ebuild,v 1.3 2012/01/16 14:03:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langpolish/texlive-langpolish-2011.ebuild,v 1.4 2012/01/17 18:59:57 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Polish"
 
 LICENSE="GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2011
 >=dev-texlive/texlive-basic-2011
diff --git a/dev-texlive/texlive-langportuguese/texlive-langportuguese-2011.ebuild b/dev-texlive/texlive-langportuguese/texlive-langportuguese-2011.ebuild
index 076ebdd3447c..20329461efa4 100644
--- a/dev-texlive/texlive-langportuguese/texlive-langportuguese-2011.ebuild
+++ b/dev-texlive/texlive-langportuguese/texlive-langportuguese-2011.ebuild
@@ -1,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-texlive/texlive-langportuguese/texlive-langportuguese-2011.ebuild,v 1.3 2012/01/16 14:04:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langportuguese/texlive-langportuguese-2011.ebuild,v 1.4 2012/01/17 19:00:22 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Portuguese"
 
 LICENSE="GPL-2 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langspanish/texlive-langspanish-2011.ebuild b/dev-texlive/texlive-langspanish/texlive-langspanish-2011.ebuild
index 6d2bbcd3994b..70607776b1ec 100644
--- a/dev-texlive/texlive-langspanish/texlive-langspanish-2011.ebuild
+++ b/dev-texlive/texlive-langspanish/texlive-langspanish-2011.ebuild
@@ -1,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-texlive/texlive-langspanish/texlive-langspanish-2011.ebuild,v 1.3 2012/01/16 14:05:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langspanish/texlive-langspanish-2011.ebuild,v 1.4 2012/01/17 19:00:49 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Spanish"
 
 LICENSE="GPL-2 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langswedish/texlive-langswedish-2011.ebuild b/dev-texlive/texlive-langswedish/texlive-langswedish-2011.ebuild
index 650111351732..79218a0808aa 100644
--- a/dev-texlive/texlive-langswedish/texlive-langswedish-2011.ebuild
+++ b/dev-texlive/texlive-langswedish/texlive-langswedish-2011.ebuild
@@ -1,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-texlive/texlive-langswedish/texlive-langswedish-2011.ebuild,v 1.3 2012/01/16 14:05:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langswedish/texlive-langswedish-2011.ebuild,v 1.4 2012/01/17 19:01:17 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Swedish"
 
 LICENSE="GPL-2 LPPL-1.2 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langtibetan/texlive-langtibetan-2011.ebuild b/dev-texlive/texlive-langtibetan/texlive-langtibetan-2011.ebuild
index 76471a1f14de..371f1d87ab67 100644
--- a/dev-texlive/texlive-langtibetan/texlive-langtibetan-2011.ebuild
+++ b/dev-texlive/texlive-langtibetan/texlive-langtibetan-2011.ebuild
@@ -1,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-texlive/texlive-langtibetan/texlive-langtibetan-2011.ebuild,v 1.3 2012/01/16 14:06:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langtibetan/texlive-langtibetan-2011.ebuild,v 1.4 2012/01/17 19:01:44 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Tibetan"
 
 LICENSE="GPL-2 GPL-1 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langturkmen/texlive-langturkmen-2011.ebuild b/dev-texlive/texlive-langturkmen/texlive-langturkmen-2011.ebuild
index 0aff2f9ec45d..cc634bb238eb 100644
--- a/dev-texlive/texlive-langturkmen/texlive-langturkmen-2011.ebuild
+++ b/dev-texlive/texlive-langturkmen/texlive-langturkmen-2011.ebuild
@@ -1,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-texlive/texlive-langturkmen/texlive-langturkmen-2011.ebuild,v 1.3 2012/01/16 14:07:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langturkmen/texlive-langturkmen-2011.ebuild,v 1.4 2012/01/17 19:02:10 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Turkmen"
 
 LICENSE="GPL-2 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langvietnamese/texlive-langvietnamese-2011.ebuild b/dev-texlive/texlive-langvietnamese/texlive-langvietnamese-2011.ebuild
index a8a76aa9d05c..d0ecb4d4eb0b 100644
--- a/dev-texlive/texlive-langvietnamese/texlive-langvietnamese-2011.ebuild
+++ b/dev-texlive/texlive-langvietnamese/texlive-langvietnamese-2011.ebuild
@@ -1,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-texlive/texlive-langvietnamese/texlive-langvietnamese-2011.ebuild,v 1.3 2012/01/16 14:07:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langvietnamese/texlive-langvietnamese-2011.ebuild,v 1.4 2012/01/17 19:02:39 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Vietnamese"
 
 LICENSE="GPL-2 as-is "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-latex/texlive-latex-2011.ebuild b/dev-texlive/texlive-latex/texlive-latex-2011.ebuild
index 166463f1e0cb..ca76214b4d99 100644
--- a/dev-texlive/texlive-latex/texlive-latex-2011.ebuild
+++ b/dev-texlive/texlive-latex/texlive-latex-2011.ebuild
@@ -1,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-texlive/texlive-latex/texlive-latex-2011.ebuild,v 1.4 2012/01/16 14:08:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-latex/texlive-latex-2011.ebuild,v 1.5 2012/01/17 19:03:10 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Basic LaTeX packages"
 
 LICENSE="GPL-2 GPL-2 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 >=dev-tex/luatex-0.45
diff --git a/dev-texlive/texlive-latexextra/texlive-latexextra-2011-r2.ebuild b/dev-texlive/texlive-latexextra/texlive-latexextra-2011-r2.ebuild
index e410f0ccba58..c3870f547fa8 100644
--- a/dev-texlive/texlive-latexextra/texlive-latexextra-2011-r2.ebuild
+++ b/dev-texlive/texlive-latexextra/texlive-latexextra-2011-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-texlive/texlive-latexextra/texlive-latexextra-2011-r2.ebuild,v 1.3 2012/01/16 14:11:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-latexextra/texlive-latexextra-2011-r2.ebuild,v 1.4 2012/01/17 19:05:42 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive LaTeX supplementary packages"
 
 LICENSE="GPL-2 Apache-2.0 as-is GPL-1 GPL-2 GPL-3 LGPL-2 LPPL-1.2 LPPL-1.3 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2011
 >=dev-texlive/texlive-pictures-2011
diff --git a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2011.ebuild b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2011.ebuild
index 33ff6828734f..7244402bed8d 100644
--- a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2011.ebuild
+++ b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2011.ebuild
@@ -1,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-texlive/texlive-latexrecommended/texlive-latexrecommended-2011.ebuild,v 1.4 2012/01/16 14:12:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2011.ebuild,v 1.5 2012/01/17 19:06:55 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive LaTeX recommended packages"
 
 LICENSE="GPL-2 as-is GPL-1 LPPL-1.2 LPPL-1.3 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2011
 >=dev-texlive/texlive-latex-2011
diff --git a/dev-texlive/texlive-luatex/texlive-luatex-2011.ebuild b/dev-texlive/texlive-luatex/texlive-luatex-2011.ebuild
index 5c7c29b3b59d..b194d5808b00 100644
--- a/dev-texlive/texlive-luatex/texlive-luatex-2011.ebuild
+++ b/dev-texlive/texlive-luatex/texlive-luatex-2011.ebuild
@@ -1,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-texlive/texlive-luatex/texlive-luatex-2011.ebuild,v 1.3 2012/01/16 14:13:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-luatex/texlive-luatex-2011.ebuild,v 1.4 2012/01/17 19:07:24 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive LuaTeX packages"
 
 LICENSE="GPL-2 FDL-1.1 GPL-2 LPPL-1.3 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 >=dev-tex/luatex-0.45
diff --git a/dev-texlive/texlive-mathextra/texlive-mathextra-2011.ebuild b/dev-texlive/texlive-mathextra/texlive-mathextra-2011.ebuild
index be7833e4985c..3860ee2edab0 100644
--- a/dev-texlive/texlive-mathextra/texlive-mathextra-2011.ebuild
+++ b/dev-texlive/texlive-mathextra/texlive-mathextra-2011.ebuild
@@ -1,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-texlive/texlive-mathextra/texlive-mathextra-2011.ebuild,v 1.3 2012/01/16 14:14:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-mathextra/texlive-mathextra-2011.ebuild,v 1.4 2012/01/17 19:07:55 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Advanced math typesetting"
 
 LICENSE="GPL-2 as-is BSD GPL-1 GPL-3 LGPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-fontsrecommended-2011
 >=dev-texlive/texlive-latex-2011
diff --git a/dev-texlive/texlive-metapost/texlive-metapost-2011.ebuild b/dev-texlive/texlive-metapost/texlive-metapost-2011.ebuild
index 8feed90302dd..3fb89d0beef1 100644
--- a/dev-texlive/texlive-metapost/texlive-metapost-2011.ebuild
+++ b/dev-texlive/texlive-metapost/texlive-metapost-2011.ebuild
@@ -1,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-texlive/texlive-metapost/texlive-metapost-2011.ebuild,v 1.3 2012/01/16 14:15:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-metapost/texlive-metapost-2011.ebuild,v 1.4 2012/01/17 19:08:25 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive MetaPost (and Metafont) drawing packages"
 
 LICENSE="GPL-2 as-is GPL-1 LGPL-2 LPPL-1.3 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-music/texlive-music-2011.ebuild b/dev-texlive/texlive-music/texlive-music-2011.ebuild
index f3e15d55a274..8fab78347b73 100644
--- a/dev-texlive/texlive-music/texlive-music-2011.ebuild
+++ b/dev-texlive/texlive-music/texlive-music-2011.ebuild
@@ -1,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-texlive/texlive-music/texlive-music-2011.ebuild,v 1.3 2012/01/16 14:15:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-music/texlive-music-2011.ebuild,v 1.4 2012/01/17 19:08:53 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Music typesetting"
 
 LICENSE="GPL-2 GPL-1 LGPL-2.1 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2011
 !<app-text/texlive-core-2011
diff --git a/dev-texlive/texlive-omega/texlive-omega-2011.ebuild b/dev-texlive/texlive-omega/texlive-omega-2011.ebuild
index 5cda4c6064fd..d6faec9c59d6 100644
--- a/dev-texlive/texlive-omega/texlive-omega-2011.ebuild
+++ b/dev-texlive/texlive-omega/texlive-omega-2011.ebuild
@@ -1,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-texlive/texlive-omega/texlive-omega-2011.ebuild,v 1.3 2012/01/16 14:16:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-omega/texlive-omega-2011.ebuild,v 1.4 2012/01/17 19:09:20 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Omega"
 
 LICENSE="GPL-2 as-is GPL-1 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 >=dev-texlive/texlive-latex-2011
diff --git a/dev-texlive/texlive-pictures/texlive-pictures-2011.ebuild b/dev-texlive/texlive-pictures/texlive-pictures-2011.ebuild
index 6a0a9c3be255..ef301d297c22 100644
--- a/dev-texlive/texlive-pictures/texlive-pictures-2011.ebuild
+++ b/dev-texlive/texlive-pictures/texlive-pictures-2011.ebuild
@@ -1,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-texlive/texlive-pictures/texlive-pictures-2011.ebuild,v 1.3 2012/01/16 14:17:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-pictures/texlive-pictures-2011.ebuild,v 1.4 2012/01/17 19:09:55 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Graphics packages and programs"
 
 LICENSE="GPL-2 Apache-2.0 as-is GPL-1 GPL-3 LPPL-1.3 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 !<dev-texlive/texlive-latexextra-2009
diff --git a/dev-texlive/texlive-plainextra/texlive-plainextra-2011.ebuild b/dev-texlive/texlive-plainextra/texlive-plainextra-2011.ebuild
index 11b76478e5c8..6aa58074e39b 100644
--- a/dev-texlive/texlive-plainextra/texlive-plainextra-2011.ebuild
+++ b/dev-texlive/texlive-plainextra/texlive-plainextra-2011.ebuild
@@ -1,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-texlive/texlive-plainextra/texlive-plainextra-2011.ebuild,v 1.3 2012/01/16 14:18:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-plainextra/texlive-plainextra-2011.ebuild,v 1.4 2012/01/17 19:10:25 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Plain TeX supplementary packages"
 
 LICENSE="GPL-2 as-is LPPL-1.3 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 !<dev-texlive/texlive-langvietnamese-2009
diff --git a/dev-texlive/texlive-pstricks/texlive-pstricks-2011.ebuild b/dev-texlive/texlive-pstricks/texlive-pstricks-2011.ebuild
index 4ecc36879c6e..b4087f7e580d 100644
--- a/dev-texlive/texlive-pstricks/texlive-pstricks-2011.ebuild
+++ b/dev-texlive/texlive-pstricks/texlive-pstricks-2011.ebuild
@@ -1,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-texlive/texlive-pstricks/texlive-pstricks-2011.ebuild,v 1.3 2012/01/16 14:19:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-pstricks/texlive-pstricks-2011.ebuild,v 1.4 2012/01/17 19:11:03 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive PSTricks packages"
 
 LICENSE="GPL-2 GPL-1 LGPL-2 LPPL-1.3 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 >=dev-texlive/texlive-genericrecommended-2011
diff --git a/dev-texlive/texlive-publishers/texlive-publishers-2011.ebuild b/dev-texlive/texlive-publishers/texlive-publishers-2011.ebuild
index 895bee0ece92..e5407c452933 100644
--- a/dev-texlive/texlive-publishers/texlive-publishers-2011.ebuild
+++ b/dev-texlive/texlive-publishers/texlive-publishers-2011.ebuild
@@ -1,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-texlive/texlive-publishers/texlive-publishers-2011.ebuild,v 1.4 2012/01/16 14:20:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-publishers/texlive-publishers-2011.ebuild,v 1.5 2012/01/17 19:11:46 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Support for publishers, theses, standards, conferences, etc
 
 LICENSE="GPL-2 Apache-2.0 as-is GPL-1 GPL-3 LPPL-1.2 LPPL-1.3 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2011
 !<dev-texlive/texlive-latexextra-2011
diff --git a/dev-texlive/texlive-science/texlive-science-2011.ebuild b/dev-texlive/texlive-science/texlive-science-2011.ebuild
index 9ad9ab04ada8..b2f1f8876382 100644
--- a/dev-texlive/texlive-science/texlive-science-2011.ebuild
+++ b/dev-texlive/texlive-science/texlive-science-2011.ebuild
@@ -1,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-texlive/texlive-science/texlive-science-2011.ebuild,v 1.3 2012/01/16 14:21:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-science/texlive-science-2011.ebuild,v 1.4 2012/01/17 19:12:21 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Typesetting for natural and computer sciences"
 
 LICENSE="GPL-2 as-is GPL-1 LGPL-2 LPPL-1.2 LPPL-1.3 public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2011
 !dev-tex/SIunits
diff --git a/dev-texlive/texlive-texinfo/texlive-texinfo-2011.ebuild b/dev-texlive/texlive-texinfo/texlive-texinfo-2011.ebuild
index 3ad8a24ac494..a2c4450c9eca 100644
--- a/dev-texlive/texlive-texinfo/texlive-texinfo-2011.ebuild
+++ b/dev-texlive/texlive-texinfo/texlive-texinfo-2011.ebuild
@@ -1,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-texlive/texlive-texinfo/texlive-texinfo-2011.ebuild,v 1.3 2012/01/16 14:21:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-texinfo/texlive-texinfo-2011.ebuild,v 1.4 2012/01/17 19:12:47 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive GNU Texinfo"
 
 LICENSE="GPL-2 GPL-1 "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-xetex/texlive-xetex-2011.ebuild b/dev-texlive/texlive-xetex/texlive-xetex-2011.ebuild
index 767d83e0fe6d..055c0b3f03f0 100644
--- a/dev-texlive/texlive-xetex/texlive-xetex-2011.ebuild
+++ b/dev-texlive/texlive-xetex/texlive-xetex-2011.ebuild
@@ -1,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-texlive/texlive-xetex/texlive-xetex-2011.ebuild,v 1.3 2012/01/16 14:23:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-xetex/texlive-xetex-2011.ebuild,v 1.4 2012/01/17 19:13:14 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive XeTeX packages"
 
 LICENSE="GPL-2 Apache-2.0 GPL-1 LPPL-1.3 OFL public-domain "
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 !=app-text/texlive-core-2007*
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 944812279d44..3b2d9921b672 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,2 +1 @@
-DIST glib-2.30.1.tar.xz 5809220 RMD160 2bfd106eb56d1ad4af4be556f2398991e53e1825 SHA1 15d497106ccc389a26297725f8dc6de37f2c0371 SHA256 82fde222ea33a0faac88e9b50f5b1f7fcfc235c861a9371e8fe47ec12c1e27f9
 DIST glib-2.30.2.tar.xz 5818860 RMD160 d8fc7c876bd15ea3a9255d4d0a67d745e3790488 SHA1 bc7be8572122997e4d5fc6691f51602f28cd4e3a SHA256 f0e91e6333321ddb48fa12b5c66f56c3d5f05325748c66dd2e9016c278ff8e82
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.30.1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.30.1.ebuild
deleted file mode 100644
index 5f6d175b6e7e..000000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.30.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.30.1.ebuild,v 1.1 2011/10/16 19:24:10 pacho Exp $
-
-EAPI="4"
-GNOME_ORG_MODULE="glib"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="xml"
-
-inherit gnome.org multilib python
-
-DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
-~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-# To prevent circular dependencies with glib[test]
-PDEPEND=">=dev-libs/glib-${PV}:2"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs 2 gdbus-codegen.in
-	sed -e "s:@libdir@:${EPREFIX}/usr/$(get_libdir):" \
-		-i gdbus-codegen.in || die "sed gdbus-codegen.in failed"
-	sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \
-		-i config.py || die "sed config.py failed"
-}
-
-src_test() {
-	elog "Skipping tests. To test ${PN}, emerge dev-libs/glib"
-	elog "with FEATURES=test"
-}
-
-src_install() {
-	insinto "/usr/$(get_libdir)/gdbus-2.0/codegen"
-
-	# Keep in sync with Makefile.am!
-	doins __init__.py \
-		codegen.py \
-		codegen_main.py \
-		codegen_docbook.py \
-		config.py \
-		dbustypes.py \
-		parser.py \
-		utils.py
-
-	newbin gdbus-codegen.in gdbus-codegen
-
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
-
-pkg_postinst() {
-	python_need_rebuild
-	python_mod_optimize /usr/$(get_libdir)/gdbus-2.0/codegen
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/gdbus-2.0/codegen
-}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.30.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.30.2.ebuild
index 41c426d4a987..1ebc7f29e17d 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.30.2.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.30.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.30.2.ebuild,v 1.4 2012/01/14 16:15:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.30.2.ebuild,v 1.5 2012/01/17 11:00:47 pacho Exp $
 
 EAPI="4"
 GNOME_ORG_MODULE="glib"
@@ -38,8 +38,8 @@ src_prepare() {
 }
 
 src_test() {
-	elog "Skipping tests. To test ${PN}, emerge dev-libs/glib"
-	elog "with FEATURES=test"
+	elog "Skipping tests. This package is tested by dev-libs/glib"
+	elog "when merged with FEATURES=test"
 }
 
 src_install() {
diff --git a/dev-util/intltool/intltool-0.50.0.ebuild b/dev-util/intltool/intltool-0.50.0.ebuild
index e5fa144caeb3..be29df0287ce 100644
--- a/dev-util/intltool/intltool-0.50.0.ebuild
+++ b/dev-util/intltool/intltool-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-util/intltool/intltool-0.50.0.ebuild,v 1.1 2011/12/03 00:26:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/intltool/intltool-0.50.0.ebuild,v 1.2 2012/01/17 13:01:39 ago Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="http://edge.launchpad.net/intltool/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-lang/perl-5.8.1
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index a9036ed760d6..09fdce9e2a11 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -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/eclass/kde4-base.eclass,v 1.111 2011/12/18 00:00:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.112 2012/01/17 11:20:03 johu Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -423,9 +423,6 @@ DEPEND+=" ${COMMONDEPEND}"
 RDEPEND+=" ${COMMONDEPEND}"
 unset COMMONDEPEND
 
-# Add experimental kdeenablefinal, masked by default
-IUSE+=" kdeenablefinal"
-
 # Fetch section - If the ebuild's category is not 'kde-base' and if it is not a
 # koffice ebuild, the URI should be set in the ebuild itself
 _calculate_src_uri() {
@@ -452,7 +449,7 @@ _calculate_src_uri() {
 	case ${KDEBASE} in
 		kde-base)
 			case ${PV} in
-				4.[456789].8[05] | 4.[456789].9[023568])
+				4.[456789].8[05] | 4.[456789].9[0235678])
 					# Unstable KDE SC releases
 					SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2"
 					if ! version_is_at_least 4.6.80 ${PV}
@@ -759,10 +756,6 @@ kde4-base_src_configure() {
 	# Build tests in src_test only, where we override this value
 	local cmakeargs=(-DKDE4_BUILD_TESTS=OFF)
 
-	if use_if_iuse kdeenablefinal; then
-		cmakeargs+=(-DKDE4_ENABLE_FINAL=ON)
-	fi
-
 	if use_if_iuse debug; then
 		# Set "real" debug mode
 		CMAKE_BUILD_TYPE="Debugfull"
@@ -896,15 +889,6 @@ kde4-base_pkg_postinst() {
 	buildsycoca
 
 	if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
-		if use_if_iuse kdeenablefinal; then
-			echo
-			ewarn "WARNING! you have kdeenable final useflag enabled."
-			ewarn "This useflag needs to be enabled on ALL kde using packages and"
-			ewarn "is known to cause issues."
-			ewarn "You are using this setup at your own risk and the kde team does not"
-			ewarn "take responsibilities for dead kittens."
-			echo
-		fi
 		if [[ ${BUILD_TYPE} = live ]]; then
 			echo
 			einfo "WARNING! This is an experimental live ebuild of ${CATEGORY}/${PN}"
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index d4d8c3efca53..2b4df7abfd32 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.514 2011/12/16 18:44:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.515 2012/01/17 16:05:59 zorry Exp $
 #
 # Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
 
@@ -1775,11 +1775,18 @@ do_gcc_PIE_patches() {
 		EPATCH_MULTI_MSG="Applying default pie patches ..." \
 		epatch "${WORKDIR}"/piepatch/def
 	fi
-		# we want to be able to control the pie patch logic via something other
-		# than ALL_CFLAGS...
-		sed -e '/^ALL_CFLAGS/iHARD_CFLAGS = ' \
-			-e 's|^ALL_CFLAGS = |ALL_CFLAGS = $(HARD_CFLAGS) |' \
-			-i "${S}"/gcc/Makefile.in
+	
+	# we want to be able to control the pie patch logic via something other
+	# than ALL_CFLAGS...
+	sed -e '/^ALL_CFLAGS/iHARD_CFLAGS = ' \
+		-e 's|^ALL_CFLAGS = |ALL_CFLAGS = $(HARD_CFLAGS) |' \
+		-i "${S}"/gcc/Makefile.in
+	# Need to add HARD_CFLAGS to ALL_CXXFLAGS on >= 4.7
+	if tc_version_is_at_least 4.7.0 ; then
+		sed -e '/^ALL_CXXFLAGS/iHARD_CFLAGS = ' \
+                        -e 's|^ALL_CXXFLAGS = |ALL_CXXFLAGS = $(HARD_CFLAGS) |' \
+                        -i "${S}"/gcc/Makefile.in
+	fi
 
 	BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, pie-${PIE_VER}"
 }
diff --git a/games-arcade/fishsupper/Manifest b/games-arcade/fishsupper/Manifest
new file mode 100644
index 000000000000..c08600bfe216
--- /dev/null
+++ b/games-arcade/fishsupper/Manifest
@@ -0,0 +1 @@
+DIST fishsupper-0.1.6.tar.gz 1136893 RMD160 14118b8f25d698e2c934cc1a8e4da52f8b00a554 SHA1 aa4018e1b0cf4dc73b071d833024d93d0e3c0cc4 SHA256 d2d026ce9567fd6a86cb1c81458b540fd511d269d1af37c9e29df145091da3a8
diff --git a/games-arcade/fishsupper/fishsupper-0.1.6.ebuild b/games-arcade/fishsupper/fishsupper-0.1.6.ebuild
new file mode 100644
index 000000000000..f638230e1574
--- /dev/null
+++ b/games-arcade/fishsupper/fishsupper-0.1.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/fishsupper/fishsupper-0.1.6.ebuild,v 1.1 2012/01/17 14:35:09 ssuominen Exp $
+
+EAPI=2
+inherit eutils games
+
+DESCRIPTION="A simple arcade/puzzle game, loosely based on the retro classic Frogger"
+HOMEPAGE="http://sourceforge.net/projects/fishsupper/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="CCPL-Attribution-ShareAlike-2.5 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/libsdl[audio,video,opengl,X]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[wav]
+	virtual/opengl"
+DEPEND="${RDEPEND}
+	dev-libs/boost"
+
+src_configure() {
+	egamesconf \
+		--disable-dependency-tracking
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS README
+
+	newicon data/images/fs_sprite_042.png ${PN}.png
+	make_desktop_entry ${PN} "Fish Supper"
+
+	prepgamesdirs
+}
diff --git a/games-arcade/fishsupper/metadata.xml b/games-arcade/fishsupper/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-arcade/fishsupper/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>games</herd>
+</pkgmetadata>
diff --git a/games-mud/crystal/crystal-0.2.4.ebuild b/games-mud/crystal/crystal-0.2.4.ebuild
index 1d34452a2eb9..1c7de6468f3c 100644
--- a/games-mud/crystal/crystal-0.2.4.ebuild
+++ b/games-mud/crystal/crystal-0.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/crystal/crystal-0.2.4.ebuild,v 1.1 2011/12/10 07:23:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/crystal/crystal-0.2.4.ebuild,v 1.2 2012/01/17 22:42:49 ago Exp $
 
 EAPI=2
 inherit eutils games
@@ -11,7 +11,7 @@ SRC_URI="http://www.evilmagic.org/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="sys-libs/zlib
diff --git a/games-mud/trebuchet/trebuchet-1.075.ebuild b/games-mud/trebuchet/trebuchet-1.075.ebuild
index cf1fac60d6ed..a741d7ecdcb0 100644
--- a/games-mud/trebuchet/trebuchet-1.075.ebuild
+++ b/games-mud/trebuchet/trebuchet-1.075.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/games-mud/trebuchet/trebuchet-1.075.ebuild,v 1.1 2011/12/09 19:04:45 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/trebuchet/trebuchet-1.075.ebuild,v 1.2 2012/01/17 22:43:47 ago Exp $
 
 EAPI=2
 inherit games
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trebuchet/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 RESTRICT="test"
 
diff --git a/games-strategy/lightyears/lightyears-1.4.ebuild b/games-strategy/lightyears/lightyears-1.4.ebuild
index 8df1cdb0f893..108273b287c5 100644
--- a/games-strategy/lightyears/lightyears-1.4.ebuild
+++ b/games-strategy/lightyears/lightyears-1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/lightyears/lightyears-1.4.ebuild,v 1.1 2011/12/13 03:02:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lightyears/lightyears-1.4.ebuild,v 1.2 2012/01/17 22:42:24 ago Exp $
 
 EAPI=3
 PYTHON_DEPEND="2"
@@ -12,7 +12,7 @@ SRC_URI="http://www.jwhitham.org.uk/20kly/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/pygame"
diff --git a/kde-base/activitymanager/Manifest b/kde-base/activitymanager/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/activitymanager/Manifest
+++ b/kde-base/activitymanager/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/activitymanager/activitymanager-4.7.3.ebuild b/kde-base/activitymanager/activitymanager-4.7.3.ebuild
deleted file mode 100644
index aaeb3b8d78b8..000000000000
--- a/kde-base/activitymanager/activitymanager-4.7.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/activitymanager/activitymanager-4.7.3.ebuild,v 1.3 2011/12/07 22:13:44 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="Activity manager"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug semantic-desktop"
-
-DEPEND="$(add_kdebase_dep kdelibs 'semantic-desktop=')"
-RDEPEND=${DEPEND}
-
-KMEXTRACTONLY="
-	nepomuk/
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		# $(cmake-utils_use_with zeitgeist QtZeitgeist)
-		-DWITH_QtZeitgeist=NO
-	)
-	kde4-meta_src_configure
-}
diff --git a/kde-base/akonadiconsole/Manifest b/kde-base/akonadiconsole/Manifest
index c2f15733fc69..d801b2b719ef 100644
--- a/kde-base/akonadiconsole/Manifest
+++ b/kde-base/akonadiconsole/Manifest
@@ -1,2 +1 @@
-DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
 DIST kdepim-4.7.4.tar.bz2 16182345 RMD160 a36035cce2e25bc0cbddb50e4c9d5fdd661a2f26 SHA1 233f6c413eeedd4af7cf15106a2af7b8f29977bf SHA256 17a5e185e1199436864400d930f60979265cf0cd775b37a2e7b5a1a267c76868
diff --git a/kde-base/akonadiconsole/akonadiconsole-4.7.3.ebuild b/kde-base/akonadiconsole/akonadiconsole-4.7.3.ebuild
deleted file mode 100644
index 3661f9b37924..000000000000
--- a/kde-base/akonadiconsole/akonadiconsole-4.7.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadiconsole/akonadiconsole-4.7.3.ebuild,v 1.4 2011/12/07 22:13:42 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="Akonadi developer console"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	akonadi_next/
-	calendarsupport/
-	messageviewer/
-"
diff --git a/kde-base/akregator/Manifest b/kde-base/akregator/Manifest
index 6a624e13c105..2b0d834b02ae 100644
--- a/kde-base/akregator/Manifest
+++ b/kde-base/akregator/Manifest
@@ -1,3 +1,2 @@
 DIST kdepim-4.4.11.1.tar.bz2 8964708 RMD160 51394b9dcb3aecc4f108e87de37c21e3af820ee1 SHA1 49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf
-DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
 DIST kdepim-4.7.4.tar.bz2 16182345 RMD160 a36035cce2e25bc0cbddb50e4c9d5fdd661a2f26 SHA1 233f6c413eeedd4af7cf15106a2af7b8f29977bf SHA256 17a5e185e1199436864400d930f60979265cf0cd775b37a2e7b5a1a267c76868
diff --git a/kde-base/akregator/akregator-4.4.11.1-r1.ebuild b/kde-base/akregator/akregator-4.4.11.1-r1.ebuild
index 4156f58c02cc..58b7c9cf2849 100644
--- a/kde-base/akregator/akregator-4.4.11.1-r1.ebuild
+++ b/kde-base/akregator/akregator-4.4.11.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-4.4.11.1-r1.ebuild,v 1.5 2011/06/01 19:35:20 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-4.4.11.1-r1.ebuild,v 1.6 2012/01/17 12:01:08 johu Exp $
 
 EAPI=4
 
@@ -19,7 +19,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}"-4.4.10-enablefinal.patch
 	"${FILESDIR}/${PN}"-4.4.11.1-revert.patch
 )
 
diff --git a/kde-base/akregator/akregator-4.4.11.1.ebuild b/kde-base/akregator/akregator-4.4.11.1.ebuild
index 439962d184a0..90873233ac03 100644
--- a/kde-base/akregator/akregator-4.4.11.1.ebuild
+++ b/kde-base/akregator/akregator-4.4.11.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/kde-base/akregator/akregator-4.4.11.1.ebuild,v 1.2 2011/04/22 12:12:51 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-4.4.11.1.ebuild,v 1.3 2012/01/17 12:01:08 johu Exp $
 
 EAPI=4
 
@@ -18,6 +18,4 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}"-4.4.10-enablefinal.patch )
-
 KMLOADLIBS="libkdepim"
diff --git a/kde-base/akregator/akregator-4.7.3.ebuild b/kde-base/akregator/akregator-4.7.3.ebuild
deleted file mode 100644
index be6d933e933d..000000000000
--- a/kde-base/akregator/akregator-4.7.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-4.7.3.ebuild,v 1.4 2011/12/07 22:14:00 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE news feed aggregator."
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/akregator/files/akregator-4.4.10-enablefinal.patch b/kde-base/akregator/files/akregator-4.4.10-enablefinal.patch
deleted file mode 100644
index de134168c5c2..000000000000
--- a/kde-base/akregator/files/akregator-4.4.10-enablefinal.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ru orig/kdepim-4.4.9/akregator/src/deletesubscriptioncommand.cpp kdepim-4.4.9/akregator/src/deletesubscriptioncommand.cpp
---- orig/kdepim-4.4.9/akregator/src/deletesubscriptioncommand.cpp
-+++ kdepim-4.4.9/akregator/src/deletesubscriptioncommand.cpp
-@@ -66,7 +66,7 @@
-             return true;
-         }
-
--        virtual bool visitFeed(Feed* node)
-+        virtual bool visitFeed(Akregator::Feed* node)
-         {
-             QString msg;
-             if (node->title().isEmpty())
-diff -ru orig/kdepim-4.4.9/akregator/src/editsubscriptioncommand.cpp kdepim-4.4.9/akregator/src/editsubscriptioncommand.cpp
---- orig/kdepim-4.4.9/akregator/src/editsubscriptioncommand.cpp
-+++ kdepim-4.4.9/akregator/src/editsubscriptioncommand.cpp
-@@ -51,7 +51,7 @@
-         return true;
-     }
- 
--    bool visitFeed(Feed* node)
-+    bool visitFeed(Akregator::Feed* node)
-     {
-         QPointer<FeedPropertiesDialog> dlg = new FeedPropertiesDialog( m_widget );
-         dlg->setFeed(node);
-diff -ru orig/kdepim-4.4.9/akregator/src/feed.cpp kdepim-4.4.9/akregator/src/feed.cpp
---- orig/kdepim-4.4.9/akregator/src/feed.cpp
-+++ kdepim-4.4.9/akregator/src/feed.cpp
-@@ -61,9 +61,10 @@
- #include <memory>
-
- using Syndication::ItemPtr;
--using namespace Akregator;
- using namespace boost;
-
-+namespace Akregator {
-+
- class Feed::Private
- {
-         Feed* const q;
-@@ -883,5 +884,7 @@
-     }
- }
-
-+}
-+
- #include "feed.moc"
-
-diff -ru orig/kdepim-4.4.9/akregator/src/folder.cpp kdepim-4.4.9/akregator/src/folder.cpp
---- orig/kdepim-4.4.9/akregator/src/folder.cpp
-+++ kdepim-4.4.9/akregator/src/folder.cpp
-@@ -37,7 +37,7 @@
-
- #include <cassert>
-
--using namespace Akregator;
-+namespace Akregator {
-
- class Folder::FolderPrivate
- {
-@@ -454,4 +454,6 @@
-     return nodeList;
- }
-
-+}
-+
- #include "folder.moc"
diff --git a/kde-base/amor/Manifest b/kde-base/amor/Manifest
index edcac9aab994..8103e4966c24 100644
--- a/kde-base/amor/Manifest
+++ b/kde-base/amor/Manifest
@@ -1,3 +1,2 @@
 DIST kdetoys-4.6.3.tar.bz2 402892 RMD160 e17cf18bf95fab96814ba77bee7493a7d1901229 SHA1 07eaf12ccabc9209bd5de6a3f0e4ff6c70fca8b0 SHA256 ebbf38ac02a36bfebd8231c3c0d9e94193e98a947d04869e825e3bc404fad7b6
-DIST kdetoys-4.7.3.tar.bz2 413419 RMD160 f082336f17e1fc3234e6a00c1109c7bec2eaf4b6 SHA1 93d6f0a92c805de51fc68469f940f38858f81fbe SHA256 edff03b9ae91b6c79e09a15a136ba4854c5c73c9be9ab4bfffe6ed8684dd6c31
 DIST kdetoys-4.7.4.tar.bz2 413690 RMD160 6751f98bcd0d6cf1257855bd0ccde0be20183406 SHA1 f929e598180f420d7fc6e4642ed56af9eee5a22b SHA256 d04187e1fbc69f6cf1fc950f4231d3ae8b8a8843444852c1b749bea5ea0ad39d
diff --git a/kde-base/amor/amor-4.7.3.ebuild b/kde-base/amor/amor-4.7.3.ebuild
deleted file mode 100644
index dced0906c2eb..000000000000
--- a/kde-base/amor/amor-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/amor/amor-4.7.3.ebuild,v 1.3 2011/12/07 22:13:33 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdetoys"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Amusing Misuse Of Resources - desktop-dwelling creature"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/ark/Manifest b/kde-base/ark/Manifest
index f961b744c25e..0b02373ba0f9 100644
--- a/kde-base/ark/Manifest
+++ b/kde-base/ark/Manifest
@@ -1,3 +1,2 @@
 DIST kdeutils-4.6.3.tar.bz2 3703326 RMD160 1fe6287fed3fa21eef902ee764425171f7345e6c SHA1 1aa735c03689ef49b949278ee31d0d8e8536b7d6 SHA256 d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
-DIST kdeutils-4.7.3.tar.bz2 3802391 RMD160 0e0a73d290baaa289665b49722f04f19ab517dd9 SHA1 23fc9823647152d5d8cc250a55402c8930db4059 SHA256 a8c802f32b9e918d806a4487c25485f86019e4c473f0de6d3086d8ea8e492839
 DIST kdeutils-4.7.4.tar.bz2 3802873 RMD160 24c3af30a407523bdf853059fc38bfbf6e6d4604 SHA1 4630f01f36558eb5494fc562086fbd4e488e411e SHA256 bb50a5069808a0280eff671b2f9c0053f5bbbfdc432760bc35ccf654de833c68
diff --git a/kde-base/ark/ark-4.7.3.ebuild b/kde-base/ark/ark-4.7.3.ebuild
deleted file mode 100644
index e2ea41b3b77a..000000000000
--- a/kde-base/ark/ark-4.7.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ark-4.7.3.ebuild,v 1.3 2011/12/07 22:13:43 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeutils"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
-
-DESCRIPTION="KDE Archiving tool"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+archive +bzip2 debug lzma"
-
-DEPEND="
-	$(add_kdebase_dep libkonq)
-	sys-libs/zlib
-	archive? ( >=app-arch/libarchive-2.6.1[bzip2?,lzma?,zlib] )
-	lzma? ( app-arch/xz-utils )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with archive LibArchive)
-		$(cmake-utils_use_with bzip2 BZip2)
-		$(cmake-utils_use_with lzma LibLZMA)
-	)
-	${kde_eclass}_src_configure
-}
-
-pkg_postinst() {
-	${kde_eclass}_pkg_postinst
-	elog "For creating rar archives, install app-arch/rar"
-}
diff --git a/kde-base/attica/Manifest b/kde-base/attica/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/attica/Manifest
+++ b/kde-base/attica/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/attica/attica-4.7.3.ebuild b/kde-base/attica/attica-4.7.3.ebuild
deleted file mode 100644
index 5e19eeea3994..000000000000
--- a/kde-base/attica/attica-4.7.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/attica/attica-4.7.3.ebuild,v 1.3 2011/12/07 22:13:32 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="Open Collaboration Services provider management"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	>=dev-libs/libattica-0.1.4
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/blinken/Manifest b/kde-base/blinken/Manifest
index a7cb7b1685b9..9afd45779a32 100644
--- a/kde-base/blinken/Manifest
+++ b/kde-base/blinken/Manifest
@@ -1,3 +1,2 @@
-DIST blinken-4.7.3.tar.bz2 602194 RMD160 44ee3cf9901b329c1311cb3f86a901a1409a77b7 SHA1 24f09f604e1687062b3296a30b873d1781379543 SHA256 7731e008d42669d3841ab6edee70801f3fb934bd9d58e1a92e3b397400a0ae2b
 DIST blinken-4.7.4.tar.bz2 602215 RMD160 3bb1b1e4c129d91e922965d77815cf8fb9ed4ef6 SHA1 edeb024db23da00cf896bc41c6e3efa371d9867d SHA256 266a5e29c6c832baa67ac5e512ad93506f66ccbe3bb38c0b1891cdb5c0c3aa99
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
diff --git a/kde-base/blinken/blinken-4.7.3.ebuild b/kde-base/blinken/blinken-4.7.3.ebuild
deleted file mode 100644
index 98cb14eb0804..000000000000
--- a/kde-base/blinken/blinken-4.7.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/blinken-4.7.3.ebuild,v 1.3 2011/12/07 22:13:42 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE version of the Simon Says game."
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkdeedu)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep knotify)
-"
diff --git a/kde-base/blogilo/Manifest b/kde-base/blogilo/Manifest
index 6a624e13c105..2b0d834b02ae 100644
--- a/kde-base/blogilo/Manifest
+++ b/kde-base/blogilo/Manifest
@@ -1,3 +1,2 @@
 DIST kdepim-4.4.11.1.tar.bz2 8964708 RMD160 51394b9dcb3aecc4f108e87de37c21e3af820ee1 SHA1 49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf
-DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
 DIST kdepim-4.7.4.tar.bz2 16182345 RMD160 a36035cce2e25bc0cbddb50e4c9d5fdd661a2f26 SHA1 233f6c413eeedd4af7cf15106a2af7b8f29977bf SHA256 17a5e185e1199436864400d930f60979265cf0cd775b37a2e7b5a1a267c76868
diff --git a/kde-base/blogilo/blogilo-4.7.3.ebuild b/kde-base/blogilo/blogilo-4.7.3.ebuild
deleted file mode 100644
index e0a39b458164..000000000000
--- a/kde-base/blogilo/blogilo-4.7.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/blogilo/blogilo-4.7.3.ebuild,v 1.4 2011/12/07 22:13:53 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE Blogging Client"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}
-"
diff --git a/kde-base/bomber/Manifest b/kde-base/bomber/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/bomber/Manifest
+++ b/kde-base/bomber/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/bomber/bomber-4.7.3.ebuild b/kde-base/bomber/bomber-4.7.3.ebuild
deleted file mode 100644
index b95fc009feb2..000000000000
--- a/kde-base/bomber/bomber-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/bomber/bomber-4.7.3.ebuild,v 1.3 2011/12/07 22:13:38 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE arcade bombing game"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/bovo/Manifest b/kde-base/bovo/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/bovo/Manifest
+++ b/kde-base/bovo/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/bovo/bovo-4.7.3.ebuild b/kde-base/bovo/bovo-4.7.3.ebuild
deleted file mode 100644
index 09bc0f7dfb23..000000000000
--- a/kde-base/bovo/bovo-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/bovo/bovo-4.7.3.ebuild,v 1.3 2011/12/07 22:13:40 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="Five-in-a-row Board Game"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/cantor/Manifest b/kde-base/cantor/Manifest
index 4b79d7a32f11..26ddc1436473 100644
--- a/kde-base/cantor/Manifest
+++ b/kde-base/cantor/Manifest
@@ -1,3 +1,2 @@
-DIST cantor-4.7.3.tar.bz2 499214 RMD160 97aef2d4782722bcb7a090b7c60e2ceee6e96cde SHA1 ce6240d44cbf47b3dbfd1dbc03196c916e4394e9 SHA256 7451843080e2e5f68112e5da7f8b4d08c579a9436d816a4958d7d8253218d73d
 DIST cantor-4.7.4.tar.bz2 500119 RMD160 c53785ac0db9ae2368f9630222d7392819220213 SHA1 da39832093c1ea6eb28c6b5b4f67cb24473d8fb5 SHA256 2a1b40275e6360142154449406bebf5da4a1cbfd104447d25c6218ba9204f571
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
diff --git a/kde-base/cantor/cantor-4.7.3.ebuild b/kde-base/cantor/cantor-4.7.3.ebuild
deleted file mode 100644
index 9149aaa38263..000000000000
--- a/kde-base/cantor/cantor-4.7.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/cantor/cantor-4.7.3.ebuild,v 1.3 2011/12/07 22:13:52 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE4 interface for doing mathematics and scientific computing"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug ps +R"
-
-# TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
-RDEPEND="
-	ps? ( app-text/libspectre )
-	R? ( dev-lang/R )
-"
-DEPEND="${RDEPEND}
-	>=dev-cpp/eigen-2.0.3:2
-"
-
-# bug 386491
-RESTRICT="test"
-
-src_configure() {
-	mycmakeargs+="
-		$(cmake-utils_use_with ps LibSpectre)
-		$(cmake-utils_use_with R)
-	"
-	kde4-base_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if ! use R; then
-		echo
-		ewarn "You have decided to build ${PN} with no backend."
-		ewarn "To have this application functional, please do one of below:"
-		ewarn "    # emerge -va1 '='${CATEGORY}/${P} with 'R' USE flag enabled"
-		ewarn "    # emerge -vaDu sci-mathematics/maxima"
-		echo
-	fi
-}
diff --git a/kde-base/cervisia/Manifest b/kde-base/cervisia/Manifest
index 8129826b48d8..2c54c126587e 100644
--- a/kde-base/cervisia/Manifest
+++ b/kde-base/cervisia/Manifest
@@ -1,3 +1,2 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
-DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
 DIST kdesdk-4.7.4.tar.bz2 5266656 RMD160 9fc17159fd8cbbf9cfe76ed18dfcf8a269d0270e SHA1 3a0f61204653dc3f9f975732b6f67659c60ecaf3 SHA256 a2142ea51e9172e589b0526879061e5c3e4337f6154d89b0491fef9c68e56f6c
diff --git a/kde-base/cervisia/cervisia-4.7.3.ebuild b/kde-base/cervisia/cervisia-4.7.3.ebuild
deleted file mode 100644
index 79683d87229a..000000000000
--- a/kde-base/cervisia/cervisia-4.7.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/cervisia-4.7.3.ebuild,v 1.3 2011/12/07 22:14:02 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdesdk"
-inherit kde4-meta
-
-DESCRIPTION="Cervisia - A KDE CVS frontend"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	dev-vcs/cvs
-"
diff --git a/kde-base/dolphin-plugins/Manifest b/kde-base/dolphin-plugins/Manifest
index 8129826b48d8..2c54c126587e 100644
--- a/kde-base/dolphin-plugins/Manifest
+++ b/kde-base/dolphin-plugins/Manifest
@@ -1,3 +1,2 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
-DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
 DIST kdesdk-4.7.4.tar.bz2 5266656 RMD160 9fc17159fd8cbbf9cfe76ed18dfcf8a269d0270e SHA1 3a0f61204653dc3f9f975732b6f67659c60ecaf3 SHA256 a2142ea51e9172e589b0526879061e5c3e4337f6154d89b0491fef9c68e56f6c
diff --git a/kde-base/dolphin-plugins/dolphin-plugins-4.7.3.ebuild b/kde-base/dolphin-plugins/dolphin-plugins-4.7.3.ebuild
deleted file mode 100644
index 502482adbb31..000000000000
--- a/kde-base/dolphin-plugins/dolphin-plugins-4.7.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin-plugins/dolphin-plugins-4.7.3.ebuild,v 1.3 2011/12/07 22:13:55 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdesdk"
-inherit kde4-meta
-
-DESCRIPTION="Extra Dolphin plugins"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug +git +subversion"
-
-DEPEND="
-	$(add_kdebase_dep libkonq)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kompare)
-	git? ( dev-vcs/git )
-	subversion? ( dev-vcs/subversion )
-"
-
-KMLOADLIBS="libkonq"
-
-#
-# See bug 351147 for why this is necessary
-#
-src_prepare() {
-	echo 'macro_optional_add_subdirectory ( dolphin-plugins )' >> CMakeLists.txt || die
-	echo > dolphin-plugins/CMakeLists.txt || die
-	use git && echo 'add_subdirectory ( git )' >> dolphin-plugins/CMakeLists.txt
-	use subversion && echo 'add_subdirectory ( svn )' >> dolphin-plugins/CMakeLists.txt
-
-	kde4-meta_src_prepare
-}
-
-src_install() {
-	{ use git || use subversion; } && kde4-meta_src_install
-}
diff --git a/kde-base/dolphin/Manifest b/kde-base/dolphin/Manifest
index d0cd4f15d1e8..7af0c2c0ae27 100644
--- a/kde-base/dolphin/Manifest
+++ b/kde-base/dolphin/Manifest
@@ -1,3 +1,2 @@
-DIST kde-baseapps-4.7.3.tar.bz2 2685074 RMD160 270f3f3ae7b473651517db8818160f16e4faf544 SHA1 952dc26d0d908b41973a8d7b4d27765bf5128d58 SHA256 e9fb0c5da9e9a255c1a1735dfa518dcadc1ea23c68a467164597ff3dbf51c8df
 DIST kde-baseapps-4.7.4.tar.bz2 2684721 RMD160 cedc577cb3449e36b7e7dab1192688c8014c46d1 SHA1 ad4b6d8479bcf8be49b5f53ee8fdcc1b3d1106d6 SHA256 0a59e87b0019bb5d80abbc9cb2fc691ec838d43e9b168e7a15b11d40ac1db51c
 DIST kdebase-4.6.3.tar.bz2 2682586 RMD160 38784d7a5a708703f5a22e39dc5f83ef7aecd833 SHA1 69cfba74099cdce27f7f72725288f025979b41f3 SHA256 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
diff --git a/kde-base/dolphin/dolphin-4.7.3.ebuild b/kde-base/dolphin/dolphin-4.7.3.ebuild
deleted file mode 100644
index ebf4357598d8..000000000000
--- a/kde-base/dolphin/dolphin-4.7.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.7.3.ebuild,v 1.4 2011/12/07 22:13:50 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-baseapps"
-inherit kde4-meta
-
-DESCRIPTION="A KDE filemanager focusing on usability"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug semantic-desktop thumbnail"
-
-DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop=')
-	$(add_kdebase_dep libkonq)
-	semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.2 )
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kfind)
-"
-PDEPEND="
-	thumbnail? (
-		$(add_kdebase_dep thumbnailers)
-		|| (
-			$(add_kdebase_dep ffmpegthumbs)
-			$(add_kdebase_dep mplayerthumbs)
-		)
-	)
-"
-
-KMLOADLIBS="libkonq"
-
-RESTRICT="test"
-# bug 393129
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/dolphin/dolphin-4.7.4.ebuild b/kde-base/dolphin/dolphin-4.7.4.ebuild
index 813645313db7..47c5f020c319 100644
--- a/kde-base/dolphin/dolphin-4.7.4.ebuild
+++ b/kde-base/dolphin/dolphin-4.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/kde-base/dolphin/dolphin-4.7.4.ebuild,v 1.3 2012/01/16 21:08:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.7.4.ebuild,v 1.4 2012/01/17 22:00:19 johu Exp $
 
 EAPI=4
 
@@ -42,3 +42,10 @@ src_configure() {
 
 	kde4-meta_src_configure
 }
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+	echo
+	elog "For .exe file preview support, install media-gfx/icoutils."
+	echo
+}
diff --git a/kde-base/dragonplayer/Manifest b/kde-base/dragonplayer/Manifest
index 76bfebff29d3..5dd228e2a189 100644
--- a/kde-base/dragonplayer/Manifest
+++ b/kde-base/dragonplayer/Manifest
@@ -1,3 +1,2 @@
 DIST kdemultimedia-4.6.3.tar.bz2 1611668 RMD160 8824bda18a1f1051dea366a0ff0d6191068476dd SHA1 d5bde19156b65e9b56e0e6de800efc0efe117632 SHA256 b3a6732dead0558610b4b40d3ce28c4b7b5da8869a63436180eacb3aacec533b
-DIST kdemultimedia-4.7.3.tar.bz2 1644497 RMD160 de9d9f9341d91bf0d56fa9468c0441226cb6aba2 SHA1 4db44494e6a2ef886e3513b6a2eb4e526741a6ff SHA256 ad96332218b82c4466debcb165061d87051a917e0321bdc34e4024da9c8c30b1
 DIST kdemultimedia-4.7.4.tar.bz2 1644450 RMD160 c180dfed17735bfef4303802dd8065ed308cdd6a SHA1 e0001afac38e35e3ab7b919d79f74cd57e3c18dd SHA256 c1236ed17f575ff793869e5ade024f892ae36aba27a00edafb3495806fb81b28
diff --git a/kde-base/dragonplayer/dragonplayer-4.7.3.ebuild b/kde-base/dragonplayer/dragonplayer-4.7.3.ebuild
deleted file mode 100644
index ba8159ef8013..000000000000
--- a/kde-base/dragonplayer/dragonplayer-4.7.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dragonplayer/dragonplayer-4.7.3.ebuild,v 1.3 2011/12/07 22:13:50 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdemultimedia"
-inherit kde4-meta
-
-DESCRIPTION="Dragon Player is a simple video player for KDE 4"
-HOMEPAGE="http://www.dragonplayer.net/"
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-IUSE="debug xine"
-
-RDEPEND="
-	>=media-libs/phonon-4.4.3
-	xine? ( media-libs/xine-lib[xcb] )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with xine)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/drkonqi/Manifest b/kde-base/drkonqi/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/drkonqi/Manifest
+++ b/kde-base/drkonqi/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/drkonqi/drkonqi-4.7.3.ebuild b/kde-base/drkonqi/drkonqi-4.7.3.ebuild
deleted file mode 100644
index 3a433e24e4d2..000000000000
--- a/kde-base/drkonqi/drkonqi-4.7.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/drkonqi-4.7.3.ebuild,v 1.3 2011/12/07 22:13:57 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE crash handler, gives the user feedback if a program crashed"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-	if ! has_version "sys-devel/gdb"; then
-		elog "For more usability consider installing following packages:"
-		elog "    sys-devel/gdb - Easier debugging support"
-	fi
-}
diff --git a/kde-base/ffmpegthumbs/Manifest b/kde-base/ffmpegthumbs/Manifest
index 76bfebff29d3..5dd228e2a189 100644
--- a/kde-base/ffmpegthumbs/Manifest
+++ b/kde-base/ffmpegthumbs/Manifest
@@ -1,3 +1,2 @@
 DIST kdemultimedia-4.6.3.tar.bz2 1611668 RMD160 8824bda18a1f1051dea366a0ff0d6191068476dd SHA1 d5bde19156b65e9b56e0e6de800efc0efe117632 SHA256 b3a6732dead0558610b4b40d3ce28c4b7b5da8869a63436180eacb3aacec533b
-DIST kdemultimedia-4.7.3.tar.bz2 1644497 RMD160 de9d9f9341d91bf0d56fa9468c0441226cb6aba2 SHA1 4db44494e6a2ef886e3513b6a2eb4e526741a6ff SHA256 ad96332218b82c4466debcb165061d87051a917e0321bdc34e4024da9c8c30b1
 DIST kdemultimedia-4.7.4.tar.bz2 1644450 RMD160 c180dfed17735bfef4303802dd8065ed308cdd6a SHA1 e0001afac38e35e3ab7b919d79f74cd57e3c18dd SHA256 c1236ed17f575ff793869e5ade024f892ae36aba27a00edafb3495806fb81b28
diff --git a/kde-base/ffmpegthumbs/ffmpegthumbs-4.7.3.ebuild b/kde-base/ffmpegthumbs/ffmpegthumbs-4.7.3.ebuild
deleted file mode 100644
index 14a28b8c91bf..000000000000
--- a/kde-base/ffmpegthumbs/ffmpegthumbs-4.7.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ffmpegthumbs/ffmpegthumbs-4.7.3.ebuild,v 1.3 2011/12/07 22:14:00 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdemultimedia"
-inherit kde4-meta
-
-DESCRIPTION="A FFmpeg based thumbnail Generator for Video Files."
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	virtual/ffmpeg
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/filelight/Manifest b/kde-base/filelight/Manifest
index f961b744c25e..0b02373ba0f9 100644
--- a/kde-base/filelight/Manifest
+++ b/kde-base/filelight/Manifest
@@ -1,3 +1,2 @@
 DIST kdeutils-4.6.3.tar.bz2 3703326 RMD160 1fe6287fed3fa21eef902ee764425171f7345e6c SHA1 1aa735c03689ef49b949278ee31d0d8e8536b7d6 SHA256 d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
-DIST kdeutils-4.7.3.tar.bz2 3802391 RMD160 0e0a73d290baaa289665b49722f04f19ab517dd9 SHA1 23fc9823647152d5d8cc250a55402c8930db4059 SHA256 a8c802f32b9e918d806a4487c25485f86019e4c473f0de6d3086d8ea8e492839
 DIST kdeutils-4.7.4.tar.bz2 3802873 RMD160 24c3af30a407523bdf853059fc38bfbf6e6d4604 SHA1 4630f01f36558eb5494fc562086fbd4e488e411e SHA256 bb50a5069808a0280eff671b2f9c0053f5bbbfdc432760bc35ccf654de833c68
diff --git a/kde-base/filelight/filelight-4.7.3.ebuild b/kde-base/filelight/filelight-4.7.3.ebuild
deleted file mode 100644
index a361ca693cfc..000000000000
--- a/kde-base/filelight/filelight-4.7.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/filelight/filelight-4.7.3.ebuild,v 1.3 2011/12/07 22:13:35 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeutils"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
-
-DESCRIPTION="Filelight creates an interactive map of concentric, segmented rings that help visualise disk usage."
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	x11-apps/xdpyinfo
-"
diff --git a/kde-base/freespacenotifier/Manifest b/kde-base/freespacenotifier/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/freespacenotifier/Manifest
+++ b/kde-base/freespacenotifier/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/freespacenotifier/freespacenotifier-4.7.3.ebuild b/kde-base/freespacenotifier/freespacenotifier-4.7.3.ebuild
deleted file mode 100644
index ae8942dd2727..000000000000
--- a/kde-base/freespacenotifier/freespacenotifier-4.7.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/freespacenotifier/freespacenotifier-4.7.3.ebuild,v 1.3 2011/12/07 22:13:53 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="A module that monitors free disk space on the home dir"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/granatier/Manifest b/kde-base/granatier/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/granatier/Manifest
+++ b/kde-base/granatier/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/granatier/granatier-4.7.3.ebuild b/kde-base/granatier/granatier-4.7.3.ebuild
deleted file mode 100644
index 1ef26eb0c84b..000000000000
--- a/kde-base/granatier/granatier-4.7.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/granatier/granatier-4.7.3.ebuild,v 1.3 2011/12/07 22:13:32 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE Bomberman game"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	media-libs/libsndfile
-	media-libs/openal
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/gwenview/Manifest b/kde-base/gwenview/Manifest
index c17e18c1bb9c..6cff0d20548c 100644
--- a/kde-base/gwenview/Manifest
+++ b/kde-base/gwenview/Manifest
@@ -1,3 +1,2 @@
-DIST gwenview-4.7.3.tar.bz2 1975245 RMD160 4edf13949e772e36934efbab68d0d1dfe0ff5b3c SHA1 7096721285d15311699acc76abd62755d6e93860 SHA256 41ca54aeec104bd7c7eb8b17f49176d77ce45481a668707f0d449835fe2fc972
 DIST gwenview-4.7.4.tar.bz2 1975363 RMD160 c2d1ee9e1be97dce632030a6feac5bf9bd99f357 SHA1 598714d18cf7adab8afd4f906070f0915e1cdc95 SHA256 d23d34790a460ed314a6b7b5b05b631d6eaa27c05269b908cd29fb0af05917b6
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
diff --git a/kde-base/gwenview/gwenview-4.7.3.ebuild b/kde-base/gwenview/gwenview-4.7.3.ebuild
deleted file mode 100644
index e1f6edcb1f5a..000000000000
--- a/kde-base/gwenview/gwenview-4.7.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/gwenview/gwenview-4.7.3.ebuild,v 1.3 2011/12/07 22:13:44 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE image viewer"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug kipi semantic-desktop"
-
-# tests hang, last checked for 4.2.96
-RESTRICT="test"
-
-DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop=')
-	$(add_kdebase_dep libkonq)
-	>=media-gfx/exiv2-0.19
-	virtual/jpeg
-	kipi? ( $(add_kdebase_dep libkipi) )
-"
-RDEPEND="${DEPEND}"
-
-KMLOADLIBS="libkonq"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with kipi)
-	)
-
-	if use semantic-desktop; then
-		mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Nepomuk)
-	else
-		mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=None)
-	fi
-
-	kde4-base_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	echo
-	elog "For SVG support, emerge -va kde-base/svgpart"
-	echo
-	use kipi && elog "The plugins for the KIPI inteface can be found in media-plugins/kipi-plugins"
-	use kipi && echo
-}
diff --git a/kde-base/jovie/Manifest b/kde-base/jovie/Manifest
index 4399b5e0128d..08505cac662b 100644
--- a/kde-base/jovie/Manifest
+++ b/kde-base/jovie/Manifest
@@ -1,3 +1,2 @@
 DIST kdeaccessibility-4.6.3.tar.bz2 5225058 RMD160 29e3f99600e0670233f87837e8df7923877d3de6 SHA1 8d4053defbf839fd428820d6d1659b6e46ab468a SHA256 e3f64e002d98a2b878abb76897b96945ed3c17ff84ed64ef6f7156bd7e3018f8
-DIST kdeaccessibility-4.7.3.tar.bz2 878030 RMD160 48a77ba186233a8b34e79fd1f3f7e15e250ca882 SHA1 9695d2b8b6f55266e3f76ebf05543f23857b9520 SHA256 d4225fcf207b06506972e0d1e405f7521492106e6b7994145ecb8cc3cd9f60d1
 DIST kdeaccessibility-4.7.4.tar.bz2 876933 RMD160 3f4f7b5a71a3d5f2520fca710c65992c6c93830d SHA1 03f4ac8234dcc49eb93eff3630f76e226e290fff SHA256 031251969c0edcbfd93ceffce5665574df7af476e24112fe5af6f9e261d0bb8a
diff --git a/kde-base/jovie/jovie-4.7.3.ebuild b/kde-base/jovie/jovie-4.7.3.ebuild
deleted file mode 100644
index 82e15f62f8c5..000000000000
--- a/kde-base/jovie/jovie-4.7.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/jovie/jovie-4.7.3.ebuild,v 1.3 2011/12/07 22:13:45 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeaccessibility"
-	kde_eclass="kde4-meta"
-fi
-
-inherit ${kde_eclass}
-
-DESCRIPTION="Jovie is a text to speech application"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-accessibility/speech-dispatcher
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/juk/Manifest b/kde-base/juk/Manifest
index 76bfebff29d3..5dd228e2a189 100644
--- a/kde-base/juk/Manifest
+++ b/kde-base/juk/Manifest
@@ -1,3 +1,2 @@
 DIST kdemultimedia-4.6.3.tar.bz2 1611668 RMD160 8824bda18a1f1051dea366a0ff0d6191068476dd SHA1 d5bde19156b65e9b56e0e6de800efc0efe117632 SHA256 b3a6732dead0558610b4b40d3ce28c4b7b5da8869a63436180eacb3aacec533b
-DIST kdemultimedia-4.7.3.tar.bz2 1644497 RMD160 de9d9f9341d91bf0d56fa9468c0441226cb6aba2 SHA1 4db44494e6a2ef886e3513b6a2eb4e526741a6ff SHA256 ad96332218b82c4466debcb165061d87051a917e0321bdc34e4024da9c8c30b1
 DIST kdemultimedia-4.7.4.tar.bz2 1644450 RMD160 c180dfed17735bfef4303802dd8065ed308cdd6a SHA1 e0001afac38e35e3ab7b919d79f74cd57e3c18dd SHA256 c1236ed17f575ff793869e5ade024f892ae36aba27a00edafb3495806fb81b28
diff --git a/kde-base/juk/juk-4.7.3.ebuild b/kde-base/juk/juk-4.7.3.ebuild
deleted file mode 100644
index 3cfebfcccddd..000000000000
--- a/kde-base/juk/juk-4.7.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/juk-4.7.3.ebuild,v 1.3 2011/12/07 22:13:41 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdemultimedia"
-inherit kde4-meta
-
-DESCRIPTION="Jukebox and music manager for KDE."
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug musicbrainz"
-
-DEPEND="
-	>=media-libs/taglib-1.6
-	musicbrainz? ( media-libs/tunepimp )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with musicbrainz TunePimp)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kabcclient/Manifest b/kde-base/kabcclient/Manifest
index 6a624e13c105..2b0d834b02ae 100644
--- a/kde-base/kabcclient/Manifest
+++ b/kde-base/kabcclient/Manifest
@@ -1,3 +1,2 @@
 DIST kdepim-4.4.11.1.tar.bz2 8964708 RMD160 51394b9dcb3aecc4f108e87de37c21e3af820ee1 SHA1 49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf
-DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
 DIST kdepim-4.7.4.tar.bz2 16182345 RMD160 a36035cce2e25bc0cbddb50e4c9d5fdd661a2f26 SHA1 233f6c413eeedd4af7cf15106a2af7b8f29977bf SHA256 17a5e185e1199436864400d930f60979265cf0cd775b37a2e7b5a1a267c76868
diff --git a/kde-base/kabcclient/kabcclient-4.7.3.ebuild b/kde-base/kabcclient/kabcclient-4.7.3.ebuild
deleted file mode 100644
index ffca3984deae..000000000000
--- a/kde-base/kabcclient/kabcclient-4.7.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kabcclient/kabcclient-4.7.3.ebuild,v 1.4 2011/12/07 22:14:03 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KMMODULE="console/${PN}"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="A command line client for accessing the KDE addressbook"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	kde4-meta_src_install
-
-	# work around NULL DT_RPATH in kabc2mutt
-	dosym kabcclient ${PREFIX}/bin/kabc2mutt
-}
diff --git a/kde-base/kaccessible/Manifest b/kde-base/kaccessible/Manifest
index 4399b5e0128d..08505cac662b 100644
--- a/kde-base/kaccessible/Manifest
+++ b/kde-base/kaccessible/Manifest
@@ -1,3 +1,2 @@
 DIST kdeaccessibility-4.6.3.tar.bz2 5225058 RMD160 29e3f99600e0670233f87837e8df7923877d3de6 SHA1 8d4053defbf839fd428820d6d1659b6e46ab468a SHA256 e3f64e002d98a2b878abb76897b96945ed3c17ff84ed64ef6f7156bd7e3018f8
-DIST kdeaccessibility-4.7.3.tar.bz2 878030 RMD160 48a77ba186233a8b34e79fd1f3f7e15e250ca882 SHA1 9695d2b8b6f55266e3f76ebf05543f23857b9520 SHA256 d4225fcf207b06506972e0d1e405f7521492106e6b7994145ecb8cc3cd9f60d1
 DIST kdeaccessibility-4.7.4.tar.bz2 876933 RMD160 3f4f7b5a71a3d5f2520fca710c65992c6c93830d SHA1 03f4ac8234dcc49eb93eff3630f76e226e290fff SHA256 031251969c0edcbfd93ceffce5665574df7af476e24112fe5af6f9e261d0bb8a
diff --git a/kde-base/kaccessible/kaccessible-4.7.3.ebuild b/kde-base/kaccessible/kaccessible-4.7.3.ebuild
deleted file mode 100644
index db261370606e..000000000000
--- a/kde-base/kaccessible/kaccessible-4.7.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaccessible/kaccessible-4.7.3.ebuild,v 1.3 2011/12/07 22:14:01 hwoarang Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeaccessibility"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
-
-DESCRIPTION="Provides accessibility services like focus tracking"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug +speechd"
-
-DEPEND="app-accessibility/speech-dispatcher"
-RDEPEND=${DEPEND}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with speechd Speechd)
-	)
-	${kde_eclass}_src_configure
-}
diff --git a/kde-base/kactivities/Manifest b/kde-base/kactivities/Manifest
index 842746468258..07dd28d7144c 100644
--- a/kde-base/kactivities/Manifest
+++ b/kde-base/kactivities/Manifest
@@ -1,2 +1 @@
-DIST kdelibs-4.7.3.tar.bz2 12071229 RMD160 e8bb93554a915d97d6619b8a9bfccdd7175259a0 SHA1 4f1bbd1b4d558f3541057747db9bf7e9dcececb3 SHA256 00ef65295134e998e8bc1123b0bd64245811106e827ab90458378ea4ab5b0e66
 DIST kdelibs-4.7.4.tar.bz2 12084560 RMD160 5666cacb69ebdbd2d0e9ce9300f35ecf6d6ba48c SHA1 78b25e93a8c70ccc1e0f117cce960fe4e1deb8d8 SHA256 fe1d41ecce95d9ef67a9b81cee55afe5ac98aa937e2c2356bd69f9bb31a2af39
diff --git a/kde-base/kactivities/kactivities-4.7.3.ebuild b/kde-base/kactivities/kactivities-4.7.3.ebuild
deleted file mode 100644
index ce015c68d221..000000000000
--- a/kde-base/kactivities/kactivities-4.7.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kactivities/kactivities-4.7.3.ebuild,v 1.3 2011/12/07 22:13:37 hwoarang Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-KMNAME="kdelibs"
-
-inherit kde4-base
-
-DESCRIPTION="KDE Activity Manager"
-
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT="test"
-
-# Split out from kdelibs in 4.7.1-r2
-add_blocker kdelibs 4.7.1-r1
-
-src_unpack() {
-	kde4-base_src_unpack
-	# Move the unpacked sources to where they are expected to be
-	[[ $(echo *-${PV}) != ${P} ]] && { mv *-${PV} ${P} || die; }
-}
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	sed -i -e '/libkdeclarative/s:^:#DONOTWANT:' experimental/CMakeLists.txt || die
-}
-
-src_configure() {
-	local S="${WORKDIR}/${P}/experimental"
-
-	kde4-base_src_configure
-}
-
-src_compile() {
-	local S="${WORKDIR}/${P}/experimental"
-
-	kde4-base_src_compile
-}
-
-src_install() {
-	local S="${WORKDIR}/${P}/experimental"
-
-	kde4-base_src_install
-}
diff --git a/kde-base/kaddressbook/Manifest b/kde-base/kaddressbook/Manifest
index 6a624e13c105..2b0d834b02ae 100644
--- a/kde-base/kaddressbook/Manifest
+++ b/kde-base/kaddressbook/Manifest
@@ -1,3 +1,2 @@
 DIST kdepim-4.4.11.1.tar.bz2 8964708 RMD160 51394b9dcb3aecc4f108e87de37c21e3af820ee1 SHA1 49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf
-DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
 DIST kdepim-4.7.4.tar.bz2 16182345 RMD160 a36035cce2e25bc0cbddb50e4c9d5fdd661a2f26 SHA1 233f6c413eeedd4af7cf15106a2af7b8f29977bf SHA256 17a5e185e1199436864400d930f60979265cf0cd775b37a2e7b5a1a267c76868
diff --git a/kde-base/kaddressbook/kaddressbook-4.7.3.ebuild b/kde-base/kaddressbook/kaddressbook-4.7.3.ebuild
deleted file mode 100644
index 0493f70276da..000000000000
--- a/kde-base/kaddressbook/kaddressbook-4.7.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.7.3.ebuild,v 1.5 2011/12/07 22:13:32 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="The KDE Address Book"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	>=dev-libs/grantlee-0.1.4
-	$(add_kdebase_dep kdelibs 'semantic-desktop')
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-# bug 393127
-
-KMEXTRA="
-	plugins/kaddressbook/
-	plugins/ktexteditor/
-"
-KMEXTRACTONLY="
-	akonadi_next/
-	calendarsupport/
-	libkleo/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
-		echo
-		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
-		echo
-	fi
-}
diff --git a/kde-base/kajongg/Manifest b/kde-base/kajongg/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/kajongg/Manifest
+++ b/kde-base/kajongg/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/kajongg/kajongg-4.7.3.ebuild b/kde-base/kajongg/kajongg-4.7.3.ebuild
deleted file mode 100644
index 1e7b4384a0e5..000000000000
--- a/kde-base/kajongg/kajongg-4.7.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kajongg/kajongg-4.7.3.ebuild,v 1.3 2011/12/07 22:13:59 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta python
-
-DESCRIPTION="The classical Mah Jongg for four players"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	dev-db/sqlite:3
-	$(add_kdebase_dep libkdegames)
-	$(add_kdebase_dep pykde4)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep libkmahjongg)
-	>=dev-python/twisted-8.2.0
-"
-
-pkg_setup() {
-	python_pkg_setup
-	kde4-meta_pkg_setup
-}
diff --git a/kde-base/kalarm/Manifest b/kde-base/kalarm/Manifest
index 6a624e13c105..2b0d834b02ae 100644
--- a/kde-base/kalarm/Manifest
+++ b/kde-base/kalarm/Manifest
@@ -1,3 +1,2 @@
 DIST kdepim-4.4.11.1.tar.bz2 8964708 RMD160 51394b9dcb3aecc4f108e87de37c21e3af820ee1 SHA1 49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf
-DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
 DIST kdepim-4.7.4.tar.bz2 16182345 RMD160 a36035cce2e25bc0cbddb50e4c9d5fdd661a2f26 SHA1 233f6c413eeedd4af7cf15106a2af7b8f29977bf SHA256 17a5e185e1199436864400d930f60979265cf0cd775b37a2e7b5a1a267c76868
diff --git a/kde-base/kalarm/kalarm-4.7.3.ebuild b/kde-base/kalarm/kalarm-4.7.3.ebuild
deleted file mode 100644
index ddffab37cdc7..000000000000
--- a/kde-base/kalarm/kalarm-4.7.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-4.7.3.ebuild,v 1.4 2011/12/07 22:13:56 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	$(add_kdebase_dep kdepim-common-libs)
-	media-libs/phonon
-"
-DEPEND="${RDEPEND}"
-
-KMEXTRACTONLY="
-	kmail/
-"
diff --git a/kde-base/kalgebra/Manifest b/kde-base/kalgebra/Manifest
index 34777ce6cc5f..49ae5164ccd6 100644
--- a/kde-base/kalgebra/Manifest
+++ b/kde-base/kalgebra/Manifest
@@ -1,3 +1,2 @@
-DIST kalgebra-4.7.3.tar.bz2 233440 RMD160 db28cc47099a7776466f0b5e3c03d41ebd5ce871 SHA1 88cc89a6c942b7cef548532702c5e68bf75f0748 SHA256 59a498304606204ad12ea26460643dc1422ee35167f2bdc8c9584bc8d7547bf0
 DIST kalgebra-4.7.4.tar.bz2 233979 RMD160 93a80b48bd5ad7ae5ee806baacdad047aa9eec4d SHA1 8ef005a50316d7d86b7bc1ed306380d69ce946a0 SHA256 295266cd721a552e4df175fa5c39dbedc959e7746f265742be938499bd3ee011
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
diff --git a/kde-base/kalgebra/kalgebra-4.7.3.ebuild b/kde-base/kalgebra/kalgebra-4.7.3.ebuild
deleted file mode 100644
index f52852ae84c3..000000000000
--- a/kde-base/kalgebra/kalgebra-4.7.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/kalgebra-4.7.3.ebuild,v 1.4 2011/12/07 22:13:40 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-OPENGL_REQUIRED="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="MathML-based graph calculator for KDE."
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug +plasma readline"
-
-DEPEND="
-	$(add_kdebase_dep libkdeedu)
-	readline? ( sys-libs/readline )
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	libkdeedu/kdeeduui/
-"
-KMEXTRA="
-	libkdeedu/qtmmlwidget/
-"
-
-RESTRICT="test"
-# bug 382561
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.5.73-solaris-graph2d.patch
-)
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with readline)
-		$(cmake-utils_use_with plasma)
-		$(cmake-utils_use_with opengl OpenGL)
-	)
-
-	kde4-base_src_configure
-}
-
-src_test() {
-	# disable broken test
-	sed -i -e '/mathmlpresentationtest/ s/^/#DO_NOT_RUN_TEST /' \
-		"${S}"/analitza/tests/CMakeLists.txt || \
-		die "sed to disable mathmlpresentationtest failed."
-
-	kde4-base_src_test
-}
diff --git a/kde-base/kalzium/Manifest b/kde-base/kalzium/Manifest
index 335eb67d47e9..c6e0f84440b8 100644
--- a/kde-base/kalzium/Manifest
+++ b/kde-base/kalzium/Manifest
@@ -1,3 +1,2 @@
-DIST kalzium-4.7.3.tar.bz2 3949095 RMD160 f7cb5af0fd6d2b4a5401f58d967e321356e727b3 SHA1 e22b54be4a2e8ce8a22af73fa6155ee012fa6fdf SHA256 8b433b23e1105dea11c046c051aaa3303b93616453d5aa4b4c24f67b355db3d5
 DIST kalzium-4.7.4.tar.bz2 3950449 RMD160 f2f0ac17abeb279c5adaf7590bdead07bfe76c57 SHA1 6cb65b2c524f529976e4c63a75a7637a181d08d9 SHA256 e197ea916e47dde5af93061c5ec7642839a8c262bce69830bad29bcb6d64454c
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
diff --git a/kde-base/kalzium/kalzium-4.7.3.ebuild b/kde-base/kalzium/kalzium-4.7.3.ebuild
deleted file mode 100644
index 59914a6b38b6..000000000000
--- a/kde-base/kalzium/kalzium-4.7.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-4.7.3.ebuild,v 1.3 2011/12/07 22:14:01 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-CPPUNIT_REQUIRED="optional"
-OPENGL_REQUIRED="always"
-inherit kde4-base flag-o-matic
-
-DESCRIPTION="KDE: periodic table of the elements."
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="editor debug +plasma solver"
-
-RDEPEND="
-	$(add_kdebase_dep libkdeedu)
-	editor? ( >=sci-chemistry/openbabel-2.2 )
-"
-DEPEND="${RDEPEND}
-	editor? ( >=dev-cpp/eigen-2.0.3:2 )
-	solver? ( dev-ml/facile[ocamlopt] )
-"
-
-KMEXTRACTONLY="
-	libkdeedu/kdeeduui/
-	libkdeedu/libscience/
-"
-
-src_configure(){
-	# Fix missing finite()
-	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
-
-	mycmakeargs=(
-		$(cmake-utils_use_with editor Eigen2)
-		$(cmake-utils_use_with editor OpenBabel2)
-		$(cmake-utils_use_with editor OpenGL)
-		$(cmake-utils_use_with solver OCaml)
-		$(cmake-utils_use_with solver Libfacile)
-	)
-
-	kde4-base_src_configure
-}
-
-src_test(){ :; } #see bug 376911
diff --git a/kde-base/kamera/Manifest b/kde-base/kamera/Manifest
index 78fb3c710811..5f49488399b3 100644
--- a/kde-base/kamera/Manifest
+++ b/kde-base/kamera/Manifest
@@ -1,3 +1,2 @@
-DIST kamera-4.7.3.tar.bz2 38725 RMD160 345a4e75743bf0c6012acdebc8e143fe475ac4f7 SHA1 820f9b6449732f6cab48f5c2d9e7dbcf53eb6437 SHA256 81aacb6f499d27df6eab6496385b4969383aa58b5d578e89d3f50e66ba82f2c7
 DIST kamera-4.7.4.tar.bz2 38739 RMD160 7fa9861f9ee3536b76f19564e36ff44cc3415a9e SHA1 098c71d7588d5163656cb07a476efbfc6755900a SHA256 64e4915e57b116594357b5c4491fbd9cd3c02e8001034e9efa77dbfb3bf4392a
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
diff --git a/kde-base/kamera/kamera-4.7.3.ebuild b/kde-base/kamera/kamera-4.7.3.ebuild
deleted file mode 100644
index 31efbf39c4f2..000000000000
--- a/kde-base/kamera/kamera-4.7.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/kamera-4.7.3.ebuild,v 1.3 2011/12/07 22:13:50 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE digital camera manager"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	media-libs/libgphoto2
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kanagram/Manifest b/kde-base/kanagram/Manifest
index b68758ac695e..194376216537 100644
--- a/kde-base/kanagram/Manifest
+++ b/kde-base/kanagram/Manifest
@@ -1,3 +1,2 @@
-DIST kanagram-4.7.3.tar.bz2 650672 RMD160 fb9e147d9dbddec288235bf756c0a82e331e4f6a SHA1 44a60b76bbc8ae61b8673c37c2b8721f12dc22bb SHA256 a834259a6f8cc9c5bcdd7d43906c3cec6b34c65371164fb85ab8eadb5bdb6a1f
 DIST kanagram-4.7.4.tar.bz2 650835 RMD160 cc84504f97546fc8ae493482b8eac3215950a7ad SHA1 15fda47cd6685a7e19fb4744ec930b9a4dcfbe05 SHA256 d5022cfae077c8e17418e988394e61a5e753eb4da10ec4601649af960656e108
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
diff --git a/kde-base/kanagram/kanagram-4.7.3.ebuild b/kde-base/kanagram/kanagram-4.7.3.ebuild
deleted file mode 100644
index 2cf9cfb63637..000000000000
--- a/kde-base/kanagram/kanagram-4.7.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kanagram/kanagram-4.7.3.ebuild,v 1.3 2011/12/07 22:13:34 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE: letter order game."
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkdeedu)
-"
diff --git a/kde-base/kapman/Manifest b/kde-base/kapman/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/kapman/Manifest
+++ b/kde-base/kapman/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/kapman/kapman-4.7.3.ebuild b/kde-base/kapman/kapman-4.7.3.ebuild
deleted file mode 100644
index d2dcc543acc6..000000000000
--- a/kde-base/kapman/kapman-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kapman/kapman-4.7.3.ebuild,v 1.3 2011/12/07 22:13:54 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="Pac-Man clone for KDE"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kapptemplate/Manifest b/kde-base/kapptemplate/Manifest
index 8129826b48d8..2c54c126587e 100644
--- a/kde-base/kapptemplate/Manifest
+++ b/kde-base/kapptemplate/Manifest
@@ -1,3 +1,2 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
-DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
 DIST kdesdk-4.7.4.tar.bz2 5266656 RMD160 9fc17159fd8cbbf9cfe76ed18dfcf8a269d0270e SHA1 3a0f61204653dc3f9f975732b6f67659c60ecaf3 SHA256 a2142ea51e9172e589b0526879061e5c3e4337f6154d89b0491fef9c68e56f6c
diff --git a/kde-base/kapptemplate/kapptemplate-4.7.3.ebuild b/kde-base/kapptemplate/kapptemplate-4.7.3.ebuild
deleted file mode 100644
index 0a2f81226569..000000000000
--- a/kde-base/kapptemplate/kapptemplate-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kapptemplate/kapptemplate-4.7.3.ebuild,v 1.3 2011/12/07 22:13:49 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdesdk"
-inherit kde4-meta
-
-DESCRIPTION="KAppTemplate - A shell script to create the necessary framework to develop KDE applications."
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kate/Manifest b/kde-base/kate/Manifest
index 32a993363e8c..288482d875a1 100644
--- a/kde-base/kate/Manifest
+++ b/kde-base/kate/Manifest
@@ -1,3 +1,2 @@
-DIST kate-4.7.3.tar.bz2 2038690 RMD160 c5809a4b915dc6b2c55d1bef9d1ebfa16606e5c7 SHA1 d67e871a49d426246f2e555ace0ad5a303c41045 SHA256 154dd3dfc16745ea567834eac7d082990d2251a79c6161c9fc4d34566936fc95
 DIST kate-4.7.4.tar.bz2 2041564 RMD160 01a5bdc2f647d2c061313a76ccd56bfb916e3373 SHA1 b808f01213e0e44607e8f2577f9d1b4f88e14388 SHA256 be8e40822a0a388cf3edc56cfc22a13b84460d8ac26c6c6fc457a5f44e6ccd5d
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
diff --git a/kde-base/kate/kate-4.7.3.ebuild b/kde-base/kate/kate-4.7.3.ebuild
deleted file mode 100644
index 3802212891e9..000000000000
--- a/kde-base/kate/kate-4.7.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/kate-4.7.3.ebuild,v 1.3 2011/12/07 22:13:49 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kate"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="Kate is an MDI texteditor."
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug +plasma"
-
-DEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep katepart)
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with plasma)
-	)
-
-	kde4-meta_src_configure
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	if ! has_version kde-base/kaddressbook:${SLOT}; then
-		echo
-		elog "File templates plugin requires kde-base/kaddressbook:${SLOT}."
-		elog "Please install it if you plan to use this plugin."
-		echo
-	fi
-}
diff --git a/kde-base/katepart/Manifest b/kde-base/katepart/Manifest
index c9cbd261456e..b9297badb1f5 100644
--- a/kde-base/katepart/Manifest
+++ b/kde-base/katepart/Manifest
@@ -1,2 +1 @@
-DIST kate-4.7.3.tar.bz2 2038690 RMD160 c5809a4b915dc6b2c55d1bef9d1ebfa16606e5c7 SHA1 d67e871a49d426246f2e555ace0ad5a303c41045 SHA256 154dd3dfc16745ea567834eac7d082990d2251a79c6161c9fc4d34566936fc95
 DIST kate-4.7.4.tar.bz2 2041564 RMD160 01a5bdc2f647d2c061313a76ccd56bfb916e3373 SHA1 b808f01213e0e44607e8f2577f9d1b4f88e14388 SHA256 be8e40822a0a388cf3edc56cfc22a13b84460d8ac26c6c6fc457a5f44e6ccd5d
diff --git a/kde-base/katepart/katepart-4.7.3.ebuild b/kde-base/katepart/katepart-4.7.3.ebuild
deleted file mode 100644
index 614dfa08d5dc..000000000000
--- a/kde-base/katepart/katepart-4.7.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/katepart/katepart-4.7.3.ebuild,v 1.5 2011/12/07 22:13:45 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kate"
-KMMODULE="part"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE Editor KPart"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="debug"
-
-RESTRICT="test"
-# bug 392993
-
-add_blocker kdelibs 4.6.50
-
-src_configure() {
-	local mycmakeargs=(
-		"-DKDE4_BUILD_TESTS=OFF"
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/katomic/Manifest b/kde-base/katomic/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/katomic/Manifest
+++ b/kde-base/katomic/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/katomic/katomic-4.7.3.ebuild b/kde-base/katomic/katomic-4.7.3.ebuild
deleted file mode 100644
index 73e90c964f8b..000000000000
--- a/kde-base/katomic/katomic-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/katomic-4.7.3.ebuild,v 1.3 2011/12/07 22:13:48 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE Atomic Entertainment Game"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kbattleship/Manifest b/kde-base/kbattleship/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/kbattleship/Manifest
+++ b/kde-base/kbattleship/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/kbattleship/kbattleship-4.7.3.ebuild b/kde-base/kbattleship/kbattleship-4.7.3.ebuild
deleted file mode 100644
index e2bf7c0a89d7..000000000000
--- a/kde-base/kbattleship/kbattleship-4.7.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbattleship/kbattleship-4.7.3.ebuild,v 1.3 2011/12/07 22:13:54 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit games-ggz kde4-meta
-
-DESCRIPTION="The KDE Battleship clone"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-src_prepare() {
-	# cmake is doing this really weird
-	sed -i \
-		-e "s:register_ggz_module:#register_ggz_module:g" \
-		"${PN}"/src/CMakeLists.txt || die "ggz removal failed"
-
-	kde4-meta_src_prepare
-}
-
-src_install() {
-	kde4-meta_src_install
-	# and also we have to prepare the ggz dir
-	insinto "${GGZ_MODDIR}"
-	newins ${PN}/src/module.dsc ${P}.dsc
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-	games-ggz_pkg_postinst
-}
-
-pkg_postrm() {
-	kde4-meta_pkg_postrm
-	games-ggz_pkg_postrm
-}
diff --git a/kde-base/kblackbox/Manifest b/kde-base/kblackbox/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/kblackbox/Manifest
+++ b/kde-base/kblackbox/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/kblackbox/kblackbox-4.7.3.ebuild b/kde-base/kblackbox/kblackbox-4.7.3.ebuild
deleted file mode 100644
index ff255e22c841..000000000000
--- a/kde-base/kblackbox/kblackbox-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/kblackbox-4.7.3.ebuild,v 1.3 2011/12/07 22:14:01 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE Blackbox Game"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kblocks/Manifest b/kde-base/kblocks/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/kblocks/Manifest
+++ b/kde-base/kblocks/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/kblocks/kblocks-4.7.3.ebuild b/kde-base/kblocks/kblocks-4.7.3.ebuild
deleted file mode 100644
index df3aab83be65..000000000000
--- a/kde-base/kblocks/kblocks-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kblocks/kblocks-4.7.3.ebuild,v 1.3 2011/12/07 22:13:43 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Kblocks is a single-player Tetris-like game."
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kbounce/Manifest b/kde-base/kbounce/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/kbounce/Manifest
+++ b/kde-base/kbounce/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/kbounce/kbounce-4.7.3.ebuild b/kde-base/kbounce/kbounce-4.7.3.ebuild
deleted file mode 100644
index 51d5b4365eb6..000000000000
--- a/kde-base/kbounce/kbounce-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/kbounce-4.7.3.ebuild,v 1.3 2011/12/07 22:13:44 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE Bounce Ball Game"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kbreakout/Manifest b/kde-base/kbreakout/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/kbreakout/Manifest
+++ b/kde-base/kbreakout/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/kbreakout/kbreakout-4.7.3.ebuild b/kde-base/kbreakout/kbreakout-4.7.3.ebuild
deleted file mode 100644
index e937ec731e15..000000000000
--- a/kde-base/kbreakout/kbreakout-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbreakout/kbreakout-4.7.3.ebuild,v 1.3 2011/12/07 22:14:02 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: A Breakout-like game for KDE."
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kbruch/Manifest b/kde-base/kbruch/Manifest
index 99e8358bf82f..f42757512d86 100644
--- a/kde-base/kbruch/Manifest
+++ b/kde-base/kbruch/Manifest
@@ -1,3 +1,2 @@
-DIST kbruch-4.7.3.tar.bz2 964151 RMD160 a3843e06e17110eebec569f391a4745299186f7a SHA1 c90205954d9c153aaa5966b424aa437b07e657f7 SHA256 a77f3490721c50d3cefd13ca815419212103a9cefb02be275dda562e00e7a507
 DIST kbruch-4.7.4.tar.bz2 963676 RMD160 1c4b51b1da770e7b9ec6cf819dcd1822cdf7c2a5 SHA1 36165292cb9935343d1aa2572935a130b6619f00 SHA256 2bfef14741746f1adace532b57309d8f1c7c1352b5032e283944afd14a9910b6
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
diff --git a/kde-base/kbruch/kbruch-4.7.3.ebuild b/kde-base/kbruch/kbruch-4.7.3.ebuild
deleted file mode 100644
index fa58679ddf20..000000000000
--- a/kde-base/kbruch/kbruch-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbruch/kbruch-4.7.3.ebuild,v 1.3 2011/12/07 22:13:39 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE Educational: Learn calculating with fractions"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kcachegrind/Manifest b/kde-base/kcachegrind/Manifest
index 8129826b48d8..2c54c126587e 100644
--- a/kde-base/kcachegrind/Manifest
+++ b/kde-base/kcachegrind/Manifest
@@ -1,3 +1,2 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
-DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
 DIST kdesdk-4.7.4.tar.bz2 5266656 RMD160 9fc17159fd8cbbf9cfe76ed18dfcf8a269d0270e SHA1 3a0f61204653dc3f9f975732b6f67659c60ecaf3 SHA256 a2142ea51e9172e589b0526879061e5c3e4337f6154d89b0491fef9c68e56f6c
diff --git a/kde-base/kcachegrind/kcachegrind-4.7.3.ebuild b/kde-base/kcachegrind/kcachegrind-4.7.3.ebuild
deleted file mode 100644
index d7c6688133d3..000000000000
--- a/kde-base/kcachegrind/kcachegrind-4.7.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/kcachegrind-4.7.3.ebuild,v 1.3 2011/12/07 22:13:33 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdesdk"
-inherit kde4-meta
-
-DESCRIPTION="KDE Frontend for Cachegrind"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	media-gfx/graphviz
-"
diff --git a/kde-base/kcalc/Manifest b/kde-base/kcalc/Manifest
index f961b744c25e..0b02373ba0f9 100644
--- a/kde-base/kcalc/Manifest
+++ b/kde-base/kcalc/Manifest
@@ -1,3 +1,2 @@
 DIST kdeutils-4.6.3.tar.bz2 3703326 RMD160 1fe6287fed3fa21eef902ee764425171f7345e6c SHA1 1aa735c03689ef49b949278ee31d0d8e8536b7d6 SHA256 d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
-DIST kdeutils-4.7.3.tar.bz2 3802391 RMD160 0e0a73d290baaa289665b49722f04f19ab517dd9 SHA1 23fc9823647152d5d8cc250a55402c8930db4059 SHA256 a8c802f32b9e918d806a4487c25485f86019e4c473f0de6d3086d8ea8e492839
 DIST kdeutils-4.7.4.tar.bz2 3802873 RMD160 24c3af30a407523bdf853059fc38bfbf6e6d4604 SHA1 4630f01f36558eb5494fc562086fbd4e488e411e SHA256 bb50a5069808a0280eff671b2f9c0053f5bbbfdc432760bc35ccf654de833c68
diff --git a/kde-base/kcalc/kcalc-4.7.3.ebuild b/kde-base/kcalc/kcalc-4.7.3.ebuild
deleted file mode 100644
index 93283149f890..000000000000
--- a/kde-base/kcalc/kcalc-4.7.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/kcalc-4.7.3.ebuild,v 1.4 2011/12/07 22:13:40 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-CPPUNIT_REQUIRED="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeutils"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
-
-DESCRIPTION="KDE calculator"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	dev-libs/gmp
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-# bug 393093
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.2-solaris-knumber_priv.patch
-)
-
-src_test() {
-	LANG=C ${kde_eclass}_src_test
-}
diff --git a/kde-base/kcharselect/Manifest b/kde-base/kcharselect/Manifest
index f961b744c25e..0b02373ba0f9 100644
--- a/kde-base/kcharselect/Manifest
+++ b/kde-base/kcharselect/Manifest
@@ -1,3 +1,2 @@
 DIST kdeutils-4.6.3.tar.bz2 3703326 RMD160 1fe6287fed3fa21eef902ee764425171f7345e6c SHA1 1aa735c03689ef49b949278ee31d0d8e8536b7d6 SHA256 d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
-DIST kdeutils-4.7.3.tar.bz2 3802391 RMD160 0e0a73d290baaa289665b49722f04f19ab517dd9 SHA1 23fc9823647152d5d8cc250a55402c8930db4059 SHA256 a8c802f32b9e918d806a4487c25485f86019e4c473f0de6d3086d8ea8e492839
 DIST kdeutils-4.7.4.tar.bz2 3802873 RMD160 24c3af30a407523bdf853059fc38bfbf6e6d4604 SHA1 4630f01f36558eb5494fc562086fbd4e488e411e SHA256 bb50a5069808a0280eff671b2f9c0053f5bbbfdc432760bc35ccf654de833c68
diff --git a/kde-base/kcharselect/kcharselect-4.7.3.ebuild b/kde-base/kcharselect/kcharselect-4.7.3.ebuild
deleted file mode 100644
index 9e4036e2d10f..000000000000
--- a/kde-base/kcharselect/kcharselect-4.7.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcharselect/kcharselect-4.7.3.ebuild,v 1.3 2011/12/07 22:13:39 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeutils"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
-
-DESCRIPTION="KDE character selection utility"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kcheckpass/Manifest b/kde-base/kcheckpass/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/kcheckpass/Manifest
+++ b/kde-base/kcheckpass/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/kcheckpass/kcheckpass-4.7.3.ebuild b/kde-base/kcheckpass/kcheckpass-4.7.3.ebuild
deleted file mode 100644
index 81ebf15bb4bd..000000000000
--- a/kde-base/kcheckpass/kcheckpass-4.7.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-4.7.3.ebuild,v 1.3 2011/12/07 22:13:49 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="A simple password checker, used by any software in need of user authentication."
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug pam"
-
-RDEPEND="
-	pam? (
-		>=kde-base/kdebase-pam-7
-		virtual/pam
-	)
-"
-DEPEND="${RDEPEND}
-	x11-libs/libxkbfile
-"
-
-PATCHES=(
-	"${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
-)
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	use pam && epatch "${FILESDIR}/${PN}-4.4.2-no-SUID-no-GUID.patch"
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with pam)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kcminit/Manifest b/kde-base/kcminit/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/kcminit/Manifest
+++ b/kde-base/kcminit/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/kcminit/kcminit-4.7.3.ebuild b/kde-base/kcminit/kcminit-4.7.3.ebuild
deleted file mode 100644
index 059d655b937e..000000000000
--- a/kde-base/kcminit/kcminit-4.7.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcminit/kcminit-4.7.3.ebuild,v 1.3 2011/12/07 22:13:52 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KCMInit - runs startups initialization for Control Modules."
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep ksplash)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kcmshell/Manifest b/kde-base/kcmshell/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/kcmshell/Manifest
+++ b/kde-base/kcmshell/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/kcmshell/kcmshell-4.7.3.ebuild b/kde-base/kcmshell/kcmshell-4.7.3.ebuild
deleted file mode 100644
index 9733cba31ad4..000000000000
--- a/kde-base/kcmshell/kcmshell-4.7.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcmshell/kcmshell-4.7.3.ebuild,v 1.3 2011/12/07 22:13:59 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KCMShell is a utility to host KDE control modules independently of SystemSettings."
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kcolorchooser/Manifest b/kde-base/kcolorchooser/Manifest
index 23587e3e11a2..10bc7db9271d 100644
--- a/kde-base/kcolorchooser/Manifest
+++ b/kde-base/kcolorchooser/Manifest
@@ -1,3 +1,2 @@
-DIST kcolorchooser-4.7.3.tar.bz2 4817 RMD160 4572f8b70904115870deb104b80b8e952e792499 SHA1 bdd35e5defbcfc151f4960541c351246cb4dfa9e SHA256 7043dec3ef38cea45380295fb289b146255b5649c46f6aa74d5d684a7a040b22
 DIST kcolorchooser-4.7.4.tar.bz2 4840 RMD160 1e1554ac3e6a8237f90e2cccd2312c63f71e0cee SHA1 bbfda234e8aec109c63226499fc72355b1c051ca SHA256 aaf500dad9e57263c4f69e3d22b984fea194d47f8182f166dd0e78175c3068bd
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
diff --git a/kde-base/kcolorchooser/kcolorchooser-4.7.3.ebuild b/kde-base/kcolorchooser/kcolorchooser-4.7.3.ebuild
deleted file mode 100644
index b2ab8f4f88f0..000000000000
--- a/kde-base/kcolorchooser/kcolorchooser-4.7.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcolorchooser/kcolorchooser-4.7.3.ebuild,v 1.3 2011/12/07 22:13:46 hwoarang Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE color selector/editor"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kcontrol/Manifest b/kde-base/kcontrol/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/kcontrol/Manifest
+++ b/kde-base/kcontrol/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/kcontrol/kcontrol-4.7.3.ebuild b/kde-base/kcontrol/kcontrol-4.7.3.ebuild
deleted file mode 100644
index 8c617dd28f12..000000000000
--- a/kde-base/kcontrol/kcontrol-4.7.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-4.7.3.ebuild,v 1.3 2011/12/07 22:14:03 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="The KDE Control Center"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep kdnssd)
-	$(add_kdebase_dep khotkeys)
-"
diff --git a/kde-base/kcron/Manifest b/kde-base/kcron/Manifest
index d117d4e4bed2..4ae3002bd652 100644
--- a/kde-base/kcron/Manifest
+++ b/kde-base/kcron/Manifest
@@ -1,3 +1,2 @@
 DIST kdeadmin-4.6.3.tar.bz2 792325 RMD160 b36d9a7c983f5da9e6a3524d3cde1f28464d1580 SHA1 141e8e794ebd5341940d2d22986b7376a2abefbf SHA256 1db65d3f5afb83affdad921ee034f33d7aeb1aac7fe9a55f4b1d26c385577076
-DIST kdeadmin-4.7.3.tar.bz2 806208 RMD160 5aefc3021a1fea4725295ebe97ba8486a09f2768 SHA1 b2d6d210bc40e8731a9ae8409673f3d71b57de0a SHA256 00b32dfb17a8edd89cdd01083df71b1b177e79c7a6ab7fce679a3d0246647029
 DIST kdeadmin-4.7.4.tar.bz2 807192 RMD160 9082b64533435f23a26bb185a20cd7fa47054e80 SHA1 1a294315645adbbff348a380196d4300a408b70d SHA256 f90ecbe4a34bbe47d862e9af6a26811635120d11f6a3ef9163e2c0d7ee1fc79b
diff --git a/kde-base/kcron/kcron-4.7.3.ebuild b/kde-base/kcron/kcron-4.7.3.ebuild
deleted file mode 100644
index fcd4e8e8bd3f..000000000000
--- a/kde-base/kcron/kcron-4.7.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcron/kcron-4.7.3.ebuild,v 1.3 2011/12/07 22:13:56 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdeadmin"
-inherit kde4-meta
-
-DESCRIPTION="KDE Task Scheduler"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="!prefix? ( virtual/cron )"
diff --git a/kde-base/kde-env/kde-env-4.7.3.ebuild b/kde-base/kde-env/kde-env-4.7.3.ebuild
deleted file mode 100644
index 1655bf714b38..000000000000
--- a/kde-base/kde-env/kde-env-4.7.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.7.3.ebuild,v 1.3 2011/12/07 22:14:01 hwoarang Exp $
-
-EAPI=4
-
-CMAKE_REQUIRED="never"
-KDE_REQUIRED="never"
-inherit kde4-base
-
-DESCRIPTION="Environment setting required for all KDE4 apps to run."
-SRC_URI=""
-ESVN_REPO_URI=""
-
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-LICENSE="as-is"
-IUSE="aqua"
-
-add_blocker kdelibs 4.6.80
-
-S=${WORKDIR}
-
-src_unpack() {
-	:
-}
-
-src_prepare() {
-	:
-}
-
-src_install() {
-	# number goes down with version
-	cat <<-EOF > 43kdepaths
-CONFIG_PROTECT="/usr/share/config"
-#KDE_IS_PRELINKED=1
-EOF
-	doenvd 43kdepaths
-
-	# Properly place xinitrc.d file that exports XDG_MENU_PREFIX to env
-	cat <<EOF > 11-xdg-menu-kde-4
-#!/bin/sh
-
-if [ -z \${XDG_MENU_PREFIX} ] && [ "\${DESKTOP_SESSION}" = "KDE-4" ]; then
-	export XDG_MENU_PREFIX="kde-4-"
-fi
-EOF
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe 11-xdg-menu-kde-4 || die "doexe failed"
-}
-
-pkg_preinst() {
-	:
-}
-
-src_test() {
-	:
-}
diff --git a/kde-base/kde-l10n/Manifest b/kde-base/kde-l10n/Manifest
index 3ca54da88517..5aa5b19fe3f6 100644
--- a/kde-base/kde-l10n/Manifest
+++ b/kde-base/kde-l10n/Manifest
@@ -1,158 +1,106 @@
 DIST kde-l10n-ar-4.6.3.tar.bz2 3077588 RMD160 83f13cb0c3ce407abb5bcff8bf400a007bc7dcf0 SHA1 a433fbfcde29131bca6a06fdcb6d44c748008927 SHA256 6fc25a94093fffcfde4f3805f612bb6aa7ac6858ff33cd9a15241f77e83d6c8b
-DIST kde-l10n-ar-4.7.3.tar.bz2 3595175 RMD160 347d0a6f52cb140d5b79c3b09dd2671def15b08a SHA1 6cc066ec6cfdc592918615dca655af9fe25d0f3f SHA256 63d37595e933de20f8d402411274a5bbf7e4492a423f5a97c10e2baa2af76127
 DIST kde-l10n-ar-4.7.4.tar.bz2 3594293 RMD160 37738dc4f39e37a38167fa77580dc70c6713d8d5 SHA1 96b2e5ae3084f192ca83d2de2272901f183238c3 SHA256 fb5297f16e44a46997cba874b6d367f1b5a0188fe6086c11c32fcb3026ea88c7
 DIST kde-l10n-bg-4.6.3.tar.bz2 1701946 RMD160 47da9d254f2ed18411ee6bd3824d1c4afe8e3650 SHA1 8e2b8c7b8554e1facfb02656a4dcfb8b3fe7d349 SHA256 0e7a7315384900faca5e9a655a29c0c143f619bd583a3660776395d66d76eb64
-DIST kde-l10n-bg-4.7.3.tar.bz2 2155895 RMD160 3bddbedbfb86f56f5fc93b6a2e64b60e1272100e SHA1 5552ee00bba8c33a59c1684210e0967213ee3de5 SHA256 5b14c2367e4ac1f08e9587ee16df3157fb40714e3042d5f3d0385041cec91586
 DIST kde-l10n-bg-4.7.4.tar.bz2 2155697 RMD160 1260baaa131cf30fc5be0dcbdebedb61d3cdcf39 SHA1 b20fb868f61b85fa4399fda68061f930eb306198 SHA256 eeab00ffcd0cb768f792a724cf0b0b9e18cf7f3645105b724d854f37a5d1241e
-DIST kde-l10n-bs-4.7.3.tar.bz2 2479149 RMD160 f708ec212f24bb28df6f3fbe782d4f3287422279 SHA1 206dd68f06ed7e69fb7850c4c17d8e6084bb4ab3 SHA256 211145eeed46a6a0aa1a6943512aac8a1c2877a5b51d9acd99085447abdd96d8
 DIST kde-l10n-bs-4.7.4.tar.bz2 2479266 RMD160 1514cec3bfb8b7b8a420be4345cee94bcf442bc5 SHA1 407d8c3b5426319db4601a68d2ffebe891ec913e SHA256 39f6edb7c52fe372fd38951f53e87fc621fd7e97d434a3322fc4e16f04db1a20
 DIST kde-l10n-ca-4.6.3.tar.bz2 4344297 RMD160 140fd984971cd0d6626a2d60fe6bedf3776ebbd7 SHA1 4f996f389b629ff079c1deb68156b82ddc8b0037 SHA256 2f0d9e02cd2da46a47ca83d629fe6b16a955e44a5a4c8b0234e4777244879389
-DIST kde-l10n-ca-4.7.3.tar.bz2 9288467 RMD160 e6cba1b3fd6ab2b06b7ede0a3a84191b99d90beb SHA1 a516d7ef6020083cd746f30effdaa8eb22f75961 SHA256 09a95546e5a671ccd64701c379428b36671e137d0e0cdd2587329e9902a70281
 DIST kde-l10n-ca-4.7.4.tar.bz2 9605651 RMD160 42bdc428445f776e2122cce0f09e24a5ef539e39 SHA1 92f5112aa2930ed7737557a7b7d4f407a76c3331 SHA256 128fb022b3fd20462ed9f13441ca8aeb2357b33a4a16be74af86deaca129df11
 DIST kde-l10n-ca@valencia-4.6.3.tar.bz2 2126551 RMD160 09e70412f6f4e362011c7fa2d30d6a390d0165ad SHA1 6fdd39a67eaa3c09ccdd266b3824ec2cde690222 SHA256 f374f56a7fa3f9f2f1f02bed9e365827c1957ad514acc706bd3122bcecf3d8f6
-DIST kde-l10n-ca@valencia-4.7.3.tar.bz2 2494576 RMD160 30abf6c16e92c2a3555ef1130b533802b86ae290 SHA1 58413cf8d0c210d53c9b20dcca9eb14041b9c2df SHA256 397e5deff961894d47aedaeb748b1f4c8192d26ba1a61089ff2a74e1573e79cc
 DIST kde-l10n-ca@valencia-4.7.4.tar.bz2 2495226 RMD160 24a36632c6341337c4e62c86d46384051b728158 SHA1 c4ccf06160ca0e454e5b9dd715e111bdcb137451 SHA256 974e4adbed5462d59bf0626b1384a1f15f701ecae37ec996108197ef4d0bb106
 DIST kde-l10n-cs-4.6.3.tar.bz2 2856093 RMD160 ef2c8b4c4f43a7513621fdb83bd3b605defc7239 SHA1 8a485a912c272c5660da8b9113ae6637daecaaca SHA256 3fcc275b2eb7c069d2d3288c1314e290943f2fd734470a1062943b8e4fd9fd37
-DIST kde-l10n-cs-4.7.3.tar.bz2 3305556 RMD160 823253cbfbb777336e550919dffa9f5b8de829e7 SHA1 1a59b0480bbab0d53660a276aa736f6e8c2c116f SHA256 57825b309f0b923a5dd319fae1d086808af2d4100f66eaadd41816d6978f4c87
 DIST kde-l10n-cs-4.7.4.tar.bz2 3326281 RMD160 22b9836cac88a1d655c9e948a729816a2a8f3b39 SHA1 292d51be86eb6a74db5ae69791398397405e09b1 SHA256 2ba2998d7e5e6822622528eb4019af05e4ce2d2b75c7260a73f36e3043e73950
 DIST kde-l10n-da-4.6.3.tar.bz2 12921841 RMD160 e5254d6bc018f5b933236440eb1e6c169255a88a SHA1 71c61b0f09e47eb945420581a6dc1e46baefcefb SHA256 f9a1c48d817655e5bb27315b0fc170938463d674c10d922ab2cb7be022a1ed06
-DIST kde-l10n-da-4.7.3.tar.bz2 14262565 RMD160 d9dd3d783ce3232fa9173302cf7158e5939e4191 SHA1 e73907144816b795b9be6b245b582719654e8e7d SHA256 18926bc1b3cc632acf94cdd791297244a96d14c3915422f48b71fa9b3d6f76d5
 DIST kde-l10n-da-4.7.4.tar.bz2 14265952 RMD160 c3e4c3f076ccb74a468636713b227176c914546c SHA1 f15bba7edb0d0c344cc182242d4aae5168d3bf1f SHA256 66f78605e9f0b911c79923fe95109e3ed0b9733317e012bf8388e5a0f7fc57e4
 DIST kde-l10n-de-4.6.3.tar.bz2 28532174 RMD160 fc8521ba8aa0ba0d7e08fffb75b02451802962fc SHA1 6abb82ad32329672ca254e1b971c3d61274a20d4 SHA256 66357e1186a07fac53b825db2a16bfe6ab87bd98ce0352ca66686a15c4449903
-DIST kde-l10n-de-4.7.3.tar.bz2 37551846 RMD160 6df5289dd6ec0d4096044189dbcb02f9d985cc37 SHA1 d53939327c050b8807779c92965a5fd09cfed25f SHA256 443a06eb80119e8c6c9ea1c3765738237aecba418bd9d2b09e0d1ed4e0944cd8
 DIST kde-l10n-de-4.7.4.tar.bz2 37548936 RMD160 e1da4f4c9abd52b2bf580b6d78f5ac11bb54ac84 SHA1 e6126a6ce53e88c9a39a8c6cf8ed343c1aa47ae8 SHA256 e9e54c5d531fb947131ec02624d6c00b0cb6402494db3061642d173e79420580
 DIST kde-l10n-el-4.6.3.tar.bz2 3676261 RMD160 d562207d9d2aa5e135fe1c6726344e10b8b2cffb SHA1 1b22436c2aa5b4ec51c64d552455ff658ae26ece SHA256 3fa84ef37f2c8a67404b56d2ae2524c0441e82c01b9486d4d8f67a86f22d7cad
-DIST kde-l10n-el-4.7.3.tar.bz2 4770850 RMD160 305461e294fd64cfc071e18dc59d1adf3bb2333d SHA1 ff082e9bc86e9612fdf496c932a9f329305a2ccb SHA256 ebb825d7e27068785ee82f6735fe10781f3afcce1cede52dd194689c559b9940
 DIST kde-l10n-el-4.7.4.tar.bz2 4772408 RMD160 c6c81d44c84ca75bd92383149674a02fa107ade2 SHA1 4a949a3513fe79ceca9b3e02daa69627e92ce37a SHA256 683f33a880a5019b5347dafc930797a40ec4663e2c71cb72ee326be4e6a58160
 DIST kde-l10n-en_GB-4.6.3.tar.bz2 2821787 RMD160 cc563d2454cd407e91677636ff2a83ed8ee191b0 SHA1 d643c59fea3104df7c362a6ea63cefa785e26938 SHA256 0e4add450be96d805424429b2291a451d30b76b2b0cec01f332e7fd9b3682191
-DIST kde-l10n-en_GB-4.7.3.tar.bz2 3558545 RMD160 4fb5eb3e17241901af8f7b73d72c5be0f78058fb SHA1 56e2de38ef100b600feb4113f022586452f8d014 SHA256 237b6e1ecf42f74157de91161b436b238f322def334630661ccbec3527be1380
 DIST kde-l10n-en_GB-4.7.4.tar.bz2 3558740 RMD160 4d6e1ed9518f3da24f1a3a3f34c6275718d52938 SHA1 653d44f4841c862944a3882ee23c7376f90bb38e SHA256 117ba552ae87f0a1065375834339a91aa276e8ee1605e62b2a298702ddc8bb56
 DIST kde-l10n-es-4.6.3.tar.bz2 24800825 RMD160 25ce6a70699a4fa62dc4fb19cd613e46c3911abb SHA1 06a1f04cd692180c6c2ea43034f0ba47aefc4082 SHA256 3949a7103d06ab49f7928e66092d2f7ed3a5c8d25ec025295cabc2de48917fa8
-DIST kde-l10n-es-4.7.3.tar.bz2 29253576 RMD160 bd36ac8091c9d5a8f8f18ae03998c02092ab230a SHA1 21ecf5cd219cb55bdee39caa8d86169486912cc4 SHA256 4d49f21686c945aa96636b658ed5fe94378537f1ea4a0875dcb23be78c65b96e
 DIST kde-l10n-es-4.7.4.tar.bz2 29267538 RMD160 ce660275952cdcb05ea885a2eab91f193bd461ac SHA1 4c1256749ef3088a93bdd5adf3c8075580b3ac0e SHA256 2e3155f365269e05c317cb0564a60c011e48c6c81fb6ae6a1824c16bf7d66886
 DIST kde-l10n-et-4.6.3.tar.bz2 5721051 RMD160 18455d9e563cc26a63d88f7cd2164c651dc81f76 SHA1 ee4cf1ea49671d13ff725afcaab4d5ce57025924 SHA256 75886b928cd30baab9d0bfa5aaa61210cafc668225dfcd41c431be4825f0fd8a
-DIST kde-l10n-et-4.7.3.tar.bz2 5889791 RMD160 a7c36f944d640135278b7516e0cd6621a5ef8c55 SHA1 43f80846881131adad5a6dfd1e07d6b7e07a0be1 SHA256 a01857d73a55c005967e2cde350f9d39a7a7af7523d93e3b752c7807d0f7c0ae
 DIST kde-l10n-et-4.7.4.tar.bz2 5901930 RMD160 915ef427adae5e8dc983e4055317d0729cd245d4 SHA1 9cb6b28e3dea7098c2409a01cf04596673d85da1 SHA256 6d6767f06391316c7c952771d752578fe13807947e95185b7a73ab91e074725f
 DIST kde-l10n-eu-4.6.3.tar.bz2 1853507 RMD160 2f10480d0e4637b946bfb47f866b043c81abd9cb SHA1 9e8ec39c769ca02d60531b11e41fbb1381433038 SHA256 fce530622becc19e8439b955d4bae52774381874cba55e3046421661b20b325d
-DIST kde-l10n-eu-4.7.3.tar.bz2 2329392 RMD160 50f098aef726ea39feadba63c6f047d4fe0e997b SHA1 9bf412c5993846c14f362caf65ecc2cd39a5229e SHA256 52d673f68124a62ffd18e3b70b7be5da730b5d1fb19dff318f3be7a611c50375
 DIST kde-l10n-eu-4.7.4.tar.bz2 2329389 RMD160 653f3e44d931f0181e9d445eac127f9bbd2e8fde SHA1 789776d3c5413526dda6b28bae91abde4a4e77fd SHA256 29f92d900b38f940e294a2baa670a96f68bd881c33e82f86713fcbeeedc9d63e
 DIST kde-l10n-fi-4.6.3.tar.bz2 2243414 RMD160 f4b73992a133e232e9e52fef2e4a5fedf1937442 SHA1 db2926ab71d0a67a9c017154580708cec6a37bef SHA256 5ef122a824b31a820cc6a4b93ecee6c040ac87002ad079fbfcc26233763f5e6b
-DIST kde-l10n-fi-4.7.3.tar.bz2 2933099 RMD160 c9eaa36c5321c7786985fa4cc2b78090564810f1 SHA1 5361265d5bd3176f8090b36ae8885706c5529d76 SHA256 6bd3a7ae3ee6bda5fb7f3a222b60200141e4d57d0ca211ab8aaecff2f8d1b48f
 DIST kde-l10n-fi-4.7.4.tar.bz2 2955248 RMD160 efefb376b65b54d9360768ac7440758ae701f4a6 SHA1 b11ba0482d3c98cdda7dc90676bda785766b2cb0 SHA256 7a156216053ebda4641f28bff0c08065fb9ad2416bbd950e7e19471f2caed955
 DIST kde-l10n-fr-4.6.3.tar.bz2 20077793 RMD160 bba51ddc25ea4ea84939ab1a84e37bab07cc0d09 SHA1 aa2ba512e244ee03807e5f6542499cd0d27d3df7 SHA256 23eb47b6bcd144008d8a783a168cd1aa277517ff17f3091aac5b7379db4bf446
-DIST kde-l10n-fr-4.7.3.tar.bz2 21833929 RMD160 216a3a3f8dc42e51f5cbb9bf5643761a2599b77e SHA1 68bfcff6d11617ae918be856c4d89de1f4ab9441 SHA256 bd201ee4aacc7b53a1586197d3a4ad2ab17d8f9d0e380bcf98d75b1d7c76a23e
 DIST kde-l10n-fr-4.7.4.tar.bz2 21833359 RMD160 8ddd950e8f78b272916cff92ce1de2a4ce02b725 SHA1 d4347308cbb00f5650605991496db9a2b5fb8a66 SHA256 05613e52b1d18cfd89656639990042bc64b7d062f4e0d0f7a7fa2578d8eaa60d
 DIST kde-l10n-ga-4.6.3.tar.bz2 3184545 RMD160 11b03c480dc897199613340e8ba6cc9f2319b253 SHA1 d63493d9a887a4e45a40738154a7b362c64bf592 SHA256 b1af02697e32e23346084b88c85dbd1c1cd0b693ac74a80b34fae551319ab7d9
-DIST kde-l10n-ga-4.7.3.tar.bz2 3553997 RMD160 c50dd4809a38755abdbb1a34ae05d5a49ea010ea SHA1 779ec0cc115bbe8928a74de51b60a063e6e2e12c SHA256 d0a758b50da27a50759ae38ecd918ba8991efcebd73710d7268060ec8b6e6bf3
 DIST kde-l10n-ga-4.7.4.tar.bz2 3553333 RMD160 f0b1456080f9dc5966f3771baa03c0f144b9d173 SHA1 a66cb122e2e7953bacf23d554982fb902f82c1ee SHA256 8512c2b0772a432432f437b9e2a93be714d9d1f6df41d3c5532cb4277ecba78e
 DIST kde-l10n-gl-4.6.3.tar.bz2 3478795 RMD160 9665c3212b004b0b894af2ed85df3d29a19f1759 SHA1 d94bb75da54d7257093429a021d6f952e389ad73 SHA256 60437411af84a793e5fb5d6c88e585e289abef357e8c9e98920c91243bc9c662
-DIST kde-l10n-gl-4.7.3.tar.bz2 4305543 RMD160 89369943040b9e7a638c59a439d10d5b3183c663 SHA1 43a7a00ab479cdd4600035ec5f23113cc99a1e46 SHA256 1e2e15b29ef086db2b1e76f906f195e72ba5a19118617fd051dd195d52db273c
 DIST kde-l10n-gl-4.7.4.tar.bz2 4301955 RMD160 c84f6327641e0c96f950627d07dc26bad492cdc6 SHA1 c2c3dc4ebdb6deec70b8ec15f23b113c27616a2c SHA256 9ff152d441af4ed14f04934da7972f04d57e468b408ea801518af7d628acd1e7
 DIST kde-l10n-gu-4.6.3.tar.bz2 858183 RMD160 a9f37a88e4c6cb9c3a6059c5f22020e722a2914d SHA1 631463f7fe3a90f293632ac5782a3035ff75091c SHA256 307b8d8ea0c1c6cd45a57709dd3540837ea6079d87554840b1f1d07b9fda49d6
 DIST kde-l10n-he-4.6.3.tar.bz2 1986558 RMD160 0f13fd6c20ea8c33380a9899efe729c7e3e38a9b SHA1 68a9f3fdcfd9f4d5b44fdf57261201d035f9b48a SHA256 61da3c6113bd98771610051d515b71aaee79d1376cd9912436505061cee2b3f9
-DIST kde-l10n-he-4.7.3.tar.bz2 2362009 RMD160 3312213d167b23e1ba09d6ca4d8991168c0591d3 SHA1 e4e3a6b8e6fcc354c8d2671db5bce3dc4d03cd46 SHA256 c8c586d02b31bb8912978b39e7f2a66db1594b162991e1eefa7a848ca5b8d75d
 DIST kde-l10n-he-4.7.4.tar.bz2 2363118 RMD160 bec1b01331d3cfdbfbbd07f75adccd59da59656a SHA1 4c0a25c50c59054461a2d23a331006690ea18ce0 SHA256 e20e087dfe4b7fb923503fc6142c00d9e6a0751241da7a3e315b2fe8d7dc6407
 DIST kde-l10n-hi-4.6.3.tar.bz2 1650726 RMD160 1e553fad1b58d6b148831f1959428ac4b9c0331b SHA1 e2ba20baf3d53e1802abf91f696df56bd966c0fe SHA256 28fbfb5849f7c2ceee37287947b63857e2ac484c8b32b3e079566ab2b429ecac
 DIST kde-l10n-hr-4.6.3.tar.bz2 1932759 RMD160 70c1d3f570ef97f75521313cf0ceb2adfb4e9f3c SHA1 83b7df72f80aaaeaced7ad7f89ae5a123fc3a290 SHA256 92dc437122fd729720a7065c4abcabfab905bac5b82dac8bf83c848a3d988b3d
-DIST kde-l10n-hr-4.7.3.tar.bz2 2289838 RMD160 dcf781294fdaf7e8efb39fac30870cd71b44b037 SHA1 1660184438749efdc34a221052475fd9a10d5043 SHA256 af48137b21a11857f68af94c37fab5c00fcd4da17ce172c45d15f51df3de2888
 DIST kde-l10n-hr-4.7.4.tar.bz2 2288477 RMD160 00a986176cc01364ddfc22c907cbd31bb99799ff SHA1 56a35f47882bbb4b9019b055b365356979f6fe73 SHA256 bc3ff5fa7562c709706254207c4d63184b1632cfca08a23e927d803f98254a68
 DIST kde-l10n-hu-4.6.3.tar.bz2 3947675 RMD160 e3a56b94d289bae6a7d180025a3fd08290069738 SHA1 a5c9d9f49afba78815ecf7735a8cc8d69def5327 SHA256 3d230a82df3e1d75dc095810e12e13ee6066c53635e02dca322c0542d23b103b
-DIST kde-l10n-hu-4.7.3.tar.bz2 4383891 RMD160 2954e7a85e389bfd8c3e00b2a82b26c7470587e4 SHA1 e4b144aa2719e69d5edab20bb2e8c7c29debc390 SHA256 e934d11a4d74b52e3699e838f443fc6f8f36ed3a42ed69de7e5cc3f3cb9826a5
 DIST kde-l10n-hu-4.7.4.tar.bz2 4401170 RMD160 d106eeb5bf9bdea1cb85a1842bead1fce55f06a5 SHA1 430d0ac130ce4fbff90be3c8d96c17661d5e23db SHA256 17260979bbddcf3e44f1ec1003e80b03e33fd31b68bba34970f65a6bad76646b
 DIST kde-l10n-ia-4.6.3.tar.bz2 796078 RMD160 57b2be770e4b923ca3c743696b990c39c82c3b3b SHA1 0c820c3a1d32f3ad121ad0d08a93b42000a2cad1 SHA256 16ee3dfb2996aa3471ee8372f8694a42c37638f42c1a8458016a5a2dbd13aadd
-DIST kde-l10n-ia-4.7.3.tar.bz2 1182411 RMD160 972e8ffc8b96a70df644639044d84d7f4562cd9f SHA1 80d83ce4316724f5e7e73ad0620141136d848983 SHA256 564715a7bb109cab327d6b2b73a8c5b9e5bdcca90cf14f0fb684525ee671c1de
 DIST kde-l10n-ia-4.7.4.tar.bz2 1183353 RMD160 7bab8018b79c162c602509a457169c17db1eb3d0 SHA1 80ff9a88b884a3d02535cfee3f4303029396a63b SHA256 5f525d30f59b811a62842ffac87034d12a4a0ec4758e892d3a73d3eb63ff2f4d
 DIST kde-l10n-id-4.6.3.tar.bz2 510692 RMD160 aac3173ac3a21cc6543971c128ba1fb19db7a6a8 SHA1 631bbce80890b480bc833141b5068dc2c6f684af SHA256 72ec9ba451e0f938e313cea618fdc895bddca8c6a2980ac804c62da6d0e324aa
-DIST kde-l10n-id-4.7.3.tar.bz2 535378 RMD160 8e6788c9f6f4f8c84be016804360b89bc2c2f435 SHA1 aacf9136fff9f10763273cb3333bf0fc996d5d30 SHA256 28148966677b58b232f93241290028ac1ccfc57a5f9b81dfe9dd5d95562b9fc2
 DIST kde-l10n-id-4.7.4.tar.bz2 535594 RMD160 3e462855c996bd086659564c02ae90caeed7392b SHA1 74c27ff37c5f3513f79c6cba54e10c9cdfe4a29b SHA256 ea19a66ac112f4a6b8fab6c71a01275a378e12f40ecea766bcbb6a0c5ce4849a
 DIST kde-l10n-is-4.6.3.tar.bz2 1642256 RMD160 833610eccc1571ebac502702e3500ea2ad292e0a SHA1 5345433637df4b5ec842474d67ab4135a804831d SHA256 64ffabd6729e3304fe871a0eb4d81d82e720251ded2fb231813ce4fdc2c2d215
-DIST kde-l10n-is-4.7.3.tar.bz2 2064299 RMD160 c1aab8e5a5c7780c245a5f9a74e1229dab1faf82 SHA1 5392040a07d79189745e629f635a89b51cdbe884 SHA256 615b672b0437173ff47ee950fbbc88ff35ebfb78a295b497164cea2b87f420fe
 DIST kde-l10n-is-4.7.4.tar.bz2 2074197 RMD160 69323f1c71a015844a12e9d45b9faf6aaab2c8d1 SHA1 5d5d5838386eabc50151c38191a486b5a29e9203 SHA256 72590f2efb5672f35216ca5fe24d61d92735ec0177f757fe20bd0a1f8355b7bc
 DIST kde-l10n-it-4.6.3.tar.bz2 10343550 RMD160 7317b723bfa982ccd2fdc57310f7a78054a572e7 SHA1 f040f9587913acff0cf5f87ac67433d29455aeeb SHA256 e023ff3e85855badd13c5d138f17b785197420033734d01f591e12b8b6987376
-DIST kde-l10n-it-4.7.3.tar.bz2 11600838 RMD160 763eae2d0dd9325dbbafee2812d888f9476de491 SHA1 8a5358e6a21a0f1de5dc4ce4e54e90e8391028cc SHA256 68ec0b26ca2c6c62fd4afae7ea26ff06f610936fc29806c8024bb7269373cc3e
 DIST kde-l10n-it-4.7.4.tar.bz2 11602471 RMD160 7019c6852bf352b8705948b987f9b1f462e9b811 SHA1 3a82fcad771bcb6b8328548241895393b37a18e9 SHA256 591518be51c829a98b49f2058acfd60ae5afe4bbb43e0463c57012d025cc0f5c
 DIST kde-l10n-ja-4.6.3.tar.bz2 2143338 RMD160 6a43b448a210e2166f7acc6fb502d20fa10bb3cb SHA1 85d9a7bef80c53322b5dcb8bfc7c79c0ee2910f1 SHA256 d986cf83e99bdea2fb91f886364eaca255c0a11ea26078401705c6262a77a4b6
-DIST kde-l10n-ja-4.7.3.tar.bz2 2424571 RMD160 74bb3c1194116a448b09a24e1fea7b936a0a7d4a SHA1 17597dd170c73dc8ad5165443c222e55c2c8e4c0 SHA256 578f69d7564ad875bf0dd2df5b0b96ea8c992f23dfc6eced93b1b1038243cb81
 DIST kde-l10n-ja-4.7.4.tar.bz2 2425944 RMD160 e9146d8a3e0446904ec159177a5d50c401617adb SHA1 1c7658830055fb26cd3b1cd9315f6d8f30808571 SHA256 fd793b2f86c6e256daa65099b6a071b352e82fb3ef36ca17e11c473d3a7ad1b8
 DIST kde-l10n-kk-4.6.3.tar.bz2 1682883 RMD160 26c31213c76e99f9257fb1285b5972b8b3f35c0a SHA1 51a7ef1ad1c0664d4a409580362fb6d6d89ec391 SHA256 26679fe745b3f492ffc211e102ce397051db527bf1a1c851553a3a05a9c8dac1
-DIST kde-l10n-kk-4.7.3.tar.bz2 2379395 RMD160 a3d5671538ade9d592e9ace51d3df4157cdf7312 SHA1 77ac4645578b68e4100e9dc2dfb3c4c471abbd9e SHA256 e7a43aaadfd149aa7ed27bbf04a540ce410dd3898325515f9a2543d8b62264ee
 DIST kde-l10n-kk-4.7.4.tar.bz2 2480093 RMD160 7493489f9ab2ffd96db5cde595b52d856a99c912 SHA1 801a94f9e778fec0e10a91591478eed84fc6d95e SHA256 71a7383152a3621c215e986d1d42ef22d881fd6679d054746b82a05716c8d04f
 DIST kde-l10n-km-4.6.3.tar.bz2 1897291 RMD160 501dfdbe205c6ff65e69c5c0b3288f7e47bb30f6 SHA1 a593eb1134dcf1fdde7e67e46636c91fc72bab8d SHA256 880fb3f9d4df7040e0c2f7b27b62f2e34d55783853bd65bdac6e666589d4b344
-DIST kde-l10n-km-4.7.3.tar.bz2 2219712 RMD160 83181538b3b01698be2b8e16c42aeda877bfb696 SHA1 d149e90c6732391316fde90c619ba3abf3461c97 SHA256 94ece7de2bdc589025a7039023ac3b49f01712f9c4fbe5d28b22f15c5084dc9b
 DIST kde-l10n-km-4.7.4.tar.bz2 2220158 RMD160 eaca13ea83a3bbfca9521c223ef4d7808f256c6a SHA1 62e2484c80af833c5dbe41d723caec5825c051b8 SHA256 b947cb5ab76b35a07ba5a9290d61c31e5a30fcec8026739401361c877b365a0b
 DIST kde-l10n-kn-4.6.3.tar.bz2 446869 RMD160 364e55b91ab03218a7c7a01f86c0c75d0faa96be SHA1 dd074c3ff03582006c5e202dd6312475320b5567 SHA256 78c21057033abe091b075b2b584e9e66e3c80fd98c0f639c4da3a08537d4edc5
-DIST kde-l10n-kn-4.7.3.tar.bz2 532878 RMD160 5dfd362f3fc3565e2b23280ddfec44c02f637531 SHA1 eef4b7cf1a0e853a6a117b371a88e0c9846951e0 SHA256 8e3974c2e9574a46935908027704990ef36a4d483f651b3883eebc127202c46e
 DIST kde-l10n-kn-4.7.4.tar.bz2 533045 RMD160 ecf9b97c9c8b5bf2b57f197cba4565e9af979f37 SHA1 c9cdf72c1f3effdf01dc4dbf9bac38313190480a SHA256 3ec5358a15938fa82aeb0d5aecab9f05accec143de9fe5e83070c323d4486166
 DIST kde-l10n-ko-4.6.3.tar.bz2 1559518 RMD160 352e01105c55b4a5c1562492bbb5837a8d13d5cc SHA1 aa5d5b2fde391cd373b9c00047f2523749f22fbf SHA256 9a8c4797115f7b56801f167b86ca252b9ca46602fd552367571bf0aaf0816146
-DIST kde-l10n-ko-4.7.3.tar.bz2 1901844 RMD160 05776133bffd0061ace97fbebbbf8162ca14f858 SHA1 6934688e5dee395042903c06bc3a88f982dfe422 SHA256 a2aed9827a17e0a28a3cd2951c43a0a746b298c35675e59a38064c457a9f2144
 DIST kde-l10n-ko-4.7.4.tar.bz2 1962255 RMD160 cc6845166c46a72defdd47b1c8dbaeb094bae2dd SHA1 cc10efa29dd56fde5e265fc735b4522fe4a5ac30 SHA256 95edd24e671918e2c3fbfa29b86a5939939a1fbfb7777966a9ad1a3ce7a5d773
 DIST kde-l10n-lt-4.6.3.tar.bz2 3458190 RMD160 a9052e7d480b150628ae736e0acfffe86108228e SHA1 fb4438d0fb280f56e310f330953ab08ea4e365f2 SHA256 6b3ef4ca2ed098c899c7410a8b723bd851e087fa123bcaff3b6a9e402dc7834b
-DIST kde-l10n-lt-4.7.3.tar.bz2 6797869 RMD160 8cfa3121bcadb978b7f30fb35d147e4e44420c6b SHA1 92f3cb20bd47594e1d344c36ab3eeac125f0395d SHA256 d04dc95c29f9aef3d88f0ed741a653c64d352426301925f9c661afad3cf59f21
 DIST kde-l10n-lt-4.7.4.tar.bz2 6798799 RMD160 977e717e6589af07fc0364c86e97cdba740313e6 SHA1 526dd1552707b2512d8886be62277259970bebd3 SHA256 3acd362526478c48396bfb7cbdf060385f79a43481b63ca71400ebd3353be620
 DIST kde-l10n-lv-4.6.3.tar.bz2 1925475 RMD160 de86170b59091b1f866483f731c856bd17d82659 SHA1 e6c5377ec11ebc81131b1b552d6f7a74c93729a1 SHA256 651d08b8f5b8da474fa3f3ac7483b51f94d031c23503d277dff45b881728f6a0
-DIST kde-l10n-lv-4.7.3.tar.bz2 2452185 RMD160 35644ec7b5f060d64372ae09e76b1c75b84187c6 SHA1 e49072ae22b8280f7ed168e36f8c4db27b4287e2 SHA256 bb29dac7166a565f0f11b85ec9b23429664e94cbf651cec1deb996816cc90fa8
 DIST kde-l10n-lv-4.7.4.tar.bz2 2452080 RMD160 f03c7a63cceef4ec65d08b31d7cd94f6f45a2d59 SHA1 d3e8e24883b48a5d6ed01a62902c1f8e6495a13f SHA256 ec11a52457b10781767d9f2eafd24762dafec141d688384f91fa46f1b4ec9538
 DIST kde-l10n-mai-4.6.3.tar.bz2 1237972 RMD160 e737929eb77e80df009cacc92a46f47d6573837b SHA1 1f2a48c213abacccb086f9ba38349da035bdf027 SHA256 43c1fd95b9a18983572625efbc43caf1a762523cf9f1bb581d7d839d1042e40a
 DIST kde-l10n-nb-4.6.3.tar.bz2 2299177 RMD160 f5a01af5a001a7c19bd19a112e21d2773e7791d8 SHA1 db0216de633f032efe0cb2e915607f9a25e7208d SHA256 94d2fc7bd8e0f8811d2dc4f722d6c81de1cad55ca7094099581e83d602506af3
-DIST kde-l10n-nb-4.7.3.tar.bz2 2666049 RMD160 31394129dc1f4a876197b00715a0126e0b3596d1 SHA1 baadcde24f4910f0b8db603c1c9b9a1b4ee6f1f8 SHA256 aedbf33588253f6cf7d33c39eaadd9b3e8ca0bb37fe542685a1aefed4be5a1f9
 DIST kde-l10n-nb-4.7.4.tar.bz2 2665621 RMD160 9441111ff7f272e521f56eafdabd268aba4d0feb SHA1 cb5842c0cc989c27fffff7f3d7e43abe28cf68c7 SHA256 b53230c4bec0c7f884e273170677fb6439ed8a67b05881c9da361174c90acbd7
 DIST kde-l10n-nds-4.6.3.tar.bz2 3619430 RMD160 0befae581a05af5aa0190c32ea6163f5efdf4351 SHA1 45ca1d44f6140cfef0b75f6510bb623f9b1ee6ac SHA256 e6f308c42ceeb36b797efe239f83072caa684df1ec1a62f0d15e19b1642a7a5d
-DIST kde-l10n-nds-4.7.3.tar.bz2 4169394 RMD160 f5511cb220c1e3f4a31785b8172b245a23d18ab6 SHA1 493f1545359d79c53f49ecf11904163bf69d503d SHA256 b9c341fdcf95d59c18e4a1b82835361c79155c5dd636afda5203c4785657075b
 DIST kde-l10n-nds-4.7.4.tar.bz2 4169697 RMD160 ea32e8837e92108a8c290df1c8da6aac751cb221 SHA1 ba29b58cd06b0d8a2596ae15ab710819411b5d18 SHA256 b34f36ffb31c3be67e032552ff739059ad4900d2e43f9a81a65d29c09474a6ee
 DIST kde-l10n-nl-4.6.3.tar.bz2 13622561 RMD160 3fc05b481b9d8d653c2307e9d5905317bff2d5db SHA1 a364726d1d263b79930d1ed43b6e2a8957adba0d SHA256 6b7b3f6e3b40f9aab3c3f1d311830853ec0a3102dacb5cdb458809fc782a717b
-DIST kde-l10n-nl-4.7.3.tar.bz2 15680330 RMD160 2624218354663fd594badd129dc6232a0749a0be SHA1 21731691f920e2945bf8308a1721107133b612af SHA256 0e8aabf25dc7e0a81950ac95492500f5b3667d24fe9e65f2bd0c923cd33922c4
 DIST kde-l10n-nl-4.7.4.tar.bz2 14750533 RMD160 0fddaf97e439485ae81ac0489c68acf311c8db81 SHA1 e7ade27597d25a5994bcece448c3cd9684f48b6c SHA256 22888fd20b3f87a6bef561beab8901188f5454c85d307fa876fcd0679966600b
 DIST kde-l10n-nn-4.6.3.tar.bz2 1872341 RMD160 3dd147cba93a0a8a3939d6564251916f9b59b5e3 SHA1 116dd6c6b05a6bf7a9913e6cd2a6ff0ab5a90929 SHA256 67530758de9ed53a44523e53c348c2d1faca7329d457f819e6969465c1fb0f53
-DIST kde-l10n-nn-4.7.3.tar.bz2 2157518 RMD160 c5bd6ae6cfde9619896fdea67aa856941357ed04 SHA1 3510559e378a0705ecc9ccb45458617159b25ee8 SHA256 089b57bbe411a2978bbeaa7363836bb985f453a47f10e128a44a8337cb5ae275
 DIST kde-l10n-nn-4.7.4.tar.bz2 2156108 RMD160 c052eba911f442b7c49b7e567653a1cf62f17f4c SHA1 b48c7bd7c07da2b209af37b9fc6cd87b7aeb0f6c SHA256 676dcb845611461b87b4f4e2a11a4497cb4a25fef820ea2f8366805eae9b4107
 DIST kde-l10n-pa-4.6.3.tar.bz2 1612220 RMD160 5b11124ecb02395790c270000fa29a26ad3d6a64 SHA1 585f7af652f7193cf79789abc7cc422d1b9beda3 SHA256 b49dc5168c48cc18eef6e5bac8f1182f3df68d0c92dc9e2e1036dfea0e885995
-DIST kde-l10n-pa-4.7.3.tar.bz2 2015757 RMD160 dd463b0d43f5ed323d6bd0bd5672379def01ef15 SHA1 e344769783894f64e5b4301f48d2b0830b3efa8b SHA256 d46615532a9c9df6838fed42bdbda78ba248cca9966ae7acde9c26ce98662618
 DIST kde-l10n-pa-4.7.4.tar.bz2 2015566 RMD160 460504c09dc52c264f4c303d6c095b274ac7a911 SHA1 3de2b3ea81cadc61c809e45c4706973febbce9de SHA256 aba5eb12eec945655dc356b45bda9cfd63c3df9a6a7af1e80d370f2137a7822a
 DIST kde-l10n-pl-4.6.3.tar.bz2 18345785 RMD160 3828b906d303cecc481d09542b8730595164a72e SHA1 a0d97485786c98bce8069452af28ae3f60c55225 SHA256 0799421b541efa8370bf64de6fb6948c404486a4dcea50e381c27a1968c2a2da
-DIST kde-l10n-pl-4.7.3.tar.bz2 19099476 RMD160 c45d91fe675b217d81e772caebd25f76afe3c28b SHA1 069d44526d2df805910dd9839491c2b6d530d203 SHA256 cfc730e047338f9b2ba70dc1d9e828725d8f920bb378d3cb60df881cf37e8410
 DIST kde-l10n-pl-4.7.4.tar.bz2 19102081 RMD160 5541535a19e2a061e98bc58f5e4f1bafd094bc6e SHA1 fe5f9dcd01f9c46281c50ca4e547f2ca6fa1d29d SHA256 9a4ee52153829f277ccb3e0737ee724cdab98a187cbc75f4b22d00af9476ce21
 DIST kde-l10n-pt-4.6.3.tar.bz2 5180045 RMD160 141932a7f4225e1f451584a0edd85cf3c1d37091 SHA1 cd12faa4fe8946ad92f0233c075d617749b1c022 SHA256 234ed4e6df15efba354db7f7e801731cecc0af872496bbef348a5c118749b7d4
-DIST kde-l10n-pt-4.7.3.tar.bz2 6110855 RMD160 ccc8b4f5a441926997abb6a9cdeb1417a105d46f SHA1 c49e6715429b8b6193e88186a0e86808f5ecdee3 SHA256 6a60c677074f62023b9f480fbc0a0ff2050109b5ae098ab1a44fbf93e460d34e
 DIST kde-l10n-pt-4.7.4.tar.bz2 6108888 RMD160 eea128283f3440fbb28b7c2d3d5d6ce8d9788297 SHA1 79ebb100d6902b878036c4eb1c5fd3dd893ac76e SHA256 04b27d457fd8b6ac65feb41e8a0109af7f4eec415570bc0761bd0318f061740e
 DIST kde-l10n-pt_BR-4.6.3.tar.bz2 21033943 RMD160 8b3cba6515d6db6b3ad5d0562dae7fc755d1d990 SHA1 4c2ee361834a7e02f61447d4c705b8ae2b3c5802 SHA256 31edb19092f1360bcf4dda823eb9ac2d926f5d50c73911a5d06e0f91e8f2ce15
-DIST kde-l10n-pt_BR-4.7.3.tar.bz2 27492912 RMD160 6e7cd8d28d10f9557dc2c8790f9cf519492dedde SHA1 642574d93379ac37c957b77e35ebdc731b22a2eb SHA256 03019fcc4a93c1c8cf5b38dc2afcef28deccf92032aaedabd43c6d2027fac777
 DIST kde-l10n-pt_BR-4.7.4.tar.bz2 27494389 RMD160 0a852339c7c8f6de61d849c8cc905bad47b301b0 SHA1 3f230d41b596e90fe13577c367d59141618f3e2b SHA256 852f47706524bb7bf428be6217f189a74a484fe13582a83faaaabbef106996bc
 DIST kde-l10n-ro-4.6.3.tar.bz2 3109555 RMD160 b4d7f826031620d547f69f87be669716c29ecf4a SHA1 309736c15ed42c80c70bfc9feebd175f1bd91014 SHA256 3167f273a17856af77eaa4662054bfdca3dfe297843ba3b80d3521fe46390a71
-DIST kde-l10n-ro-4.7.3.tar.bz2 3645293 RMD160 5da3ca2a20f7ef9a6cecf75f88ee95272994185b SHA1 9850302e24ea05dfd513c2c18ec5a96f25aeca55 SHA256 1d2b163b49770b1b68692048b15235a6276194dfed31caecc438c2e94c29f6ec
 DIST kde-l10n-ro-4.7.4.tar.bz2 3645615 RMD160 139a4dcf09f3ceaa3171762c2ccdbb32c478d952 SHA1 3e8fb137633097e304a697d48becb88a3878e92f SHA256 cbb0667bc7d0494ab4fee21f9fc196b45a8f64ab428c84a0534fad1097915784
 DIST kde-l10n-ru-4.6.3.tar.bz2 12159214 RMD160 8cfb83088c9a13b923497a8073a4f6192b9dae61 SHA1 5c13e0f02db44b09c3d2fe3b9f749d26da08851c SHA256 79c8ace1b2932bfd55038f51cec048eaf92d22ccdfc6469d179754851148c091
-DIST kde-l10n-ru-4.7.3.tar.bz2 13865682 RMD160 a0fdf091fae02fbe15948e99cc157fd9a7f14553 SHA1 7accd85fed345a5a6c035007c5d2798532ffd5d3 SHA256 a6bbc4356e9d5baa1ea9dbba128f199bf0b0341933e1b90e4333056582e8c6d6
 DIST kde-l10n-ru-4.7.4.tar.bz2 15747360 RMD160 5f1af088460cd79db85903d6454c3ed963d4fa85 SHA1 358e19a98273607adf58276ab2a7f7c6de53b0c8 SHA256 631c7a7917de5cbb678dec746fd1b45733a7e42b08c5e7260721a59f6be98ec4
 DIST kde-l10n-si-4.7.4.tar.bz2 1091928 RMD160 1dfdf6b3863d6be6cf05e6d1e94edcb32edd62c9 SHA1 d75524225008bf3513b1d9099adb7837ad959338 SHA256 3ce2b6789f17a2921a4fc23ee56943f0a6654a5621cd632b89f657962266e740
 DIST kde-l10n-sk-4.6.3.tar.bz2 4157362 RMD160 4ea0031e8e2185512cd6e0bd3322dfab025250d7 SHA1 1cfeb55c43ee80f09fac78c9d109788dd3969a1e SHA256 44f7628ea0e824b371352982ca1f2e9ee39377cdd9709823b2b35db0c2f80981
-DIST kde-l10n-sk-4.7.3.tar.bz2 4437400 RMD160 aec9fa18f9a1ddd003ccc72c9e51ddb995cd2acf SHA1 659279f42e5e1554933307cd5492f6d45671a49b SHA256 3b9546178987d6e38953168645e6e107900b0fb0220263cb03ffcef2e7903b0e
 DIST kde-l10n-sk-4.7.4.tar.bz2 4439120 RMD160 be4f3d1ae2ddc83fc4ccd01b136d73eb05c8cf8c SHA1 f6e018474c52eec27cf08bdb81e326a478a3c6dd SHA256 d66f310e25d672dce3a95b2df5afeb55766a8d94b7a36845d04e1da814ed0be1
 DIST kde-l10n-sl-4.6.3.tar.bz2 3845675 RMD160 9fb978afcab0d521c7ef3165ae695d8890def7e9 SHA1 f460e6df1e0b09ea3de697ad4764f81fb3091f79 SHA256 22a2ac63234ee7ec63641d6201ac377e2fd700ec4724e074bffcb424f8c17c2a
-DIST kde-l10n-sl-4.7.3.tar.bz2 3675273 RMD160 6865c2a53afc879d72deed48624c49cf6139c389 SHA1 f3538e94789768a3343136a05adf17f80f2323d9 SHA256 de3006d6fd3d2e619cc38c9f766f483d464c0d1b88e672e0bc1f312b902031fe
 DIST kde-l10n-sl-4.7.4.tar.bz2 3675104 RMD160 37229d223612e525682bbd2846f121fc682f4053 SHA1 10651a5d5d7ba595e55a3c2a6cf28660aa6c78aa SHA256 0c2c784c2124189d9f9f1af76f02270c97d6212c1009dd406dc99d47a6e00814
 DIST kde-l10n-sr-4.6.3.tar.bz2 10679025 RMD160 6297a2e6e6fd8ff87a71c23d190339b6b9bc6e6f SHA1 73d958081dce0d566bc0ed73ed23a01cefd61d4e SHA256 9cf06ffe6e13015ab73b0d9c3564d23ac9a70d27dfe58fcbc4a16ef88f3120cd
-DIST kde-l10n-sr-4.7.3.tar.bz2 11908606 RMD160 9a5f3ca86c18662672f0db0c6c0df75c5087a850 SHA1 333e68638e3a17e345a99457d1c2325013d6d3a6 SHA256 235dcae68053ef7130a4b13d93752c158f93636db10a0ce3b6611d4802f226aa
 DIST kde-l10n-sr-4.7.4.tar.bz2 11949011 RMD160 f7024925c7026165810b0016a4c2103b6cf231c5 SHA1 232c8cdb68d0f2667dffecca7f450711d77bb091 SHA256 5b03f38ba684e199a1f25095d40e633b91f5519bea5e61ed4670a131a0fa6b2f
 DIST kde-l10n-sv-4.6.3.tar.bz2 14425511 RMD160 9f9d79c6608d99c72242bf2bd7152178a334b331 SHA1 f4acc7c3850dd7b1ff2aa6f6672cacf3d9e1363d SHA256 348b59bb99e07558892fac08ae07478c5a3643e9575fda7e05a1622471b36e40
-DIST kde-l10n-sv-4.7.3.tar.bz2 17642938 RMD160 3373f827c39c769d8a70fc5259548a6e4defceef SHA1 8d464d253269da49c328141191cd6644b05acccc SHA256 625568b37c2037f9bb9b102efb46d1a33201b99d1cf3c5a9c8a12e5bbcd395d3
 DIST kde-l10n-sv-4.7.4.tar.bz2 17640404 RMD160 2ff9c95cdbfc3df59d09e75f9331cc04948d7485 SHA1 2ef18f5e9b0f7abac68dba1cf9d2dbac8ac2b1a3 SHA256 76a12aa22b4bccdc0a719c66819f4ae215b6a0e42130efd5d7140f0bf5598fbe
 DIST kde-l10n-th-4.6.3.tar.bz2 1525928 RMD160 d8dbfe48f96ca33388a7e968daebe05f51281d66 SHA1 44e6490e4fa5be591189af62322399b3a13d7aae SHA256 d0c85e93ed05e329c0ddb07749904501704a15f89a375f70c372b063ec78fd54
-DIST kde-l10n-th-4.7.3.tar.bz2 1884862 RMD160 24edf2231b36924533e3edbb746c7b2e292fb37c SHA1 ca56719eaa6c384fd98c955f0dd73243de40c8f5 SHA256 4f1dc981f781e83531f06e0571585aca957c6f7b7b8fc6a1c1702d0eebb78f1c
 DIST kde-l10n-th-4.7.4.tar.bz2 1884564 RMD160 fcaead69ab5664f3a31cde080422c798391e9575 SHA1 084c815a23c70142f9bcddeb2b85c4f71eca03ab SHA256 de1397fbed1079359a96bb1bd2e85e6479148602be106e4b1263b4b1747e773c
 DIST kde-l10n-tr-4.6.3.tar.bz2 2255958 RMD160 1f4d694fc87c0ef9646f7b14737e7a41e3c3ff0a SHA1 1f3c5bbd6f5c92b1e97c111dc0e734c5219481aa SHA256 888d124650ff9f79bb0c9e9a745f58d45371c0a7c4b07ce716846cd50261ef31
-DIST kde-l10n-tr-4.7.3.tar.bz2 2785265 RMD160 88db07592e65de5dc46cb2b543d047033a5c1717 SHA1 dc72f01f586529fb0e9b9dacabcb1dce0616db01 SHA256 b313b7950fe34e4d8ee7bd299cd48c687a536b060f2d451329a4118956a06931
 DIST kde-l10n-tr-4.7.4.tar.bz2 2786613 RMD160 d19eeee1bab2eb33775d82aedbecd2a10a32c779 SHA1 67ee6fb9b359e9705ddaf0ae4c607ce062c09a26 SHA256 b7cf94ba965bade294a18a69efb2d9dfeb136896d9a37e3eb8bf48dea792610a
-DIST kde-l10n-ug-4.7.3.tar.bz2 1781060 RMD160 6cd6b72ba21f926f466329d98298492a65ab7aa6 SHA1 9ab4a55e0f5ef8c99a1656ab859b9570f7e89d6d SHA256 6af2aa6d040c3f6ce0dd849bf21f9bbf894afea24dc32013f8ad1172497d62f8
 DIST kde-l10n-ug-4.7.4.tar.bz2 1798212 RMD160 7bd690cc259fe7c3866d4db80fdcc628e835c99a SHA1 afc46b28f7b6c2385bd8443a0e3375d3d7d7c48a SHA256 7111c20d987c37b79a92229a83d9c1c3bb899399cc629fd6c75b89cf3b950173
 DIST kde-l10n-uk-4.6.3.tar.bz2 13943804 RMD160 6c30958a4c6de521827e62bf05b74438c87cccc5 SHA1 9c8d7974340218109bc3666c46dccaf5fac8d3ef SHA256 70ac39b4962fb0d4b7501b779957ae7d84efee9a0290e12b33f317d5e20d7891
-DIST kde-l10n-uk-4.7.3.tar.bz2 16579041 RMD160 49ec37365006a04736fe73153ce97dd4383c015a SHA1 919584d0aa7b0a54e8e61184ec58063d0dfd2aae SHA256 fd7df6ba7f164f856bb59dea76c10069cab9e140b9280f977c159c97f8fe8bbf
 DIST kde-l10n-uk-4.7.4.tar.bz2 19084832 RMD160 04de2746ea18e46e978bfd5db0fec63ab3828c36 SHA1 328ff235a6454e33e583ee0dc54823b00e162f37 SHA256 ba79264a3b9bac9d36aaf65c33e652967d73130d10d18ca6e873cc145f5d2320
 DIST kde-l10n-wa-4.6.3.tar.bz2 1661623 RMD160 bba8c50e23a5cf916afd5a61b2293157ef711533 SHA1 7f0aaeeb3bc7cf0d0e142fb2372d7064d2277bf7 SHA256 4c1209d0d4700434b95977275bb543d0ab65ba9d66ee03c7b44b6e1a70a845e8
-DIST kde-l10n-wa-4.7.3.tar.bz2 1896487 RMD160 be7f629ba5c29826e55f264f5f531c02296fee71 SHA1 68aab9c979b96dc4a88bf00dcb33fdeef048a7a3 SHA256 b69160326065de01eda71907324396c3fb0f7e7789b20e9ab0bb4743a8992a6c
 DIST kde-l10n-wa-4.7.4.tar.bz2 1896684 RMD160 559b780d3c9511074c53a9a9d634e22b5ff25bab SHA1 c4a9801641c6e1d624b3449e73dbfafaecdfd963 SHA256 5b9998a275fe28f01361dffe3ffebf84ff5ba2c5e9661dab30552fb93cb85493
 DIST kde-l10n-zh_CN-4.6.3.tar.bz2 3292400 RMD160 3e4531397c56e41d9753596dd0e98829c8e874b5 SHA1 7cab80d92e5ed82e2e16614c0c84bc58c20b38bb SHA256 1c93e226629ee151659866681ac938f4c965df2595c13462eab989cf36a3751d
-DIST kde-l10n-zh_CN-4.7.3.tar.bz2 3666007 RMD160 ced3e4f3f1c888e7a615ef47049e7b9f60b5b187 SHA1 692dae3418a79249fbb9ce7bdf0c6c91da03ea21 SHA256 03ba5dad0ecff0e536bfd7950435fb2053b824b41adfe69a285ed35a8128ea1d
 DIST kde-l10n-zh_CN-4.7.4.tar.bz2 3665735 RMD160 bdbb21114c882129ff3190c0c7e364084223c800 SHA1 5113f103cfa99ffb74fb095a0570de93e10af7aa SHA256 c9985c911b553c0d69d5178987ca5dfdcc617d6ad94b0e11f14b4a04c55f4ea2
 DIST kde-l10n-zh_TW-4.6.3.tar.bz2 2262527 RMD160 cd4c71eb1e5264edf804dd70684d719ff98a90b8 SHA1 3b6d33832415d56c09c88fe598a90f1fb000788c SHA256 d4282b152d9c220ef6a0c5f37f71f541e98f60036e7d3d75368b57b2136c617d
-DIST kde-l10n-zh_TW-4.7.3.tar.bz2 2830325 RMD160 638990af12cbdd9b03baa2d8014f966b1dbbe11e SHA1 7b36964b2362a8b0d172d4170c5992ddda976f12 SHA256 035b05019fa5f4cae8ad17d97a972b4453e46ed7f773e973a9e163b003d7acc3
 DIST kde-l10n-zh_TW-4.7.4.tar.bz2 2830929 RMD160 a348bfad520cd8c835791504036a7d8de35ac7b5 SHA1 2751dcc8a931692f5cd2d04b03bfb1447ee3b87f SHA256 f8ca70f9ca6b1261cc280abe3e73d7c0d0acc3031762758d050fc6e1e3d5ae26
diff --git a/kde-base/kde-l10n/kde-l10n-4.7.3.ebuild b/kde-base/kde-l10n/kde-l10n-4.7.3.ebuild
deleted file mode 100644
index a4e05cc6e296..000000000000
--- a/kde-base/kde-l10n/kde-l10n-4.7.3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-l10n/kde-l10n-4.7.3.ebuild,v 1.3 2011/12/07 22:13:32 hwoarang Exp $
-
-EAPI="4"
-
-inherit kde4-base
-
-DESCRIPTION="KDE internationalization package"
-HOMEPAGE="http://www.kde.org/"
-LICENSE="GPL-2"
-
-DEPEND="
-	sys-devel/gettext
-"
-RDEPEND="!<kde-misc/konq-plugins-4.6"
-
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+handbook"
-
-# /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.bz2::' -e 's:kde-l10n-::' |tr '\n' ' '
-MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB es et eu fi fr ga gl he hr
-hu ia id is it ja kk km kn ko lt lv nb nds nl nn pa pl pt pt_BR ro ru sk sl sr
-sv th tr ug uk wa zh_CN zh_TW"
-
-URI_BASE="${SRC_URI/-${PV}.tar.bz2/}"
-SRC_URI=""
-
-for MY_LANG in ${MY_LANGS} ; do
-	IUSE="${IUSE} linguas_${MY_LANG}"
-	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/${PN}-${MY_LANG}-${PV}.tar.bz2 )"
-done
-
-S="${WORKDIR}"
-
-src_unpack() {
-	local LNG DIR
-	if [[ -z ${A} ]]; then
-		elog
-		elog "You either have the LINGUAS variable unset, or it only"
-		elog "contains languages not supported by ${P}."
-		elog "You won't have any additional language support."
-		elog
-		elog "${P} supports these language codes:"
-		elog "${MY_LANGS}"
-		elog
-	fi
-
-	[[ -n ${A} ]] && unpack ${A}
-	cd "${S}"
-
-	# add all linguas to cmake
-	if [[ -n ${A} ]]; then
-		for LNG in ${LINGUAS}; do
-			DIR="${PN}-${LNG}-${PV}"
-			if [[ -d "${DIR}" ]] ; then
-				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	find "${S}" -name CMakeLists.txt -type f \
-		-exec sed -i -e 's:^ *add_subdirectory( *kdepim-runtime *):# no kdepim-runtime:g' {} +
-	find "${S}" -name CMakeLists.txt -type f \
-		-exec sed -i -e 's:^ *add_subdirectory( *kdepim *):# no kdepim:g' {} +
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build handbook docs)
-	)
-	[[ -n ${A} ]] && kde4-base_src_configure
-}
-
-src_compile() {
-	[[ -n ${A} ]] && kde4-base_src_compile
-}
-
-src_test() {
-	[[ -n ${A} ]] && kde4-base_src_test
-}
-
-src_install() {
-	[[ -n ${A} ]] && kde4-base_src_install
-}
diff --git a/kde-base/kde-meta/kde-meta-4.7.3.ebuild b/kde-base/kde-meta/kde-meta-4.7.3.ebuild
deleted file mode 100644
index bafdb76f5586..000000000000
--- a/kde-base/kde-meta/kde-meta-4.7.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-4.7.3.ebuild,v 1.3 2011/12/07 22:13:56 hwoarang Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="accessibility nls sdk semantic-desktop"
-
-RDEPEND="
-	$(add_kdebase_dep kate)
-	$(add_kdebase_dep kdeadmin-meta)
-	$(add_kdebase_dep kdeartwork-meta)
-	$(add_kdebase_dep kdebase-meta)
-	$(add_kdebase_dep kdeedu-meta)
-	$(add_kdebase_dep kdegames-meta)
-	$(add_kdebase_dep kdegraphics-meta)
-	$(add_kdebase_dep kdemultimedia-meta)
-	$(add_kdebase_dep kdenetwork-meta)
-	$(add_kdebase_dep kdeplasma-addons)
-	$(add_kdebase_dep kdetoys-meta)
-	$(add_kdebase_dep kdeutils-meta)
-	accessibility? ( $(add_kdebase_dep kdeaccessibility-meta) )
-	nls? ( $(add_kdebase_dep kde-l10n) )
-	sdk? (
-		$(add_kdebase_dep kdebindings-meta)
-		$(add_kdebase_dep kdesdk-meta)
-		$(add_kdebase_dep kdewebdev-meta)
-	)
-	semantic-desktop? (
-		$(add_kdebase_dep kdepim-meta "" 4.4.11.1)
-	)
-"
diff --git a/kde-base/kde-wallpapers/Manifest b/kde-base/kde-wallpapers/Manifest
index 7f7a5585f8ad..c0b0594b1402 100644
--- a/kde-base/kde-wallpapers/Manifest
+++ b/kde-base/kde-wallpapers/Manifest
@@ -1,2 +1 @@
-DIST kde-wallpapers-4.7.3.tar.bz2 49225512 RMD160 63fda03049a59c630dbbec6a98e2ca0669166393 SHA1 d1b5b9a65a731469a3fbeaae9169d50196fe4158 SHA256 00301f0d6247e605be76cbce8f8e308110dc6841a148405284eb230e21d78a53
 DIST kde-wallpapers-4.7.4.tar.bz2 49225105 RMD160 51c7de38c690c9f20623ede81767e715ceed7f6d SHA1 9380bc39db369457e9cea9166c374f3390cc52cc SHA256 7fbfc5bc9f0895422e76c588247a892ab0c0b3614caaba1e889d280661ae6a8c
diff --git a/kde-base/kde-wallpapers/kde-wallpapers-4.7.3.ebuild b/kde-base/kde-wallpapers/kde-wallpapers-4.7.3.ebuild
deleted file mode 100644
index fd38a6d2aedb..000000000000
--- a/kde-base/kde-wallpapers/kde-wallpapers-4.7.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-wallpapers/kde-wallpapers-4.7.3.ebuild,v 1.4 2011/12/07 22:13:35 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-wallpapers"
-KDE_SCM="svn"
-inherit kde4-base
-
-DESCRIPTION="KDE wallpapers"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-add_blocker kdebase-wallpapers
-
-src_configure() {
-	mycmakeargs=( -DWALLPAPER_INSTALL_DIR="${EPREFIX}/usr/share/wallpapers" )
-
-	kde4-base_src_configure
-}
diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.7.3.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.7.3.ebuild
deleted file mode 100644
index 596e96b4f1ea..000000000000
--- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.7.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.7.3.ebuild,v 1.3 2011/12/07 22:14:03 hwoarang Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	$(add_kdebase_dep jovie)
-	$(add_kdebase_dep kaccessible)
-	$(add_kdebase_dep kmag)
-	$(add_kdebase_dep kmousetool)
-	$(add_kdebase_dep kmouth)
-"
diff --git a/kde-base/kdeaccounts-plugin/Manifest b/kde-base/kdeaccounts-plugin/Manifest
index 8129826b48d8..2c54c126587e 100644
--- a/kde-base/kdeaccounts-plugin/Manifest
+++ b/kde-base/kdeaccounts-plugin/Manifest
@@ -1,3 +1,2 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
-DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
 DIST kdesdk-4.7.4.tar.bz2 5266656 RMD160 9fc17159fd8cbbf9cfe76ed18dfcf8a269d0270e SHA1 3a0f61204653dc3f9f975732b6f67659c60ecaf3 SHA256 a2142ea51e9172e589b0526879061e5c3e4337f6154d89b0491fef9c68e56f6c
diff --git a/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.7.3.ebuild b/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.7.3.ebuild
deleted file mode 100644
index 688112a06dcb..000000000000
--- a/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.7.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.7.3.ebuild,v 1.3 2011/12/07 22:13:52 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdesdk"
-inherit kde4-meta
-
-DESCRIPTION="Addressbook Plugin that puts names/email addresses of all KDE SVN accounts into an addressbook"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kdeadmin-meta/kdeadmin-meta-4.7.3.ebuild b/kde-base/kdeadmin-meta/kdeadmin-meta-4.7.3.ebuild
deleted file mode 100644
index 9c7881555296..000000000000
--- a/kde-base/kdeadmin-meta/kdeadmin-meta-4.7.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-meta/kdeadmin-meta-4.7.3.ebuild,v 1.3 2011/12/07 22:13:34 hwoarang Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="cups"
-
-RDEPEND="
-	$(add_kdebase_dep kcron)
-	$(add_kdebase_dep ksystemlog)
-	$(add_kdebase_dep kuser)
-	cups? ( $(add_kdebase_dep system-config-printer-kde) )
-"
diff --git a/kde-base/kdeartwork-colorschemes/Manifest b/kde-base/kdeartwork-colorschemes/Manifest
index 188ce0576d20..f67a6b2a209c 100644
--- a/kde-base/kdeartwork-colorschemes/Manifest
+++ b/kde-base/kdeartwork-colorschemes/Manifest
@@ -1,3 +1,2 @@
 DIST kdeartwork-4.6.3.tar.bz2 116889676 RMD160 c82f0e792e9dd51ef489970ea8d479df3e91098d SHA1 084834ac3c654ea24257d9ed407c2384bf5aa110 SHA256 5b9865381cdb41901b936745681e3b429b633f019bb9fd8a2ec36a59a4ebfcaa
-DIST kdeartwork-4.7.3.tar.bz2 122446083 RMD160 b2cbc3a49c49fb8b768ddbcfc9a2fed2ef0fd5df SHA1 4d3611cbcd6052a7ba7137baa196c654d9d38d4d SHA256 be0847c6c877ce20cf234a1b422283e48e63e2872f46b975379ffb33d932f4a0
 DIST kdeartwork-4.7.4.tar.bz2 122446585 RMD160 b97f49f2e4ebaf5587d88e456f718454208dd532 SHA1 f397f49a73273baadabcaf45cf18c4d6a3efbe44 SHA256 dbbfd9ce12075012abc7a9836b46a34cba4051db8ac1aabd33dea37a7f4ddf6d
diff --git a/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.7.3.ebuild b/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.7.3.ebuild
deleted file mode 100644
index c49791d191f2..000000000000
--- a/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.7.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.7.3.ebuild,v 1.3 2011/12/07 22:13:36 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdeartwork"
-KMMODULE="ColorSchemes"
-inherit kde4-meta
-
-DESCRIPTION="KDE extra colorschemes"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# Moved here in 4.7
-add_blocker kdeaccessibility-colorschemes
diff --git a/kde-base/kdeartwork-desktopthemes/Manifest b/kde-base/kdeartwork-desktopthemes/Manifest
index 188ce0576d20..f67a6b2a209c 100644
--- a/kde-base/kdeartwork-desktopthemes/Manifest
+++ b/kde-base/kdeartwork-desktopthemes/Manifest
@@ -1,3 +1,2 @@
 DIST kdeartwork-4.6.3.tar.bz2 116889676 RMD160 c82f0e792e9dd51ef489970ea8d479df3e91098d SHA1 084834ac3c654ea24257d9ed407c2384bf5aa110 SHA256 5b9865381cdb41901b936745681e3b429b633f019bb9fd8a2ec36a59a4ebfcaa
-DIST kdeartwork-4.7.3.tar.bz2 122446083 RMD160 b2cbc3a49c49fb8b768ddbcfc9a2fed2ef0fd5df SHA1 4d3611cbcd6052a7ba7137baa196c654d9d38d4d SHA256 be0847c6c877ce20cf234a1b422283e48e63e2872f46b975379ffb33d932f4a0
 DIST kdeartwork-4.7.4.tar.bz2 122446585 RMD160 b97f49f2e4ebaf5587d88e456f718454208dd532 SHA1 f397f49a73273baadabcaf45cf18c4d6a3efbe44 SHA256 dbbfd9ce12075012abc7a9836b46a34cba4051db8ac1aabd33dea37a7f4ddf6d
diff --git a/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.7.3.ebuild b/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.7.3.ebuild
deleted file mode 100644
index df212257d025..000000000000
--- a/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.7.3.ebuild,v 1.3 2011/12/07 22:13:38 hwoarang Exp $
-
-EAPI=4
-
-KMMODULE="desktopthemes"
-KMNAME="kdeartwork"
-inherit kde4-meta
-
-DESCRIPTION="Additional KDE4 Plasma themes"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/kde-base/kdeartwork-emoticons/Manifest b/kde-base/kdeartwork-emoticons/Manifest
index 188ce0576d20..f67a6b2a209c 100644
--- a/kde-base/kdeartwork-emoticons/Manifest
+++ b/kde-base/kdeartwork-emoticons/Manifest
@@ -1,3 +1,2 @@
 DIST kdeartwork-4.6.3.tar.bz2 116889676 RMD160 c82f0e792e9dd51ef489970ea8d479df3e91098d SHA1 084834ac3c654ea24257d9ed407c2384bf5aa110 SHA256 5b9865381cdb41901b936745681e3b429b633f019bb9fd8a2ec36a59a4ebfcaa
-DIST kdeartwork-4.7.3.tar.bz2 122446083 RMD160 b2cbc3a49c49fb8b768ddbcfc9a2fed2ef0fd5df SHA1 4d3611cbcd6052a7ba7137baa196c654d9d38d4d SHA256 be0847c6c877ce20cf234a1b422283e48e63e2872f46b975379ffb33d932f4a0
 DIST kdeartwork-4.7.4.tar.bz2 122446585 RMD160 b97f49f2e4ebaf5587d88e456f718454208dd532 SHA1 f397f49a73273baadabcaf45cf18c4d6a3efbe44 SHA256 dbbfd9ce12075012abc7a9836b46a34cba4051db8ac1aabd33dea37a7f4ddf6d
diff --git a/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.7.3.ebuild b/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.7.3.ebuild
deleted file mode 100644
index bdf77b3a63f1..000000000000
--- a/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.7.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.7.3.ebuild,v 1.3 2011/12/07 22:13:35 hwoarang Exp $
-
-EAPI=4
-
-RESTRICT="binchecks strip"
-
-KMMODULE="emoticons"
-KMNAME="kdeartwork"
-inherit kde4-meta
-
-DESCRIPTION="EmotIcons (icons for things like smilies :-) for kde"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/kde-base/kdeartwork-iconthemes/Manifest b/kde-base/kdeartwork-iconthemes/Manifest
index 188ce0576d20..f67a6b2a209c 100644
--- a/kde-base/kdeartwork-iconthemes/Manifest
+++ b/kde-base/kdeartwork-iconthemes/Manifest
@@ -1,3 +1,2 @@
 DIST kdeartwork-4.6.3.tar.bz2 116889676 RMD160 c82f0e792e9dd51ef489970ea8d479df3e91098d SHA1 084834ac3c654ea24257d9ed407c2384bf5aa110 SHA256 5b9865381cdb41901b936745681e3b429b633f019bb9fd8a2ec36a59a4ebfcaa
-DIST kdeartwork-4.7.3.tar.bz2 122446083 RMD160 b2cbc3a49c49fb8b768ddbcfc9a2fed2ef0fd5df SHA1 4d3611cbcd6052a7ba7137baa196c654d9d38d4d SHA256 be0847c6c877ce20cf234a1b422283e48e63e2872f46b975379ffb33d932f4a0
 DIST kdeartwork-4.7.4.tar.bz2 122446585 RMD160 b97f49f2e4ebaf5587d88e456f718454208dd532 SHA1 f397f49a73273baadabcaf45cf18c4d6a3efbe44 SHA256 dbbfd9ce12075012abc7a9836b46a34cba4051db8ac1aabd33dea37a7f4ddf6d
diff --git a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.7.3.ebuild b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.7.3.ebuild
deleted file mode 100644
index 17708b0213c6..000000000000
--- a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.7.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.7.3.ebuild,v 1.3 2011/12/07 22:13:46 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdeartwork"
-KMMODULE="IconThemes"
-inherit kde4-meta
-
-DESCRIPTION="Icon themes for kde"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# Provides nuvola icon theme
-RDEPEND="
-	!x11-themes/nuvola
-"
-
-# Moved here in 4.7
-add_blocker kdeaccessibility-iconthemes
diff --git a/kde-base/kdeartwork-kscreensaver/Manifest b/kde-base/kdeartwork-kscreensaver/Manifest
index 188ce0576d20..f67a6b2a209c 100644
--- a/kde-base/kdeartwork-kscreensaver/Manifest
+++ b/kde-base/kdeartwork-kscreensaver/Manifest
@@ -1,3 +1,2 @@
 DIST kdeartwork-4.6.3.tar.bz2 116889676 RMD160 c82f0e792e9dd51ef489970ea8d479df3e91098d SHA1 084834ac3c654ea24257d9ed407c2384bf5aa110 SHA256 5b9865381cdb41901b936745681e3b429b633f019bb9fd8a2ec36a59a4ebfcaa
-DIST kdeartwork-4.7.3.tar.bz2 122446083 RMD160 b2cbc3a49c49fb8b768ddbcfc9a2fed2ef0fd5df SHA1 4d3611cbcd6052a7ba7137baa196c654d9d38d4d SHA256 be0847c6c877ce20cf234a1b422283e48e63e2872f46b975379ffb33d932f4a0
 DIST kdeartwork-4.7.4.tar.bz2 122446585 RMD160 b97f49f2e4ebaf5587d88e456f718454208dd532 SHA1 f397f49a73273baadabcaf45cf18c4d6a3efbe44 SHA256 dbbfd9ce12075012abc7a9836b46a34cba4051db8ac1aabd33dea37a7f4ddf6d
diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.7.3.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.7.3.ebuild
deleted file mode 100644
index 18f8711c1df2..000000000000
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.7.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.7.3.ebuild,v 1.3 2011/12/07 22:13:35 hwoarang Exp $
-
-EAPI=4
-
-KMMODULE="kscreensaver"
-KMNAME="kdeartwork"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="Extra screensavers for kde"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug +eigen +kexiv2 opengl xscreensaver"
-
-# libkworkspace - only as a stub to provide KDE4Workspace config
-RDEPEND="
-	$(add_kdebase_dep kscreensaver 'opengl?')
-	$(add_kdebase_dep libkworkspace)
-	media-libs/libart_lgpl
-	opengl? ( virtual/opengl )
-	xscreensaver? ( x11-misc/xscreensaver )
-"
-DEPEND="${RDEPEND}
-	eigen? ( dev-cpp/eigen:2 )
-	kexiv2? ( $(add_kdebase_dep libkexiv2) )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-xscreensaver.patch"
-	"${FILESDIR}/${PN}-4.5.95-webcollage.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		-DKSCREENSAVER_SOUND_SUPPORT=ON
-		$(cmake-utils_use_with eigen Eigen2)
-		$(cmake-utils_use_with kexiv2 Kexiv2)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with xscreensaver)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kdeartwork-meta/kdeartwork-meta-4.7.3.ebuild b/kde-base/kdeartwork-meta/kdeartwork-meta-4.7.3.ebuild
deleted file mode 100644
index 9ccfd2d9bd43..000000000000
--- a/kde-base/kdeartwork-meta/kdeartwork-meta-4.7.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-meta/kdeartwork-meta-4.7.3.ebuild,v 1.3 2011/12/07 22:14:01 hwoarang Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="kdeartwork - merge this to pull in all kdeartwork-derived packages"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	$(add_kdebase_dep kdeartwork-colorschemes)
-	$(add_kdebase_dep kdeartwork-desktopthemes)
-	$(add_kdebase_dep kdeartwork-emoticons)
-	$(add_kdebase_dep kdeartwork-iconthemes)
-	$(add_kdebase_dep kdeartwork-kscreensaver)
-	$(add_kdebase_dep kdeartwork-sounds)
-	$(add_kdebase_dep kdeartwork-styles)
-	$(add_kdebase_dep kdeartwork-wallpapers)
-	$(add_kdebase_dep kdeartwork-weatherwallpapers)
-"
diff --git a/kde-base/kdeartwork-sounds/Manifest b/kde-base/kdeartwork-sounds/Manifest
index 188ce0576d20..f67a6b2a209c 100644
--- a/kde-base/kdeartwork-sounds/Manifest
+++ b/kde-base/kdeartwork-sounds/Manifest
@@ -1,3 +1,2 @@
 DIST kdeartwork-4.6.3.tar.bz2 116889676 RMD160 c82f0e792e9dd51ef489970ea8d479df3e91098d SHA1 084834ac3c654ea24257d9ed407c2384bf5aa110 SHA256 5b9865381cdb41901b936745681e3b429b633f019bb9fd8a2ec36a59a4ebfcaa
-DIST kdeartwork-4.7.3.tar.bz2 122446083 RMD160 b2cbc3a49c49fb8b768ddbcfc9a2fed2ef0fd5df SHA1 4d3611cbcd6052a7ba7137baa196c654d9d38d4d SHA256 be0847c6c877ce20cf234a1b422283e48e63e2872f46b975379ffb33d932f4a0
 DIST kdeartwork-4.7.4.tar.bz2 122446585 RMD160 b97f49f2e4ebaf5587d88e456f718454208dd532 SHA1 f397f49a73273baadabcaf45cf18c4d6a3efbe44 SHA256 dbbfd9ce12075012abc7a9836b46a34cba4051db8ac1aabd33dea37a7f4ddf6d
diff --git a/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.7.3.ebuild b/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.7.3.ebuild
deleted file mode 100644
index 1b425681acac..000000000000
--- a/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.7.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.7.3.ebuild,v 1.3 2011/12/07 22:13:57 hwoarang Exp $
-
-EAPI=4
-
-RESTRICT="binchecks strip"
-
-KMMODULE="sounds"
-KMNAME="kdeartwork"
-inherit kde4-meta
-
-DESCRIPTION="Extra sound themes for kde"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/kde-base/kdeartwork-styles/Manifest b/kde-base/kdeartwork-styles/Manifest
index 188ce0576d20..f67a6b2a209c 100644
--- a/kde-base/kdeartwork-styles/Manifest
+++ b/kde-base/kdeartwork-styles/Manifest
@@ -1,3 +1,2 @@
 DIST kdeartwork-4.6.3.tar.bz2 116889676 RMD160 c82f0e792e9dd51ef489970ea8d479df3e91098d SHA1 084834ac3c654ea24257d9ed407c2384bf5aa110 SHA256 5b9865381cdb41901b936745681e3b429b633f019bb9fd8a2ec36a59a4ebfcaa
-DIST kdeartwork-4.7.3.tar.bz2 122446083 RMD160 b2cbc3a49c49fb8b768ddbcfc9a2fed2ef0fd5df SHA1 4d3611cbcd6052a7ba7137baa196c654d9d38d4d SHA256 be0847c6c877ce20cf234a1b422283e48e63e2872f46b975379ffb33d932f4a0
 DIST kdeartwork-4.7.4.tar.bz2 122446585 RMD160 b97f49f2e4ebaf5587d88e456f718454208dd532 SHA1 f397f49a73273baadabcaf45cf18c4d6a3efbe44 SHA256 dbbfd9ce12075012abc7a9836b46a34cba4051db8ac1aabd33dea37a7f4ddf6d
diff --git a/kde-base/kdeartwork-styles/kdeartwork-styles-4.7.3.ebuild b/kde-base/kdeartwork-styles/kdeartwork-styles-4.7.3.ebuild
deleted file mode 100644
index f5249b3c14be..000000000000
--- a/kde-base/kdeartwork-styles/kdeartwork-styles-4.7.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-styles/kdeartwork-styles-4.7.3.ebuild,v 1.3 2011/12/07 22:13:36 hwoarang Exp $
-
-EAPI=4
-
-KMMODULE="styles"
-KMNAME="kdeartwork"
-inherit kde4-meta
-
-DESCRIPTION="Extra KWin styles and window decorations"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-add_blocker kwin '<4.5.67'
-
-DEPEND="
-		$(add_kdebase_dep kwin)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRA="
-	aurorae/
-	kwin-styles/
-"
diff --git a/kde-base/kdeartwork-wallpapers/Manifest b/kde-base/kdeartwork-wallpapers/Manifest
index 188ce0576d20..f67a6b2a209c 100644
--- a/kde-base/kdeartwork-wallpapers/Manifest
+++ b/kde-base/kdeartwork-wallpapers/Manifest
@@ -1,3 +1,2 @@
 DIST kdeartwork-4.6.3.tar.bz2 116889676 RMD160 c82f0e792e9dd51ef489970ea8d479df3e91098d SHA1 084834ac3c654ea24257d9ed407c2384bf5aa110 SHA256 5b9865381cdb41901b936745681e3b429b633f019bb9fd8a2ec36a59a4ebfcaa
-DIST kdeartwork-4.7.3.tar.bz2 122446083 RMD160 b2cbc3a49c49fb8b768ddbcfc9a2fed2ef0fd5df SHA1 4d3611cbcd6052a7ba7137baa196c654d9d38d4d SHA256 be0847c6c877ce20cf234a1b422283e48e63e2872f46b975379ffb33d932f4a0
 DIST kdeartwork-4.7.4.tar.bz2 122446585 RMD160 b97f49f2e4ebaf5587d88e456f718454208dd532 SHA1 f397f49a73273baadabcaf45cf18c4d6a3efbe44 SHA256 dbbfd9ce12075012abc7a9836b46a34cba4051db8ac1aabd33dea37a7f4ddf6d
diff --git a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.7.3.ebuild b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.7.3.ebuild
deleted file mode 100644
index 3be1fa41af4c..000000000000
--- a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.7.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.7.3.ebuild,v 1.3 2011/12/07 22:13:33 hwoarang Exp $
-
-EAPI=4
-
-RESTRICT="binchecks strip"
-
-KMMODULE="wallpapers"
-KMNAME="kdeartwork"
-inherit kde4-meta
-
-DESCRIPTION="Wallpapers from kde"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-KMEXTRA="
-	HighResolutionWallpapers/
-"
diff --git a/kde-base/kdeartwork-weatherwallpapers/Manifest b/kde-base/kdeartwork-weatherwallpapers/Manifest
index 188ce0576d20..f67a6b2a209c 100644
--- a/kde-base/kdeartwork-weatherwallpapers/Manifest
+++ b/kde-base/kdeartwork-weatherwallpapers/Manifest
@@ -1,3 +1,2 @@
 DIST kdeartwork-4.6.3.tar.bz2 116889676 RMD160 c82f0e792e9dd51ef489970ea8d479df3e91098d SHA1 084834ac3c654ea24257d9ed407c2384bf5aa110 SHA256 5b9865381cdb41901b936745681e3b429b633f019bb9fd8a2ec36a59a4ebfcaa
-DIST kdeartwork-4.7.3.tar.bz2 122446083 RMD160 b2cbc3a49c49fb8b768ddbcfc9a2fed2ef0fd5df SHA1 4d3611cbcd6052a7ba7137baa196c654d9d38d4d SHA256 be0847c6c877ce20cf234a1b422283e48e63e2872f46b975379ffb33d932f4a0
 DIST kdeartwork-4.7.4.tar.bz2 122446585 RMD160 b97f49f2e4ebaf5587d88e456f718454208dd532 SHA1 f397f49a73273baadabcaf45cf18c4d6a3efbe44 SHA256 dbbfd9ce12075012abc7a9836b46a34cba4051db8ac1aabd33dea37a7f4ddf6d
diff --git a/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.7.3.ebuild b/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.7.3.ebuild
deleted file mode 100644
index f3ce2173db6e..000000000000
--- a/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.7.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.7.3.ebuild,v 1.3 2011/12/07 22:13:54 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdeartwork"
-KMMODULE="WeatherWallpapers"
-inherit kde4-meta
-
-DESCRIPTION="Weather aware wallpapers. Changes with weather outside."
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	$(add_kdebase_dep kdeartwork-wallpapers)
-"
diff --git a/kde-base/kdebase-cursors/Manifest b/kde-base/kdebase-cursors/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/kdebase-cursors/Manifest
+++ b/kde-base/kdebase-cursors/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/kdebase-cursors/kdebase-cursors-4.7.3.ebuild b/kde-base/kdebase-cursors/kdebase-cursors-4.7.3.ebuild
deleted file mode 100644
index 52f65bf0bc86..000000000000
--- a/kde-base/kdebase-cursors/kdebase-cursors-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-cursors/kdebase-cursors-4.7.3.ebuild,v 1.3 2011/12/07 22:13:40 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-KMMODULE="cursors"
-inherit kde4-meta
-
-DESCRIPTION="oxygen cursors from kdebase"
-IUSE=""
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
diff --git a/kde-base/kdebase-data/Manifest b/kde-base/kdebase-data/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/kdebase-data/Manifest
+++ b/kde-base/kdebase-data/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/kdebase-data/kdebase-data-4.7.3.ebuild b/kde-base/kdebase-data/kdebase-data-4.7.3.ebuild
deleted file mode 100644
index 63cc77bcaf8f..000000000000
--- a/kde-base/kdebase-data/kdebase-data-4.7.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/kdebase-data-4.7.3.ebuild,v 1.3 2011/12/07 22:13:48 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-KMNOMODULE="true"
-inherit kde4-meta
-
-DESCRIPTION="Icons, localization data and various .desktop files from kdebase."
-IUSE="+wallpapers"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	wallpapers? ( $(add_kdebase_dep kde-wallpapers) )
-	$(add_kdebase_dep oxygen-icons)
-	x11-themes/hicolor-icon-theme
-"
-
-KMEXTRA="
-	l10n/
-	localization/
-	pics/
-"
-# Note that the eclass doesn't do this for us, because of KMNOMODULE="true".
-KMEXTRACTONLY="
-	config-runtime.h.cmake
-	kde4
-"
-
-src_configure() {
-	# Remove remnants of hicolor-icon-theme
-	sed -e "s:add_subdirectory[[:space:]]*([[:space:]]*hicolor[[:space:]]*):#donotwant:g" \
-		-i pics/CMakeLists.txt \
-		|| die "failed to remove remnants of hicolor-icon-theme"
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kdebase-desktoptheme/Manifest b/kde-base/kdebase-desktoptheme/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/kdebase-desktoptheme/Manifest
+++ b/kde-base/kdebase-desktoptheme/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.7.3.ebuild b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.7.3.ebuild
deleted file mode 100644
index 6a30d457cf48..000000000000
--- a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.7.3.ebuild,v 1.3 2011/12/07 22:13:45 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-KMMODULE="desktoptheme"
-inherit kde4-meta
-
-DESCRIPTION="Oxygen KDE4 desktop theme."
-IUSE=""
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
diff --git a/kde-base/kdebase-kioslaves/Manifest b/kde-base/kdebase-kioslaves/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/kdebase-kioslaves/Manifest
+++ b/kde-base/kdebase-kioslaves/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.7.3.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.7.3.ebuild
deleted file mode 100644
index eab49624dac6..000000000000
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.7.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.7.3.ebuild,v 1.3 2011/12/07 22:13:34 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-runtime"
-KMMODULE="kioslave"
-inherit kde4-meta
-
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-DESCRIPTION="kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data"
-IUSE="+bzip2 exif debug lzma openexr samba +sftp"
-
-# tests hang, last checked for 4.2.96
-RESTRICT="test"
-
-DEPEND="
-	!aqua? ( x11-libs/libXcursor )
-	bzip2? ( app-arch/bzip2 )
-	exif? ( media-gfx/exiv2 )
-	lzma? ( app-arch/xz-utils )
-	openexr? ( media-libs/openexr )
-	samba? ( net-fs/samba[smbclient] )
-	sftp? ( >=net-libs/libssh-0.4.0[sftp] )
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdelibs 'bzip2?,lzma?')
-	$(add_kdebase_dep kdialog)
-	virtual/ssh
-	!aqua? ( !kernel_SunOS? ( virtual/eject ) )
-"
-
-KMEXTRA="
-	kioexec
-	kdeeject
-"
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_SLP=OFF
-		$(cmake-utils_use_with bzip2 BZip2)
-		$(cmake-utils_use_with exif Exiv2)
-		$(cmake-utils_use_with lzma LibLZMA)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with samba)
-		$(cmake-utils_use_with sftp LibSSH)
-	)
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kdebase-menu-icons/Manifest b/kde-base/kdebase-menu-icons/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/kdebase-menu-icons/Manifest
+++ b/kde-base/kdebase-menu-icons/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.7.3.ebuild b/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.7.3.ebuild
deleted file mode 100644
index 9e81fc060f13..000000000000
--- a/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.7.3.ebuild,v 1.3 2011/12/07 22:13:38 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-KMMODULE="menu"
-inherit kde4-meta
-
-DESCRIPTION="KDE menu icons"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/kde-base/kdebase-menu/Manifest b/kde-base/kdebase-menu/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/kdebase-menu/Manifest
+++ b/kde-base/kdebase-menu/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/kdebase-menu/kdebase-menu-4.7.3.ebuild b/kde-base/kdebase-menu/kdebase-menu-4.7.3.ebuild
deleted file mode 100644
index 2f781f5922a0..000000000000
--- a/kde-base/kdebase-menu/kdebase-menu-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-menu/kdebase-menu-4.7.3.ebuild,v 1.3 2011/12/07 22:14:02 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-KMMODULE="kde-menu"
-inherit kde4-meta
-
-DESCRIPTION="KDE Menu query tool."
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kdebase-meta/kdebase-meta-4.7.3.ebuild b/kde-base/kdebase-meta/kdebase-meta-4.7.3.ebuild
deleted file mode 100644
index 2f72586315fd..000000000000
--- a/kde-base/kdebase-meta/kdebase-meta-4.7.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/kdebase-meta-4.7.3.ebuild,v 1.3 2011/12/07 22:13:44 hwoarang Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="Merge this to pull in all kdebase-derived packages"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+wallpapers"
-
-RDEPEND="
-	$(add_kdebase_dep dolphin)
-	$(add_kdebase_dep freespacenotifier)
-	$(add_kdebase_dep kcheckpass)
-	$(add_kdebase_dep kcminit)
-	wallpapers? ( $(add_kdebase_dep kde-wallpapers) )
-	$(add_kdebase_dep kdebase-cursors)
-	$(add_kdebase_dep kdebase-runtime-meta)
-	$(add_kdebase_dep kdebase-startkde)
-	$(add_kdebase_dep kdepasswd)
-	$(add_kdebase_dep kdialog)
-	$(add_kdebase_dep keditbookmarks)
-	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep kfind)
-	$(add_kdebase_dep kfmclient)
-	$(add_kdebase_dep khotkeys)
-	$(add_kdebase_dep kinfocenter)
-	$(add_kdebase_dep klipper)
-	$(add_kdebase_dep kmenuedit)
-	$(add_kdebase_dep konq-plugins)
-	$(add_kdebase_dep konqueror)
-	$(add_kdebase_dep konsole)
-	$(add_kdebase_dep kscreensaver)
-	$(add_kdebase_dep ksmserver)
-	$(add_kdebase_dep ksplash)
-	$(add_kdebase_dep kstartupconfig)
-	$(add_kdebase_dep kstyles)
-	$(add_kdebase_dep ksysguard)
-	$(add_kdebase_dep ksystraycmd)
-	$(add_kdebase_dep kwin)
-	$(add_kdebase_dep kwrite)
-	$(add_kdebase_dep kwrited)
-	$(add_kdebase_dep libkonq)
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep liboxygenstyle)
-	$(add_kdebase_dep libplasmaclock)
-	$(add_kdebase_dep libplasmagenericshell)
-	$(add_kdebase_dep libtaskmanager)
-	$(add_kdebase_dep nsplugins)
-	$(add_kdebase_dep phonon-kde)
-	$(add_kdebase_dep plasma-apps)
-	$(add_kdebase_dep plasma-workspace)
-	$(add_kdebase_dep powerdevil)
-	$(add_kdebase_dep qguiplatformplugin_kde)
-	$(add_kdebase_dep solid)
-	$(add_kdebase_dep systemsettings)
-	!prefix? ( $(add_kdebase_dep kdm) )
-"
diff --git a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.7.3.ebuild b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.7.3.ebuild
deleted file mode 100644
index 1e7ce6f3cf23..000000000000
--- a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.7.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.7.3.ebuild,v 1.3 2011/12/07 22:13:51 hwoarang Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+handbook semantic-desktop"
-
-RDEPEND="
-	$(add_kdebase_dep activitymanager)
-	$(add_kdebase_dep attica)
-	$(add_kdebase_dep drkonqi)
-	$(add_kdebase_dep kcmshell)
-	$(add_kdebase_dep kcontrol)
-	$(add_kdebase_dep kdebase-data)
-	$(add_kdebase_dep kdebase-desktoptheme)
-	$(add_kdebase_dep kdebase-kioslaves)
-	$(add_kdebase_dep kdebase-menu)
-	$(add_kdebase_dep kdebase-menu-icons)
-	$(add_kdebase_dep kdebugdialog)
-	$(add_kdebase_dep kdesu)
-	$(add_kdebase_dep kdontchangethehostname)
-	$(add_kdebase_dep keditfiletype)
-	$(add_kdebase_dep kfile)
-	$(add_kdebase_dep kglobalaccel)
-	$(add_kdebase_dep kiconfinder)
-	$(add_kdebase_dep kioclient)
-	$(add_kdebase_dep kmimetypefinder)
-	$(add_kdebase_dep knetattach)
-	$(add_kdebase_dep knewstuff)
-	$(add_kdebase_dep kpasswdserver)
-	$(add_kdebase_dep kquitapp)
-	$(add_kdebase_dep kstart)
-	$(add_kdebase_dep ktimezoned)
-	$(add_kdebase_dep ktraderclient)
-	$(add_kdebase_dep kuiserver)
-	$(add_kdebase_dep kurifilter-plugins)
-	$(add_kdebase_dep kwallet)
-	$(add_kdebase_dep kwalletd)
-	$(add_kdebase_dep plasma-runtime)
-	$(add_kdebase_dep renamedlg-plugins)
-	$(add_kdebase_dep solid-runtime)
-	handbook? ( $(add_kdebase_dep khelpcenter) )
-	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
-"
diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/kdebase-startkde/Manifest
+++ b/kde-base/kdebase-startkde/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.7.3.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.7.3.ebuild
deleted file mode 100644
index cffd201b1fae..000000000000
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.7.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.7.3.ebuild,v 1.3 2011/12/07 22:13:49 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-KMNOMODULE="true"
-inherit kde4-meta multilib prefix
-
-DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+wallpapers"
-
-# The KDE apps called from the startkde script.
-# These provide the most minimal KDE desktop.
-RDEPEND="
-	$(add_kdebase_dep kcminit)
-	$(add_kdebase_dep kdebase-runtime-meta)
-	wallpapers? ( $(add_kdebase_dep kde-wallpapers) )
-	$(add_kdebase_dep kfmclient)
-	$(add_kdebase_dep knotify)
-	$(add_kdebase_dep kreadconfig)
-	$(add_kdebase_dep krunner)
-	$(add_kdebase_dep ksmserver)
-	$(add_kdebase_dep ksplash)
-	$(add_kdebase_dep kstartupconfig)
-	$(add_kdebase_dep kwin)
-	$(add_kdebase_dep phonon-kde)
-	$(add_kdebase_dep plasma-apps)
-	$(add_kdebase_dep plasma-workspace)
-	$(add_kdebase_dep systemsettings)
-	x11-apps/mkfontdir
-	x11-apps/xmessage
-	x11-apps/xprop
-	x11-apps/xrandr
-	x11-apps/xrdb
-	x11-apps/xsetroot
-	x11-apps/xset
-"
-
-KMEXTRACTONLY="
-	ConfigureChecks.cmake
-	kdm/
-	startkde.cmake
-"
-
-PATCHES=("${FILESDIR}/gentoo-startkde4-4.patch")
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	cp "${FILESDIR}/KDE-4" "${T}"
-
-	# fix ${EPREFIX}
-	eprefixify startkde.cmake "${T}/KDE-4"
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# startup and shutdown scripts
-	insinto /etc/kde/startup
-	doins "${FILESDIR}/agent-startup.sh"
-
-	insinto /etc/kde/shutdown
-	doins "${FILESDIR}/agent-shutdown.sh"
-
-	# x11 session script
-	exeinto /etc/X11/Sessions
-	doexe "${T}/KDE-4"
-
-	# freedesktop compliant session script
-	sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${EPREFIX}/usr/bin:g" \
-		"${S}/kdm/kfrontend/sessions/kde-plasma.desktop.cmake" > "${T}/KDE-4.desktop"
-	insinto /usr/share/xsessions
-	doins "${T}/KDE-4.desktop"
-}
-
-pkg_postinst () {
-	kde4-meta_pkg_postinst
-
-	echo
-	elog "To enable gpg-agent and/or ssh-agent in KDE sessions,"
-	elog "edit ${EPREFIX}/etc/kde/startup/agent-startup.sh and"
-	elog "${EPREFIX}/etc/kde/shutdown/agent-shutdown.sh"
-	echo
-	elog "The name of the session script has changed."
-	elog "If you currently have XSESSION=\"kde-$(get_kde_version)\" in your"
-	elog "configuration files, you will need to change it to"
-	elog "XSESSION=\"KDE-4\""
-}
diff --git a/kde-base/kdebindings-meta/kdebindings-meta-4.7.3.ebuild b/kde-base/kdebindings-meta/kdebindings-meta-4.7.3.ebuild
deleted file mode 100644
index 04b459574ae6..000000000000
--- a/kde-base/kdebindings-meta/kdebindings-meta-4.7.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-meta/kdebindings-meta-4.7.3.ebuild,v 1.3 2011/12/07 22:13:33 hwoarang Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="KDE bindings - merge this to pull in all kdebindings-derived packages"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="csharp java perl python ruby"
-
-RDEPEND="
-	$(add_kdebase_dep smokegen)
-	$(add_kdebase_dep smokekde)
-	$(add_kdebase_dep smokeqt)
-	csharp? (
-		$(add_kdebase_dep kimono)
-		$(add_kdebase_dep qyoto)
-	)
-	java? ( $(add_kdebase_dep krossjava) )
-	perl? (
-		$(add_kdebase_dep perlkde)
-		$(add_kdebase_dep perlqt)
-	)
-	python? (
-		$(add_kdebase_dep krosspython)
-		$(add_kdebase_dep pykde4)
-	)
-	ruby? (
-		$(add_kdebase_dep korundum)
-		$(add_kdebase_dep krossruby)
-		$(add_kdebase_dep qtruby)
-	)
-"
diff --git a/kde-base/kdebugdialog/Manifest b/kde-base/kdebugdialog/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/kdebugdialog/Manifest
+++ b/kde-base/kdebugdialog/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/kdebugdialog/kdebugdialog-4.7.3.ebuild b/kde-base/kdebugdialog/kdebugdialog-4.7.3.ebuild
deleted file mode 100644
index 9ad5bf1f1fac..000000000000
--- a/kde-base/kdebugdialog/kdebugdialog-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebugdialog/kdebugdialog-4.7.3.ebuild,v 1.3 2011/12/07 22:13:38 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE: A dialog box for setting preferences for debug output"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kdeedu-meta/kdeedu-meta-4.7.3.ebuild b/kde-base/kdeedu-meta/kdeedu-meta-4.7.3.ebuild
deleted file mode 100644
index f635c1277161..000000000000
--- a/kde-base/kdeedu-meta/kdeedu-meta-4.7.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-meta/kdeedu-meta-4.7.3.ebuild,v 1.3 2011/12/07 22:13:49 hwoarang Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	$(add_kdebase_dep blinken)
-	$(add_kdebase_dep cantor)
-	$(add_kdebase_dep kalgebra)
-	$(add_kdebase_dep kalzium)
-	$(add_kdebase_dep kanagram)
-	$(add_kdebase_dep kbruch)
-	$(add_kdebase_dep kgeography)
-	$(add_kdebase_dep khangman)
-	$(add_kdebase_dep kig)
-	$(add_kdebase_dep kiten)
-	$(add_kdebase_dep klettres)
-	$(add_kdebase_dep kmplot)
-	$(add_kdebase_dep kstars)
-	$(add_kdebase_dep ktouch)
-	$(add_kdebase_dep kturtle)
-	$(add_kdebase_dep kwordquiz)
-	$(add_kdebase_dep libkdeedu)
-	$(add_kdebase_dep marble)
-	$(add_kdebase_dep parley)
-	$(add_kdebase_dep rocs)
-	$(add_kdebase_dep step)
-"
diff --git a/kde-base/kdegames-meta/kdegames-meta-4.7.3.ebuild b/kde-base/kdegames-meta/kdegames-meta-4.7.3.ebuild
deleted file mode 100644
index 5935fcc444b7..000000000000
--- a/kde-base/kdegames-meta/kdegames-meta-4.7.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames-meta/kdegames-meta-4.7.3.ebuild,v 1.3 2011/12/07 22:13:51 hwoarang Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="opengl python"
-
-RDEPEND="
-	$(add_kdebase_dep bomber)
-	$(add_kdebase_dep bovo)
-	$(add_kdebase_dep granatier)
-	$(add_kdebase_dep kapman)
-	$(add_kdebase_dep katomic)
-	$(add_kdebase_dep kbattleship)
-	$(add_kdebase_dep kblackbox)
-	$(add_kdebase_dep kblocks)
-	$(add_kdebase_dep kbounce)
-	$(add_kdebase_dep kbreakout)
-	$(add_kdebase_dep kdiamond)
-	$(add_kdebase_dep kfourinline)
-	$(add_kdebase_dep kgoldrunner)
-	$(add_kdebase_dep killbots)
-	$(add_kdebase_dep kigo)
-	$(add_kdebase_dep kiriki)
-	$(add_kdebase_dep kjumpingcube)
-	$(add_kdebase_dep klickety)
-	$(add_kdebase_dep klines)
-	$(add_kdebase_dep kmahjongg)
-	$(add_kdebase_dep kmines)
-	$(add_kdebase_dep knetwalk)
-	$(add_kdebase_dep kolf)
-	$(add_kdebase_dep kollision)
-	$(add_kdebase_dep konquest)
-	$(add_kdebase_dep kpat)
-	$(add_kdebase_dep kreversi)
-	$(add_kdebase_dep kshisen)
-	$(add_kdebase_dep ksirk)
-	$(add_kdebase_dep kspaceduel)
-	$(add_kdebase_dep ksquares)
-	$(add_kdebase_dep ktron)
-	$(add_kdebase_dep ktuberling)
-	$(add_kdebase_dep kubrick)
-	$(add_kdebase_dep libkdegames)
-	$(add_kdebase_dep libkmahjongg)
-	$(add_kdebase_dep lskat)
-	$(add_kdebase_dep palapeli)
-	opengl? ( $(add_kdebase_dep ksudoku) )
-	python? ( $(add_kdebase_dep kajongg) )
-"
diff --git a/kde-base/kdegraphics-meta/kdegraphics-meta-4.7.3.ebuild b/kde-base/kdegraphics-meta/kdegraphics-meta-4.7.3.ebuild
deleted file mode 100644
index b88f3cdddf61..000000000000
--- a/kde-base/kdegraphics-meta/kdegraphics-meta-4.7.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-meta/kdegraphics-meta-4.7.3.ebuild,v 1.3 2011/12/07 22:13:34 hwoarang Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="scanner"
-
-RDEPEND="
-	$(add_kdebase_dep gwenview)
-	$(add_kdebase_dep kamera)
-	$(add_kdebase_dep kcolorchooser)
-	$(add_kdebase_dep kdegraphics-strigi-analyzer)
-	$(add_kdebase_dep kgamma)
-	$(add_kdebase_dep kolourpaint)
-	$(add_kdebase_dep kruler)
-	$(add_kdebase_dep ksnapshot)
-	$(add_kdebase_dep libkdcraw)
-	$(add_kdebase_dep libkexiv2)
-	$(add_kdebase_dep libkipi)
-	$(add_kdebase_dep okular)
-	$(add_kdebase_dep svgpart)
-	$(add_kdebase_dep thumbnailers)
-	scanner? (
-		$(add_kdebase_dep ksaneplugin)
-		$(add_kdebase_dep libksane)
-	)
-"
diff --git a/kde-base/kdegraphics-strigi-analyzer/Manifest b/kde-base/kdegraphics-strigi-analyzer/Manifest
index df3321e32a4a..36c9db1f114a 100644
--- a/kde-base/kdegraphics-strigi-analyzer/Manifest
+++ b/kde-base/kdegraphics-strigi-analyzer/Manifest
@@ -1,3 +1,2 @@
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
-DIST kdegraphics-strigi-analyzer-4.7.3.tar.bz2 42747 RMD160 63c6b0ac8d47d64874d917f639be45690d31bc58 SHA1 827b18fd902a464162db7a3cd98a22fa211bafc9 SHA256 4a22c3e27be915fadeb9ac1310dba37ecb76162b1c3082d4df0fb883b9f9d9d3
 DIST kdegraphics-strigi-analyzer-4.7.4.tar.bz2 42747 RMD160 7cc72c5847c6e9bc229ed32b36fd931898a7d6b8 SHA1 39b3b0312663a3ef7a68c972b39bf12fb4cabe8b SHA256 89da4d51b0ae7be004b70dd5cfc080a1675d5c11a5be16fec199d36a8e83ecc8
diff --git a/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.7.3.ebuild b/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.7.3.ebuild
deleted file mode 100644
index 1c62aad103ef..000000000000
--- a/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.7.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.7.3.ebuild,v 1.3 2011/12/07 22:13:54 hwoarang Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="kdegraphics: strigi plugins"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-misc/strigi
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 8cccf374379f..b3ddbf2e90c3 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,3 +1,2 @@
 DIST kdelibs-4.6.3.tar.bz2 12916816 RMD160 f7f78ef93fa75d488efcd7c66dcbce6d153f9c28 SHA1 c7fb089c9d52a6b1d9188b9e788753373a3288e4 SHA256 b6ea04dc9014ff3fca0242fd927faeb67dc53288779aeb873d46104aa6109e38
-DIST kdelibs-4.7.3.tar.bz2 12071229 RMD160 e8bb93554a915d97d6619b8a9bfccdd7175259a0 SHA1 4f1bbd1b4d558f3541057747db9bf7e9dcececb3 SHA256 00ef65295134e998e8bc1123b0bd64245811106e827ab90458378ea4ab5b0e66
 DIST kdelibs-4.7.4.tar.bz2 12084560 RMD160 5666cacb69ebdbd2d0e9ce9300f35ecf6d6ba48c SHA1 78b25e93a8c70ccc1e0f117cce960fe4e1deb8d8 SHA256 fe1d41ecce95d9ef67a9b81cee55afe5ac98aa937e2c2356bd69f9bb31a2af39
diff --git a/kde-base/kdelibs/kdelibs-4.7.3-r1.ebuild b/kde-base/kdelibs/kdelibs-4.7.3-r1.ebuild
deleted file mode 100644
index ee6d739292c2..000000000000
--- a/kde-base/kdelibs/kdelibs-4.7.3-r1.ebuild
+++ /dev/null
@@ -1,315 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.3-r1.ebuild,v 1.5 2011/12/16 22:26:44 dilfridge Exp $
-
-EAPI=4
-
-CPPUNIT_REQUIRED="optional"
-DECLARATIVE_REQUIRED="always"
-OPENGL_REQUIRED="optional"
-KDE_SCM="git"
-inherit kde4-base fdo-mime toolchain-funcs
-
-DESCRIPTION="KDE libraries needed by all KDE programs."
-HOMEPAGE="http://www.kde.org/"
-
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos
-lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev
-+udisks +upower zeroconf"
-
-REQUIRED_USE="
-	udisks? ( udev )
-	upower? ( udev )
-"
-
-# needs the kate regression testsuite from svn
-RESTRICT="test"
-
-COMMONDEPEND="
-	app-crypt/qca:2
-	>=app-misc/strigi-0.7.6
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	>=dev-libs/libattica-0.1.90
-	>=dev-libs/libdbusmenu-qt-0.3.2
-	dev-libs/libpcre[unicode]
-	dev-libs/libxml2
-	dev-libs/libxslt
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/giflib
-	>=media-libs/libpng-1.4
-	>=media-libs/phonon-4.4.3
-	sys-libs/zlib
-	virtual/jpeg
-	>=x11-misc/shared-mime-info-0.60
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	!aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXcursor
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXrender
-		x11-libs/libXScrnSaver
-		x11-libs/libXtst
-		!kernel_SunOS? ( sys-libs/libutempter )
-	)
-	bzip2? ( app-arch/bzip2 )
-	fam? ( virtual/fam )
-	jpeg2k? ( media-libs/jasper )
-	kerberos? ( virtual/krb5 )
-	lzma? ( app-arch/xz-utils )
-	openexr? (
-		media-libs/openexr
-		media-libs/ilmbase
-	)
-	policykit? ( >=sys-auth/polkit-qt-0.99 )
-	semantic-desktop? (
-		>=dev-libs/shared-desktop-ontologies-0.6.50
-		>=dev-libs/soprano-2.6.51[dbus,raptor,redland]
-	)
-	spell? ( app-text/enchant )
-	ssl? ( dev-libs/openssl )
-	udev? ( sys-fs/udev )
-	zeroconf? (
-		|| (
-			net-dns/avahi[mdnsresponder-compat]
-			!bindist? ( net-misc/mDNSResponder )
-		)
-	)
-"
-DEPEND="${COMMONDEPEND}
-	doc? ( app-doc/doxygen )
-	nls? ( virtual/libintl )
-"
-RDEPEND="${COMMONDEPEND}
-	!x11-libs/qt-phonon
-	>=app-crypt/gnupg-2.0.11
-	app-misc/ca-certificates
-	$(add_kdebase_dep kde-env)
-	!aqua? (
-		x11-apps/iceauth
-		x11-apps/rgb
-		>=x11-misc/xdg-utils-1.0.2-r3
-		udisks? ( sys-fs/udisks )
-		upower? ( sys-power/upower )
-	)
-"
-PDEPEND="
-	$(add_kdebase_dep katepart)
-	|| ( ( $(add_kdebase_dep kfmclient) ) x11-misc/xdg-utils )
-	handbook? ( $(add_kdebase_dep khelpcenter) )
-	policykit? (
-		>=kde-misc/polkit-kde-kcmodules-0.98_pre20101127
-		>=sys-auth/polkit-kde-agent-0.99
-	)
-	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
-"
-
-# Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities
-add_blocker plasma-workspace 4.7.1
-
-# file collision, bug 394991
-add_blocker kcontrol 4.4.50
-
-PATCHES=(
-	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
-	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
-	"${FILESDIR}/${PN}-4.5.90-mimetypes.patch"
-	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
-	"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
-	"${FILESDIR}/${PN}-4.6.3-bytecode.patch"
-	"${FILESDIR}/${PN}-4.7.3-customcont.patch"
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		[[ $(gcc-major-version) -lt 4 ]] || \
-				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
-			&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
-	fi
-}
-
-src_prepare() {
-	kde4-base_src_prepare
-	use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch"
-
-	# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)
-	sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
-		-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
-
-	if use aqua; then
-		sed -i -e \
-			"s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
-			cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
-
-		#if [[ ${CHOST} == *-darwin8 ]]; then
-		sed -i -e \
-			"s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
-			cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
-		#fi
-
-		# solid/solid/backends/iokit doesn't properly link, so disable it.
-		sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
-			|| die "disabling solid/solid/backends/iokit failed"
-		sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
-			|| die "disabling solid/solid/backends/iokit failed"
-
-		# There's no fdatasync on OSX and the check fails to detect that.
-		sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
-			|| die "disabling fdatasync failed"
-
-		# Fix nameser include to nameser8_compat
-		sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
-			|| die "fixing nameser include failed"
-		append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
-
-		# Try to fix kkeyserver_mac
-		epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-ksyscoca.patch"
-		# getgrouplist not in solaris libc
-		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-getgrouplist.patch"
-		# solaris has no d_type element in dir_ent
-		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-fileunix.patch"
-	fi
-}
-
-src_configure() {
-	if use zeroconf; then
-		if has_version net-dns/avahi; then
-			mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF)
-		elif has_version net-misc/mDNSResponder; then
-			mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=ON)
-		else
-			die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found."
-		fi
-	else
-		mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF)
-	fi
-	mycmakeargs+=(
-		-DWITH_HSPELL=OFF
-		-DWITH_ASPELL=OFF
-		-DKDE_DEFAULT_HOME=.kde4
-		-DKAUTH_BACKEND=POLKITQT-1
-		-DBUILD_libkactivities=OFF
-		$(cmake-utils_use_build handbook doc)
-		$(cmake-utils_use_has 3dnow X86_3DNOW)
-		$(cmake-utils_use_has altivec PPC_ALTIVEC)
-		$(cmake-utils_use_has mmx X86_MMX)
-		$(cmake-utils_use_has sse X86_SSE)
-		$(cmake-utils_use_has sse2 X86_SSE2)
-		$(cmake-utils_use_with acl)
-		$(cmake-utils_use_with alsa)
-		$(cmake-utils_use_with bzip2 BZip2)
-		$(cmake-utils_use_with fam)
-		$(cmake-utils_use_with jpeg2k Jasper)
-		$(cmake-utils_use_with kerberos GSSAPI)
-		$(cmake-utils_use_with lzma LibLZMA)
-		$(cmake-utils_use_with nls Libintl)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with policykit PolkitQt-1)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with semantic-desktop SharedDesktopOntologies)
-		$(cmake-utils_use_with spell ENCHANT)
-		$(cmake-utils_use_with ssl OpenSSL)
-		$(cmake-utils_use_with udev UDev)
-		-DWITH_HUpnp=OFF
-	)
-	kde4-base_src_configure
-}
-
-src_compile() {
-	kde4-base_src_compile
-
-	# The building of apidox is not managed anymore by the build system
-	if use doc; then
-		einfo "Building API documentation"
-		cd "${S}"/doc/api/
-		./doxygen.sh "${S}" || die "APIDOX generation failed"
-	fi
-}
-
-src_install() {
-	kde4-base_src_install
-
-	# use system certificates
-	rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
-	dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
-
-	if use doc; then
-		einfo "Installing API documentation. This could take a bit of time."
-		cd "${S}"/doc/api/
-		docinto /HTML/en/kdelibs-apidox
-		dohtml -r ${P}-apidocs/*
-	fi
-
-	if use aqua; then
-		einfo "fixing ${PN} plugins"
-
-		local _PV=${PV:0:3}.0
-		local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script
-
-		install_name_tool -id \
-			"${_dir}/libkrossqtsplugin.${_PV}.dylib" \
-			"${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
-			|| die "failed fixing libkrossqtsplugin.${_PV}.dylib"
-
-		einfo "fixing ${PN} cmake detection files"
-		#sed -i -e \
-		#	"s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
-		echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
-			"${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \
-			|| die "failed fixing FindXKB.cmake"
-	fi
-
-	einfo Installing environment file.
-	# Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined.
-	echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
-	echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde"
-	doenvd "${T}/77kde"
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-
-	if use zeroconf; then
-		echo
-		elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon"
-		elog "is running."
-		echo
-		einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
-		einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
-		einfo "to include 'mdns', e.g.:"
-		einfo "	hosts: files mdns dns"
-		echo
-	fi
-
-	elog "Your homedir is set to \${HOME}/.kde4"
-	echo
-
-	kde4-base_pkg_postinst
-}
-
-pkg_prerm() {
-	# Remove ksycoca4 global database
-	rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-
-	kde4-base_pkg_postrm
-}
diff --git a/kde-base/kdelibs/kdelibs-4.7.3-r11.ebuild b/kde-base/kdelibs/kdelibs-4.7.3-r11.ebuild
deleted file mode 100644
index fbdb321714a3..000000000000
--- a/kde-base/kdelibs/kdelibs-4.7.3-r11.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.3-r11.ebuild,v 1.2 2011/12/16 22:26:44 dilfridge Exp $
-
-EAPI=4
-
-CPPUNIT_REQUIRED="optional"
-DECLARATIVE_REQUIRED="always"
-OPENGL_REQUIRED="optional"
-KDE_SCM="git"
-inherit kde4-base fdo-mime toolchain-funcs
-
-DESCRIPTION="KDE libraries needed by all KDE programs."
-HOMEPAGE="http://www.kde.org/"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos
-lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev
-+udisks +upower upnp zeroconf"
-
-REQUIRED_USE="
-	udisks? ( udev )
-	upower? ( udev )
-"
-
-# needs the kate regression testsuite from svn
-RESTRICT="test"
-
-COMMONDEPEND="
-	app-crypt/qca:2
-	>=app-misc/strigi-0.7.6
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	>=dev-libs/libattica-0.1.90
-	>=dev-libs/libdbusmenu-qt-0.3.2
-	dev-libs/libpcre[unicode]
-	dev-libs/libxml2
-	dev-libs/libxslt
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/giflib
-	>=media-libs/libpng-1.4
-	>=media-libs/phonon-4.4.3
-	sys-libs/zlib
-	virtual/jpeg
-	>=x11-misc/shared-mime-info-0.60
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	!aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXcursor
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXrender
-		x11-libs/libXScrnSaver
-		x11-libs/libXtst
-		!kernel_SunOS? ( sys-libs/libutempter )
-	)
-	bzip2? ( app-arch/bzip2 )
-	fam? ( virtual/fam )
-	jpeg2k? ( media-libs/jasper )
-	kerberos? ( virtual/krb5 )
-	lzma? ( app-arch/xz-utils )
-	openexr? (
-		media-libs/openexr
-		media-libs/ilmbase
-	)
-	policykit? ( >=sys-auth/polkit-qt-0.99 )
-	semantic-desktop? (
-		>=dev-libs/shared-desktop-ontologies-0.6.50
-		>=dev-libs/soprano-2.6.51[dbus,raptor,redland]
-	)
-	spell? ( app-text/enchant )
-	ssl? ( dev-libs/openssl )
-	udev? ( sys-fs/udev )
-	upnp? ( media-libs/herqq )
-	zeroconf? (
-		|| (
-			net-dns/avahi[mdnsresponder-compat]
-			!bindist? ( net-misc/mDNSResponder )
-		)
-	)
-"
-DEPEND="${COMMONDEPEND}
-	doc? ( app-doc/doxygen )
-	nls? ( virtual/libintl )
-"
-RDEPEND="${COMMONDEPEND}
-	!x11-libs/qt-phonon
-	>=app-crypt/gnupg-2.0.11
-	app-misc/ca-certificates
-	$(add_kdebase_dep kde-env)
-	!aqua? (
-		x11-apps/iceauth
-		x11-apps/rgb
-		>=x11-misc/xdg-utils-1.0.2-r3
-		udisks? ( sys-fs/udisks )
-		upower? ( sys-power/upower )
-	)
-"
-PDEPEND="
-	$(add_kdebase_dep katepart)
-	|| ( ( $(add_kdebase_dep kfmclient) ) x11-misc/xdg-utils )
-	handbook? ( $(add_kdebase_dep khelpcenter) )
-	policykit? (
-		>=kde-misc/polkit-kde-kcmodules-0.98_pre20101127
-		>=sys-auth/polkit-kde-agent-0.99
-	)
-	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
-"
-
-# Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities
-add_blocker plasma-workspace 4.7.1
-
-# file collision, bug 394991
-add_blocker kcontrol 4.4.50
-
-PATCHES=(
-	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
-	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
-	"${FILESDIR}/${PN}-4.5.90-mimetypes.patch"
-	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
-	"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
-	"${FILESDIR}/${PN}-4.6.3-bytecode.patch"
-	"${FILESDIR}/${PN}-4.7.3-customcont.patch"
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		[[ $(gcc-major-version) -lt 4 ]] || \
-				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
-			&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
-	fi
-}
-
-src_prepare() {
-	kde4-base_src_prepare
-	use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch"
-
-	# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)
-	sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
-		-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
-
-	if use aqua; then
-		sed -i -e \
-			"s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
-			cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
-
-		#if [[ ${CHOST} == *-darwin8 ]]; then
-		sed -i -e \
-			"s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
-			cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
-		#fi
-
-		# solid/solid/backends/iokit doesn't properly link, so disable it.
-		sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
-			|| die "disabling solid/solid/backends/iokit failed"
-		sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
-			|| die "disabling solid/solid/backends/iokit failed"
-
-		# There's no fdatasync on OSX and the check fails to detect that.
-		sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
-			|| die "disabling fdatasync failed"
-
-		# Fix nameser include to nameser8_compat
-		sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
-			|| die "fixing nameser include failed"
-		append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
-
-		# Try to fix kkeyserver_mac
-		epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-ksyscoca.patch"
-		# getgrouplist not in solaris libc
-		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-getgrouplist.patch"
-		# solaris has no d_type element in dir_ent
-		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-fileunix.patch"
-	fi
-}
-
-src_configure() {
-	if use zeroconf; then
-		if has_version net-dns/avahi; then
-			mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF)
-		elif has_version net-misc/mDNSResponder; then
-			mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=ON)
-		else
-			die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found."
-		fi
-	else
-		mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF)
-	fi
-	mycmakeargs+=(
-		-DWITH_HSPELL=OFF
-		-DWITH_ASPELL=OFF
-		-DKDE_DEFAULT_HOME=.kde4
-		-DKAUTH_BACKEND=POLKITQT-1
-		-DBUILD_libkactivities=OFF
-		$(cmake-utils_use_build handbook doc)
-		$(cmake-utils_use_has 3dnow X86_3DNOW)
-		$(cmake-utils_use_has altivec PPC_ALTIVEC)
-		$(cmake-utils_use_has mmx X86_MMX)
-		$(cmake-utils_use_has sse X86_SSE)
-		$(cmake-utils_use_has sse2 X86_SSE2)
-		$(cmake-utils_use_with acl)
-		$(cmake-utils_use_with alsa)
-		$(cmake-utils_use_with bzip2 BZip2)
-		$(cmake-utils_use_with fam)
-		$(cmake-utils_use_with jpeg2k Jasper)
-		$(cmake-utils_use_with kerberos GSSAPI)
-		$(cmake-utils_use_with lzma LibLZMA)
-		$(cmake-utils_use_with nls Libintl)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with policykit PolkitQt-1)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with semantic-desktop SharedDesktopOntologies)
-		$(cmake-utils_use_with spell ENCHANT)
-		$(cmake-utils_use_with ssl OpenSSL)
-		$(cmake-utils_use_with udev UDev)
-		$(cmake-utils_use_with upnp HUpnp)
-	)
-	kde4-base_src_configure
-}
-
-src_compile() {
-	kde4-base_src_compile
-
-	# The building of apidox is not managed anymore by the build system
-	if use doc; then
-		einfo "Building API documentation"
-		cd "${S}"/doc/api/
-		./doxygen.sh "${S}" || die "APIDOX generation failed"
-	fi
-}
-
-src_install() {
-	kde4-base_src_install
-
-	# use system certificates
-	rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
-	dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
-
-	if use doc; then
-		einfo "Installing API documentation. This could take a bit of time."
-		cd "${S}"/doc/api/
-		docinto /HTML/en/kdelibs-apidox
-		dohtml -r ${P}-apidocs/*
-	fi
-
-	if use aqua; then
-		einfo "fixing ${PN} plugins"
-
-		local _PV=${PV:0:3}.0
-		local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script
-
-		install_name_tool -id \
-			"${_dir}/libkrossqtsplugin.${_PV}.dylib" \
-			"${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
-			|| die "failed fixing libkrossqtsplugin.${_PV}.dylib"
-
-		einfo "fixing ${PN} cmake detection files"
-		#sed -i -e \
-		#	"s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
-		echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
-			"${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \
-			|| die "failed fixing FindXKB.cmake"
-	fi
-
-	einfo Installing environment file.
-	# Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined.
-	echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
-	echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde"
-	doenvd "${T}/77kde"
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-
-	if use zeroconf; then
-		echo
-		elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon"
-		elog "is running."
-		echo
-		einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
-		einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
-		einfo "to include 'mdns', e.g.:"
-		einfo "	hosts: files mdns dns"
-		echo
-	fi
-
-	elog "Your homedir is set to \${HOME}/.kde4"
-	echo
-
-	kde4-base_pkg_postinst
-}
-
-pkg_prerm() {
-	# Remove ksycoca4 global database
-	rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-
-	kde4-base_pkg_postrm
-}
diff --git a/kde-base/kdemultimedia-kioslaves/Manifest b/kde-base/kdemultimedia-kioslaves/Manifest
index 76bfebff29d3..5dd228e2a189 100644
--- a/kde-base/kdemultimedia-kioslaves/Manifest
+++ b/kde-base/kdemultimedia-kioslaves/Manifest
@@ -1,3 +1,2 @@
 DIST kdemultimedia-4.6.3.tar.bz2 1611668 RMD160 8824bda18a1f1051dea366a0ff0d6191068476dd SHA1 d5bde19156b65e9b56e0e6de800efc0efe117632 SHA256 b3a6732dead0558610b4b40d3ce28c4b7b5da8869a63436180eacb3aacec533b
-DIST kdemultimedia-4.7.3.tar.bz2 1644497 RMD160 de9d9f9341d91bf0d56fa9468c0441226cb6aba2 SHA1 4db44494e6a2ef886e3513b6a2eb4e526741a6ff SHA256 ad96332218b82c4466debcb165061d87051a917e0321bdc34e4024da9c8c30b1
 DIST kdemultimedia-4.7.4.tar.bz2 1644450 RMD160 c180dfed17735bfef4303802dd8065ed308cdd6a SHA1 e0001afac38e35e3ab7b919d79f74cd57e3c18dd SHA256 c1236ed17f575ff793869e5ade024f892ae36aba27a00edafb3495806fb81b28
diff --git a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.7.3.ebuild b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.7.3.ebuild
deleted file mode 100644
index 856aa044c7cc..000000000000
--- a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.7.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.7.3.ebuild,v 1.3 2011/12/07 22:13:54 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdemultimedia"
-KMMODULE="kioslave"
-inherit kde4-meta
-
-DESCRIPTION="KDE kioslaves from the kdemultimedia package"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug encode flac vorbis"
-
-# 4 of 9 tests fail. Last checked for 4.2.88
-RESTRICT=test
-
-DEPEND="
-	$(add_kdebase_dep libkcddb)
-	$(add_kdebase_dep libkcompactdisc)
-	media-sound/cdparanoia
-	encode? (
-		flac? ( >=media-libs/flac-1.1.2 )
-		vorbis? ( media-libs/libvorbis )
-	)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	libkcompactdisc/
-"
-KMCOMPILEONLY="
-	libkcddb/
-"
-
-KMLOADLIBS="libkcddb"
-
-src_configure() {
-	if use encode; then
-		mycmakeargs=(
-			$(cmake-utils_use_with flac)
-			$(cmake-utils_use_with vorbis OggVorbis)
-		)
-	else
-		mycmakeargs=(-DWITH_OggVorbis=OFF -DWITH_Flac=OFF)
-	fi
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.7.3.ebuild b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.7.3.ebuild
deleted file mode 100644
index c6e4363c278c..000000000000
--- a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.7.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.7.3.ebuild,v 1.3 2011/12/07 22:14:03 hwoarang Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="ffmpeg +mplayer"
-
-RDEPEND="
-	$(add_kdebase_dep dragonplayer)
-	$(add_kdebase_dep juk)
-	$(add_kdebase_dep kdemultimedia-kioslaves)
-	$(add_kdebase_dep kmix)
-	$(add_kdebase_dep kscd)
-	$(add_kdebase_dep libkcddb)
-	$(add_kdebase_dep libkcompactdisc)
-	mplayer? ( $(add_kdebase_dep mplayerthumbs) )
-	ffmpeg? ( $(add_kdebase_dep ffmpegthumbs) )
-"
diff --git a/kde-base/kdenetwork-filesharing/Manifest b/kde-base/kdenetwork-filesharing/Manifest
index 26b47ed33f66..e6f64a45cee7 100644
--- a/kde-base/kdenetwork-filesharing/Manifest
+++ b/kde-base/kdenetwork-filesharing/Manifest
@@ -1,3 +1,2 @@
 DIST kdenetwork-4.6.3.tar.bz2 8693954 RMD160 a70c031107dd56eda618b91482b814e14425cb1d SHA1 6f140dca442be815eda4fb79d51efd9e4588a1f1 SHA256 423424f2bbc18cb6a0bd52305a238a5b7d4b5f483f30c0590f975b0c229be1fb
-DIST kdenetwork-4.7.3.tar.bz2 9947763 RMD160 8d1cdce1dfd5fa4aae6ecb2d55b189e0bcd94981 SHA1 5d8ed6a478d9afdaf19d350f1d2fe7e9dd48b2f7 SHA256 5a5e7bfa7998e38f80667473c590ab11dde8f3dd6a81a5d9e61ca3940354efa4
 DIST kdenetwork-4.7.4.tar.bz2 9966358 RMD160 6974ef88e22a41d2a6f412c0efcf1af1290a77fa SHA1 15d5bdcda0e05de6247b22b96c6ca4a98da8a278 SHA256 6521b32bd35f2f86f87e50251eff953d48a9238593301ae9b7b6f05da85f987f
diff --git a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.7.3.ebuild b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.7.3.ebuild
deleted file mode 100644
index 5c7460dc7f9f..000000000000
--- a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.7.3.ebuild,v 1.3 2011/12/07 22:13:35 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdenetwork"
-KMMODULE="filesharing"
-inherit kde4-meta
-
-DESCRIPTION="kcontrol filesharing config module for NFS, SMB etc"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-4.7.3.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-4.7.3.ebuild
deleted file mode 100644
index 5b869a25fd2b..000000000000
--- a/kde-base/kdenetwork-meta/kdenetwork-meta-4.7.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/kdenetwork-meta-4.7.3.ebuild,v 1.3 2011/12/07 22:13:32 hwoarang Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="ppp"
-
-RDEPEND="
-	$(add_kdebase_dep kdenetwork-filesharing)
-	$(add_kdebase_dep kdnssd)
-	$(add_kdebase_dep kget)
-	$(add_kdebase_dep kopete)
-	$(add_kdebase_dep krdc)
-	$(add_kdebase_dep krfb)
-	ppp? ( $(add_kdebase_dep kppp) )
-"
diff --git a/kde-base/kdepasswd/Manifest b/kde-base/kdepasswd/Manifest
index d0cd4f15d1e8..7af0c2c0ae27 100644
--- a/kde-base/kdepasswd/Manifest
+++ b/kde-base/kdepasswd/Manifest
@@ -1,3 +1,2 @@
-DIST kde-baseapps-4.7.3.tar.bz2 2685074 RMD160 270f3f3ae7b473651517db8818160f16e4faf544 SHA1 952dc26d0d908b41973a8d7b4d27765bf5128d58 SHA256 e9fb0c5da9e9a255c1a1735dfa518dcadc1ea23c68a467164597ff3dbf51c8df
 DIST kde-baseapps-4.7.4.tar.bz2 2684721 RMD160 cedc577cb3449e36b7e7dab1192688c8014c46d1 SHA1 ad4b6d8479bcf8be49b5f53ee8fdcc1b3d1106d6 SHA256 0a59e87b0019bb5d80abbc9cb2fc691ec838d43e9b168e7a15b11d40ac1db51c
 DIST kdebase-4.6.3.tar.bz2 2682586 RMD160 38784d7a5a708703f5a22e39dc5f83ef7aecd833 SHA1 69cfba74099cdce27f7f72725288f025979b41f3 SHA256 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
diff --git a/kde-base/kdepasswd/kdepasswd-4.7.3.ebuild b/kde-base/kdepasswd/kdepasswd-4.7.3.ebuild
deleted file mode 100644
index 789bfcf8a5d8..000000000000
--- a/kde-base/kdepasswd/kdepasswd-4.7.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/kdepasswd-4.7.3.ebuild,v 1.3 2011/12/07 22:13:35 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-baseapps"
-inherit kde4-meta
-
-DESCRIPTION="KDE GUI for passwd"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkonq)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdesu)
-"
-
-KMLOADLIBS="libkonq"
diff --git a/kde-base/kdepim-common-libs/Manifest b/kde-base/kdepim-common-libs/Manifest
index c2f15733fc69..d801b2b719ef 100644
--- a/kde-base/kdepim-common-libs/Manifest
+++ b/kde-base/kdepim-common-libs/Manifest
@@ -1,2 +1 @@
-DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
 DIST kdepim-4.7.4.tar.bz2 16182345 RMD160 a36035cce2e25bc0cbddb50e4c9d5fdd661a2f26 SHA1 233f6c413eeedd4af7cf15106a2af7b8f29977bf SHA256 17a5e185e1199436864400d930f60979265cf0cd775b37a2e7b5a1a267c76868
diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.3.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.3.ebuild
deleted file mode 100644
index b83b961b3037..000000000000
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.3.ebuild,v 1.5 2011/12/07 22:13:41 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdepim"
-KMNOMODULE="true"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="Common libraries for KDE PIM apps"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-crypt/gpgme
-	>=app-office/akonadi-server-1.3.60
-	>=dev-libs/shared-desktop-ontologies-0.6.50
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-"
-RDEPEND="${DEPEND}
-	app-crypt/gnupg
-	$(add_kdebase_dep kdepim-runtime)
-"
-
-# @Since >4.4.76 merged here
-add_blocker akonadi
-add_blocker libkdepim
-add_blocker libkleo
-add_blocker libkpgp
-add_blocker kaddressbook '<4.4.90'
-add_blocker kmail '<4.4.80'
-add_blocker korganizer '<4.5.67'
-
-RESTRICT="test"
-# bug 393131
-
-KMEXTRA="
-	akonadi_next/
-	calendarsupport/
-	calendarviews/
-	incidenceeditor-ng/
-	libkdepim/
-	libkdepimdbusinterfaces/
-	libkleo/
-	libkpgp/
-	kdgantt2/
-	messagecomposer/
-	messagecore/
-	messagelist/
-	messageviewer/
-	nepomuk_email_feeder/
-	ontologies/
-	templateparser/
-"
-
-KMEXTRACTONLY="
-	kleopatra/
-	kmail/
-	knode/org.kde.knode.xml
-	korganizer/korgac/org.kde.korganizer.KOrgac.xml
-	korganizer/org.kde.korganizer.Korganizer.xml
-"
-
-KMSAVELIBS="true"
diff --git a/kde-base/kdepim-icons/Manifest b/kde-base/kdepim-icons/Manifest
index 6a624e13c105..2b0d834b02ae 100644
--- a/kde-base/kdepim-icons/Manifest
+++ b/kde-base/kdepim-icons/Manifest
@@ -1,3 +1,2 @@
 DIST kdepim-4.4.11.1.tar.bz2 8964708 RMD160 51394b9dcb3aecc4f108e87de37c21e3af820ee1 SHA1 49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf
-DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
 DIST kdepim-4.7.4.tar.bz2 16182345 RMD160 a36035cce2e25bc0cbddb50e4c9d5fdd661a2f26 SHA1 233f6c413eeedd4af7cf15106a2af7b8f29977bf SHA256 17a5e185e1199436864400d930f60979265cf0cd775b37a2e7b5a1a267c76868
diff --git a/kde-base/kdepim-icons/kdepim-icons-4.7.3.ebuild b/kde-base/kdepim-icons/kdepim-icons-4.7.3.ebuild
deleted file mode 100644
index 9a3dd9f0dd63..000000000000
--- a/kde-base/kdepim-icons/kdepim-icons-4.7.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-icons/kdepim-icons-4.7.3.ebuild,v 1.4 2011/12/07 22:13:32 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdepim"
-KMMODULE="icons"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE PIM icons"
-IUSE=""
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-DEPEND="$(add_kdebase_dep kdepimlibs)"
-RDEPEND=""
diff --git a/kde-base/kdepim-kresources/Manifest b/kde-base/kdepim-kresources/Manifest
index 6a624e13c105..2b0d834b02ae 100644
--- a/kde-base/kdepim-kresources/Manifest
+++ b/kde-base/kdepim-kresources/Manifest
@@ -1,3 +1,2 @@
 DIST kdepim-4.4.11.1.tar.bz2 8964708 RMD160 51394b9dcb3aecc4f108e87de37c21e3af820ee1 SHA1 49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf
-DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
 DIST kdepim-4.7.4.tar.bz2 16182345 RMD160 a36035cce2e25bc0cbddb50e4c9d5fdd661a2f26 SHA1 233f6c413eeedd4af7cf15106a2af7b8f29977bf SHA256 17a5e185e1199436864400d930f60979265cf0cd775b37a2e7b5a1a267c76868
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-4.7.3.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.7.3.ebuild
deleted file mode 100644
index 58564441a705..000000000000
--- a/kde-base/kdepim-kresources/kdepim-kresources-4.7.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/kdepim-kresources-4.7.3.ebuild,v 1.4 2011/12/07 22:13:34 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdepim"
-KMMODULE="kresources"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE PIM groupware plugin collection"
-IUSE="debug"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	kmail/
-	knotes/
-	korganizer/version.h
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-src_install() {
-	kde4-meta_src_install
-
-	# Install headers needed by kdepim-wizards, egroupware and slox stuff gone
-	insinto "${PREFIX}"/include/${PN}
-	doins "${CMAKE_BUILD_DIR}"/${KMMODULE}/groupwise/*.h
-}
diff --git a/kde-base/kdepim-l10n/Manifest b/kde-base/kdepim-l10n/Manifest
index 3f8333ee45f8..db8f02018797 100644
--- a/kde-base/kdepim-l10n/Manifest
+++ b/kde-base/kdepim-l10n/Manifest
@@ -1,162 +1,110 @@
 DIST kde-l10n-ar-4.4.5.tar.bz2 3440572 RMD160 15e3e81225769b07225b73142570f22775f5be04 SHA1 87a475c960fee4a82d72a6e84dce2bcf1a88dc3d SHA256 0737abd17950418f686e4c3f0b27f835da2a5ba2f8bb662693ec6046fc9d85d9
-DIST kde-l10n-ar-4.7.3.tar.bz2 3595175 RMD160 347d0a6f52cb140d5b79c3b09dd2671def15b08a SHA1 6cc066ec6cfdc592918615dca655af9fe25d0f3f SHA256 63d37595e933de20f8d402411274a5bbf7e4492a423f5a97c10e2baa2af76127
 DIST kde-l10n-ar-4.7.4.tar.bz2 3594293 RMD160 37738dc4f39e37a38167fa77580dc70c6713d8d5 SHA1 96b2e5ae3084f192ca83d2de2272901f183238c3 SHA256 fb5297f16e44a46997cba874b6d367f1b5a0188fe6086c11c32fcb3026ea88c7
 DIST kde-l10n-bg-4.4.5.tar.bz2 2112721 RMD160 846040993c10a4d075000ba5dece25df8faf9c6f SHA1 12758687384de09ea8ba8ae8f5b4460ed2879cab SHA256 214c62e32d7fde793275c9b52813839c48bb181312c038068ca5a4b1d9a2d48c
-DIST kde-l10n-bg-4.7.3.tar.bz2 2155895 RMD160 3bddbedbfb86f56f5fc93b6a2e64b60e1272100e SHA1 5552ee00bba8c33a59c1684210e0967213ee3de5 SHA256 5b14c2367e4ac1f08e9587ee16df3157fb40714e3042d5f3d0385041cec91586
 DIST kde-l10n-bg-4.7.4.tar.bz2 2155697 RMD160 1260baaa131cf30fc5be0dcbdebedb61d3cdcf39 SHA1 b20fb868f61b85fa4399fda68061f930eb306198 SHA256 eeab00ffcd0cb768f792a724cf0b0b9e18cf7f3645105b724d854f37a5d1241e
-DIST kde-l10n-bs-4.7.3.tar.bz2 2479149 RMD160 f708ec212f24bb28df6f3fbe782d4f3287422279 SHA1 206dd68f06ed7e69fb7850c4c17d8e6084bb4ab3 SHA256 211145eeed46a6a0aa1a6943512aac8a1c2877a5b51d9acd99085447abdd96d8
 DIST kde-l10n-bs-4.7.4.tar.bz2 2479266 RMD160 1514cec3bfb8b7b8a420be4345cee94bcf442bc5 SHA1 407d8c3b5426319db4601a68d2ffebe891ec913e SHA256 39f6edb7c52fe372fd38951f53e87fc621fd7e97d434a3322fc4e16f04db1a20
 DIST kde-l10n-ca-4.4.5.tar.bz2 4915160 RMD160 d07a690738204e6aa93cf50dfc857f160fbc9c03 SHA1 f55e20ed14a306902c3a7bbfd17654428367c628 SHA256 b713ebe738605f6bc803fad3cee23de73b566930aa1f9cf005be328c8e9a89e1
-DIST kde-l10n-ca-4.7.3.tar.bz2 9288467 RMD160 e6cba1b3fd6ab2b06b7ede0a3a84191b99d90beb SHA1 a516d7ef6020083cd746f30effdaa8eb22f75961 SHA256 09a95546e5a671ccd64701c379428b36671e137d0e0cdd2587329e9902a70281
 DIST kde-l10n-ca-4.7.4.tar.bz2 9605651 RMD160 42bdc428445f776e2122cce0f09e24a5ef539e39 SHA1 92f5112aa2930ed7737557a7b7d4f407a76c3331 SHA256 128fb022b3fd20462ed9f13441ca8aeb2357b33a4a16be74af86deaca129df11
 DIST kde-l10n-ca@valencia-4.4.5.tar.bz2 2384578 RMD160 4dd8976271a93a03ec23d520d85cd13b6cf66386 SHA1 e52409a742274d89dd480e624c840911e7c36b92 SHA256 14b09496721a8348588aa0e7e13dabc7b6fa5aa4c0584f0e1b51b6526e4364f5
-DIST kde-l10n-ca@valencia-4.7.3.tar.bz2 2494576 RMD160 30abf6c16e92c2a3555ef1130b533802b86ae290 SHA1 58413cf8d0c210d53c9b20dcca9eb14041b9c2df SHA256 397e5deff961894d47aedaeb748b1f4c8192d26ba1a61089ff2a74e1573e79cc
 DIST kde-l10n-ca@valencia-4.7.4.tar.bz2 2495226 RMD160 24a36632c6341337c4e62c86d46384051b728158 SHA1 c4ccf06160ca0e454e5b9dd715e111bdcb137451 SHA256 974e4adbed5462d59bf0626b1384a1f15f701ecae37ec996108197ef4d0bb106
 DIST kde-l10n-cs-4.4.5.tar.bz2 3100186 RMD160 7a1230c62a4d464001690f7c8a3dbaf8a54e0731 SHA1 2406af1274e30e6656f941e3b251d8f27a94c73f SHA256 e87e79f7edc3e8728d520f2e7d52c580e9bb3ab221ed51a3ced96c1d8c572c61
-DIST kde-l10n-cs-4.7.3.tar.bz2 3305556 RMD160 823253cbfbb777336e550919dffa9f5b8de829e7 SHA1 1a59b0480bbab0d53660a276aa736f6e8c2c116f SHA256 57825b309f0b923a5dd319fae1d086808af2d4100f66eaadd41816d6978f4c87
 DIST kde-l10n-cs-4.7.4.tar.bz2 3326281 RMD160 22b9836cac88a1d655c9e948a729816a2a8f3b39 SHA1 292d51be86eb6a74db5ae69791398397405e09b1 SHA256 2ba2998d7e5e6822622528eb4019af05e4ce2d2b75c7260a73f36e3043e73950
 DIST kde-l10n-csb-4.4.5.tar.bz2 532917 RMD160 ea729e982b7b043e0095d886f737bbee833b4d51 SHA1 41c9155fb0fc396b091228a1fb880a4727f016f7 SHA256 b93f6e322485297605efcdff87c995d47144a527be571a14b426fda96593c1fb
 DIST kde-l10n-da-4.4.5.tar.bz2 17862365 RMD160 3c3cda3a2f5328c67fae761502726c9e7f5ed753 SHA1 897528d2d431d13fc2c1886cc221d9e94372d2c1 SHA256 057716745d02a7a85be92a8eb96b3ff8b59fafffe3f1855b49cf6f10c350b861
-DIST kde-l10n-da-4.7.3.tar.bz2 14262565 RMD160 d9dd3d783ce3232fa9173302cf7158e5939e4191 SHA1 e73907144816b795b9be6b245b582719654e8e7d SHA256 18926bc1b3cc632acf94cdd791297244a96d14c3915422f48b71fa9b3d6f76d5
 DIST kde-l10n-da-4.7.4.tar.bz2 14265952 RMD160 c3e4c3f076ccb74a468636713b227176c914546c SHA1 f15bba7edb0d0c344cc182242d4aae5168d3bf1f SHA256 66f78605e9f0b911c79923fe95109e3ed0b9733317e012bf8388e5a0f7fc57e4
 DIST kde-l10n-de-4.4.5.tar.bz2 21841433 RMD160 7cf873b5c2402e17c468467c3c1ec2681c189a62 SHA1 6dcc6252adaa8a799a854f855221f2c86bcb8f56 SHA256 bd5c2647b26c2e5bdb71c69e0d23929867ca922c060dd61146c4cc3172d6c214
-DIST kde-l10n-de-4.7.3.tar.bz2 37551846 RMD160 6df5289dd6ec0d4096044189dbcb02f9d985cc37 SHA1 d53939327c050b8807779c92965a5fd09cfed25f SHA256 443a06eb80119e8c6c9ea1c3765738237aecba418bd9d2b09e0d1ed4e0944cd8
 DIST kde-l10n-de-4.7.4.tar.bz2 37548936 RMD160 e1da4f4c9abd52b2bf580b6d78f5ac11bb54ac84 SHA1 e6126a6ce53e88c9a39a8c6cf8ed343c1aa47ae8 SHA256 e9e54c5d531fb947131ec02624d6c00b0cb6402494db3061642d173e79420580
 DIST kde-l10n-el-4.4.5.tar.bz2 2625049 RMD160 df4dd00f655670303d641a26d9929e75c510e650 SHA1 d906e30fc33d9e3fda7207cf32b3712e92e4d271 SHA256 d296996a738dab0b34cf9ae06f88f03d52bf6aa863bae0ce5e48ac8eae6287e5
-DIST kde-l10n-el-4.7.3.tar.bz2 4770850 RMD160 305461e294fd64cfc071e18dc59d1adf3bb2333d SHA1 ff082e9bc86e9612fdf496c932a9f329305a2ccb SHA256 ebb825d7e27068785ee82f6735fe10781f3afcce1cede52dd194689c559b9940
 DIST kde-l10n-el-4.7.4.tar.bz2 4772408 RMD160 c6c81d44c84ca75bd92383149674a02fa107ade2 SHA1 4a949a3513fe79ceca9b3e02daa69627e92ce37a SHA256 683f33a880a5019b5347dafc930797a40ec4663e2c71cb72ee326be4e6a58160
 DIST kde-l10n-en_GB-4.4.5.tar.bz2 4082566 RMD160 1bb6503510bf69538485d4bd5a86f690b48bf98e SHA1 161950e2d6d0dc99f45f012440a79fe0b1da8f38 SHA256 c5a7446389d499dca20879a80d5d8d0b09eb48cacb9409d28edb9dd3a501f27e
-DIST kde-l10n-en_GB-4.7.3.tar.bz2 3558545 RMD160 4fb5eb3e17241901af8f7b73d72c5be0f78058fb SHA1 56e2de38ef100b600feb4113f022586452f8d014 SHA256 237b6e1ecf42f74157de91161b436b238f322def334630661ccbec3527be1380
 DIST kde-l10n-en_GB-4.7.4.tar.bz2 3558740 RMD160 4d6e1ed9518f3da24f1a3a3f34c6275718d52938 SHA1 653d44f4841c862944a3882ee23c7376f90bb38e SHA256 117ba552ae87f0a1065375834339a91aa276e8ee1605e62b2a298702ddc8bb56
 DIST kde-l10n-eo-4.4.5.tar.bz2 2071254 RMD160 727c699925118f6f7f3fff45970e9c2f27b37896 SHA1 9902f15af2af21baa7dc1e2cc4aec0181dae38ab SHA256 79de770197e441a11100a60d531b303452e7193b402273f0a72accdec8a395d7
 DIST kde-l10n-es-4.4.5.tar.bz2 28643479 RMD160 3a77e9db3ae8f82f1aff4fbb8d8a4b8ea1729aeb SHA1 7d4a20e2c477486e2551559c98e1fd04ad39004e SHA256 2b422a45765a5b5abf8697a8730434eceef3046d53b95d1a3bd7683f5b6e8d3a
-DIST kde-l10n-es-4.7.3.tar.bz2 29253576 RMD160 bd36ac8091c9d5a8f8f18ae03998c02092ab230a SHA1 21ecf5cd219cb55bdee39caa8d86169486912cc4 SHA256 4d49f21686c945aa96636b658ed5fe94378537f1ea4a0875dcb23be78c65b96e
 DIST kde-l10n-es-4.7.4.tar.bz2 29267538 RMD160 ce660275952cdcb05ea885a2eab91f193bd461ac SHA1 4c1256749ef3088a93bdd5adf3c8075580b3ac0e SHA256 2e3155f365269e05c317cb0564a60c011e48c6c81fb6ae6a1824c16bf7d66886
 DIST kde-l10n-et-4.4.5.tar.bz2 9251373 RMD160 36b28f53c2fc3120f10d8744ae9de4d5d40eb4e7 SHA1 7f624d0104057b01b4baa05055da432ef30ede2b SHA256 bf9f286da2eeb0c1f07c1df3cee4e1ea11247cef5b12d1154cd18c91a947f66e
-DIST kde-l10n-et-4.7.3.tar.bz2 5889791 RMD160 a7c36f944d640135278b7516e0cd6621a5ef8c55 SHA1 43f80846881131adad5a6dfd1e07d6b7e07a0be1 SHA256 a01857d73a55c005967e2cde350f9d39a7a7af7523d93e3b752c7807d0f7c0ae
 DIST kde-l10n-et-4.7.4.tar.bz2 5901930 RMD160 915ef427adae5e8dc983e4055317d0729cd245d4 SHA1 9cb6b28e3dea7098c2409a01cf04596673d85da1 SHA256 6d6767f06391316c7c952771d752578fe13807947e95185b7a73ab91e074725f
 DIST kde-l10n-eu-4.4.5.tar.bz2 2166606 RMD160 732f5ceb6eb38fb608ba6af2b7b59449e5967ffa SHA1 8fd27a8d78da4f1229721fe426ca2f100f793780 SHA256 7c9dfb71eef36741680f2aa9cdf456bb4426a0633e2c60e6db4141390e161060
-DIST kde-l10n-eu-4.7.3.tar.bz2 2329392 RMD160 50f098aef726ea39feadba63c6f047d4fe0e997b SHA1 9bf412c5993846c14f362caf65ecc2cd39a5229e SHA256 52d673f68124a62ffd18e3b70b7be5da730b5d1fb19dff318f3be7a611c50375
 DIST kde-l10n-eu-4.7.4.tar.bz2 2329389 RMD160 653f3e44d931f0181e9d445eac127f9bbd2e8fde SHA1 789776d3c5413526dda6b28bae91abde4a4e77fd SHA256 29f92d900b38f940e294a2baa670a96f68bd881c33e82f86713fcbeeedc9d63e
 DIST kde-l10n-fi-4.4.5.tar.bz2 2542878 RMD160 8532d6edfa953ed69df0064e5a2e3a1b5024e1a2 SHA1 11c255ee070519f083ec740ca7ddc2b12681a553 SHA256 fda5d31f17391e1fce91f7eef2845db7776b76928ee2d2abd1dfd22ec77656a5
-DIST kde-l10n-fi-4.7.3.tar.bz2 2933099 RMD160 c9eaa36c5321c7786985fa4cc2b78090564810f1 SHA1 5361265d5bd3176f8090b36ae8885706c5529d76 SHA256 6bd3a7ae3ee6bda5fb7f3a222b60200141e4d57d0ca211ab8aaecff2f8d1b48f
 DIST kde-l10n-fi-4.7.4.tar.bz2 2955248 RMD160 efefb376b65b54d9360768ac7440758ae701f4a6 SHA1 b11ba0482d3c98cdda7dc90676bda785766b2cb0 SHA256 7a156216053ebda4641f28bff0c08065fb9ad2416bbd950e7e19471f2caed955
 DIST kde-l10n-fr-4.4.5.tar.bz2 22595114 RMD160 ab023f2277b92e78652f3bc8102ddf5aac80a00a SHA1 bc82eec7be3fbfa6def91993aed84732d4655b30 SHA256 7e0fe1f35375ef0d261e7dd616dcbf9850229db66ce4be40c95a6694bfa91f27
-DIST kde-l10n-fr-4.7.3.tar.bz2 21833929 RMD160 216a3a3f8dc42e51f5cbb9bf5643761a2599b77e SHA1 68bfcff6d11617ae918be856c4d89de1f4ab9441 SHA256 bd201ee4aacc7b53a1586197d3a4ad2ab17d8f9d0e380bcf98d75b1d7c76a23e
 DIST kde-l10n-fr-4.7.4.tar.bz2 21833359 RMD160 8ddd950e8f78b272916cff92ce1de2a4ce02b725 SHA1 d4347308cbb00f5650605991496db9a2b5fb8a66 SHA256 05613e52b1d18cfd89656639990042bc64b7d062f4e0d0f7a7fa2578d8eaa60d
 DIST kde-l10n-fy-4.4.5.tar.bz2 1265536 RMD160 b3ae2a202891869251a4ef403eee98d3eb31eebc SHA1 83e77254348728e06ca932f59b87cf7dbafe8cbb SHA256 3ebb977c926491fe0677848fee9955916fd79c7e4befa6ad964301dfdf10ea06
 DIST kde-l10n-ga-4.4.5.tar.bz2 3367965 RMD160 59e613d3f7755e3c25424472163f2997b050f388 SHA1 48a13fd4c048b7c6960c2dc7240d65962bc85343 SHA256 1aae47bdf388ebc7c507e2dacfc951538ce6ed4840631bb2c81f6ab44f22d835
-DIST kde-l10n-ga-4.7.3.tar.bz2 3553997 RMD160 c50dd4809a38755abdbb1a34ae05d5a49ea010ea SHA1 779ec0cc115bbe8928a74de51b60a063e6e2e12c SHA256 d0a758b50da27a50759ae38ecd918ba8991efcebd73710d7268060ec8b6e6bf3
 DIST kde-l10n-ga-4.7.4.tar.bz2 3553333 RMD160 f0b1456080f9dc5966f3771baa03c0f144b9d173 SHA1 a66cb122e2e7953bacf23d554982fb902f82c1ee SHA256 8512c2b0772a432432f437b9e2a93be714d9d1f6df41d3c5532cb4277ecba78e
 DIST kde-l10n-gl-4.4.5.tar.bz2 3977873 RMD160 8401bbed1aa0b3ad649c55f2bdc540beb81c3a3d SHA1 d301df78e7336bf2e4d32b41a42311cb0725f844 SHA256 6ab13105048f544652af84fb58188e3f5a32b9eeab5774403cf29d78f920e452
-DIST kde-l10n-gl-4.7.3.tar.bz2 4305543 RMD160 89369943040b9e7a638c59a439d10d5b3183c663 SHA1 43a7a00ab479cdd4600035ec5f23113cc99a1e46 SHA256 1e2e15b29ef086db2b1e76f906f195e72ba5a19118617fd051dd195d52db273c
 DIST kde-l10n-gl-4.7.4.tar.bz2 4301955 RMD160 c84f6327641e0c96f950627d07dc26bad492cdc6 SHA1 c2c3dc4ebdb6deec70b8ec15f23b113c27616a2c SHA256 9ff152d441af4ed14f04934da7972f04d57e468b408ea801518af7d628acd1e7
 DIST kde-l10n-gu-4.4.5.tar.bz2 802431 RMD160 d6ee5da8c50aa82c1c38915f209c863453bfd3e2 SHA1 47fedbc7f876c4f8308d216dc2d4fb3fb23c5175 SHA256 0bacfa4f6f4deec910364445a62e8cfeefa7bfabf5b36a320390cec2424e2569
 DIST kde-l10n-he-4.4.5.tar.bz2 2291947 RMD160 f12f1a1c1611ba6a3ffa8238bca013bdb9a0ee6f SHA1 172805a6bc4cec1edfdd6b7b496deb0c4dd8e0d5 SHA256 3d1b599dc5a488eece0eff9547419becb7583a86076adc905632b8f40c3a1a24
-DIST kde-l10n-he-4.7.3.tar.bz2 2362009 RMD160 3312213d167b23e1ba09d6ca4d8991168c0591d3 SHA1 e4e3a6b8e6fcc354c8d2671db5bce3dc4d03cd46 SHA256 c8c586d02b31bb8912978b39e7f2a66db1594b162991e1eefa7a848ca5b8d75d
 DIST kde-l10n-he-4.7.4.tar.bz2 2363118 RMD160 bec1b01331d3cfdbfbbd07f75adccd59da59656a SHA1 4c0a25c50c59054461a2d23a331006690ea18ce0 SHA256 e20e087dfe4b7fb923503fc6142c00d9e6a0751241da7a3e315b2fe8d7dc6407
 DIST kde-l10n-hi-4.4.5.tar.bz2 1904159 RMD160 62fe2c75eabc5177d9e6a0bc8a7e0da46b782ca9 SHA1 512487ea16d157eaabd36e9294f4ae769f83d2da SHA256 936137002e793918898ddfc110a8476f23b1c234247639826b5128b00f445cfb
 DIST kde-l10n-hr-4.4.5.tar.bz2 2164983 RMD160 fa01c8586926378e16865d86bc612754f80f2616 SHA1 0dbd918e59c6fff426ba4831223c30f59975c5f5 SHA256 f92d7bc999df7eabb4dbff2b8216cd55a05979cb62e75d0703bd06e2bfab073a
-DIST kde-l10n-hr-4.7.3.tar.bz2 2289838 RMD160 dcf781294fdaf7e8efb39fac30870cd71b44b037 SHA1 1660184438749efdc34a221052475fd9a10d5043 SHA256 af48137b21a11857f68af94c37fab5c00fcd4da17ce172c45d15f51df3de2888
 DIST kde-l10n-hr-4.7.4.tar.bz2 2288477 RMD160 00a986176cc01364ddfc22c907cbd31bb99799ff SHA1 56a35f47882bbb4b9019b055b365356979f6fe73 SHA256 bc3ff5fa7562c709706254207c4d63184b1632cfca08a23e927d803f98254a68
 DIST kde-l10n-hu-4.4.5.tar.bz2 4674175 RMD160 8d0dceeaa9fb02fb08e2ff6940da427ba84fd88c SHA1 1e3cf4f0cb42b92e84b1eafa521f495b547e6a9d SHA256 47cba402aca2ac8daa5c70698dbe005e19bf96efb37b7d26fe9255c27e0d89fb
-DIST kde-l10n-hu-4.7.3.tar.bz2 4383891 RMD160 2954e7a85e389bfd8c3e00b2a82b26c7470587e4 SHA1 e4b144aa2719e69d5edab20bb2e8c7c29debc390 SHA256 e934d11a4d74b52e3699e838f443fc6f8f36ed3a42ed69de7e5cc3f3cb9826a5
 DIST kde-l10n-hu-4.7.4.tar.bz2 4401170 RMD160 d106eeb5bf9bdea1cb85a1842bead1fce55f06a5 SHA1 430d0ac130ce4fbff90be3c8d96c17661d5e23db SHA256 17260979bbddcf3e44f1ec1003e80b03e33fd31b68bba34970f65a6bad76646b
-DIST kde-l10n-ia-4.7.3.tar.bz2 1182411 RMD160 972e8ffc8b96a70df644639044d84d7f4562cd9f SHA1 80d83ce4316724f5e7e73ad0620141136d848983 SHA256 564715a7bb109cab327d6b2b73a8c5b9e5bdcca90cf14f0fb684525ee671c1de
 DIST kde-l10n-ia-4.7.4.tar.bz2 1183353 RMD160 7bab8018b79c162c602509a457169c17db1eb3d0 SHA1 80ff9a88b884a3d02535cfee3f4303029396a63b SHA256 5f525d30f59b811a62842ffac87034d12a4a0ec4758e892d3a73d3eb63ff2f4d
 DIST kde-l10n-id-4.4.5.tar.bz2 352302 RMD160 b9553241abf3d6c6a6e96ccb37ce25d1c4b8f86e SHA1 da25200677f4141dde63dfdc6c2a08f7a1eb94c7 SHA256 a6932808b1f27fab2c5f05090742854b2524ee832ccad8405be076b21cb344b7
-DIST kde-l10n-id-4.7.3.tar.bz2 535378 RMD160 8e6788c9f6f4f8c84be016804360b89bc2c2f435 SHA1 aacf9136fff9f10763273cb3333bf0fc996d5d30 SHA256 28148966677b58b232f93241290028ac1ccfc57a5f9b81dfe9dd5d95562b9fc2
 DIST kde-l10n-id-4.7.4.tar.bz2 535594 RMD160 3e462855c996bd086659564c02ae90caeed7392b SHA1 74c27ff37c5f3513f79c6cba54e10c9cdfe4a29b SHA256 ea19a66ac112f4a6b8fab6c71a01275a378e12f40ecea766bcbb6a0c5ce4849a
 DIST kde-l10n-is-4.4.5.tar.bz2 2009934 RMD160 fa34fef244cc1916e3f3016df29034bed08603ce SHA1 463a5a96de370902ac793cebb367a437411003af SHA256 f2fe02476c05ae2d70a7667b2365331aef3b033f8236eeccc3b3d8e07921bd1f
-DIST kde-l10n-is-4.7.3.tar.bz2 2064299 RMD160 c1aab8e5a5c7780c245a5f9a74e1229dab1faf82 SHA1 5392040a07d79189745e629f635a89b51cdbe884 SHA256 615b672b0437173ff47ee950fbbc88ff35ebfb78a295b497164cea2b87f420fe
 DIST kde-l10n-is-4.7.4.tar.bz2 2074197 RMD160 69323f1c71a015844a12e9d45b9faf6aaab2c8d1 SHA1 5d5d5838386eabc50151c38191a486b5a29e9203 SHA256 72590f2efb5672f35216ca5fe24d61d92735ec0177f757fe20bd0a1f8355b7bc
 DIST kde-l10n-it-4.4.5.tar.bz2 11339894 RMD160 9cd0ec7b31ab67f7c88bb7bf375d99fd2d1c83e7 SHA1 70b4a311f6f9d472878c730804ebc47c3092c6ae SHA256 b906a97d071967816d460d11c28273a9adf14f6a96d5978c2905f6794b0af4a9
-DIST kde-l10n-it-4.7.3.tar.bz2 11600838 RMD160 763eae2d0dd9325dbbafee2812d888f9476de491 SHA1 8a5358e6a21a0f1de5dc4ce4e54e90e8391028cc SHA256 68ec0b26ca2c6c62fd4afae7ea26ff06f610936fc29806c8024bb7269373cc3e
 DIST kde-l10n-it-4.7.4.tar.bz2 11602471 RMD160 7019c6852bf352b8705948b987f9b1f462e9b811 SHA1 3a82fcad771bcb6b8328548241895393b37a18e9 SHA256 591518be51c829a98b49f2058acfd60ae5afe4bbb43e0463c57012d025cc0f5c
 DIST kde-l10n-ja-4.4.5.tar.bz2 2315786 RMD160 524a9a22f7e08a5fea4473bd896683ee558b0eea SHA1 acaa8f510ca7c3476ccd52bc1f42ff584557b9d1 SHA256 654397ec24c4e9f356786e9655dccc2e94fbe6b0a06d3f506eb0ec9b4f50b92b
-DIST kde-l10n-ja-4.7.3.tar.bz2 2424571 RMD160 74bb3c1194116a448b09a24e1fea7b936a0a7d4a SHA1 17597dd170c73dc8ad5165443c222e55c2c8e4c0 SHA256 578f69d7564ad875bf0dd2df5b0b96ea8c992f23dfc6eced93b1b1038243cb81
 DIST kde-l10n-ja-4.7.4.tar.bz2 2425944 RMD160 e9146d8a3e0446904ec159177a5d50c401617adb SHA1 1c7658830055fb26cd3b1cd9315f6d8f30808571 SHA256 fd793b2f86c6e256daa65099b6a071b352e82fb3ef36ca17e11c473d3a7ad1b8
 DIST kde-l10n-kk-4.4.5.tar.bz2 1690115 RMD160 43787c12e05330581dc360eb2fd0861b4eab8af7 SHA1 8eabc82e2ec9dc7773c1e77b133dffb1bbf4bc25 SHA256 b9bf0d1895bbb9ea3e63c07edd694a15a5169939d4899e16316b399f478974be
-DIST kde-l10n-kk-4.7.3.tar.bz2 2379395 RMD160 a3d5671538ade9d592e9ace51d3df4157cdf7312 SHA1 77ac4645578b68e4100e9dc2dfb3c4c471abbd9e SHA256 e7a43aaadfd149aa7ed27bbf04a540ce410dd3898325515f9a2543d8b62264ee
 DIST kde-l10n-kk-4.7.4.tar.bz2 2480093 RMD160 7493489f9ab2ffd96db5cde595b52d856a99c912 SHA1 801a94f9e778fec0e10a91591478eed84fc6d95e SHA256 71a7383152a3621c215e986d1d42ef22d881fd6679d054746b82a05716c8d04f
 DIST kde-l10n-km-4.4.5.tar.bz2 2251377 RMD160 30936e9ff25d3e23f22aa06d99c698f037a5e98e SHA1 12add7476f575adc92a6e0d4a77f3e78fde92f2f SHA256 580dadae3c1124a83c62f88b4629c3b4139820b3a8c09765ca527f604af92304
-DIST kde-l10n-km-4.7.3.tar.bz2 2219712 RMD160 83181538b3b01698be2b8e16c42aeda877bfb696 SHA1 d149e90c6732391316fde90c619ba3abf3461c97 SHA256 94ece7de2bdc589025a7039023ac3b49f01712f9c4fbe5d28b22f15c5084dc9b
 DIST kde-l10n-km-4.7.4.tar.bz2 2220158 RMD160 eaca13ea83a3bbfca9521c223ef4d7808f256c6a SHA1 62e2484c80af833c5dbe41d723caec5825c051b8 SHA256 b947cb5ab76b35a07ba5a9290d61c31e5a30fcec8026739401361c877b365a0b
 DIST kde-l10n-kn-4.4.5.tar.bz2 423253 RMD160 cb9d8af3bd6f2faf3500a66f6e66f64d399af2ef SHA1 4ec0979d1cbdca02d24ad049b72ad8e7678dfffa SHA256 092132b50d806e8c90934448b4420fff84edb01ac3a33fe6b50e064175facf54
-DIST kde-l10n-kn-4.7.3.tar.bz2 532878 RMD160 5dfd362f3fc3565e2b23280ddfec44c02f637531 SHA1 eef4b7cf1a0e853a6a117b371a88e0c9846951e0 SHA256 8e3974c2e9574a46935908027704990ef36a4d483f651b3883eebc127202c46e
 DIST kde-l10n-kn-4.7.4.tar.bz2 533045 RMD160 ecf9b97c9c8b5bf2b57f197cba4565e9af979f37 SHA1 c9cdf72c1f3effdf01dc4dbf9bac38313190480a SHA256 3ec5358a15938fa82aeb0d5aecab9f05accec143de9fe5e83070c323d4486166
 DIST kde-l10n-ko-4.4.5.tar.bz2 1659705 RMD160 8def5ef2d0d56af1a3fdf4cb88726fb81fd048f9 SHA1 6956de27eba77bd45ef0d29f9f866f509d9aaa5c SHA256 94987aaa0df5c61f5cbdb10edccc1b3dade5b7a87cadb92a078db95282cc6048
-DIST kde-l10n-ko-4.7.3.tar.bz2 1901844 RMD160 05776133bffd0061ace97fbebbbf8162ca14f858 SHA1 6934688e5dee395042903c06bc3a88f982dfe422 SHA256 a2aed9827a17e0a28a3cd2951c43a0a746b298c35675e59a38064c457a9f2144
 DIST kde-l10n-ko-4.7.4.tar.bz2 1962255 RMD160 cc6845166c46a72defdd47b1c8dbaeb094bae2dd SHA1 cc10efa29dd56fde5e265fc735b4522fe4a5ac30 SHA256 95edd24e671918e2c3fbfa29b86a5939939a1fbfb7777966a9ad1a3ce7a5d773
 DIST kde-l10n-lt-4.4.5.tar.bz2 2140341 RMD160 651e7d73d9cc4b32605782cf0f286e21d63dc3a6 SHA1 e452dfca1f538c0fcadce2396690feb767661d1c SHA256 67c8e464e2caeb45611a3cf7f8226659968ad30c96b336d280732c554db85c83
-DIST kde-l10n-lt-4.7.3.tar.bz2 6797869 RMD160 8cfa3121bcadb978b7f30fb35d147e4e44420c6b SHA1 92f3cb20bd47594e1d344c36ab3eeac125f0395d SHA256 d04dc95c29f9aef3d88f0ed741a653c64d352426301925f9c661afad3cf59f21
 DIST kde-l10n-lt-4.7.4.tar.bz2 6798799 RMD160 977e717e6589af07fc0364c86e97cdba740313e6 SHA1 526dd1552707b2512d8886be62277259970bebd3 SHA256 3acd362526478c48396bfb7cbdf060385f79a43481b63ca71400ebd3353be620
 DIST kde-l10n-lv-4.4.5.tar.bz2 2253462 RMD160 1c7b985f5187ceadbeeba9699850643f74509610 SHA1 f8c93fd4ba76a8a5b743d6eecbfd72b3ed099351 SHA256 4cc2a2d89eed235d2bf49c3882063868d910ed407c0f13dfe8d635c655623e5a
-DIST kde-l10n-lv-4.7.3.tar.bz2 2452185 RMD160 35644ec7b5f060d64372ae09e76b1c75b84187c6 SHA1 e49072ae22b8280f7ed168e36f8c4db27b4287e2 SHA256 bb29dac7166a565f0f11b85ec9b23429664e94cbf651cec1deb996816cc90fa8
 DIST kde-l10n-lv-4.7.4.tar.bz2 2452080 RMD160 f03c7a63cceef4ec65d08b31d7cd94f6f45a2d59 SHA1 d3e8e24883b48a5d6ed01a62902c1f8e6495a13f SHA256 ec11a52457b10781767d9f2eafd24762dafec141d688384f91fa46f1b4ec9538
 DIST kde-l10n-mai-4.4.5.tar.bz2 923593 RMD160 d6367f25f8fe763f64526a96896a78ee12ae9a97 SHA1 afce3d9c46fa7d750f5f6a6035aa01437e76c0cc SHA256 ca98bdab253c3995a963e3cafe69bd8fa425b104a008b385e3f55422f16595b2
 DIST kde-l10n-mk-4.4.5.tar.bz2 1925513 RMD160 c178209c9d7af1baa4a6059da9039abfe1e0477c SHA1 28534e0438ebcd762c62ed6c3c66dd3a2afd9114 SHA256 f850f2fdba67df0dca31729791133cd891d13e07df7309e485a81dbe4099eb25
 DIST kde-l10n-ml-4.4.5.tar.bz2 20301499 RMD160 232c92391e64b4a553793f4a92f7440d2fb6cfe1 SHA1 1ee3507544c93f626247599fa0500ef6754baf90 SHA256 494e5d96c82c43326fde9b1ad68ff52a07e858f9201d7aede30380bb232359af
 DIST kde-l10n-nb-4.4.5.tar.bz2 2628027 RMD160 30e1c922da7b4d1449c8ea5ac262aacfc103b87d SHA1 e630721076989e65e0ad4fb246163f4d2374ddba SHA256 549a318c5ed31191a42b76b2b7aef1b5d0fb4fdb936ba0761642830bbf822cc5
-DIST kde-l10n-nb-4.7.3.tar.bz2 2666049 RMD160 31394129dc1f4a876197b00715a0126e0b3596d1 SHA1 baadcde24f4910f0b8db603c1c9b9a1b4ee6f1f8 SHA256 aedbf33588253f6cf7d33c39eaadd9b3e8ca0bb37fe542685a1aefed4be5a1f9
 DIST kde-l10n-nb-4.7.4.tar.bz2 2665621 RMD160 9441111ff7f272e521f56eafdabd268aba4d0feb SHA1 cb5842c0cc989c27fffff7f3d7e43abe28cf68c7 SHA256 b53230c4bec0c7f884e273170677fb6439ed8a67b05881c9da361174c90acbd7
 DIST kde-l10n-nds-4.4.5.tar.bz2 3883818 RMD160 7d93db7f43a29a95f30e465486400467be67898e SHA1 07294c5713d89927b6942ff8973155423621593c SHA256 8cf2d58d4f97b28bd5d47527cf4d2c146aee0942151a6c4ad30354896c45d64f
-DIST kde-l10n-nds-4.7.3.tar.bz2 4169394 RMD160 f5511cb220c1e3f4a31785b8172b245a23d18ab6 SHA1 493f1545359d79c53f49ecf11904163bf69d503d SHA256 b9c341fdcf95d59c18e4a1b82835361c79155c5dd636afda5203c4785657075b
 DIST kde-l10n-nds-4.7.4.tar.bz2 4169697 RMD160 ea32e8837e92108a8c290df1c8da6aac751cb221 SHA1 ba29b58cd06b0d8a2596ae15ab710819411b5d18 SHA256 b34f36ffb31c3be67e032552ff739059ad4900d2e43f9a81a65d29c09474a6ee
 DIST kde-l10n-nl-4.4.5.tar.bz2 14226957 RMD160 f3f8fa9c7ecc92e19145f0799f012d87ae877320 SHA1 eec3379172ed5732abce3992f35dc6c9d18fa3dc SHA256 99eb08aaeb4540f8fc7c36903b5e15e8374315213e16bcd36b1df51de3d6da3a
-DIST kde-l10n-nl-4.7.3.tar.bz2 15680330 RMD160 2624218354663fd594badd129dc6232a0749a0be SHA1 21731691f920e2945bf8308a1721107133b612af SHA256 0e8aabf25dc7e0a81950ac95492500f5b3667d24fe9e65f2bd0c923cd33922c4
 DIST kde-l10n-nl-4.7.4.tar.bz2 14750533 RMD160 0fddaf97e439485ae81ac0489c68acf311c8db81 SHA1 e7ade27597d25a5994bcece448c3cd9684f48b6c SHA256 22888fd20b3f87a6bef561beab8901188f5454c85d307fa876fcd0679966600b
 DIST kde-l10n-nn-4.4.5.tar.bz2 2202500 RMD160 8214c2f4d8f916740aedfd7ed4e85d9aee6ca408 SHA1 1bc6ed27bb60408d1d2c8af033eb11696a1397d2 SHA256 edddb150563756cd5b5c261f0bc54a7a42385c122c8541dc1b2ddbd0b11cd955
-DIST kde-l10n-nn-4.7.3.tar.bz2 2157518 RMD160 c5bd6ae6cfde9619896fdea67aa856941357ed04 SHA1 3510559e378a0705ecc9ccb45458617159b25ee8 SHA256 089b57bbe411a2978bbeaa7363836bb985f453a47f10e128a44a8337cb5ae275
 DIST kde-l10n-nn-4.7.4.tar.bz2 2156108 RMD160 c052eba911f442b7c49b7e567653a1cf62f17f4c SHA1 b48c7bd7c07da2b209af37b9fc6cd87b7aeb0f6c SHA256 676dcb845611461b87b4f4e2a11a4497cb4a25fef820ea2f8366805eae9b4107
 DIST kde-l10n-pa-4.4.5.tar.bz2 1818030 RMD160 b6f1868837e3df9c1833818303f0acc4554ec2b7 SHA1 68a1c72de7e5d99996684c8a70475ec9dcc1fc81 SHA256 8420037aac0feea5b502d9c88498ea01eb119660baa14664b1cdfe7c158c9129
-DIST kde-l10n-pa-4.7.3.tar.bz2 2015757 RMD160 dd463b0d43f5ed323d6bd0bd5672379def01ef15 SHA1 e344769783894f64e5b4301f48d2b0830b3efa8b SHA256 d46615532a9c9df6838fed42bdbda78ba248cca9966ae7acde9c26ce98662618
 DIST kde-l10n-pa-4.7.4.tar.bz2 2015566 RMD160 460504c09dc52c264f4c303d6c095b274ac7a911 SHA1 3de2b3ea81cadc61c809e45c4706973febbce9de SHA256 aba5eb12eec945655dc356b45bda9cfd63c3df9a6a7af1e80d370f2137a7822a
 DIST kde-l10n-pl-4.4.5.tar.bz2 6149268 RMD160 5e41dc78f19b77e45edf370fd3702cbdd4822b0b SHA1 40149ae0d8acfbbd65a948f786d11903a6a77565 SHA256 2ef854306bb58f6043f1361d93437ae2ed8cf71cf54e0518f60e4d20401b06f7
-DIST kde-l10n-pl-4.7.3.tar.bz2 19099476 RMD160 c45d91fe675b217d81e772caebd25f76afe3c28b SHA1 069d44526d2df805910dd9839491c2b6d530d203 SHA256 cfc730e047338f9b2ba70dc1d9e828725d8f920bb378d3cb60df881cf37e8410
 DIST kde-l10n-pl-4.7.4.tar.bz2 19102081 RMD160 5541535a19e2a061e98bc58f5e4f1bafd094bc6e SHA1 fe5f9dcd01f9c46281c50ca4e547f2ca6fa1d29d SHA256 9a4ee52153829f277ccb3e0737ee724cdab98a187cbc75f4b22d00af9476ce21
 DIST kde-l10n-pt-4.4.5.tar.bz2 6345114 RMD160 0291574d14616d2ec96c3159e0943913040ee0bb SHA1 214a6c0da3ac1718add5a4523d2942047be460cc SHA256 c1863dabddd30f970532ac6ccf50279e063bd449aa021837f3f4f3a373e2752e
-DIST kde-l10n-pt-4.7.3.tar.bz2 6110855 RMD160 ccc8b4f5a441926997abb6a9cdeb1417a105d46f SHA1 c49e6715429b8b6193e88186a0e86808f5ecdee3 SHA256 6a60c677074f62023b9f480fbc0a0ff2050109b5ae098ab1a44fbf93e460d34e
 DIST kde-l10n-pt-4.7.4.tar.bz2 6108888 RMD160 eea128283f3440fbb28b7c2d3d5d6ce8d9788297 SHA1 79ebb100d6902b878036c4eb1c5fd3dd893ac76e SHA256 04b27d457fd8b6ac65feb41e8a0109af7f4eec415570bc0761bd0318f061740e
 DIST kde-l10n-pt_BR-4.4.5.tar.bz2 17672341 RMD160 7c3a9d066a89ec639487a6529f7d8cd9156cc364 SHA1 b1d772c6a97d387d6eb287dc6550641fc3dbe791 SHA256 6a39e3be25a5d9b923ff2f42d0e7a6ab86831ec8f6d506b26d7e7ba14f2b9eb0
-DIST kde-l10n-pt_BR-4.7.3.tar.bz2 27492912 RMD160 6e7cd8d28d10f9557dc2c8790f9cf519492dedde SHA1 642574d93379ac37c957b77e35ebdc731b22a2eb SHA256 03019fcc4a93c1c8cf5b38dc2afcef28deccf92032aaedabd43c6d2027fac777
 DIST kde-l10n-pt_BR-4.7.4.tar.bz2 27494389 RMD160 0a852339c7c8f6de61d849c8cc905bad47b301b0 SHA1 3f230d41b596e90fe13577c367d59141618f3e2b SHA256 852f47706524bb7bf428be6217f189a74a484fe13582a83faaaabbef106996bc
 DIST kde-l10n-ro-4.4.5.tar.bz2 3498826 RMD160 48c015061ecda8e7d67cd051baa0ff6be46df60d SHA1 91ca23916edd2a2ea2ddbb7de9de4f2f94320e48 SHA256 dccfbd27d13a099be13031d6b730fe6ddc8145b444de831970a086005441bfd2
-DIST kde-l10n-ro-4.7.3.tar.bz2 3645293 RMD160 5da3ca2a20f7ef9a6cecf75f88ee95272994185b SHA1 9850302e24ea05dfd513c2c18ec5a96f25aeca55 SHA256 1d2b163b49770b1b68692048b15235a6276194dfed31caecc438c2e94c29f6ec
 DIST kde-l10n-ro-4.7.4.tar.bz2 3645615 RMD160 139a4dcf09f3ceaa3171762c2ccdbb32c478d952 SHA1 3e8fb137633097e304a697d48becb88a3878e92f SHA256 cbb0667bc7d0494ab4fee21f9fc196b45a8f64ab428c84a0534fad1097915784
 DIST kde-l10n-ru-4.4.5.tar.bz2 6429198 RMD160 63f359f69ed3c729244d6c0afad78a231336c5e8 SHA1 6d66712a040bd1e73098a1ee3b1146b7dc21a1a5 SHA256 5b177410efdd1109cb3ec339b9b7e88fd402a257990ba48664608b3948aadc27
-DIST kde-l10n-ru-4.7.3.tar.bz2 13865682 RMD160 a0fdf091fae02fbe15948e99cc157fd9a7f14553 SHA1 7accd85fed345a5a6c035007c5d2798532ffd5d3 SHA256 a6bbc4356e9d5baa1ea9dbba128f199bf0b0341933e1b90e4333056582e8c6d6
 DIST kde-l10n-ru-4.7.4.tar.bz2 15747360 RMD160 5f1af088460cd79db85903d6454c3ed963d4fa85 SHA1 358e19a98273607adf58276ab2a7f7c6de53b0c8 SHA256 631c7a7917de5cbb678dec746fd1b45733a7e42b08c5e7260721a59f6be98ec4
 DIST kde-l10n-si-4.4.5.tar.bz2 764320 RMD160 307bb6481a93dffaa920c0a7d8879caa1e6eb5f1 SHA1 0dd7722b94793199ac0fd96a7c8d0eefe5d766b5 SHA256 a806354815d2ea838abc91d27f835cdbfea1e59370b2063487cf65262e4e6c74
 DIST kde-l10n-sk-4.4.5.tar.bz2 4402588 RMD160 344f01e33142b4cfb52345fb3be50b5c4a0eec88 SHA1 fb27172641b6b0f31a52462fc948d3f93ea80725 SHA256 dfa0f20d03f44bb2af215a2ebcf556932a74a469b706d55fd7c238ffc833b485
-DIST kde-l10n-sk-4.7.3.tar.bz2 4437400 RMD160 aec9fa18f9a1ddd003ccc72c9e51ddb995cd2acf SHA1 659279f42e5e1554933307cd5492f6d45671a49b SHA256 3b9546178987d6e38953168645e6e107900b0fb0220263cb03ffcef2e7903b0e
 DIST kde-l10n-sk-4.7.4.tar.bz2 4439120 RMD160 be4f3d1ae2ddc83fc4ccd01b136d73eb05c8cf8c SHA1 f6e018474c52eec27cf08bdb81e326a478a3c6dd SHA256 d66f310e25d672dce3a95b2df5afeb55766a8d94b7a36845d04e1da814ed0be1
 DIST kde-l10n-sl-4.4.5.tar.bz2 4501882 RMD160 15c45c583d9c7b2a26090ec8bb929237494f20ba SHA1 31d21c9cdc6b4ab12a32382d48dc874a735d4e2a SHA256 2dc5996ffa638fa33f34a238cd21e90a26fdc59d233af3d174f33bff5679e3dc
-DIST kde-l10n-sl-4.7.3.tar.bz2 3675273 RMD160 6865c2a53afc879d72deed48624c49cf6139c389 SHA1 f3538e94789768a3343136a05adf17f80f2323d9 SHA256 de3006d6fd3d2e619cc38c9f766f483d464c0d1b88e672e0bc1f312b902031fe
 DIST kde-l10n-sl-4.7.4.tar.bz2 3675104 RMD160 37229d223612e525682bbd2846f121fc682f4053 SHA1 10651a5d5d7ba595e55a3c2a6cf28660aa6c78aa SHA256 0c2c784c2124189d9f9f1af76f02270c97d6212c1009dd406dc99d47a6e00814
 DIST kde-l10n-sr-4.4.5.tar.bz2 8508792 RMD160 dcdcd1a39459169ad27b27d14ebe5ce24036ed15 SHA1 8f4ebaad4c005a47f87a66205f0d2cbac6f00a83 SHA256 31f0b0a9fa13a178ed34ce9d6f7822bc95ac457f6e5bf98762c9de6fb30266b5
-DIST kde-l10n-sr-4.7.3.tar.bz2 11908606 RMD160 9a5f3ca86c18662672f0db0c6c0df75c5087a850 SHA1 333e68638e3a17e345a99457d1c2325013d6d3a6 SHA256 235dcae68053ef7130a4b13d93752c158f93636db10a0ce3b6611d4802f226aa
 DIST kde-l10n-sr-4.7.4.tar.bz2 11949011 RMD160 f7024925c7026165810b0016a4c2103b6cf231c5 SHA1 232c8cdb68d0f2667dffecca7f450711d77bb091 SHA256 5b03f38ba684e199a1f25095d40e633b91f5519bea5e61ed4670a131a0fa6b2f
 DIST kde-l10n-sv-4.4.5.tar.bz2 18802546 RMD160 e14185b0ac996349d05f16f630255628dfe3a7eb SHA1 906c9dd9524a9d6b9344f2e5491f22d5d6cd5f10 SHA256 7800ef1e0a32418283f5da4f70603960e8ac4fdb3750833435be8742147397c6
-DIST kde-l10n-sv-4.7.3.tar.bz2 17642938 RMD160 3373f827c39c769d8a70fc5259548a6e4defceef SHA1 8d464d253269da49c328141191cd6644b05acccc SHA256 625568b37c2037f9bb9b102efb46d1a33201b99d1cf3c5a9c8a12e5bbcd395d3
 DIST kde-l10n-sv-4.7.4.tar.bz2 17640404 RMD160 2ff9c95cdbfc3df59d09e75f9331cc04948d7485 SHA1 2ef18f5e9b0f7abac68dba1cf9d2dbac8ac2b1a3 SHA256 76a12aa22b4bccdc0a719c66819f4ae215b6a0e42130efd5d7140f0bf5598fbe
 DIST kde-l10n-tg-4.4.5.tar.bz2 2083462 RMD160 57d051f03ed6ea8b422e4e7b67e0356a8eb93967 SHA1 f23cf1aa95c52af5e08d0ecaca75381969d0d0fc SHA256 610a2a768bb948ec7323dd2a6919260195c727ac980016664aedd34db1dc1928
-DIST kde-l10n-th-4.7.3.tar.bz2 1884862 RMD160 24edf2231b36924533e3edbb746c7b2e292fb37c SHA1 ca56719eaa6c384fd98c955f0dd73243de40c8f5 SHA256 4f1dc981f781e83531f06e0571585aca957c6f7b7b8fc6a1c1702d0eebb78f1c
 DIST kde-l10n-th-4.7.4.tar.bz2 1884564 RMD160 fcaead69ab5664f3a31cde080422c798391e9575 SHA1 084c815a23c70142f9bcddeb2b85c4f71eca03ab SHA256 de1397fbed1079359a96bb1bd2e85e6479148602be106e4b1263b4b1747e773c
 DIST kde-l10n-tr-4.4.5.tar.bz2 2546808 RMD160 b6195304f4a3856e97794c94e276c3c9893657ff SHA1 a4f72d2f078e7b7b4d1ea9c63326f7703ff5ee2c SHA256 050aebf67c7539c312e971adc1ee0c33abf3e55f3d5fecc7842bb9cc770ba4c6
-DIST kde-l10n-tr-4.7.3.tar.bz2 2785265 RMD160 88db07592e65de5dc46cb2b543d047033a5c1717 SHA1 dc72f01f586529fb0e9b9dacabcb1dce0616db01 SHA256 b313b7950fe34e4d8ee7bd299cd48c687a536b060f2d451329a4118956a06931
 DIST kde-l10n-tr-4.7.4.tar.bz2 2786613 RMD160 d19eeee1bab2eb33775d82aedbecd2a10a32c779 SHA1 67ee6fb9b359e9705ddaf0ae4c607ce062c09a26 SHA256 b7cf94ba965bade294a18a69efb2d9dfeb136896d9a37e3eb8bf48dea792610a
-DIST kde-l10n-ug-4.7.3.tar.bz2 1781060 RMD160 6cd6b72ba21f926f466329d98298492a65ab7aa6 SHA1 9ab4a55e0f5ef8c99a1656ab859b9570f7e89d6d SHA256 6af2aa6d040c3f6ce0dd849bf21f9bbf894afea24dc32013f8ad1172497d62f8
 DIST kde-l10n-ug-4.7.4.tar.bz2 1798212 RMD160 7bd690cc259fe7c3866d4db80fdcc628e835c99a SHA1 afc46b28f7b6c2385bd8443a0e3375d3d7d7c48a SHA256 7111c20d987c37b79a92229a83d9c1c3bb899399cc629fd6c75b89cf3b950173
 DIST kde-l10n-uk-4.4.5.tar.bz2 13957369 RMD160 8432e459af78e494af12eaf388fa3877581348c8 SHA1 afe7cd9305030d1d3112fdb20d7a36769ef08862 SHA256 a279b785fc8e0820e4a1cd7f9ded9833f348c53dd5b6cf87df9bc8b7c60b65c6
-DIST kde-l10n-uk-4.7.3.tar.bz2 16579041 RMD160 49ec37365006a04736fe73153ce97dd4383c015a SHA1 919584d0aa7b0a54e8e61184ec58063d0dfd2aae SHA256 fd7df6ba7f164f856bb59dea76c10069cab9e140b9280f977c159c97f8fe8bbf
 DIST kde-l10n-uk-4.7.4.tar.bz2 19084832 RMD160 04de2746ea18e46e978bfd5db0fec63ab3828c36 SHA1 328ff235a6454e33e583ee0dc54823b00e162f37 SHA256 ba79264a3b9bac9d36aaf65c33e652967d73130d10d18ca6e873cc145f5d2320
 DIST kde-l10n-wa-4.4.5.tar.bz2 1823756 RMD160 bdbb66c51046763e101c7f72900223009f1d0558 SHA1 a2368b0702216e60f95a8b916e420a8e25c328b5 SHA256 e00d20597e9b691ce23cf80372a4e989d3d6c7290b414231c2ae6f525c469b55
-DIST kde-l10n-wa-4.7.3.tar.bz2 1896487 RMD160 be7f629ba5c29826e55f264f5f531c02296fee71 SHA1 68aab9c979b96dc4a88bf00dcb33fdeef048a7a3 SHA256 b69160326065de01eda71907324396c3fb0f7e7789b20e9ab0bb4743a8992a6c
 DIST kde-l10n-wa-4.7.4.tar.bz2 1896684 RMD160 559b780d3c9511074c53a9a9d634e22b5ff25bab SHA1 c4a9801641c6e1d624b3449e73dbfafaecdfd963 SHA256 5b9998a275fe28f01361dffe3ffebf84ff5ba2c5e9661dab30552fb93cb85493
 DIST kde-l10n-zh_CN-4.4.5.tar.bz2 3609788 RMD160 da11015ab8280ff2fe9fadfd6f594d13d04b2d26 SHA1 0f4671cb2a24fc2161f12e98079df7bc2054ad9b SHA256 4040bed19a37560c8a7407137f81e9bb9db550a363beaa9131e843cb9be98270
-DIST kde-l10n-zh_CN-4.7.3.tar.bz2 3666007 RMD160 ced3e4f3f1c888e7a615ef47049e7b9f60b5b187 SHA1 692dae3418a79249fbb9ce7bdf0c6c91da03ea21 SHA256 03ba5dad0ecff0e536bfd7950435fb2053b824b41adfe69a285ed35a8128ea1d
 DIST kde-l10n-zh_CN-4.7.4.tar.bz2 3665735 RMD160 bdbb21114c882129ff3190c0c7e364084223c800 SHA1 5113f103cfa99ffb74fb095a0570de93e10af7aa SHA256 c9985c911b553c0d69d5178987ca5dfdcc617d6ad94b0e11f14b4a04c55f4ea2
 DIST kde-l10n-zh_TW-4.4.5.tar.bz2 2659802 RMD160 76df1678c654aebd59c8ce5cf2b071bf097892fe SHA1 d5c5a37d0f46d7a7b47846c63d74de0dc6aec84c SHA256 91d1c414ca6ab54d8554a3aceef21036a933622fdc7809835f779ea14f611ba6
-DIST kde-l10n-zh_TW-4.7.3.tar.bz2 2830325 RMD160 638990af12cbdd9b03baa2d8014f966b1dbbe11e SHA1 7b36964b2362a8b0d172d4170c5992ddda976f12 SHA256 035b05019fa5f4cae8ad17d97a972b4453e46ed7f773e973a9e163b003d7acc3
 DIST kde-l10n-zh_TW-4.7.4.tar.bz2 2830929 RMD160 a348bfad520cd8c835791504036a7d8de35ac7b5 SHA1 2751dcc8a931692f5cd2d04b03bfb1447ee3b87f SHA256 f8ca70f9ca6b1261cc280abe3e73d7c0d0acc3031762758d050fc6e1e3d5ae26
diff --git a/kde-base/kdepim-l10n/kdepim-l10n-4.7.3.ebuild b/kde-base/kdepim-l10n/kdepim-l10n-4.7.3.ebuild
deleted file mode 100644
index f7e866d40e04..000000000000
--- a/kde-base/kdepim-l10n/kdepim-l10n-4.7.3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-l10n/kdepim-l10n-4.7.3.ebuild,v 1.3 2011/12/07 22:13:56 hwoarang Exp $
-
-EAPI=4
-
-inherit kde4-base
-
-DESCRIPTION="KDE PIM internationalization package"
-HOMEPAGE="http://www.kde.org/"
-LICENSE="GPL-2"
-
-DEPEND="
-	sys-devel/gettext
-"
-RDEPEND=""
-
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+handbook"
-
-MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB es et eu fi fr ga gl he hr
-hu ia id is it ja kk km kn ko lt lv nb nds nl nn pa pl pt pt_BR ro ru sk sl sr
-sv th tr ug uk wa zh_CN zh_TW"
-
-URI_BASE="${SRC_URI/-${PV}.tar.bz2/}"
-SRC_URI=""
-
-for MY_LANG in ${MY_LANGS} ; do
-	IUSE="${IUSE} linguas_${MY_LANG}"
-	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/kde-l10n-${MY_LANG}-${PV}.tar.bz2 )"
-done
-
-S="${WORKDIR}"
-
-src_unpack() {
-	local LNG DIR
-	if [[ -z ${A} ]]; then
-		elog
-		elog "You either have the LINGUAS variable unset, or it only"
-		elog "contains languages not supported by ${P}."
-		elog "You won't have any additional language support."
-		elog
-		elog "${P} supports these language codes:"
-		elog "${MY_LANGS}"
-		elog
-	fi
-
-	# For EAPI >= 3, or if not using .tar.xz archives:
-	[[ -n ${A} ]] && unpack ${A}
-	cd "${S}"
-
-	# add all linguas to cmake
-	if [[ -n ${A} ]]; then
-		for LNG in ${LINGUAS}; do
-			DIR="kde-l10n-${LNG}-${PV}"
-			if [[ -d "${DIR}" ]] ; then
-				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
-			fi
-
-			# remove everything except kdepim
-			for SUBDIR in data docs messages scripts ; do
-				if [[ -d "${S}/${DIR}/${SUBDIR}" ]] ; then
-					einfo "   ${SUBDIR} subdirectory"
-					echo > "${S}/${DIR}/${SUBDIR}/CMakeLists.txt"
-					[[ -d "${S}/${DIR}/${SUBDIR}/kdepim" ]] && ( echo "add_subdirectory(kdepim)" >> "${S}/${DIR}/${SUBDIR}/CMakeLists.txt" )
-				fi
-			done
-
-			# in some cases we may have sub-lingua subdirs, e.g. sr :(
-			for XSUBDIR in "${S}/${DIR}/${LNG}"@* ; do
-				XLNG=$(echo ${XSUBDIR}|sed -e 's:^.*/::')
-				if [[ -d "${XSUBDIR}" ]] ; then
-					einfo "   ${XLNG} variant"
-					# remove everything except kdepim
-					for SUBDIR in data docs messages scripts ; do
-						if [[ -d "${XSUBDIR}/${SUBDIR}" ]] ; then
-							einfo "      ${SUBDIR} subdirectory"
-							echo > "${XSUBDIR}/${SUBDIR}/CMakeLists.txt"
-							[[ -d "${XSUBDIR}/${SUBDIR}/kdepim" ]] && ( echo "add_subdirectory(kdepim)" >> "${XSUBDIR}/${SUBDIR}/CMakeLists.txt" )
-						fi
-					done
-				fi
-			done
-		done
-	fi
-}
-
-src_prepare() {
-	[[ -n ${A} ]] && kde4-base_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build handbook docs)
-	)
-	[[ -n ${A} ]] && kde4-base_src_configure
-}
-
-src_compile() {
-	[[ -n ${A} ]] && kde4-base_src_compile
-}
-
-src_test() {
-	[[ -n ${A} ]] && kde4-base_src_test
-}
-
-src_install() {
-	[[ -n ${A} ]] && kde4-base_src_install
-}
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.7.3.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.7.3.ebuild
deleted file mode 100644
index 3b97daee9199..000000000000
--- a/kde-base/kdepim-meta/kdepim-meta-4.7.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-4.7.3.ebuild,v 1.4 2011/12/07 22:13:48 hwoarang Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	$(add_kdebase_dep akonadiconsole)
-	$(add_kdebase_dep akregator)
-	$(add_kdebase_dep blogilo)
-	$(add_kdebase_dep kabcclient)
-	$(add_kdebase_dep kaddressbook)
-	$(add_kdebase_dep kalarm)
-	$(add_kdebase_dep kdepim-icons)
-	$(add_kdebase_dep kdepim-kresources)
-	$(add_kdebase_dep kdepim-runtime)
-	$(add_kdebase_dep kdepim-strigi-analyzer)
-	$(add_kdebase_dep kdepim-wizards)
-	$(add_kdebase_dep kjots)
-	$(add_kdebase_dep kleopatra)
-	$(add_kdebase_dep kmail)
-	$(add_kdebase_dep knode)
-	$(add_kdebase_dep knotes)
-	$(add_kdebase_dep konsolekalendar)
-	$(add_kdebase_dep kontact)
-	$(add_kdebase_dep korganizer)
-	$(add_kdebase_dep ktimetracker)
-"
diff --git a/kde-base/kdepim-runtime/Manifest b/kde-base/kdepim-runtime/Manifest
index 66a78672a5d1..ce8320b59bbe 100644
--- a/kde-base/kdepim-runtime/Manifest
+++ b/kde-base/kdepim-runtime/Manifest
@@ -1,3 +1,2 @@
 DIST kdepim-runtime-4.4.11.1.tar.bz2 619924 RMD160 dbc1120ab3f70c0073f6e9f389edba89bf80bee6 SHA1 e3105eb99ab0de47c617f8491774b2e3ee4cdd4a SHA256 0b2bbf59e5d8184bb1f1fc02ed442808cee6bf36f097dc84789089c6bd46c5f6
-DIST kdepim-runtime-4.7.3.tar.bz2 1205585 RMD160 11d52166d2830c3c597f3b843bb10ccdaba38581 SHA1 fa0e336e17f7abea1e36d28d941a4ef79b4e4635 SHA256 4cd505294e7caaf97562961cd989594d4bb9d71490887dba4dad615ed353fcf9
 DIST kdepim-runtime-4.7.4.tar.bz2 1205654 RMD160 3ff6b5889db504e0b369cd3995341778e4a3cf4b SHA1 fb02f53673316aaafb65b7c4dd570f3be3b4e935 SHA256 436d4a2d042bbe25e918d1620224dab1d2be896c997638c0f8d54a0c735fe592
diff --git a/kde-base/kdepim-runtime/files/kdepim-runtime-4.4.10-enablefinal-1.patch b/kde-base/kdepim-runtime/files/kdepim-runtime-4.4.10-enablefinal-1.patch
deleted file mode 100644
index cfdaf21a69d7..000000000000
--- a/kde-base/kdepim-runtime/files/kdepim-runtime-4.4.10-enablefinal-1.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- libkdepim-copy/calendardiffalgo.cpp.orig	2011-01-01 19:19:25.798000269 +0100
-+++ libkdepim-copy/calendardiffalgo.cpp	2011-01-01 19:14:15.918000268 +0100
-@@ -26,7 +26,6 @@
- 
- using namespace KPIM;
- 
--#ifndef KDE_USE_FINAL
- static bool compareString( const QString &left, const QString &right )
- {
-   if ( left.isEmpty() && right.isEmpty() )
-@@ -34,7 +33,6 @@
-   else
-     return left == right;
- }
--#endif
- 
- static QString toString( KCal::Attendee *attendee )
- {
diff --git a/kde-base/kdepim-runtime/files/kdepim-runtime-4.4.10-enablefinal-2.patch b/kde-base/kdepim-runtime/files/kdepim-runtime-4.4.10-enablefinal-2.patch
deleted file mode 100644
index 67425fe7c3a4..000000000000
--- a/kde-base/kdepim-runtime/files/kdepim-runtime-4.4.10-enablefinal-2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- resources/kolabproxy/distributionlist.cpp.orig	2011-01-01 19:18:41.274000269 +0100
-+++ resources/kolabproxy/distributionlist.cpp	2011-01-01 19:16:44.378000268 +0100
-@@ -39,8 +39,6 @@
- 
- using namespace Kolab;
- 
--static const char* s_unhandledTagAppName = "KOLABUNHANDLED"; // no hyphens in appnames!
--
- // saving (contactgroup->xml)
- DistributionList::DistributionList( const KABC::ContactGroup* contactGroup )
- {
-@@ -149,7 +147,7 @@
-         // Unhandled tag - save for later storage
-         //kDebug() <<"Saving unhandled tag" << e.tagName();
-         Custom c;
--        c.app = s_unhandledTagAppName;
-+        c.app = "KOLABUNHANDLED";
-         c.name = e.tagName();
-         c.value = e.text();
-         mCustomList.append( c );
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1.ebuild
index 82b591c7084d..d412ff414090 100644
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.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/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1.ebuild,v 1.6 2011/07/31 20:28:37 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1.ebuild,v 1.7 2012/01/17 12:12:21 johu Exp $
 
 EAPI=4
 
@@ -37,5 +37,3 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 add_blocker akonadi '<4.3.90'
-
-PATCHES=( "${FILESDIR}/${PN}"-4.4.10-enablefinal-{1,2}.patch )
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.7.3.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.7.3.ebuild
deleted file mode 100644
index 33e1c4e072f4..000000000000
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.7.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.7.3.ebuild,v 1.4 2011/12/07 22:13:47 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdepim-runtime"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE PIM runtime plugin collection"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RESTRICT="test"
-# Would need test programs _testrunner and akonaditest from kdepimlibs, see bug 313233
-
-DEPEND="
-	app-misc/strigi
-	>=app-office/akonadi-server-1.3.60
-	dev-libs/boost
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-libs/shared-desktop-ontologies-0.6.51
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	x11-misc/shared-mime-info
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdepim-icons)
-"
diff --git a/kde-base/kdepim-strigi-analyzer/Manifest b/kde-base/kdepim-strigi-analyzer/Manifest
index 6a624e13c105..2b0d834b02ae 100644
--- a/kde-base/kdepim-strigi-analyzer/Manifest
+++ b/kde-base/kdepim-strigi-analyzer/Manifest
@@ -1,3 +1,2 @@
 DIST kdepim-4.4.11.1.tar.bz2 8964708 RMD160 51394b9dcb3aecc4f108e87de37c21e3af820ee1 SHA1 49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf
-DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
 DIST kdepim-4.7.4.tar.bz2 16182345 RMD160 a36035cce2e25bc0cbddb50e4c9d5fdd661a2f26 SHA1 233f6c413eeedd4af7cf15106a2af7b8f29977bf SHA256 17a5e185e1199436864400d930f60979265cf0cd775b37a2e7b5a1a267c76868
diff --git a/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.7.3.ebuild b/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.7.3.ebuild
deleted file mode 100644
index 194a2626acd7..000000000000
--- a/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.7.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.7.3.ebuild,v 1.4 2011/12/07 22:13:40 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdepim"
-KMMODULE="strigi-analyzer"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="kdepim: strigi plugins"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-misc/strigi
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	libkleo/
-	libkpgp/
-	messageviewer/
-"
diff --git a/kde-base/kdepim-wizards/Manifest b/kde-base/kdepim-wizards/Manifest
index 6a624e13c105..2b0d834b02ae 100644
--- a/kde-base/kdepim-wizards/Manifest
+++ b/kde-base/kdepim-wizards/Manifest
@@ -1,3 +1,2 @@
 DIST kdepim-4.4.11.1.tar.bz2 8964708 RMD160 51394b9dcb3aecc4f108e87de37c21e3af820ee1 SHA1 49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf
-DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
 DIST kdepim-4.7.4.tar.bz2 16182345 RMD160 a36035cce2e25bc0cbddb50e4c9d5fdd661a2f26 SHA1 233f6c413eeedd4af7cf15106a2af7b8f29977bf SHA256 17a5e185e1199436864400d930f60979265cf0cd775b37a2e7b5a1a267c76868
diff --git a/kde-base/kdepim-wizards/kdepim-wizards-4.7.3.ebuild b/kde-base/kdepim-wizards/kdepim-wizards-4.7.3.ebuild
deleted file mode 100644
index 2baf83d2753e..000000000000
--- a/kde-base/kdepim-wizards/kdepim-wizards-4.7.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/kdepim-wizards-4.7.3.ebuild,v 1.4 2011/12/07 22:13:39 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdepim"
-KMMODULE="wizards"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE PIM wizards"
-IUSE="debug"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-kresources)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	kmail/
-	knotes/
-	kresources/groupwise/
-"
-
-src_prepare() {
-	ln -s "${EPREFIX}"/usr/include/kdepim-kresources/{kabc_groupwiseprefs,kcal_groupwiseprefsbase}.h \
-		kresources/groupwise/ \
-		|| die "Failed to link extra_headers."
-
-	kde4-meta_src_prepare
-}
diff --git a/kde-base/kdepimlibs/Manifest b/kde-base/kdepimlibs/Manifest
index a48a44bc3fcd..9a1b2086e091 100644
--- a/kde-base/kdepimlibs/Manifest
+++ b/kde-base/kdepimlibs/Manifest
@@ -1,3 +1,2 @@
 DIST kdepimlibs-4.6.3.tar.bz2 3202266 RMD160 3e1298c358f82690351d849f977ea6a4464b9dde SHA1 370b4e98ab9e1f8ba18d36630d5c8bbff8da4883 SHA256 abac2ce510f16f0614be6bb07e11f979f427981f17ab674951510c83ea72b95d
-DIST kdepimlibs-4.7.3.tar.bz2 3233484 RMD160 468d972ea73499c6cca6c10fdb3b6e84cee9aedf SHA1 b95822a3e38587744174308b629336cd3d0444f4 SHA256 11bec0a8d404bab11e0dd54d2c4e007812f675b85b3d9471a82abfcfb4925b87
 DIST kdepimlibs-4.7.4.tar.bz2 3236435 RMD160 d7b879a4a24f1878f36d9b9418464b55cbc0d3ce SHA1 a539e29557c0a30779e752b9349b3a0c000ffbba SHA256 37c2a5903b6ed8f5b10ade3696dd43bcc7515b10dd8f75d157d3ed7e019bee66
diff --git a/kde-base/kdepimlibs/kdepimlibs-4.7.3-r1.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.7.3-r1.ebuild
deleted file mode 100644
index 495dccf02035..000000000000
--- a/kde-base/kdepimlibs/kdepimlibs-4.7.3-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.7.3-r1.ebuild,v 1.2 2011/12/26 17:10:32 ago Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-CPPUNIT_REQUIRED="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="Common library for KDE PIM apps."
-HOMEPAGE="http://www.kde.org/"
-
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="debug ldap semantic-desktop"
-
-# some akonadi tests timeout, that probaly needs more work as its ~700 tests
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.1.6
-	dev-libs/libgpg-error
-	>=dev-libs/libical-0.43
-	dev-libs/cyrus-sasl
-	$(add_kdebase_dep kdelibs 'semantic-desktop=')
-	semantic-desktop? (
-		>=app-office/akonadi-server-1.5.80
-		media-libs/phonon
-		x11-misc/shared-mime-info
-	)
-	ldap? ( net-nds/openldap )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.35.0-r5
-"
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.7.4-size.patch"
-)
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	# Disable hardcoded checks
-	sed -r -e '/find_package\((Akonadi|SharedDesktopOntologies|Soprano|Nepomuk)/{/macro_optional_/!s/find/macro_optional_&/}' \
-		-e '/macro_log_feature\((Akonadi|SHAREDDESKTOPONTOLOGIES|Soprano|Nepomuk)_FOUND/s/ TRUE / FALSE /' \
-		-e '/add_subdirectory\((akonadi|mailtransport)/{/macro_optional_/!s/add/macro_optional_&/}' \
-		-i CMakeLists.txt || die
-	if ! use semantic-desktop; then
-		sed -e '/include(SopranoAddOntology)/s/^/#DISABLED /' \
-			-i CMakeLists.txt || die
-		# More reliable than -DBUILD_akonadi=OFF
-		rm -r akonadi mailtransport || die
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build handbook doc)
-		$(cmake-utils_use_with ldap)
-		$(cmake-utils_use_with semantic-desktop Akonadi)
-		$(cmake-utils_use_with semantic-desktop SharedDesktopOntologies)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		# $(cmake-utils_use_with prison)
-		-DWITH_Prison=NO
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-base/kdeplasma-addons/Manifest b/kde-base/kdeplasma-addons/Manifest
index 40e3d47af73c..13bd2c9c736b 100644
--- a/kde-base/kdeplasma-addons/Manifest
+++ b/kde-base/kdeplasma-addons/Manifest
@@ -1,3 +1,2 @@
 DIST kdeplasma-addons-4.6.3.tar.bz2 1935272 RMD160 85c546d4aad35e3785980203d2f8ff0d154cafb6 SHA1 7a43dcfebc0316e681b04d0958d89272620a11b7 SHA256 6f8c11191aecb7cd8477c3c406515dc13991c4f6f73b892c0e25e89b12e58bcf
-DIST kdeplasma-addons-4.7.3.tar.bz2 1974816 RMD160 3ee4aa11b4dbf9e520d9918638b45edb6472928d SHA1 decdea2d081396c90daabc9af754a233b43a0783 SHA256 c1d0cdb41dc5293ef1ee415d99cda2b7f6c51b776d08199f0904c25b30bc9601
 DIST kdeplasma-addons-4.7.4.tar.bz2 1975849 RMD160 3cb04e64b67f53b24d7e80f47eeba14439648e97 SHA1 2bbf77d77e809733e6a74ff5688e6ff5487bc8bf SHA256 c55f5304d426a56455e34da7826f51b3ead2234ed31237a6673ae7ebaf141519
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.3-r1.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.3-r1.ebuild
deleted file mode 100644
index cde6fa429193..000000000000
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.3-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.3-r1.ebuild,v 1.3 2011/12/07 22:13:35 hwoarang Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="Extra Plasma applets and engines."
-HOMEPAGE="http://www.kde.org/"
-LICENSE="GPL-2 LGPL-2"
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="attica debug desktopglobe exif qalculate qwt scim semantic-desktop"
-
-# krunner is only needed to generate dbus interface for lancelot
-COMMON_DEPEND="
-	app-crypt/qca:2
-	app-crypt/qca-ossl:2
-	$(add_kdebase_dep kdelibs 'semantic-desktop=')
-	$(add_kdebase_dep krunner)
-	$(add_kdebase_dep plasma-workspace 'semantic-desktop=')
-	x11-misc/shared-mime-info
-	attica? ( dev-libs/libattica )
-	desktopglobe? ( $(add_kdebase_dep marble) )
-	exif? ( $(add_kdebase_dep libkexiv2) )
-	qalculate? ( sci-libs/libqalculate )
-	qwt? ( x11-libs/qwt:5 )
-	scim? ( app-i18n/scim )
-	semantic-desktop? (
-		$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-		$(add_kdebase_dep plasma-workspace 'rss')
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/eigen:2
-"
-RDEPEND="${COMMON_DEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.7.3-knowledge.patch"
-)
-
-src_prepare() {
-	use semantic-desktop || epatch "${FILESDIR}/${PN}-4.6.2-optional-akonadi.patch"
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DDBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/interfaces/"
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_with desktopglobe Marble)
-		$(cmake-utils_use_with exif Kexiv2)
-		$(cmake-utils_use_with qalculate)
-		$(cmake-utils_use_with qwt)
-		$(cmake-utils_use_with semantic-desktop KdepimLibs)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with scim)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.3.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.3.ebuild
deleted file mode 100644
index 9db43c4816e5..000000000000
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.3.ebuild,v 1.1 2011/11/02 20:48:22 alexxy Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="Extra Plasma applets and engines."
-HOMEPAGE="http://www.kde.org/"
-LICENSE="GPL-2 LGPL-2"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="attica debug desktopglobe exif qalculate qwt scim semantic-desktop"
-
-# krunner is only needed to generate dbus interface for lancelot
-COMMON_DEPEND="
-	app-crypt/qca:2
-	app-crypt/qca-ossl:2
-	$(add_kdebase_dep kdelibs 'semantic-desktop=')
-	$(add_kdebase_dep krunner)
-	$(add_kdebase_dep plasma-workspace 'semantic-desktop=')
-	x11-misc/shared-mime-info
-	attica? ( dev-libs/libattica )
-	desktopglobe? ( $(add_kdebase_dep marble) )
-	exif? ( $(add_kdebase_dep libkexiv2) )
-	qalculate? ( sci-libs/libqalculate )
-	qwt? ( x11-libs/qwt:5 )
-	scim? ( app-i18n/scim )
-	semantic-desktop? (
-		$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-		$(add_kdebase_dep plasma-workspace 'rss')
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/eigen:2
-"
-RDEPEND="${COMMON_DEPEND}
-"
-
-src_prepare() {
-	use semantic-desktop || epatch "${FILESDIR}/${PN}-4.6.2-optional-akonadi.patch"
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DDBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/interfaces/"
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_with desktopglobe Marble)
-		$(cmake-utils_use_with exif Kexiv2)
-		$(cmake-utils_use_with qalculate)
-		$(cmake-utils_use_with qwt)
-		$(cmake-utils_use_with semantic-desktop KdepimLibs)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with scim)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-base/kdesdk-kioslaves/Manifest b/kde-base/kdesdk-kioslaves/Manifest
index 8129826b48d8..2c54c126587e 100644
--- a/kde-base/kdesdk-kioslaves/Manifest
+++ b/kde-base/kdesdk-kioslaves/Manifest
@@ -1,3 +1,2 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
-DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
 DIST kdesdk-4.7.4.tar.bz2 5266656 RMD160 9fc17159fd8cbbf9cfe76ed18dfcf8a269d0270e SHA1 3a0f61204653dc3f9f975732b6f67659c60ecaf3 SHA256 a2142ea51e9172e589b0526879061e5c3e4337f6154d89b0491fef9c68e56f6c
diff --git a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.7.3.ebuild b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.7.3.ebuild
deleted file mode 100644
index f4516bef486d..000000000000
--- a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.7.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.7.3.ebuild,v 1.3 2011/12/07 22:13:43 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdesdk"
-KMMODULE="kioslave"
-inherit kde4-meta
-
-DESCRIPTION="kioslaves from kdesdk package"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug subversion"
-
-DEPEND="
-	subversion? (
-		dev-libs/apr
-		dev-vcs/subversion
-	)
-"
-RDEPEND="${DEPEND}
-	subversion? ( !>=dev-vcs/kdesvn-1.5.2:4 )
-"
-
-src_configure() {
-	mycmakeargs=(
-		-DAPRCONFIG_EXECUTABLE="${EPREFIX}"/usr/bin/apr-1-config
-		$(cmake-utils_use_with subversion SVN)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kdesdk-meta/kdesdk-meta-4.7.3.ebuild b/kde-base/kdesdk-meta/kdesdk-meta-4.7.3.ebuild
deleted file mode 100644
index 903879afd803..000000000000
--- a/kde-base/kdesdk-meta/kdesdk-meta-4.7.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-meta/kdesdk-meta-4.7.3.ebuild,v 1.3 2011/12/07 22:13:32 hwoarang Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="cvs"
-
-RDEPEND="
-	cvs? ( $(add_kdebase_dep cervisia) )
-	$(add_kdebase_dep dolphin-plugins)
-	$(add_kdebase_dep kapptemplate)
-	$(add_kdebase_dep kate)
-	$(add_kdebase_dep kcachegrind)
-	$(add_kdebase_dep kdeaccounts-plugin)
-	$(add_kdebase_dep kdesdk-kioslaves)
-	$(add_kdebase_dep kdesdk-misc)
-	$(add_kdebase_dep kdesdk-scripts)
-	$(add_kdebase_dep kdesdk-strigi-analyzer)
-	$(add_kdebase_dep kompare)
-	$(add_kdebase_dep kstartperf)
-	$(add_kdebase_dep kuiviewer)
-	$(add_kdebase_dep lokalize)
-	$(add_kdebase_dep okteta)
-	$(add_kdebase_dep umbrello)
-"
diff --git a/kde-base/kdesdk-misc/Manifest b/kde-base/kdesdk-misc/Manifest
index 8129826b48d8..2c54c126587e 100644
--- a/kde-base/kdesdk-misc/Manifest
+++ b/kde-base/kdesdk-misc/Manifest
@@ -1,3 +1,2 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
-DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
 DIST kdesdk-4.7.4.tar.bz2 5266656 RMD160 9fc17159fd8cbbf9cfe76ed18dfcf8a269d0270e SHA1 3a0f61204653dc3f9f975732b6f67659c60ecaf3 SHA256 a2142ea51e9172e589b0526879061e5c3e4337f6154d89b0491fef9c68e56f6c
diff --git a/kde-base/kdesdk-misc/kdesdk-misc-4.7.3.ebuild b/kde-base/kdesdk-misc/kdesdk-misc-4.7.3.ebuild
deleted file mode 100644
index 0a87a95ba1da..000000000000
--- a/kde-base/kdesdk-misc/kdesdk-misc-4.7.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-misc/kdesdk-misc-4.7.3.ebuild,v 1.3 2011/12/07 22:14:00 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdesdk"
-KMNOMODULE="true"
-inherit kde4-meta
-
-DESCRIPTION="KDE miscellaneous SDK tools"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug extras"
-
-DEPEND="
-	extras? ( >=dev-java/antlr-2.7.7:0[cxx,script] )
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRA="
-	doc/kmtrace/
-	doc/poxml/
-	kmtrace/
-	kpartloader/
-	kprofilemethod/
-	kspy/
-	kunittest/
-	poxml/
-	scheck/
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with extras Antlr2)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kdesdk-scripts/Manifest b/kde-base/kdesdk-scripts/Manifest
index 8129826b48d8..2c54c126587e 100644
--- a/kde-base/kdesdk-scripts/Manifest
+++ b/kde-base/kdesdk-scripts/Manifest
@@ -1,3 +1,2 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
-DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
 DIST kdesdk-4.7.4.tar.bz2 5266656 RMD160 9fc17159fd8cbbf9cfe76ed18dfcf8a269d0270e SHA1 3a0f61204653dc3f9f975732b6f67659c60ecaf3 SHA256 a2142ea51e9172e589b0526879061e5c3e4337f6154d89b0491fef9c68e56f6c
diff --git a/kde-base/kdesdk-scripts/kdesdk-scripts-4.7.3.ebuild b/kde-base/kdesdk-scripts/kdesdk-scripts-4.7.3.ebuild
deleted file mode 100644
index 83d71fb9cb8e..000000000000
--- a/kde-base/kdesdk-scripts/kdesdk-scripts-4.7.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/kdesdk-scripts-4.7.3.ebuild,v 1.4 2011/12/16 22:16:55 dilfridge Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdesdk"
-KMMODULE="scripts"
-inherit kde4-meta
-
-DESCRIPTION="KDE SDK Scripts"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	app-arch/advancecomp
-"
-
-src_prepare() {
-	# bug 275069
-	sed -ie 's:colorsvn::' scripts/CMakeLists.txt || die
-
-	kde4-meta_src_prepare
-}
diff --git a/kde-base/kdesdk-strigi-analyzer/Manifest b/kde-base/kdesdk-strigi-analyzer/Manifest
index 8129826b48d8..2c54c126587e 100644
--- a/kde-base/kdesdk-strigi-analyzer/Manifest
+++ b/kde-base/kdesdk-strigi-analyzer/Manifest
@@ -1,3 +1,2 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
-DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
 DIST kdesdk-4.7.4.tar.bz2 5266656 RMD160 9fc17159fd8cbbf9cfe76ed18dfcf8a269d0270e SHA1 3a0f61204653dc3f9f975732b6f67659c60ecaf3 SHA256 a2142ea51e9172e589b0526879061e5c3e4337f6154d89b0491fef9c68e56f6c
diff --git a/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.7.3.ebuild b/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.7.3.ebuild
deleted file mode 100644
index 74a5c61edd7d..000000000000
--- a/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.7.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.7.3.ebuild,v 1.3 2011/12/07 22:13:48 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdesdk"
-KMMODULE="strigi-analyzer"
-inherit kde4-meta
-
-DESCRIPTION="kdesdk: strigi plugins"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-misc/strigi
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kdesu/Manifest b/kde-base/kdesu/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/kdesu/Manifest
+++ b/kde-base/kdesu/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/kdesu/kdesu-4.7.3.ebuild b/kde-base/kdesu/kdesu-4.7.3.ebuild
deleted file mode 100644
index 8edd794f68d9..000000000000
--- a/kde-base/kdesu/kdesu-4.7.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/kdesu-4.7.3.ebuild,v 1.3 2011/12/07 22:13:39 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-# FIXME: Is default command ( su/sudo ) still configurable,
-# if not, USE-flag ?
-DESCRIPTION="KDE: gui for su(1)"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-src_configure() {
-	# Upstream moved kdesu to libexec first, then decided to move it back
-	# to /${PREFIX}/bin/ , so I'm doing that now already.
-	sed -e '/kdesu_executable/s:LIBEXEC_INSTALL_DIR:BIN_INSTALL_DIR:' \
-		-i "${S}"/kdesu/kdesu/CMakeLists.txt || \
-		die "Moving kdesu from libexec to bin failed."
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kdetoys-meta/kdetoys-meta-4.7.3.ebuild b/kde-base/kdetoys-meta/kdetoys-meta-4.7.3.ebuild
deleted file mode 100644
index c664b5dd3008..000000000000
--- a/kde-base/kdetoys-meta/kdetoys-meta-4.7.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys-meta/kdetoys-meta-4.7.3.ebuild,v 1.3 2011/12/07 22:13:59 hwoarang Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="KDE toys - merge this to pull in all kdetoys-derived packages"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	$(add_kdebase_dep amor)
-	$(add_kdebase_dep kteatime)
-	$(add_kdebase_dep ktux)
-"
diff --git a/kde-base/kdeutils-meta/kdeutils-meta-4.7.3.ebuild b/kde-base/kdeutils-meta/kdeutils-meta-4.7.3.ebuild
deleted file mode 100644
index 9b5556017014..000000000000
--- a/kde-base/kdeutils-meta/kdeutils-meta-4.7.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils-meta/kdeutils-meta-4.7.3.ebuild,v 1.3 2011/12/07 22:13:39 hwoarang Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="cups floppy"
-
-RDEPEND="
-	$(add_kdebase_dep ark)
-	$(add_kdebase_dep filelight)
-	$(add_kdebase_dep kcalc)
-	$(add_kdebase_dep kcharselect)
-	$(add_kdebase_dep kdf)
-	$(add_kdebase_dep kgpg)
-	$(add_kdebase_dep kremotecontrol)
-	$(add_kdebase_dep ktimer)
-	$(add_kdebase_dep kwallet)
-	$(add_kdebase_dep superkaramba)
-	$(add_kdebase_dep sweeper)
-	cups? ( $(add_kdebase_dep printer-applet) )
-	floppy? ( $(add_kdebase_dep kfloppy) )
-"
diff --git a/kde-base/kdewebdev-meta/kdewebdev-meta-4.7.3.ebuild b/kde-base/kdewebdev-meta/kdewebdev-meta-4.7.3.ebuild
deleted file mode 100644
index eee17906ffa4..000000000000
--- a/kde-base/kdewebdev-meta/kdewebdev-meta-4.7.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev-meta/kdewebdev-meta-4.7.3.ebuild,v 1.3 2011/12/07 22:13:52 hwoarang Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="KDE WebDev - merge this to pull in all kdewebdev-derived packages"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	$(add_kdebase_dep kfilereplace)
-	$(add_kdebase_dep kimagemapeditor)
-	$(add_kdebase_dep klinkstatus)
-	$(add_kdebase_dep kommander)
-"
diff --git a/kde-base/kdf/Manifest b/kde-base/kdf/Manifest
index f961b744c25e..0b02373ba0f9 100644
--- a/kde-base/kdf/Manifest
+++ b/kde-base/kdf/Manifest
@@ -1,3 +1,2 @@
 DIST kdeutils-4.6.3.tar.bz2 3703326 RMD160 1fe6287fed3fa21eef902ee764425171f7345e6c SHA1 1aa735c03689ef49b949278ee31d0d8e8536b7d6 SHA256 d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
-DIST kdeutils-4.7.3.tar.bz2 3802391 RMD160 0e0a73d290baaa289665b49722f04f19ab517dd9 SHA1 23fc9823647152d5d8cc250a55402c8930db4059 SHA256 a8c802f32b9e918d806a4487c25485f86019e4c473f0de6d3086d8ea8e492839
 DIST kdeutils-4.7.4.tar.bz2 3802873 RMD160 24c3af30a407523bdf853059fc38bfbf6e6d4604 SHA1 4630f01f36558eb5494fc562086fbd4e488e411e SHA256 bb50a5069808a0280eff671b2f9c0053f5bbbfdc432760bc35ccf654de833c68
diff --git a/kde-base/kdf/kdf-4.7.3.ebuild b/kde-base/kdf/kdf-4.7.3.ebuild
deleted file mode 100644
index f774512d829d..000000000000
--- a/kde-base/kdf/kdf-4.7.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdf/kdf-4.7.3.ebuild,v 1.3 2011/12/07 22:13:56 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeutils"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
-
-DESCRIPTION="KDE free disk space utility"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-src_unpack() {
-	${kde_eclass}_src_unpack
-}
diff --git a/kde-base/kdialog/Manifest b/kde-base/kdialog/Manifest
index d0cd4f15d1e8..7af0c2c0ae27 100644
--- a/kde-base/kdialog/Manifest
+++ b/kde-base/kdialog/Manifest
@@ -1,3 +1,2 @@
-DIST kde-baseapps-4.7.3.tar.bz2 2685074 RMD160 270f3f3ae7b473651517db8818160f16e4faf544 SHA1 952dc26d0d908b41973a8d7b4d27765bf5128d58 SHA256 e9fb0c5da9e9a255c1a1735dfa518dcadc1ea23c68a467164597ff3dbf51c8df
 DIST kde-baseapps-4.7.4.tar.bz2 2684721 RMD160 cedc577cb3449e36b7e7dab1192688c8014c46d1 SHA1 ad4b6d8479bcf8be49b5f53ee8fdcc1b3d1106d6 SHA256 0a59e87b0019bb5d80abbc9cb2fc691ec838d43e9b168e7a15b11d40ac1db51c
 DIST kdebase-4.6.3.tar.bz2 2682586 RMD160 38784d7a5a708703f5a22e39dc5f83ef7aecd833 SHA1 69cfba74099cdce27f7f72725288f025979b41f3 SHA256 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
diff --git a/kde-base/kdialog/kdialog-4.7.3.ebuild b/kde-base/kdialog/kdialog-4.7.3.ebuild
deleted file mode 100644
index b62bb68fef35..000000000000
--- a/kde-base/kdialog/kdialog-4.7.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/kdialog-4.7.3.ebuild,v 1.3 2011/12/07 22:13:51 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-baseapps"
-inherit kde4-meta
-
-DESCRIPTION="KDialog can be used to show nice dialog boxes from shell scripts"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kdiamond/Manifest b/kde-base/kdiamond/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/kdiamond/Manifest
+++ b/kde-base/kdiamond/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/kdiamond/kdiamond-4.7.3.ebuild b/kde-base/kdiamond/kdiamond-4.7.3.ebuild
deleted file mode 100644
index 78352a14a0eb..000000000000
--- a/kde-base/kdiamond/kdiamond-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdiamond/kdiamond-4.7.3.ebuild,v 1.3 2011/12/07 22:14:03 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: KDiamond is a three-in-a-row game."
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/kdm/kdm-4.7.3-r1.ebuild b/kde-base/kdm/kdm-4.7.3-r1.ebuild
deleted file mode 100644
index 62dbd5e5f40d..000000000000
--- a/kde-base/kdm/kdm-4.7.3-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.7.3-r1.ebuild,v 1.3 2011/12/07 22:13:57 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-inherit kde4-meta flag-o-matic
-
-DESCRIPTION="KDE login manager, similar to xdm and gdm"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="+consolekit debug kerberos pam"
-
-DEPEND="
-	$(add_kdebase_dep libkworkspace)
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXtst
-	consolekit? (
-		>=sys-apps/dbus-1.0.2
-		sys-auth/consolekit
-	)
-	kerberos? ( virtual/krb5 )
-	pam? (
-		$(add_kdebase_dep kcheckpass)
-		virtual/pam
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdepasswd)
-	>=x11-apps/xinit-1.0.5-r2
-	x11-apps/xmessage
-"
-
-KMEXTRA="
-	libs/kdm/
-"
-
-PATCHES=(
-	"${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
-	"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
-	"${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch"
-)
-
-pkg_setup() {
-	kde4-meta_pkg_setup
-
-	# Create kdm:kdm user
-	KDM_HOME=/var/lib/kdm
-	enewgroup kdm
-	enewuser kdm -1 -1 "${KDM_HOME}" kdm
-}
-
-src_configure() {
-	# genkdmconf breaks with -O3
-	# last checked in 4.2.95
-	replace-flags -O3 -O2
-
-	mycmakeargs=(
-		$(cmake-utils_use kerberos KDE4_KRB5AUTH)
-		$(cmake-utils_use_with pam)
-		$(cmake-utils_use_with consolekit CkConnector)
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	export GENKDMCONF_FLAGS="--no-old --no-backup"
-
-	kde4-meta_src_install
-
-	# an equivalent file is already installed by kde-base/startkde, bug 377151
-	rm "${ED}/usr/share/apps/kdm/sessions/kde-plasma.desktop" || die
-
-	# Customize the kdmrc configuration:
-	# - SessionDirs set to /usr/share/xsessions
-	# - increase server timeout to 30s
-	# - TerminateServer=true to workaround X server regen bug, bug 278473
-	# - DataDir set to /var/lib/kdm
-	# - FaceDir set to /var/lib/kdm/faces
-	sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions,${EPREFIX}/usr/share/xsessions|" \
-		-e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \
-		-e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \
-		-e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \
-		-e "s|^.*FaceDir=.*$|#&\nFaceDir=${EPREFIX}${KDM_HOME}/faces|" \
-		-i "${ED}"/usr/share/config/kdm/kdmrc \
-		|| die "Failed to set ServerTimeout and SessionsDirs correctly in kdmrc."
-
-	# Don't install empty dir
-	rmdir "${ED}"/usr/share/config/kdm/sessions
-
-	# Set up permissions to kdm work directory
-	keepdir "${KDM_HOME}"
-	fowners root:kdm "${KDM_HOME}"
-	fperms 1770 "${KDM_HOME}"
-
-	# install logrotate file
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/kdm-logrotate kdm
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	local file src dest dir old_dirs=(
-		/var/lib/kdm-live
-		/var/lib/kdm-4.6
-		/var/lib/kdm-4.5
-		/var/lib/kdm-4.4
-		/usr/share/apps/kdm
-		/usr/kde/4.4/share/apps/kdm
-		/usr/kde/4.3/share/apps/kdm
-		/usr/kde/4.2/share/apps/kdm
-	)
-
-	mkdir -p "${EROOT}${KDM_HOME}/faces"
-	# Set the default kdm face icon if it's not already set by the system admin
-	# because this is user-overrideable in that way, it's not in src_install
-	for file in faces/.default.face.icon:default1.png faces/root.face.icon:root1.png kdmsts: ; do
-		src=${file#*:}
-		dest=${file%:*}
-		if [[ ! -e ${EROOT}${KDM_HOME}/$dest ]]; then
-			for dir in "${old_dirs[@]}"; do
-				if [[ -e ${EROOT}${dir}/${dest} ]]; then
-					cp "${EROOT}${dir}/${dest}" "${EROOT}${KDM_HOME}/${dest}"
-					break 2
-				fi
-			done
-			if [[ -n ${src} ]]; then
-				cp "${EROOT}/usr/share/apps/kdm/pics/users/${src}" \
-					"${EROOT}${KDM_HOME}/${dest}"
-			fi
-		fi
-	done
-	for dir in "${old_dirs[@]}"; do
-		if [[ ${dir} != /usr/* && -d ${EROOT}${dir} ]]; then
-			echo
-			elog "The directory ${EROOT%/}${dir} still exists from an older installation of KDE."
-			elog "You may wish to copy relevant settings into ${EROOT%/}${KDM_HOME}."
-			echo
-			elog "After doing so, you may delete the directory."
-			echo
-		fi
-	done
-
-	# Make sure permissions are correct -- old installations may have
-	# gotten this wrong
-	use prefix || chown root:kdm "${EROOT}${KDM_HOME}"
-	chmod 1770 "${EROOT}${KDM_HOME}"
-
-	if use consolekit; then
-		echo
-		elog "You have compiled 'kdm' with consolekit support. If you want to use kdm,"
-		elog "make sure consolekit daemon is running and started at login time"
-		elog
-		elog "rc-update add consolekit default && /etc/init.d/consolekit start"
-		echo
-	fi
-}
diff --git a/kde-base/kdnssd/Manifest b/kde-base/kdnssd/Manifest
index 26b47ed33f66..e6f64a45cee7 100644
--- a/kde-base/kdnssd/Manifest
+++ b/kde-base/kdnssd/Manifest
@@ -1,3 +1,2 @@
 DIST kdenetwork-4.6.3.tar.bz2 8693954 RMD160 a70c031107dd56eda618b91482b814e14425cb1d SHA1 6f140dca442be815eda4fb79d51efd9e4588a1f1 SHA256 423424f2bbc18cb6a0bd52305a238a5b7d4b5f483f30c0590f975b0c229be1fb
-DIST kdenetwork-4.7.3.tar.bz2 9947763 RMD160 8d1cdce1dfd5fa4aae6ecb2d55b189e0bcd94981 SHA1 5d8ed6a478d9afdaf19d350f1d2fe7e9dd48b2f7 SHA256 5a5e7bfa7998e38f80667473c590ab11dde8f3dd6a81a5d9e61ca3940354efa4
 DIST kdenetwork-4.7.4.tar.bz2 9966358 RMD160 6974ef88e22a41d2a6f412c0efcf1af1290a77fa SHA1 15d5bdcda0e05de6247b22b96c6ca4a98da8a278 SHA256 6521b32bd35f2f86f87e50251eff953d48a9238593301ae9b7b6f05da85f987f
diff --git a/kde-base/kdnssd/kdnssd-4.7.3.ebuild b/kde-base/kdnssd/kdnssd-4.7.3.ebuild
deleted file mode 100644
index ba9efeb54fb9..000000000000
--- a/kde-base/kdnssd/kdnssd-4.7.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdnssd/kdnssd-4.7.3.ebuild,v 1.3 2011/12/07 22:13:33 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdenetwork"
-inherit kde4-meta
-
-DESCRIPTION="A DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug zeroconf"
-
-DEPEND="
-	zeroconf? ( $(add_kdebase_dep kdelibs zeroconf) )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(-DWITH_Xmms=OFF -DWITH_DNSSD=ON)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kdontchangethehostname/Manifest b/kde-base/kdontchangethehostname/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/kdontchangethehostname/Manifest
+++ b/kde-base/kdontchangethehostname/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/kdontchangethehostname/kdontchangethehostname-4.7.3.ebuild b/kde-base/kdontchangethehostname/kdontchangethehostname-4.7.3.ebuild
deleted file mode 100644
index 3ac85ef8ec0f..000000000000
--- a/kde-base/kdontchangethehostname/kdontchangethehostname-4.7.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdontchangethehostname/kdontchangethehostname-4.7.3.ebuild,v 1.3 2011/12/07 22:13:52 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="Tool to inform KDE about a change in hostname"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	x11-apps/xauth
-"
diff --git a/kde-base/keditbookmarks/Manifest b/kde-base/keditbookmarks/Manifest
index d0cd4f15d1e8..7af0c2c0ae27 100644
--- a/kde-base/keditbookmarks/Manifest
+++ b/kde-base/keditbookmarks/Manifest
@@ -1,3 +1,2 @@
-DIST kde-baseapps-4.7.3.tar.bz2 2685074 RMD160 270f3f3ae7b473651517db8818160f16e4faf544 SHA1 952dc26d0d908b41973a8d7b4d27765bf5128d58 SHA256 e9fb0c5da9e9a255c1a1735dfa518dcadc1ea23c68a467164597ff3dbf51c8df
 DIST kde-baseapps-4.7.4.tar.bz2 2684721 RMD160 cedc577cb3449e36b7e7dab1192688c8014c46d1 SHA1 ad4b6d8479bcf8be49b5f53ee8fdcc1b3d1106d6 SHA256 0a59e87b0019bb5d80abbc9cb2fc691ec838d43e9b168e7a15b11d40ac1db51c
 DIST kdebase-4.6.3.tar.bz2 2682586 RMD160 38784d7a5a708703f5a22e39dc5f83ef7aecd833 SHA1 69cfba74099cdce27f7f72725288f025979b41f3 SHA256 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
diff --git a/kde-base/keditbookmarks/keditbookmarks-4.7.3.ebuild b/kde-base/keditbookmarks/keditbookmarks-4.7.3.ebuild
deleted file mode 100644
index de531f6c985d..000000000000
--- a/kde-base/keditbookmarks/keditbookmarks-4.7.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/keditbookmarks/keditbookmarks-4.7.3.ebuild,v 1.4 2011/12/07 22:13:31 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-baseapps"
-inherit kde4-meta
-
-DESCRIPTION="KDE's bookmarks editor"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkonq)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	lib/konq/
-"
-
-RESTRICT="test"
-# bug 392703
diff --git a/kde-base/keditfiletype/Manifest b/kde-base/keditfiletype/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/keditfiletype/Manifest
+++ b/kde-base/keditfiletype/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/keditfiletype/keditfiletype-4.7.3.ebuild b/kde-base/keditfiletype/keditfiletype-4.7.3.ebuild
deleted file mode 100644
index 3f0137847bab..000000000000
--- a/kde-base/keditfiletype/keditfiletype-4.7.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/keditfiletype/keditfiletype-4.7.3.ebuild,v 1.3 2011/12/07 22:13:31 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE mime/file type assocciation editor"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-# test fails, last checked for 4.2.89
-RESTRICT=test
diff --git a/kde-base/kephal/Manifest b/kde-base/kephal/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/kephal/Manifest
+++ b/kde-base/kephal/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/kephal/kephal-4.7.3.ebuild b/kde-base/kephal/kephal-4.7.3.ebuild
deleted file mode 100644
index 84e5bd7cb692..000000000000
--- a/kde-base/kephal/kephal-4.7.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kephal/kephal-4.7.3.ebuild,v 1.3 2011/12/07 22:13:59 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-KMMODULE="libs/kephal"
-inherit kde4-meta
-
-DESCRIPTION="Allows handling of multihead systems via the XRandR extension"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-"
-DEPEND="${RDEPEND}
-	x11-proto/randrproto
-"
diff --git a/kde-base/kfile/Manifest b/kde-base/kfile/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/kfile/Manifest
+++ b/kde-base/kfile/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/kfile/kfile-4.7.3.ebuild b/kde-base/kfile/kfile-4.7.3.ebuild
deleted file mode 100644
index a0f2a86aa773..000000000000
--- a/kde-base/kfile/kfile-4.7.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfile/kfile-4.7.3.ebuild,v 1.3 2011/12/07 22:13:46 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="A commandline frontend to KFileMetaInfo"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kfilereplace/Manifest b/kde-base/kfilereplace/Manifest
index 18ca9e53fb68..2977272934ff 100644
--- a/kde-base/kfilereplace/Manifest
+++ b/kde-base/kfilereplace/Manifest
@@ -1,3 +1,2 @@
 DIST kdewebdev-4.6.3.tar.bz2 2202203 RMD160 21bd54a6f202ebfd5d829375791c21e0fc80f2dc SHA1 39e72fbaf76ee1c685321c8c3a767c38e63bc2a9 SHA256 f47957e1e05171c7a04668b29791049c0de1f330247fb2e4f3cc4db95695ffe6
-DIST kdewebdev-4.7.3.tar.bz2 2718880 RMD160 a95a945d7ae2d09dbe009bb573322eeffabcaaf6 SHA1 11108698887d376d00f02cbdfa1496aa3cb268c1 SHA256 20f5c5e7227c00cdf1723b2b48d92c791c6bd06e051e4789c4b9528e71f2ee37
 DIST kdewebdev-4.7.4.tar.bz2 2718520 RMD160 21e21a172ca3ddd7ba7e52ddb8d298a75ef45600 SHA1 1e37e877d4f5ec8f6dcd05e828b4a8f0fd743d2c SHA256 4c62459e87a1b93c13e7263ac6fb2dd6922f0dbabc79b95d8572649b801417db
diff --git a/kde-base/kfilereplace/kfilereplace-4.7.3.ebuild b/kde-base/kfilereplace/kfilereplace-4.7.3.ebuild
deleted file mode 100644
index 01d0786fa173..000000000000
--- a/kde-base/kfilereplace/kfilereplace-4.7.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/kfilereplace-4.7.3.ebuild,v 1.3 2011/12/07 22:13:43 hwoarang Exp $
-
-EAPI=4
-KDE_HANDBOOK="optional"
-KMNAME="kdewebdev"
-inherit kde4-meta
-
-DESCRIPTION="KDE web development - powerful search and replace in multiple files"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kfind/Manifest b/kde-base/kfind/Manifest
index d0cd4f15d1e8..7af0c2c0ae27 100644
--- a/kde-base/kfind/Manifest
+++ b/kde-base/kfind/Manifest
@@ -1,3 +1,2 @@
-DIST kde-baseapps-4.7.3.tar.bz2 2685074 RMD160 270f3f3ae7b473651517db8818160f16e4faf544 SHA1 952dc26d0d908b41973a8d7b4d27765bf5128d58 SHA256 e9fb0c5da9e9a255c1a1735dfa518dcadc1ea23c68a467164597ff3dbf51c8df
 DIST kde-baseapps-4.7.4.tar.bz2 2684721 RMD160 cedc577cb3449e36b7e7dab1192688c8014c46d1 SHA1 ad4b6d8479bcf8be49b5f53ee8fdcc1b3d1106d6 SHA256 0a59e87b0019bb5d80abbc9cb2fc691ec838d43e9b168e7a15b11d40ac1db51c
 DIST kdebase-4.6.3.tar.bz2 2682586 RMD160 38784d7a5a708703f5a22e39dc5f83ef7aecd833 SHA1 69cfba74099cdce27f7f72725288f025979b41f3 SHA256 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
diff --git a/kde-base/kfind/kfind-4.7.3.ebuild b/kde-base/kfind/kfind-4.7.3.ebuild
deleted file mode 100644
index 365d46236764..000000000000
--- a/kde-base/kfind/kfind-4.7.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/kfind-4.7.3.ebuild,v 1.3 2011/12/07 22:13:55 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-baseapps"
-inherit kde4-meta
-
-DESCRIPTION="KDE file finder utility"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkonq)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kfloppy/Manifest b/kde-base/kfloppy/Manifest
index f961b744c25e..0b02373ba0f9 100644
--- a/kde-base/kfloppy/Manifest
+++ b/kde-base/kfloppy/Manifest
@@ -1,3 +1,2 @@
 DIST kdeutils-4.6.3.tar.bz2 3703326 RMD160 1fe6287fed3fa21eef902ee764425171f7345e6c SHA1 1aa735c03689ef49b949278ee31d0d8e8536b7d6 SHA256 d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
-DIST kdeutils-4.7.3.tar.bz2 3802391 RMD160 0e0a73d290baaa289665b49722f04f19ab517dd9 SHA1 23fc9823647152d5d8cc250a55402c8930db4059 SHA256 a8c802f32b9e918d806a4487c25485f86019e4c473f0de6d3086d8ea8e492839
 DIST kdeutils-4.7.4.tar.bz2 3802873 RMD160 24c3af30a407523bdf853059fc38bfbf6e6d4604 SHA1 4630f01f36558eb5494fc562086fbd4e488e411e SHA256 bb50a5069808a0280eff671b2f9c0053f5bbbfdc432760bc35ccf654de833c68
diff --git a/kde-base/kfloppy/kfloppy-4.7.3.ebuild b/kde-base/kfloppy/kfloppy-4.7.3.ebuild
deleted file mode 100644
index df5aaaebe0e5..000000000000
--- a/kde-base/kfloppy/kfloppy-4.7.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfloppy/kfloppy-4.7.3.ebuild,v 1.3 2011/12/07 22:13:57 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeutils"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
-
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kfmclient/Manifest b/kde-base/kfmclient/Manifest
index d0cd4f15d1e8..7af0c2c0ae27 100644
--- a/kde-base/kfmclient/Manifest
+++ b/kde-base/kfmclient/Manifest
@@ -1,3 +1,2 @@
-DIST kde-baseapps-4.7.3.tar.bz2 2685074 RMD160 270f3f3ae7b473651517db8818160f16e4faf544 SHA1 952dc26d0d908b41973a8d7b4d27765bf5128d58 SHA256 e9fb0c5da9e9a255c1a1735dfa518dcadc1ea23c68a467164597ff3dbf51c8df
 DIST kde-baseapps-4.7.4.tar.bz2 2684721 RMD160 cedc577cb3449e36b7e7dab1192688c8014c46d1 SHA1 ad4b6d8479bcf8be49b5f53ee8fdcc1b3d1106d6 SHA256 0a59e87b0019bb5d80abbc9cb2fc691ec838d43e9b168e7a15b11d40ac1db51c
 DIST kdebase-4.6.3.tar.bz2 2682586 RMD160 38784d7a5a708703f5a22e39dc5f83ef7aecd833 SHA1 69cfba74099cdce27f7f72725288f025979b41f3 SHA256 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
diff --git a/kde-base/kfmclient/kfmclient-4.7.3.ebuild b/kde-base/kfmclient/kfmclient-4.7.3.ebuild
deleted file mode 100644
index 7d22a6301263..000000000000
--- a/kde-base/kfmclient/kfmclient-4.7.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfmclient/kfmclient-4.7.3.ebuild,v 1.3 2011/12/07 22:13:32 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-baseapps"
-KMMODULE="konqueror/client"
-inherit kde4-meta
-
-DESCRIPTION="KDE tool for opening URLs from the command line"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-KMEXTRACTONLY="
-	konqueror/kfmclient.desktop
-	konqueror/kfmclient_dir.desktop
-	konqueror/kfmclient_html.desktop
-	konqueror/kfmclient_war.desktop
-	konqueror/src/org.kde.Konqueror.Main.xml
-	konqueror/src/org.kde.Konqueror.MainWindow.xml
-"
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	# Do not install non-kfmclient *.desktop files
-	sed -e "/konqbrowser\.desktop/d" \
-		-e "/konqueror\.desktop/s/^/#DONOTWANT/" \
-		-e "/install(FILES profile/s/^/#DONOTWANT/" \
-		-i konqueror/CMakeLists.txt \
-		|| die "Failed to omit .desktop files"
-}
diff --git a/kde-base/kfourinline/Manifest b/kde-base/kfourinline/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/kfourinline/Manifest
+++ b/kde-base/kfourinline/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/kfourinline/kfourinline-4.7.3.ebuild b/kde-base/kfourinline/kfourinline-4.7.3.ebuild
deleted file mode 100644
index 2ecc898fb821..000000000000
--- a/kde-base/kfourinline/kfourinline-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfourinline/kfourinline-4.7.3.ebuild,v 1.3 2011/12/07 22:13:32 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE four-in-a-row game."
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kgamma/Manifest b/kde-base/kgamma/Manifest
index 533df6f8970e..350b2eb3b57e 100644
--- a/kde-base/kgamma/Manifest
+++ b/kde-base/kgamma/Manifest
@@ -1,3 +1,2 @@
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
-DIST kgamma-4.7.3.tar.bz2 28365 RMD160 9af87dc8bd015db157ee006111df50c8714b2135 SHA1 d97511574120614ffb85308888c23eb2d3ba1b01 SHA256 5e752fc413fe54b4be59ee580bab01c6005cc861c6962b8a343863d757a7e94f
 DIST kgamma-4.7.4.tar.bz2 28373 RMD160 ccaeccf9d82e16842644f902915261acfddd57fb SHA1 cd528839b6a9be997ed8d4a2fc87a8b5b8e8de91 SHA256 09a2b3f5f40f2d1041b5befb2ea724c05410bac2c9625aba2d27020ec82a7317
diff --git a/kde-base/kgamma/kgamma-4.7.3.ebuild b/kde-base/kgamma/kgamma-4.7.3.ebuild
deleted file mode 100644
index ef31d1132239..000000000000
--- a/kde-base/kgamma/kgamma-4.7.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgamma/kgamma-4.7.3.ebuild,v 1.3 2011/12/07 22:13:55 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-
-inherit kde4-base
-
-DESCRIPTION="KDE screen gamma values kcontrol module"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	x11-libs/libXxf86vm
-"
-DEPEND="${RDEPEND}
-	x11-proto/xf86vidmodeproto
-"
diff --git a/kde-base/kgeography/Manifest b/kde-base/kgeography/Manifest
index 08b3a951f84a..b2d0f7b79590 100644
--- a/kde-base/kgeography/Manifest
+++ b/kde-base/kgeography/Manifest
@@ -1,3 +1,2 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
-DIST kgeography-4.7.3.tar.bz2 6938003 RMD160 82ceafa67d6c772603bd35bc81a4b39779dacea6 SHA1 5f9835994ec6ad9454f7ee19bf003c8457e11d9e SHA256 ce7c30e3fd6ce00b4c3786ed5afa0574fc7a1e4b531c1cf7943bfff70440ed7c
 DIST kgeography-4.7.4.tar.bz2 6937478 RMD160 dbc3babae378e0b656e97f2b372d83c48b44ba18 SHA1 4a90c59928a4947c5cd970ed72e5e9cea370d8e6 SHA256 0c3b3c36fd0727ef43cb3a2684ff2d35d9bd62a9da954aeab133ad8f3efe89a8
diff --git a/kde-base/kgeography/kgeography-4.7.3.ebuild b/kde-base/kgeography/kgeography-4.7.3.ebuild
deleted file mode 100644
index 71065400cc28..000000000000
--- a/kde-base/kgeography/kgeography-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgeography/kgeography-4.7.3.ebuild,v 1.3 2011/12/07 22:13:52 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE: a geography learning tool"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kget/Manifest b/kde-base/kget/Manifest
index 26b47ed33f66..e6f64a45cee7 100644
--- a/kde-base/kget/Manifest
+++ b/kde-base/kget/Manifest
@@ -1,3 +1,2 @@
 DIST kdenetwork-4.6.3.tar.bz2 8693954 RMD160 a70c031107dd56eda618b91482b814e14425cb1d SHA1 6f140dca442be815eda4fb79d51efd9e4588a1f1 SHA256 423424f2bbc18cb6a0bd52305a238a5b7d4b5f483f30c0590f975b0c229be1fb
-DIST kdenetwork-4.7.3.tar.bz2 9947763 RMD160 8d1cdce1dfd5fa4aae6ecb2d55b189e0bcd94981 SHA1 5d8ed6a478d9afdaf19d350f1d2fe7e9dd48b2f7 SHA256 5a5e7bfa7998e38f80667473c590ab11dde8f3dd6a81a5d9e61ca3940354efa4
 DIST kdenetwork-4.7.4.tar.bz2 9966358 RMD160 6974ef88e22a41d2a6f412c0efcf1af1290a77fa SHA1 15d5bdcda0e05de6247b22b96c6ca4a98da8a278 SHA256 6521b32bd35f2f86f87e50251eff953d48a9238593301ae9b7b6f05da85f987f
diff --git a/kde-base/kget/kget-4.7.3.ebuild b/kde-base/kget/kget-4.7.3.ebuild
deleted file mode 100644
index e222db4c34d2..000000000000
--- a/kde-base/kget/kget-4.7.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/kget-4.7.3.ebuild,v 1.3 2011/12/07 22:13:50 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdenetwork"
-inherit kde4-meta
-
-DESCRIPTION="An advanced download manager for KDE"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug bittorrent mms semantic-desktop sqlite webkit"
-
-RDEPEND="
-	app-crypt/qca:2
-	$(add_kdebase_dep kdelibs 'semantic-desktop=')
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep libkonq)
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep solid)
-	bittorrent? ( >=net-libs/libktorrent-1.0.3 )
-	mms? ( media-libs/libmms )
-	sqlite? ( dev-db/sqlite:3 )
-	webkit? ( >=kde-misc/kwebkitpart-0.9.6 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with bittorrent KTorrent)
-		$(cmake-utils_use_with mms LibMms)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with sqlite)
-		$(cmake-utils_use_with webkit KWebKitPart)
-	)
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kglobalaccel/Manifest b/kde-base/kglobalaccel/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/kglobalaccel/Manifest
+++ b/kde-base/kglobalaccel/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/kglobalaccel/kglobalaccel-4.7.3.ebuild b/kde-base/kglobalaccel/kglobalaccel-4.7.3.ebuild
deleted file mode 100644
index a097a4e02d92..000000000000
--- a/kde-base/kglobalaccel/kglobalaccel-4.7.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kglobalaccel/kglobalaccel-4.7.3.ebuild,v 1.3 2011/12/07 22:13:43 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE's Global Shortcut Daemon"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-src_configure() {
-	mycmakeargs=(
-		-DKDEBASE_KGLOBALACCEL_REMOVE_OBSOLETE_KDED_DESKTOP_FILE=NOTFOUND
-		-DKDEBASE_KGLOBALACCEL_REMOVE_OBSOLETE_KDED_PLUGIN=NOTFOUND
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kgoldrunner/Manifest b/kde-base/kgoldrunner/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/kgoldrunner/Manifest
+++ b/kde-base/kgoldrunner/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/kgoldrunner/kgoldrunner-4.7.3.ebuild b/kde-base/kgoldrunner/kgoldrunner-4.7.3.ebuild
deleted file mode 100644
index fdf806394896..000000000000
--- a/kde-base/kgoldrunner/kgoldrunner-4.7.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/kgoldrunner-4.7.3.ebuild,v 1.3 2011/12/07 22:13:41 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: KGoldrunner is a game of action and puzzle solving"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	media-libs/libsndfile
-	media-libs/openal
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kgpg/Manifest b/kde-base/kgpg/Manifest
index f961b744c25e..0b02373ba0f9 100644
--- a/kde-base/kgpg/Manifest
+++ b/kde-base/kgpg/Manifest
@@ -1,3 +1,2 @@
 DIST kdeutils-4.6.3.tar.bz2 3703326 RMD160 1fe6287fed3fa21eef902ee764425171f7345e6c SHA1 1aa735c03689ef49b949278ee31d0d8e8536b7d6 SHA256 d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
-DIST kdeutils-4.7.3.tar.bz2 3802391 RMD160 0e0a73d290baaa289665b49722f04f19ab517dd9 SHA1 23fc9823647152d5d8cc250a55402c8930db4059 SHA256 a8c802f32b9e918d806a4487c25485f86019e4c473f0de6d3086d8ea8e492839
 DIST kdeutils-4.7.4.tar.bz2 3802873 RMD160 24c3af30a407523bdf853059fc38bfbf6e6d4604 SHA1 4630f01f36558eb5494fc562086fbd4e488e411e SHA256 bb50a5069808a0280eff671b2f9c0053f5bbbfdc432760bc35ccf654de833c68
diff --git a/kde-base/kgpg/kgpg-4.7.3.ebuild b/kde-base/kgpg/kgpg-4.7.3.ebuild
deleted file mode 100644
index 31b7d47d86e2..000000000000
--- a/kde-base/kgpg/kgpg-4.7.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/kgpg-4.7.3.ebuild,v 1.3 2011/12/07 22:13:44 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeutils"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
-
-DESCRIPTION="KDE gpg keyring manager"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}
-	app-crypt/gnupg
-"
-
-pkg_postinst() {
-	${kde_eclass}_pkg_postinst
-
-	if ! has_version app-crypt/dirmngr ; then
-		elog "For improved key search functionality, install app-crypt/dirmngr."
-	fi
-}
diff --git a/kde-base/khangman/Manifest b/kde-base/khangman/Manifest
index 7f07028f3523..2d12ca8f2617 100644
--- a/kde-base/khangman/Manifest
+++ b/kde-base/khangman/Manifest
@@ -1,3 +1,2 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
-DIST khangman-4.7.3.tar.bz2 1122969 RMD160 87b8f74aa59ac76c48c607e025d5f790c52afcd0 SHA1 aef288a20209a4c1bf5d6f48be689c433049ea83 SHA256 be3af7abe8cc96dff242c8a454fd5789f4d0f458477654dc7620c465d1ee0b6b
 DIST khangman-4.7.4.tar.bz2 1122998 RMD160 38ad8656d263670e27bc1cc12152bfa9275e82f2 SHA1 c5999ba4218cb0331b906fbcaafa7f497762221d SHA256 cd7471bc147e1a1799af9acc01734290c87f4653ff26de5fc289af2f0bcbbfae
diff --git a/kde-base/khangman/khangman-4.7.3.ebuild b/kde-base/khangman/khangman-4.7.3.ebuild
deleted file mode 100644
index 4df5516cd5e2..000000000000
--- a/kde-base/khangman/khangman-4.7.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/khangman-4.7.3.ebuild,v 1.3 2011/12/07 22:13:48 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="Classical hangman game for KDE"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkdeedu)
-"
diff --git a/kde-base/khelpcenter/Manifest b/kde-base/khelpcenter/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/khelpcenter/Manifest
+++ b/kde-base/khelpcenter/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/khelpcenter/khelpcenter-4.7.3.ebuild b/kde-base/khelpcenter/khelpcenter-4.7.3.ebuild
deleted file mode 100644
index 23060ebe2abe..000000000000
--- a/kde-base/khelpcenter/khelpcenter-4.7.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/khelpcenter-4.7.3.ebuild,v 1.3 2011/12/07 22:13:34 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="always"
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="The KDE Help Center"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep kdesu)
-	>=www-misc/htdig-3.2.0_beta6-r1
-"
-
-KMEXTRA="
-	doc/documentationnotfound/
-	doc/glossary/
-	doc/onlinehelp/
-"
diff --git a/kde-base/khotkeys/Manifest b/kde-base/khotkeys/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/khotkeys/Manifest
+++ b/kde-base/khotkeys/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/khotkeys/khotkeys-4.7.3.ebuild b/kde-base/khotkeys/khotkeys-4.7.3.ebuild
deleted file mode 100644
index 6d632081dfee..000000000000
--- a/kde-base/khotkeys/khotkeys-4.7.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/khotkeys-4.7.3.ebuild,v 1.3 2011/12/07 22:13:55 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE: hotkey daemon"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkworkspace)
-	x11-libs/libXtst
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	libs/kworkspace/
-"
diff --git a/kde-base/kiconfinder/Manifest b/kde-base/kiconfinder/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/kiconfinder/Manifest
+++ b/kde-base/kiconfinder/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/kiconfinder/kiconfinder-4.7.3.ebuild b/kde-base/kiconfinder/kiconfinder-4.7.3.ebuild
deleted file mode 100644
index 32eaf3c24de1..000000000000
--- a/kde-base/kiconfinder/kiconfinder-4.7.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiconfinder/kiconfinder-4.7.3.ebuild,v 1.3 2011/12/07 22:13:33 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="Finds an icon based on its name"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kig/Manifest b/kde-base/kig/Manifest
index 482b4d15af88..001857b9088e 100644
--- a/kde-base/kig/Manifest
+++ b/kde-base/kig/Manifest
@@ -1,3 +1,2 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
-DIST kig-4.7.3.tar.bz2 1592779 RMD160 c8cdf99788b314ab4f996d0e12c8e13cbded74ce SHA1 5a948b641f380e1cc6cf0f91d795a97029464bbb SHA256 218a5084aa9fce7c32978de173358a0b7ddd28ace8dc04dd40d5580dc676fed4
 DIST kig-4.7.4.tar.bz2 1592509 RMD160 91ca05639b2656b9bb6535be753e9d6838bcb17a SHA1 4c76ef89e6210f2f25e719176db4d8a2b31b6222 SHA256 a096ec85e04798e39cf090618557b4c00da22402d35940434055c52ca4e515e8
diff --git a/kde-base/kig/kig-4.7.3.ebuild b/kde-base/kig/kig-4.7.3.ebuild
deleted file mode 100644
index 49cb4f863e47..000000000000
--- a/kde-base/kig/kig-4.7.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-4.7.3.ebuild,v 1.3 2011/12/07 22:13:44 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE Interactive Geometry tool"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug kig-scripting"
-
-DEPEND="
-	kig-scripting? ( >=dev-libs/boost-1.32 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with kig-scripting BoostPython)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-base/kigo/Manifest b/kde-base/kigo/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/kigo/Manifest
+++ b/kde-base/kigo/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/kigo/kigo-4.7.3.ebuild b/kde-base/kigo/kigo-4.7.3.ebuild
deleted file mode 100644
index c0cb4cbfa67a..000000000000
--- a/kde-base/kigo/kigo-4.7.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kigo/kigo-4.7.3.ebuild,v 1.3 2011/12/07 22:13:58 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit games-ggz kde4-meta
-
-DESCRIPTION="KDE Go game"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	games-board/gnugo
-"
-
-src_install() {
-	kde4-meta_src_install
-	# and also we have to prepare the ggz dir
-	insinto "${GGZ_MODDIR}"
-	newins ${PN}/src/module.dsc ${P}.dsc
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-	games-ggz_pkg_postinst
-}
-
-pkg_postrm() {
-	kde4-meta_pkg_postrm
-	games-ggz_pkg_postrm
-}
diff --git a/kde-base/killbots/Manifest b/kde-base/killbots/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/killbots/Manifest
+++ b/kde-base/killbots/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/killbots/killbots-4.7.3.ebuild b/kde-base/killbots/killbots-4.7.3.ebuild
deleted file mode 100644
index 0f8670864016..000000000000
--- a/kde-base/killbots/killbots-4.7.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/killbots/killbots-4.7.3.ebuild,v 1.3 2011/12/07 22:13:45 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="Kill the bots or they kill you!"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-# Tests hang, last checked in 4.3.3
-RESTRICT="test"
diff --git a/kde-base/kimagemapeditor/Manifest b/kde-base/kimagemapeditor/Manifest
index 18ca9e53fb68..2977272934ff 100644
--- a/kde-base/kimagemapeditor/Manifest
+++ b/kde-base/kimagemapeditor/Manifest
@@ -1,3 +1,2 @@
 DIST kdewebdev-4.6.3.tar.bz2 2202203 RMD160 21bd54a6f202ebfd5d829375791c21e0fc80f2dc SHA1 39e72fbaf76ee1c685321c8c3a767c38e63bc2a9 SHA256 f47957e1e05171c7a04668b29791049c0de1f330247fb2e4f3cc4db95695ffe6
-DIST kdewebdev-4.7.3.tar.bz2 2718880 RMD160 a95a945d7ae2d09dbe009bb573322eeffabcaaf6 SHA1 11108698887d376d00f02cbdfa1496aa3cb268c1 SHA256 20f5c5e7227c00cdf1723b2b48d92c791c6bd06e051e4789c4b9528e71f2ee37
 DIST kdewebdev-4.7.4.tar.bz2 2718520 RMD160 21e21a172ca3ddd7ba7e52ddb8d298a75ef45600 SHA1 1e37e877d4f5ec8f6dcd05e828b4a8f0fd743d2c SHA256 4c62459e87a1b93c13e7263ac6fb2dd6922f0dbabc79b95d8572649b801417db
diff --git a/kde-base/kimagemapeditor/kimagemapeditor-4.7.3.ebuild b/kde-base/kimagemapeditor/kimagemapeditor-4.7.3.ebuild
deleted file mode 100644
index 4512f0fa853f..000000000000
--- a/kde-base/kimagemapeditor/kimagemapeditor-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kimagemapeditor/kimagemapeditor-4.7.3.ebuild,v 1.3 2011/12/07 22:13:58 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdewebdev"
-inherit kde4-meta
-
-DESCRIPTION="KDE web development - image map editor"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kimono/Manifest b/kde-base/kimono/Manifest
index e643d88eb03e..b67a9851b4e2 100644
--- a/kde-base/kimono/Manifest
+++ b/kde-base/kimono/Manifest
@@ -1,2 +1 @@
-DIST kimono-4.7.3.tar.bz2 1005215 RMD160 a245fbff6017f4ef4da71ebd8ca0f599845d3b93 SHA1 d87622d46bce9a5f8b875393ac2292f5a57d5f78 SHA256 f297f97a0efd129311adf9104699a45b343654e371a3f125f6dfcb9033c1bd42
 DIST kimono-4.7.4.tar.bz2 1005274 RMD160 f18567c9711fda5fd30e47abc109927362bffab7 SHA1 8f260e09bffcf74bad18a5168016d0dad5db3656 SHA256 e98a0bb961de3acd727857fa9def7aff6d4855e9f9d7d9a8b1ba74221b646bb1
diff --git a/kde-base/kimono/kimono-4.7.3.ebuild b/kde-base/kimono/kimono-4.7.3.ebuild
deleted file mode 100644
index 2801963b5a36..000000000000
--- a/kde-base/kimono/kimono-4.7.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kimono/kimono-4.7.3.ebuild,v 1.3 2011/12/07 22:13:39 hwoarang Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base mono
-
-DESCRIPTION="C# bindings for KDE"
-KEYWORDS="amd64 x86"
-IUSE="akonadi debug plasma semantic-desktop"
-
-DEPEND="
-	dev-lang/mono
-	$(add_kdebase_dep qyoto 'webkit')
-	$(add_kdebase_dep smokeqt)
-	$(add_kdebase_dep smokekde 'akonadi?,semantic-desktop=')
-	plasma? ( $(add_kdebase_dep smokeqt 'webkit') )
-	semantic-desktop? ( >=dev-libs/soprano-2.6.51[clucene] )
-"
-RDEPEND="${DEPEND}"
-
-# Split from kdebindings-csharp in 4.7
-add_blocker kdebindings-csharp
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	sed -i "/add_subdirectory( examples )/ s:^:#:" plasma/CMakeLists.txt
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with akonadi)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_disable plasma)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-	)
-	kde4-base_src_configure
-}
diff --git a/kde-base/kinfocenter/Manifest b/kde-base/kinfocenter/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/kinfocenter/Manifest
+++ b/kde-base/kinfocenter/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/kinfocenter/kinfocenter-4.7.3.ebuild b/kde-base/kinfocenter/kinfocenter-4.7.3.ebuild
deleted file mode 100644
index f2191efaf6c0..000000000000
--- a/kde-base/kinfocenter/kinfocenter-4.7.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/kinfocenter-4.7.3.ebuild,v 1.3 2011/12/07 22:13:35 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="The KDE Info Center"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug ieee1394"
-
-DEPEND="
-	$(add_kdebase_dep solid)
-	sys-apps/pciutils
-	ieee1394? ( sys-libs/libraw1394 )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-"
-RDEPEND="${DEPEND}
-	sys-apps/usbutils
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with ieee1394 RAW1394)
-		$(cmake-utils_use_with opengl OpenGL)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kioclient/Manifest b/kde-base/kioclient/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/kioclient/Manifest
+++ b/kde-base/kioclient/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/kioclient/kioclient-4.7.3.ebuild b/kde-base/kioclient/kioclient-4.7.3.ebuild
deleted file mode 100644
index 5f2ebb59eafc..000000000000
--- a/kde-base/kioclient/kioclient-4.7.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kioclient/kioclient-4.7.3.ebuild,v 1.3 2011/12/07 22:13:55 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="Command-line tool for network-transparent operations"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kiriki/Manifest b/kde-base/kiriki/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/kiriki/Manifest
+++ b/kde-base/kiriki/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/kiriki/kiriki-4.7.3.ebuild b/kde-base/kiriki/kiriki-4.7.3.ebuild
deleted file mode 100644
index 7cefa7134baf..000000000000
--- a/kde-base/kiriki/kiriki-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiriki/kiriki-4.7.3.ebuild,v 1.3 2011/12/07 22:13:54 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="Kiriki - a gtali clone for KDE4"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kiten/Manifest b/kde-base/kiten/Manifest
index a233d0bde75d..74535dfb5c44 100644
--- a/kde-base/kiten/Manifest
+++ b/kde-base/kiten/Manifest
@@ -1,3 +1,2 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
-DIST kiten-4.7.3.tar.bz2 4021239 RMD160 a6254c969537a7f5aadd2009e0ddbd041a4ddb13 SHA1 5df19802a731b5f7033b43aa9b35e0b20164cd3e SHA256 d01751c73420a6a738e70362acec0643c249ea95b50bb7aba61112cd1dcabe81
 DIST kiten-4.7.4.tar.bz2 4019636 RMD160 7d0dcab778b02f595a10e730009d333e0a906984 SHA1 8ec806306a7b08cb8ca5e567a48417cd2268e501 SHA256 5f152b878fc4d31884f14af49a97c6751fb134823afbc577390fc03472e06c8d
diff --git a/kde-base/kiten/kiten-4.7.3.ebuild b/kde-base/kiten/kiten-4.7.3.ebuild
deleted file mode 100644
index d76a6cd7bab6..000000000000
--- a/kde-base/kiten/kiten-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiten/kiten-4.7.3.ebuild,v 1.3 2011/12/07 22:13:40 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE Japanese dictionary and reference"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kjots/Manifest b/kde-base/kjots/Manifest
index 6a624e13c105..2b0d834b02ae 100644
--- a/kde-base/kjots/Manifest
+++ b/kde-base/kjots/Manifest
@@ -1,3 +1,2 @@
 DIST kdepim-4.4.11.1.tar.bz2 8964708 RMD160 51394b9dcb3aecc4f108e87de37c21e3af820ee1 SHA1 49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf
-DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
 DIST kdepim-4.7.4.tar.bz2 16182345 RMD160 a36035cce2e25bc0cbddb50e4c9d5fdd661a2f26 SHA1 233f6c413eeedd4af7cf15106a2af7b8f29977bf SHA256 17a5e185e1199436864400d930f60979265cf0cd775b37a2e7b5a1a267c76868
diff --git a/kde-base/kjots/kjots-4.7.3.ebuild b/kde-base/kjots/kjots-4.7.3.ebuild
deleted file mode 100644
index 4614de1e0e13..000000000000
--- a/kde-base/kjots/kjots-4.7.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/kjots-4.7.3.ebuild,v 1.4 2011/12/07 22:14:02 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE note taking utility"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	>=dev-libs/grantlee-0.1
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	akonadi_next/
-"
diff --git a/kde-base/kjumpingcube/Manifest b/kde-base/kjumpingcube/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/kjumpingcube/Manifest
+++ b/kde-base/kjumpingcube/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/kjumpingcube/kjumpingcube-4.7.3.ebuild b/kde-base/kjumpingcube/kjumpingcube-4.7.3.ebuild
deleted file mode 100644
index 3f40a6817421..000000000000
--- a/kde-base/kjumpingcube/kjumpingcube-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/kjumpingcube-4.7.3.ebuild,v 1.3 2011/12/07 22:13:38 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Tactical one or two player game"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kleopatra/Manifest b/kde-base/kleopatra/Manifest
index 2857a61b6949..3461cf1086ca 100644
--- a/kde-base/kleopatra/Manifest
+++ b/kde-base/kleopatra/Manifest
@@ -1,4 +1,3 @@
 DIST kdepim-4.4.11.1.tar.bz2 8964708 RMD160 51394b9dcb3aecc4f108e87de37c21e3af820ee1 SHA1 49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf
-DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
 DIST kdepim-4.7.4.tar.bz2 16182345 RMD160 a36035cce2e25bc0cbddb50e4c9d5fdd661a2f26 SHA1 233f6c413eeedd4af7cf15106a2af7b8f29977bf SHA256 17a5e185e1199436864400d930f60979265cf0cd775b37a2e7b5a1a267c76868
 DIST kleopatra-4.4.3-assuan2.patch.bz2 9304 RMD160 fd00c6e28d05b19e89f029338e2e59b81866f415 SHA1 d69d28734c1db16f1af9018ca16de58bf277fa55 SHA256 eee3fb370a0f93bfbfc4c4386e74c026ab8fceba004eac3a1467721e31856c96
diff --git a/kde-base/kleopatra/kleopatra-4.7.3.ebuild b/kde-base/kleopatra/kleopatra-4.7.3.ebuild
deleted file mode 100644
index 39ae782bb478..000000000000
--- a/kde-base/kleopatra/kleopatra-4.7.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/kleopatra-4.7.3.ebuild,v 1.4 2011/12/07 22:13:53 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="Kleopatra - KDE X.509 key manager"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-crypt/gpgme
-	dev-libs/boost
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}
-	app-crypt/gnupg
-"
-
-KMEXTRACTONLY="
-	libkleo/
-"
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA="
-			doc/kwatchgnupg
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-base/klettres/Manifest b/kde-base/klettres/Manifest
index 0064c2964bba..1f0b704d6369 100644
--- a/kde-base/klettres/Manifest
+++ b/kde-base/klettres/Manifest
@@ -1,3 +1,2 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
-DIST klettres-4.7.3.tar.bz2 2788924 RMD160 47863203cd2c910c9d0f81f3b97e78decfc362b9 SHA1 da01b1c71d74f634ace0b6c2fc6e0186a08f9974 SHA256 cb78d8fa0f7f1ebb2edb983e161ae0cf56fbb3e5fc9e547b68d5541ae71d9cc5
 DIST klettres-4.7.4.tar.bz2 2787950 RMD160 f9063bd399870e5220019b690bd4b89690297c6f SHA1 d2450f7aa24fc0118dd20d2e11d61fca68ba5461 SHA256 f21811745921ba85142996514d7ce46093f947c697442f3c63850fcc03819ff1
diff --git a/kde-base/klettres/klettres-4.7.3.ebuild b/kde-base/klettres/klettres-4.7.3.ebuild
deleted file mode 100644
index b1413a8cc55b..000000000000
--- a/kde-base/klettres/klettres-4.7.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/klettres-4.7.3.ebuild,v 1.3 2011/12/07 22:13:53 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE: KLettres helps a very young child or an adult learning "
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep knotify)
-"
diff --git a/kde-base/klickety/Manifest b/kde-base/klickety/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/klickety/Manifest
+++ b/kde-base/klickety/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/klickety/klickety-4.7.3.ebuild b/kde-base/klickety/klickety-4.7.3.ebuild
deleted file mode 100644
index 72a6142d97c0..000000000000
--- a/kde-base/klickety/klickety-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klickety/klickety-4.7.3.ebuild,v 1.3 2011/12/07 22:13:57 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="A KDE game almost the same as ksame, but a bit different."
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/klines/Manifest b/kde-base/klines/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/klines/Manifest
+++ b/kde-base/klines/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/klines/klines-4.7.3.ebuild b/kde-base/klines/klines-4.7.3.ebuild
deleted file mode 100644
index 56b0100268ff..000000000000
--- a/kde-base/klines/klines-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/klines-4.7.3.ebuild,v 1.3 2011/12/07 22:13:49 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Kolor Lines - a little game about balls and how to get rid of them"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/klinkstatus/Manifest b/kde-base/klinkstatus/Manifest
index 18ca9e53fb68..2977272934ff 100644
--- a/kde-base/klinkstatus/Manifest
+++ b/kde-base/klinkstatus/Manifest
@@ -1,3 +1,2 @@
 DIST kdewebdev-4.6.3.tar.bz2 2202203 RMD160 21bd54a6f202ebfd5d829375791c21e0fc80f2dc SHA1 39e72fbaf76ee1c685321c8c3a767c38e63bc2a9 SHA256 f47957e1e05171c7a04668b29791049c0de1f330247fb2e4f3cc4db95695ffe6
-DIST kdewebdev-4.7.3.tar.bz2 2718880 RMD160 a95a945d7ae2d09dbe009bb573322eeffabcaaf6 SHA1 11108698887d376d00f02cbdfa1496aa3cb268c1 SHA256 20f5c5e7227c00cdf1723b2b48d92c791c6bd06e051e4789c4b9528e71f2ee37
 DIST kdewebdev-4.7.4.tar.bz2 2718520 RMD160 21e21a172ca3ddd7ba7e52ddb8d298a75ef45600 SHA1 1e37e877d4f5ec8f6dcd05e828b4a8f0fd743d2c SHA256 4c62459e87a1b93c13e7263ac6fb2dd6922f0dbabc79b95d8572649b801417db
diff --git a/kde-base/klinkstatus/klinkstatus-4.7.3.ebuild b/kde-base/klinkstatus/klinkstatus-4.7.3.ebuild
deleted file mode 100644
index 3e75c41787a3..000000000000
--- a/kde-base/klinkstatus/klinkstatus-4.7.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-4.7.3.ebuild,v 1.3 2011/12/07 22:13:44 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdewebdev"
-inherit kde4-meta
-
-DESCRIPTION="KDE web development - link validity checker"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug tidy"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	tidy? ( app-text/htmltidy )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_KdepimLibs=ON
-		$(cmake-utils_use_with tidy LibTidy)
-	)
-
-	kde4-meta_src_configure
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	echo
-	elog "To use scripting in ${PN}, install dev-lang/ruby."
-	echo
-}
diff --git a/kde-base/klipper/Manifest b/kde-base/klipper/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/klipper/Manifest
+++ b/kde-base/klipper/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/klipper/klipper-4.7.3.ebuild b/kde-base/klipper/klipper-4.7.3.ebuild
deleted file mode 100644
index d19c92b20b1a..000000000000
--- a/kde-base/klipper/klipper-4.7.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/klipper-4.7.3.ebuild,v 1.3 2011/12/07 22:13:51 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="Applet for KDE and X clipboard management"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep libtaskmanager)
-	!aqua? ( x11-libs/libXfixes )
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kmag/Manifest b/kde-base/kmag/Manifest
index 4399b5e0128d..08505cac662b 100644
--- a/kde-base/kmag/Manifest
+++ b/kde-base/kmag/Manifest
@@ -1,3 +1,2 @@
 DIST kdeaccessibility-4.6.3.tar.bz2 5225058 RMD160 29e3f99600e0670233f87837e8df7923877d3de6 SHA1 8d4053defbf839fd428820d6d1659b6e46ab468a SHA256 e3f64e002d98a2b878abb76897b96945ed3c17ff84ed64ef6f7156bd7e3018f8
-DIST kdeaccessibility-4.7.3.tar.bz2 878030 RMD160 48a77ba186233a8b34e79fd1f3f7e15e250ca882 SHA1 9695d2b8b6f55266e3f76ebf05543f23857b9520 SHA256 d4225fcf207b06506972e0d1e405f7521492106e6b7994145ecb8cc3cd9f60d1
 DIST kdeaccessibility-4.7.4.tar.bz2 876933 RMD160 3f4f7b5a71a3d5f2520fca710c65992c6c93830d SHA1 03f4ac8234dcc49eb93eff3630f76e226e290fff SHA256 031251969c0edcbfd93ceffce5665574df7af476e24112fe5af6f9e261d0bb8a
diff --git a/kde-base/kmag/kmag-4.7.3.ebuild b/kde-base/kmag/kmag-4.7.3.ebuild
deleted file mode 100644
index 2da646e01078..000000000000
--- a/kde-base/kmag/kmag-4.7.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/kmag-4.7.3.ebuild,v 1.3 2011/12/07 22:13:57 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeaccessibility"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
-
-DESCRIPTION="KDE screen magnifier"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep kaccessible)
-"
diff --git a/kde-base/kmahjongg/Manifest b/kde-base/kmahjongg/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/kmahjongg/Manifest
+++ b/kde-base/kmahjongg/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/kmahjongg/kmahjongg-4.7.3.ebuild b/kde-base/kmahjongg/kmahjongg-4.7.3.ebuild
deleted file mode 100644
index 380bc00cc803..000000000000
--- a/kde-base/kmahjongg/kmahjongg-4.7.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/kmahjongg-4.7.3.ebuild,v 1.3 2011/12/07 22:13:59 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="Mahjongg for KDE"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkmahjongg)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	libkdegames/
-	libkmahjongg/
-"
diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest
index 6a624e13c105..2b0d834b02ae 100644
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -1,3 +1,2 @@
 DIST kdepim-4.4.11.1.tar.bz2 8964708 RMD160 51394b9dcb3aecc4f108e87de37c21e3af820ee1 SHA1 49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf
-DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
 DIST kdepim-4.7.4.tar.bz2 16182345 RMD160 a36035cce2e25bc0cbddb50e4c9d5fdd661a2f26 SHA1 233f6c413eeedd4af7cf15106a2af7b8f29977bf SHA256 17a5e185e1199436864400d930f60979265cf0cd775b37a2e7b5a1a267c76868
diff --git a/kde-base/kmail/kmail-4.7.3.ebuild b/kde-base/kmail/kmail-4.7.3.ebuild
deleted file mode 100644
index c8f178135adf..000000000000
--- a/kde-base/kmail/kmail-4.7.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.7.3.ebuild,v 1.5 2011/12/07 22:14:00 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-VIRTUALX_REQUIRED=test
-inherit kde4-meta
-
-DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE."
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	$(add_kdebase_dep korganizer)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-# bug 393147
-
-KMEXTRACTONLY="
-	akonadi_next/
-	calendarsupport/
-	korganizer/
-	kresources/
-	libkleo/
-	libkpgp/
-	libkdepimdbusinterfaces/
-	kdgantt2/
-"
-KMCOMPILEONLY="
-	messagecomposer/
-	messagecore/
-	messagelist/
-	messageviewer/
-	templateparser/
-	incidenceeditor-ng/
-	calendarsupport/
-"
-KMEXTRA="
-	kmailcvt/
-	ksendemail/
-	libksieve/
-	mailcommon/
-	ontologies/
-	plugins/messageviewer/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-src_configure() {
-	# Bug 308903
-	use ppc64 && append-flags -mminimal-toc
-
-	kde4-meta_src_configure
-}
-
-src_compile() {
-	kde4-meta_src_compile kmail_xml
-	kde4-meta_src_compile
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
-		echo
-		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
-		echo
-	fi
-	if ! has_version kde-base/kleopatra:${SLOT}; then
-		echo
-		elog "For certificate management and the gnupg log viewer, please install kde-base/kleopatra:${SLOT}"
-		echo
-	fi
-}
diff --git a/kde-base/kmenuedit/Manifest b/kde-base/kmenuedit/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/kmenuedit/Manifest
+++ b/kde-base/kmenuedit/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/kmenuedit/kmenuedit-4.7.3.ebuild b/kde-base/kmenuedit/kmenuedit-4.7.3.ebuild
deleted file mode 100644
index e42356016d59..000000000000
--- a/kde-base/kmenuedit/kmenuedit-4.7.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmenuedit/kmenuedit-4.7.3.ebuild,v 1.3 2011/12/07 22:13:46 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE menu editor"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep khotkeys)
-"
-DEPEND=${RDEPEND}
-
-KMEXTRACTONLY="
-	libs/kworkspace/
-"
-
-src_configure() {
-	sed -i -e \
-		"s:\${CMAKE_CURRENT_BINARY_DIR}/../khotkeys/app/org.kde.khotkeys.xml:${EPREFIX}/usr/share/dbus-1/interfaces/org.kde.khotkeys.xml:g" \
-		kmenuedit/CMakeLists.txt \
-		|| die "sed failed"
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kmimetypefinder/Manifest b/kde-base/kmimetypefinder/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/kmimetypefinder/Manifest
+++ b/kde-base/kmimetypefinder/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/kmimetypefinder/kmimetypefinder-4.7.3.ebuild b/kde-base/kmimetypefinder/kmimetypefinder-4.7.3.ebuild
deleted file mode 100644
index add38352dc20..000000000000
--- a/kde-base/kmimetypefinder/kmimetypefinder-4.7.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmimetypefinder/kmimetypefinder-4.7.3.ebuild,v 1.3 2011/12/07 22:13:47 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE application to report the mimetype for a given file"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kmines/Manifest b/kde-base/kmines/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/kmines/Manifest
+++ b/kde-base/kmines/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/kmines/kmines-4.7.3.ebuild b/kde-base/kmines/kmines-4.7.3.ebuild
deleted file mode 100644
index 9d427e1d9185..000000000000
--- a/kde-base/kmines/kmines-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/kmines-4.7.3.ebuild,v 1.3 2011/12/07 22:14:00 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KMines is a classic mine sweeper game"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kmix/Manifest b/kde-base/kmix/Manifest
index 76bfebff29d3..5dd228e2a189 100644
--- a/kde-base/kmix/Manifest
+++ b/kde-base/kmix/Manifest
@@ -1,3 +1,2 @@
 DIST kdemultimedia-4.6.3.tar.bz2 1611668 RMD160 8824bda18a1f1051dea366a0ff0d6191068476dd SHA1 d5bde19156b65e9b56e0e6de800efc0efe117632 SHA256 b3a6732dead0558610b4b40d3ce28c4b7b5da8869a63436180eacb3aacec533b
-DIST kdemultimedia-4.7.3.tar.bz2 1644497 RMD160 de9d9f9341d91bf0d56fa9468c0441226cb6aba2 SHA1 4db44494e6a2ef886e3513b6a2eb4e526741a6ff SHA256 ad96332218b82c4466debcb165061d87051a917e0321bdc34e4024da9c8c30b1
 DIST kdemultimedia-4.7.4.tar.bz2 1644450 RMD160 c180dfed17735bfef4303802dd8065ed308cdd6a SHA1 e0001afac38e35e3ab7b919d79f74cd57e3c18dd SHA256 c1236ed17f575ff793869e5ade024f892ae36aba27a00edafb3495806fb81b28
diff --git a/kde-base/kmix/kmix-4.7.3.ebuild b/kde-base/kmix/kmix-4.7.3.ebuild
deleted file mode 100644
index 41f47ccdf269..000000000000
--- a/kde-base/kmix/kmix-4.7.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/kmix-4.7.3.ebuild,v 1.3 2011/12/07 22:13:34 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdemultimedia"
-inherit kde4-meta
-
-DESCRIPTION="KDE mixer gui"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="alsa debug pulseaudio"
-
-DEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.14a )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.12 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with pulseaudio PulseAudio)
-		$(cmake-utils_use_with alsa)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kmousetool/Manifest b/kde-base/kmousetool/Manifest
index 4399b5e0128d..08505cac662b 100644
--- a/kde-base/kmousetool/Manifest
+++ b/kde-base/kmousetool/Manifest
@@ -1,3 +1,2 @@
 DIST kdeaccessibility-4.6.3.tar.bz2 5225058 RMD160 29e3f99600e0670233f87837e8df7923877d3de6 SHA1 8d4053defbf839fd428820d6d1659b6e46ab468a SHA256 e3f64e002d98a2b878abb76897b96945ed3c17ff84ed64ef6f7156bd7e3018f8
-DIST kdeaccessibility-4.7.3.tar.bz2 878030 RMD160 48a77ba186233a8b34e79fd1f3f7e15e250ca882 SHA1 9695d2b8b6f55266e3f76ebf05543f23857b9520 SHA256 d4225fcf207b06506972e0d1e405f7521492106e6b7994145ecb8cc3cd9f60d1
 DIST kdeaccessibility-4.7.4.tar.bz2 876933 RMD160 3f4f7b5a71a3d5f2520fca710c65992c6c93830d SHA1 03f4ac8234dcc49eb93eff3630f76e226e290fff SHA256 031251969c0edcbfd93ceffce5665574df7af476e24112fe5af6f9e261d0bb8a
diff --git a/kde-base/kmousetool/kmousetool-4.7.3.ebuild b/kde-base/kmousetool/kmousetool-4.7.3.ebuild
deleted file mode 100644
index 1f8db65f1c83..000000000000
--- a/kde-base/kmousetool/kmousetool-4.7.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/kmousetool-4.7.3.ebuild,v 1.3 2011/12/07 22:13:33 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeaccessibility"
-	kde_eclass="kde4-meta"
-fi
-
-inherit ${kde_eclass}
-
-DESCRIPTION="KDE program that clicks the mouse for you."
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep knotify)
-"
diff --git a/kde-base/kmouth/Manifest b/kde-base/kmouth/Manifest
index 4399b5e0128d..08505cac662b 100644
--- a/kde-base/kmouth/Manifest
+++ b/kde-base/kmouth/Manifest
@@ -1,3 +1,2 @@
 DIST kdeaccessibility-4.6.3.tar.bz2 5225058 RMD160 29e3f99600e0670233f87837e8df7923877d3de6 SHA1 8d4053defbf839fd428820d6d1659b6e46ab468a SHA256 e3f64e002d98a2b878abb76897b96945ed3c17ff84ed64ef6f7156bd7e3018f8
-DIST kdeaccessibility-4.7.3.tar.bz2 878030 RMD160 48a77ba186233a8b34e79fd1f3f7e15e250ca882 SHA1 9695d2b8b6f55266e3f76ebf05543f23857b9520 SHA256 d4225fcf207b06506972e0d1e405f7521492106e6b7994145ecb8cc3cd9f60d1
 DIST kdeaccessibility-4.7.4.tar.bz2 876933 RMD160 3f4f7b5a71a3d5f2520fca710c65992c6c93830d SHA1 03f4ac8234dcc49eb93eff3630f76e226e290fff SHA256 031251969c0edcbfd93ceffce5665574df7af476e24112fe5af6f9e261d0bb8a
diff --git a/kde-base/kmouth/kmouth-4.7.3.ebuild b/kde-base/kmouth/kmouth-4.7.3.ebuild
deleted file mode 100644
index c91dfca25908..000000000000
--- a/kde-base/kmouth/kmouth-4.7.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/kmouth-4.7.3.ebuild,v 1.3 2011/12/07 22:14:02 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeaccessibility"
-	kde_eclass="kde4-meta"
-fi
-
-inherit ${kde_eclass}
-
-DESCRIPTION="KDE application that reads what you type out loud. Doesn't include a speech synthesizer."
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kmplot/Manifest b/kde-base/kmplot/Manifest
index d071872c912b..722a69caf69e 100644
--- a/kde-base/kmplot/Manifest
+++ b/kde-base/kmplot/Manifest
@@ -1,3 +1,2 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
-DIST kmplot-4.7.3.tar.bz2 707516 RMD160 31902de5ac91a76041b0f9adf2efd860cf600280 SHA1 e98ba022e987b9601ea1b27e97607ff7885ff788 SHA256 a843eee79452beb48b336f7157f7bfb2ac4d4f7209f0ca0d86b52c4d2f7ec7b6
 DIST kmplot-4.7.4.tar.bz2 707436 RMD160 87013de56d0ffded522c3db4113aab9b5037b581 SHA1 b0b2b748e4ea0f670ffe5c9be01a6997a061a75c SHA256 39afdb57d1a3564c5c6ddbfe2895601028edf8f3db91e3aa3e1801a0bc7da537
diff --git a/kde-base/kmplot/kmplot-4.7.3.ebuild b/kde-base/kmplot/kmplot-4.7.3.ebuild
deleted file mode 100644
index aa93bf9d0e4f..000000000000
--- a/kde-base/kmplot/kmplot-4.7.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/kmplot-4.7.3.ebuild,v 1.3 2011/12/07 22:13:42 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="Mathematical function plotter for KDE"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep knotify)
-"
diff --git a/kde-base/knetattach/Manifest b/kde-base/knetattach/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/knetattach/Manifest
+++ b/kde-base/knetattach/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/knetattach/knetattach-4.7.3.ebuild b/kde-base/knetattach/knetattach-4.7.3.ebuild
deleted file mode 100644
index 23bac103d48f..000000000000
--- a/kde-base/knetattach/knetattach-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knetattach/knetattach-4.7.3.ebuild,v 1.3 2011/12/07 22:13:38 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE network wizard"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/knetwalk/Manifest b/kde-base/knetwalk/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/knetwalk/Manifest
+++ b/kde-base/knetwalk/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/knetwalk/knetwalk-4.7.3.ebuild b/kde-base/knetwalk/knetwalk-4.7.3.ebuild
deleted file mode 100644
index 5a3b260db4f8..000000000000
--- a/kde-base/knetwalk/knetwalk-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knetwalk/knetwalk-4.7.3.ebuild,v 1.3 2011/12/07 22:13:39 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Knetwalk is the kde version of the popular NetWalk game for system administrators"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/knewstuff/Manifest b/kde-base/knewstuff/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/knewstuff/Manifest
+++ b/kde-base/knewstuff/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/knewstuff/knewstuff-4.7.3.ebuild b/kde-base/knewstuff/knewstuff-4.7.3.ebuild
deleted file mode 100644
index 6cdd418715d8..000000000000
--- a/kde-base/knewstuff/knewstuff-4.7.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knewstuff/knewstuff-4.7.3.ebuild,v 1.3 2011/12/07 22:13:50 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE4 software to download and upload 'new stuff'"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/knode/Manifest b/kde-base/knode/Manifest
index 6a624e13c105..2b0d834b02ae 100644
--- a/kde-base/knode/Manifest
+++ b/kde-base/knode/Manifest
@@ -1,3 +1,2 @@
 DIST kdepim-4.4.11.1.tar.bz2 8964708 RMD160 51394b9dcb3aecc4f108e87de37c21e3af820ee1 SHA1 49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf
-DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
 DIST kdepim-4.7.4.tar.bz2 16182345 RMD160 a36035cce2e25bc0cbddb50e4c9d5fdd661a2f26 SHA1 233f6c413eeedd4af7cf15106a2af7b8f29977bf SHA256 17a5e185e1199436864400d930f60979265cf0cd775b37a2e7b5a1a267c76868
diff --git a/kde-base/knode/files/knode-4.4.10-enablefinal.patch b/kde-base/knode/files/knode-4.4.10-enablefinal.patch
deleted file mode 100644
index 8d140abcaedd..000000000000
--- a/kde-base/knode/files/knode-4.4.10-enablefinal.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdepim-4.4.9/libkdepim/addressesdialog.h.orig	2011-01-02 10:25:59.941000270 +0100
-+++ kdepim-4.4.9/libkdepim/addressesdialog.h	2011-01-02 10:25:59.941000270 +0100
-@@ -37,7 +37,7 @@
- #include <QStringList>
- #include <QTreeWidget>
- 
--class AddressPickerUI : public QWidget, public Ui::AddressPickerUI
-+class AddressPickerUI : public QWidget, public ::Ui::AddressPickerUI
- {
- public:
-   AddressPickerUI( QWidget *parent ) : QWidget( parent ) {
diff --git a/kde-base/knode/knode-4.4.11.1.ebuild b/kde-base/knode/knode-4.4.11.1.ebuild
index 961aa39180c5..9dd897f97780 100644
--- a/kde-base/knode/knode-4.4.11.1.ebuild
+++ b/kde-base/knode/knode-4.4.11.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/kde-base/knode/knode-4.4.11.1.ebuild,v 1.5 2011/06/01 19:41:49 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-4.4.11.1.ebuild,v 1.6 2012/01/17 11:56:06 johu Exp $
 
 EAPI=4
 
@@ -27,8 +27,6 @@ KMEXTRACTONLY="
 
 KMLOADLIBS="libkdepim"
 
-PATCHES=( "${FILESDIR}/${PN}"-4.4.10-enablefinal.patch )
-
 src_unpack() {
 	if use handbook; then
 		KMEXTRA="
diff --git a/kde-base/knode/knode-4.7.3.ebuild b/kde-base/knode/knode-4.7.3.ebuild
deleted file mode 100644
index 12f44e013b2b..000000000000
--- a/kde-base/knode/knode-4.7.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-4.7.3.ebuild,v 1.4 2011/12/07 22:13:53 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="A newsreader for KDE"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-# test fails, last checked for 4.2.96
-RESTRICT=test
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	libkleo/
-	libkpgp/
-	messagecomposer/
-	messageviewer/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA="
-			doc/kioslave/news
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-base/knotes/Manifest b/kde-base/knotes/Manifest
index 6a624e13c105..2b0d834b02ae 100644
--- a/kde-base/knotes/Manifest
+++ b/kde-base/knotes/Manifest
@@ -1,3 +1,2 @@
 DIST kdepim-4.4.11.1.tar.bz2 8964708 RMD160 51394b9dcb3aecc4f108e87de37c21e3af820ee1 SHA1 49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf
-DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
 DIST kdepim-4.7.4.tar.bz2 16182345 RMD160 a36035cce2e25bc0cbddb50e4c9d5fdd661a2f26 SHA1 233f6c413eeedd4af7cf15106a2af7b8f29977bf SHA256 17a5e185e1199436864400d930f60979265cf0cd775b37a2e7b5a1a267c76868
diff --git a/kde-base/knotes/knotes-4.7.3.ebuild b/kde-base/knotes/knotes-4.7.3.ebuild
deleted file mode 100644
index a42b4e96def6..000000000000
--- a/kde-base/knotes/knotes-4.7.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/knotes-4.7.3.ebuild,v 1.4 2011/12/07 22:13:57 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE Notes application"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/knotify/Manifest b/kde-base/knotify/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/knotify/Manifest
+++ b/kde-base/knotify/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/knotify/knotify-4.7.3.ebuild b/kde-base/knotify/knotify-4.7.3.ebuild
deleted file mode 100644
index 14b1fef9cff1..000000000000
--- a/kde-base/knotify/knotify-4.7.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knotify/knotify-4.7.3.ebuild,v 1.3 2011/12/07 22:13:46 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="The KDE notification daemon."
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kolf/Manifest b/kde-base/kolf/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/kolf/Manifest
+++ b/kde-base/kolf/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/kolf/kolf-4.7.3.ebuild b/kde-base/kolf/kolf-4.7.3.ebuild
deleted file mode 100644
index 192ce0d655ee..000000000000
--- a/kde-base/kolf/kolf-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/kolf-4.7.3.ebuild,v 1.3 2011/12/07 22:13:40 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE Minigolf Game"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kollision/Manifest b/kde-base/kollision/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/kollision/Manifest
+++ b/kde-base/kollision/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/kollision/kollision-4.7.3.ebuild b/kde-base/kollision/kollision-4.7.3.ebuild
deleted file mode 100644
index 59be71b8f432..000000000000
--- a/kde-base/kollision/kollision-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kollision/kollision-4.7.3.ebuild,v 1.3 2011/12/07 22:13:36 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: A simple ball dodging game"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kolourpaint/Manifest b/kde-base/kolourpaint/Manifest
index 3c6baed4900e..095b9706c597 100644
--- a/kde-base/kolourpaint/Manifest
+++ b/kde-base/kolourpaint/Manifest
@@ -1,3 +1,2 @@
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
-DIST kolourpaint-4.7.3.tar.bz2 1244126 RMD160 704b0e021e79839e86588ff19b5ec88f3d3bb359 SHA1 d276d230e76f7fbe91229dd015a6465cb1a6956e SHA256 baca905423abbd8baa678ce5bac7a1c2608d36466541a6864931156e136b1cb6
 DIST kolourpaint-4.7.4.tar.bz2 1244063 RMD160 5adfa97972a15c11116ceb5dcf8652fc8b895999 SHA1 31e23ab6735291ec86ebd83e2eee7afa191a4a59 SHA256 dd22cf7554dc3352b8781e17063fbccc611d563f522ea2502cae6c15c480f993
diff --git a/kde-base/kolourpaint/kolourpaint-4.7.3.ebuild b/kde-base/kolourpaint/kolourpaint-4.7.3.ebuild
deleted file mode 100644
index fdd24b293fd1..000000000000
--- a/kde-base/kolourpaint/kolourpaint-4.7.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kolourpaint/kolourpaint-4.7.3.ebuild,v 1.3 2011/12/07 22:13:37 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="Paint Program for KDE"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-LICENSE="BSD LGPL-2"
-IUSE="debug scanner"
-
-DEPEND="media-libs/qimageblitz"
-RDEPEND="${DEPEND}
-	scanner? ( kde-base/ksaneplugin )"
diff --git a/kde-base/kommander/Manifest b/kde-base/kommander/Manifest
index 18ca9e53fb68..2977272934ff 100644
--- a/kde-base/kommander/Manifest
+++ b/kde-base/kommander/Manifest
@@ -1,3 +1,2 @@
 DIST kdewebdev-4.6.3.tar.bz2 2202203 RMD160 21bd54a6f202ebfd5d829375791c21e0fc80f2dc SHA1 39e72fbaf76ee1c685321c8c3a767c38e63bc2a9 SHA256 f47957e1e05171c7a04668b29791049c0de1f330247fb2e4f3cc4db95695ffe6
-DIST kdewebdev-4.7.3.tar.bz2 2718880 RMD160 a95a945d7ae2d09dbe009bb573322eeffabcaaf6 SHA1 11108698887d376d00f02cbdfa1496aa3cb268c1 SHA256 20f5c5e7227c00cdf1723b2b48d92c791c6bd06e051e4789c4b9528e71f2ee37
 DIST kdewebdev-4.7.4.tar.bz2 2718520 RMD160 21e21a172ca3ddd7ba7e52ddb8d298a75ef45600 SHA1 1e37e877d4f5ec8f6dcd05e828b4a8f0fd743d2c SHA256 4c62459e87a1b93c13e7263ac6fb2dd6922f0dbabc79b95d8572649b801417db
diff --git a/kde-base/kommander/kommander-4.7.3.ebuild b/kde-base/kommander/kommander-4.7.3.ebuild
deleted file mode 100644
index 60c2bcc90abd..000000000000
--- a/kde-base/kommander/kommander-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/kommander-4.7.3.ebuild,v 1.3 2011/12/07 22:13:41 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdewebdev"
-inherit kde4-meta
-
-DESCRIPTION="KDE dialog system for scripting"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kompare/Manifest b/kde-base/kompare/Manifest
index 8129826b48d8..2c54c126587e 100644
--- a/kde-base/kompare/Manifest
+++ b/kde-base/kompare/Manifest
@@ -1,3 +1,2 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
-DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
 DIST kdesdk-4.7.4.tar.bz2 5266656 RMD160 9fc17159fd8cbbf9cfe76ed18dfcf8a269d0270e SHA1 3a0f61204653dc3f9f975732b6f67659c60ecaf3 SHA256 a2142ea51e9172e589b0526879061e5c3e4337f6154d89b0491fef9c68e56f6c
diff --git a/kde-base/kompare/kompare-4.7.3.ebuild b/kde-base/kompare/kompare-4.7.3.ebuild
deleted file mode 100644
index 3870c93554b4..000000000000
--- a/kde-base/kompare/kompare-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/kompare-4.7.3.ebuild,v 1.3 2011/12/07 22:14:00 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdesdk"
-inherit kde4-meta
-
-DESCRIPTION="Kompare is a program to view the differences between files."
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/konq-plugins/Manifest b/kde-base/konq-plugins/Manifest
index 4d0057c5292c..2399026f3944 100644
--- a/kde-base/konq-plugins/Manifest
+++ b/kde-base/konq-plugins/Manifest
@@ -1,2 +1 @@
-DIST kde-baseapps-4.7.3.tar.bz2 2685074 RMD160 270f3f3ae7b473651517db8818160f16e4faf544 SHA1 952dc26d0d908b41973a8d7b4d27765bf5128d58 SHA256 e9fb0c5da9e9a255c1a1735dfa518dcadc1ea23c68a467164597ff3dbf51c8df
 DIST kde-baseapps-4.7.4.tar.bz2 2684721 RMD160 cedc577cb3449e36b7e7dab1192688c8014c46d1 SHA1 ad4b6d8479bcf8be49b5f53ee8fdcc1b3d1106d6 SHA256 0a59e87b0019bb5d80abbc9cb2fc691ec838d43e9b168e7a15b11d40ac1db51c
diff --git a/kde-base/konq-plugins/konq-plugins-4.7.3.ebuild b/kde-base/konq-plugins/konq-plugins-4.7.3.ebuild
deleted file mode 100644
index 662b7886722e..000000000000
--- a/kde-base/konq-plugins/konq-plugins-4.7.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/konq-plugins-4.7.3.ebuild,v 1.4 2011/12/07 22:13:43 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-baseapps"
-inherit kde4-meta
-
-DESCRIPTION="Various plugins for konqueror"
-HOMEPAGE="http://kde.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="debug tidy"
-
-DEPEND="
-	$(add_kdebase_dep libkonq)
-	tidy? ( app-text/htmltidy )
-"
-RDEPEND="${DEPEND}
-	!kde-misc/konq-plugins
-	$(add_kdebase_dep kcmshell)
-	$(add_kdebase_dep konqueror)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DKdeWebKit=OFF
-		-DWebKitPart=OFF
-		$(cmake-utils_use_with tidy LibTidy)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/konqueror/Manifest b/kde-base/konqueror/Manifest
index d0cd4f15d1e8..7af0c2c0ae27 100644
--- a/kde-base/konqueror/Manifest
+++ b/kde-base/konqueror/Manifest
@@ -1,3 +1,2 @@
-DIST kde-baseapps-4.7.3.tar.bz2 2685074 RMD160 270f3f3ae7b473651517db8818160f16e4faf544 SHA1 952dc26d0d908b41973a8d7b4d27765bf5128d58 SHA256 e9fb0c5da9e9a255c1a1735dfa518dcadc1ea23c68a467164597ff3dbf51c8df
 DIST kde-baseapps-4.7.4.tar.bz2 2684721 RMD160 cedc577cb3449e36b7e7dab1192688c8014c46d1 SHA1 ad4b6d8479bcf8be49b5f53ee8fdcc1b3d1106d6 SHA256 0a59e87b0019bb5d80abbc9cb2fc691ec838d43e9b168e7a15b11d40ac1db51c
 DIST kdebase-4.6.3.tar.bz2 2682586 RMD160 38784d7a5a708703f5a22e39dc5f83ef7aecd833 SHA1 69cfba74099cdce27f7f72725288f025979b41f3 SHA256 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
diff --git a/kde-base/konqueror/konqueror-4.7.3.ebuild b/kde-base/konqueror/konqueror-4.7.3.ebuild
deleted file mode 100644
index 438ab221ccba..000000000000
--- a/kde-base/konqueror/konqueror-4.7.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-4.7.3.ebuild,v 1.3 2011/12/07 22:13:37 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-baseapps"
-inherit flag-o-matic kde4-meta
-
-DESCRIPTION="KDE: Web browser, file manager, ..."
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+bookmarks debug svg"
-# 4 of 4 tests fail. Last checked for 4.0.3
-RESTRICT="test"
-
-DEPEND="
-	$(add_kdebase_dep libkonq)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kfind)
-	$(add_kdebase_dep kfmclient)
-	bookmarks? ( $(add_kdebase_dep keditbookmarks) )
-	svg? ( $(add_kdebase_dep svgpart) )
-"
-
-KMEXTRACTONLY="
-	konqueror/client/
-	lib/konq/
-"
-
-src_prepare() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
-
-	kde4-meta_src_prepare
-
-	# Do not install *.desktop files for kfmclient
-	sed -e "/kfmclient\.desktop/d" -i konqueror/CMakeLists.txt \
-		|| die "Failed to omit .desktop files"
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	echo
-	elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
-	elog "emerge -1 kde-base/dolphin:${SLOT}"
-	elog
-	elog "To use Java on webpages: emerge jre"
-	echo
-}
diff --git a/kde-base/konquest/Manifest b/kde-base/konquest/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/konquest/Manifest
+++ b/kde-base/konquest/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/konquest/konquest-4.7.3.ebuild b/kde-base/konquest/konquest-4.7.3.ebuild
deleted file mode 100644
index 225d146e5bd3..000000000000
--- a/kde-base/konquest/konquest-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/konquest-4.7.3.ebuild,v 1.3 2011/12/07 22:13:44 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="Galactic Strategy KDE Game"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/konsole/Manifest b/kde-base/konsole/Manifest
index c29270fac1d9..0b5dc5c4a575 100644
--- a/kde-base/konsole/Manifest
+++ b/kde-base/konsole/Manifest
@@ -1,3 +1,2 @@
 DIST kdebase-4.6.3.tar.bz2 2682586 RMD160 38784d7a5a708703f5a22e39dc5f83ef7aecd833 SHA1 69cfba74099cdce27f7f72725288f025979b41f3 SHA256 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
-DIST konsole-4.7.3.tar.bz2 462846 RMD160 1cc3c2816c8b2ab6c23624b02dda5a1ffd1f3457 SHA1 ecf5d1cc087d78ba049fe65e06ee992a2fadcc19 SHA256 e18d838ce3a34a60ad61b9fa21b2ba07466491ea81649efa4dff3b96291a4f00
 DIST konsole-4.7.4.tar.bz2 463114 RMD160 fc4bad47e8cb86440b04182101c0dedb70b1ae4b SHA1 33e1bc6f1043c9bf6186190b66b21483301eac7e SHA256 fe464482d43b2ca33a4f26a978c1959e16b55056e4c32fc5e906d9681e9a02f3
diff --git a/kde-base/konsole/konsole-4.7.3.ebuild b/kde-base/konsole/konsole-4.7.3.ebuild
deleted file mode 100644
index 8e529ebdf6d2..000000000000
--- a/kde-base/konsole/konsole-4.7.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-4.7.3.ebuild,v 1.3 2011/12/07 22:13:59 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-
-KDE_DOC_DIRS="doc/manual"
-
-inherit kde4-base
-
-DESCRIPTION="X terminal for use with KDE"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-COMMONDEPEND="
-	!aqua? (
-		x11-libs/libX11
-		x11-libs/libXext
-		>=x11-libs/libxklavier-3.2
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)
-"
-DEPEND="${COMMONDEPEND}
-	!aqua? (
-		x11-apps/bdftopcf
-		x11-proto/kbproto
-		x11-proto/renderproto
-	)
-"
-RDEPEND="${COMMONDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.6.4-imagesize.patch"
-	"${FILESDIR}/${PN}-4.7.0-tests.patch"
-)
diff --git a/kde-base/konsolekalendar/Manifest b/kde-base/konsolekalendar/Manifest
index 6a624e13c105..2b0d834b02ae 100644
--- a/kde-base/konsolekalendar/Manifest
+++ b/kde-base/konsolekalendar/Manifest
@@ -1,3 +1,2 @@
 DIST kdepim-4.4.11.1.tar.bz2 8964708 RMD160 51394b9dcb3aecc4f108e87de37c21e3af820ee1 SHA1 49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf
-DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
 DIST kdepim-4.7.4.tar.bz2 16182345 RMD160 a36035cce2e25bc0cbddb50e4c9d5fdd661a2f26 SHA1 233f6c413eeedd4af7cf15106a2af7b8f29977bf SHA256 17a5e185e1199436864400d930f60979265cf0cd775b37a2e7b5a1a267c76868
diff --git a/kde-base/konsolekalendar/konsolekalendar-4.7.3.ebuild b/kde-base/konsolekalendar/konsolekalendar-4.7.3.ebuild
deleted file mode 100644
index f32457b44576..000000000000
--- a/kde-base/konsolekalendar/konsolekalendar-4.7.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/konsolekalendar-4.7.3.ebuild,v 1.4 2011/12/07 22:13:59 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KMMODULE="console/${PN}"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="A command line interface to KDE calendars"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/kontact/Manifest b/kde-base/kontact/Manifest
index 6a624e13c105..2b0d834b02ae 100644
--- a/kde-base/kontact/Manifest
+++ b/kde-base/kontact/Manifest
@@ -1,3 +1,2 @@
 DIST kdepim-4.4.11.1.tar.bz2 8964708 RMD160 51394b9dcb3aecc4f108e87de37c21e3af820ee1 SHA1 49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf
-DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
 DIST kdepim-4.7.4.tar.bz2 16182345 RMD160 a36035cce2e25bc0cbddb50e4c9d5fdd661a2f26 SHA1 233f6c413eeedd4af7cf15106a2af7b8f29977bf SHA256 17a5e185e1199436864400d930f60979265cf0cd775b37a2e7b5a1a267c76868
diff --git a/kde-base/kontact/kontact-4.7.3.ebuild b/kde-base/kontact/kontact-4.7.3.ebuild
deleted file mode 100644
index 946a2fcf3d7f..000000000000
--- a/kde-base/kontact/kontact-4.7.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-4.7.3.ebuild,v 1.4 2011/12/07 22:13:45 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE personal information manager"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMLOADLIBS="kdepim-common-libs"
-KMSAVELIBS="true"
-
-# We remove plugins that are related to external kdepim programs. This way
-# kontact doesn't have to depend on all programs it has plugins for.
-# kcontactmanager gone from kdesvn
-#
-KMEXTRACTONLY="
-	kontact/plugins/akregator/
-	kontact/plugins/kaddressbook/
-	kontact/plugins/kjots/
-	kontact/plugins/kmail/
-	kontact/plugins/knode/
-	kontact/plugins/knotes/
-	kontact/plugins/korganizer/
-	kontact/plugins/ktimetracker/
-	kontact/plugins/planner/
-	kontact/plugins/specialdates/
-	libkdepimdbusinterfaces/
-"
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA+="
-			doc/kontact-admin/
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 26b47ed33f66..e6f64a45cee7 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -1,3 +1,2 @@
 DIST kdenetwork-4.6.3.tar.bz2 8693954 RMD160 a70c031107dd56eda618b91482b814e14425cb1d SHA1 6f140dca442be815eda4fb79d51efd9e4588a1f1 SHA256 423424f2bbc18cb6a0bd52305a238a5b7d4b5f483f30c0590f975b0c229be1fb
-DIST kdenetwork-4.7.3.tar.bz2 9947763 RMD160 8d1cdce1dfd5fa4aae6ecb2d55b189e0bcd94981 SHA1 5d8ed6a478d9afdaf19d350f1d2fe7e9dd48b2f7 SHA256 5a5e7bfa7998e38f80667473c590ab11dde8f3dd6a81a5d9e61ca3940354efa4
 DIST kdenetwork-4.7.4.tar.bz2 9966358 RMD160 6974ef88e22a41d2a6f412c0efcf1af1290a77fa SHA1 15d5bdcda0e05de6247b22b96c6ca4a98da8a278 SHA256 6521b32bd35f2f86f87e50251eff953d48a9238593301ae9b7b6f05da85f987f
diff --git a/kde-base/kopete/kopete-4.7.3.ebuild b/kde-base/kopete/kopete-4.7.3.ebuild
deleted file mode 100644
index 42ddaa766f50..000000000000
--- a/kde-base/kopete/kopete-4.7.3.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.7.3.ebuild,v 1.3 2011/12/07 22:13:33 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdenetwork"
-inherit kde4-meta
-
-DESCRIPTION="KDE multi-protocol IM client"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug ssl v4l"
-
-# tests hang, last checked for 4.2.96
-RESTRICT=test
-
-# Available plugins
-#
-#	addbookmarks: NO DEPS
-#	alias: NO DEPS (disabled upstream)
-#	autoreplace: NO DEPS
-#	contactnotes: NO DEPS
-#	highlight: NO DEPS
-#	history: NO DEPS
-#	latex: virtual/latex as RDEPEND
-#	nowlistening: NO DEPS
-#	otr: libotr
-#	pipes: NO DEPS
-#	privacy: NO DEPS
-#	statistics: dev-db/sqlite:3
-#	texteffect: NO DEPS
-#	translator: NO DEPS
-#	urlpicpreview: NO DEPS
-#	webpresence: libxml2 libxslt
-# NOTE: By default we enable all plugins that don't have any dependencies
-PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
-+nowlistening otr +pipes +privacy +statistics +texteffect +translator
-+urlpicpreview webpresence"
-
-# Available protocols
-#
-#	gadu: net-libs/libgadu @since 4.3
-#	groupwise: app-crypt/qca:2
-#	irc: NO DEPS, probably will fail so inform user about it
-#	xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
-#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
-#	meanwhile: net-libs/meanwhile
-#	msn: libmsn == this is wlm plugin, we disable msn one
-#	oscar: NO DEPS
-#	qq: NO DEPS
-#   telepathy: net-libs/decibel
-#   testbed: NO DEPS
-#	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
-#	yahoo: media-libs/jasper
-#	zeroconf (bonjour): NO DEPS
-PROTOCOLS="gadu groupwise jingle meanwhile msn oscar qq skype
-sms testbed winpopup +xmpp yahoo zeroconf"
-
-# disabled protocols
-#   telepathy: net-libs/decibel
-#   irc: NO DEPS
-
-IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
-
-COMMONDEPEND="
-	dev-libs/libpcre
-	$(add_kdebase_dep kdepimlibs)
-	media-libs/qimageblitz
-	>=x11-libs/qt-gui-4.4.0:4[mng]
-	!aqua? ( x11-libs/libXScrnSaver )
-	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
-	groupwise? ( app-crypt/qca:2 )
-	jingle? (
-		>=media-libs/mediastreamer-2.3.0
-		media-libs/speex
-		net-libs/ortp
-	)
-	meanwhile? ( net-libs/meanwhile )
-	msn? ( >=net-libs/libmsn-4.1 )
-	otr? ( >=net-libs/libotr-3.2.0 )
-	statistics? ( dev-db/sqlite:3 )
-	v4l? ( media-libs/libv4l )
-	webpresence? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-	)
-	xmpp? (
-		app-crypt/qca:2
-		net-dns/libidn
-	)
-	yahoo? ( media-libs/jasper )
-"
-RDEPEND="${COMMONDEPEND}
-	latex? (
-		|| (
-			media-gfx/imagemagick
-			media-gfx/graphicsmagick[imagemagick]
-		)
-		virtual/latex-base
-	)
-	sms? ( app-mobilephone/smssend )
-	ssl? ( app-crypt/qca-ossl )
-	winpopup? ( net-fs/samba )
-"
-#	telepathy? ( net-libs/decibel )"
-DEPEND="${COMMONDEPEND}
-	!aqua? ( x11-proto/scrnsaverproto )
-"
-
-src_prepare() {
-	sed -e "s:lib/mozilla:$(get_libdir)/mozilla:" \
-		-i kopete/protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed"
-
-	kde4-meta_src_prepare
-}
-
-src_configure() {
-	local x x2
-	# Handle common stuff
-	mycmakeargs=(
-		$(cmake-utils_use_with jingle GOOGLETALK)
-		$(cmake-utils_use_with jingle LiboRTP)
-		$(cmake-utils_use_with jingle Mediastreamer)
-		$(cmake-utils_use_with jingle Speex)
-		$(cmake-utils_use_disable v4l VIDEOSUPPORT)
-	)
-	# enable protocols
-	for x in ${PROTOCOLS}; do
-		case ${x/+/} in
-			msn) x2=Libmsn ;;
-			zeroconf) x2=bonjour ;;
-			xmpp) x2=jabber ;;
-			*) x2='' ;;
-		esac
-		mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
-	done
-
-	# enable plugins
-	for x in ${PLUGINS}; do
-		mycmakeargs+=($(cmake-utils_use_with ${x/+/}))
-	done
-
-	kde4-meta_src_configure
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	#if use telepathy; then
-	#	elog "To use kopete telepathy plugins, you need to start gabble first:"
-	#	elog "GABBLE_PERSIST=1 telepathy-gabble &"
-	#	elog "export TELEPATHY_DATA_PATH='${EPREFIX}/usr/share/telepathy/managers/'"
-	#fi
-
-	if ! use ssl; then
-		if use xmpp || use msn; then # || use irc; then
-			echo
-			elog "In order to use ssl in xmpp and msn you'll need to"
-			elog "install app-crypt/qca-ossl package."
-			echo
-		fi
-	fi
-}
diff --git a/kde-base/korganizer/Manifest b/kde-base/korganizer/Manifest
index 6a624e13c105..2b0d834b02ae 100644
--- a/kde-base/korganizer/Manifest
+++ b/kde-base/korganizer/Manifest
@@ -1,3 +1,2 @@
 DIST kdepim-4.4.11.1.tar.bz2 8964708 RMD160 51394b9dcb3aecc4f108e87de37c21e3af820ee1 SHA1 49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf
-DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
 DIST kdepim-4.7.4.tar.bz2 16182345 RMD160 a36035cce2e25bc0cbddb50e4c9d5fdd661a2f26 SHA1 233f6c413eeedd4af7cf15106a2af7b8f29977bf SHA256 17a5e185e1199436864400d930f60979265cf0cd775b37a2e7b5a1a267c76868
diff --git a/kde-base/korganizer/korganizer-4.7.3.ebuild b/kde-base/korganizer/korganizer-4.7.3.ebuild
deleted file mode 100644
index 560efcc4ab52..000000000000
--- a/kde-base/korganizer/korganizer-4.7.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-4.7.3.ebuild,v 1.5 2011/12/07 22:13:53 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="A Personal Organizer for KDE"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	$(add_kdebase_dep kdepim-common-libs)
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep ktimezoned)
-"
-
-RESTRICT="test"
-# bug 393135
-
-KMLOADLIBS="kdepim-common-libs"
-
-KMEXTRACTONLY="
-	akonadi_next/
-	calendarviews/
-	kdgantt2/
-	kmail/
-	knode/org.kde.knode.xml
-	libkdepimdbusinterfaces/
-"
-
-KMCOMPILEONLY="
-	incidenceeditor-ng/
-	calendarsupport/
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.5.64_missing_header.patch"
-)
-
-src_unpack() {
-	if use kontact; then
-		KMEXTRA="${KMEXTRA}
-			kontact/plugins/planner/
-			kontact/plugins/specialdates/
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
-
-src_install() {
-	kde4-meta_src_install
-	# colliding with kdepim-common-libs
-	rm -rf "${ED}"/usr/share/kde4/servicetypes/calendarplugin.desktop
-	rm -rf "${ED}"/usr/share/kde4/servicetypes/calendardecoration.desktop
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
-		echo
-		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
-		echo
-	fi
-}
diff --git a/kde-base/korundum/Manifest b/kde-base/korundum/Manifest
index d6046a9ac78f..b8c5bd8b4b13 100644
--- a/kde-base/korundum/Manifest
+++ b/kde-base/korundum/Manifest
@@ -1,2 +1 @@
-DIST korundum-4.7.3.tar.bz2 180120 RMD160 145a61fcafa79a3af6d57bfbc3302a99eb7c35b7 SHA1 bf41817298a8b18ba3542e45256c1c6ddb08c900 SHA256 79a0eb94137cb3f8620ec9bc8676d1e1f9d0ae217af6fd106f921d80d8b6ffd7
 DIST korundum-4.7.4.tar.bz2 179936 RMD160 f3f349343144cdd3f9d38c533fadf6f4203e0cb5 SHA1 e220dc672461aa1369e58de325f980139fcd52f6 SHA256 590c92c6d4e993ff69b737bc8906888c083d567f8e01cf201f88265680538d08
diff --git a/kde-base/korundum/korundum-4.7.3.ebuild b/kde-base/korundum/korundum-4.7.3.ebuild
deleted file mode 100644
index ed1cf4d23cc9..000000000000
--- a/kde-base/korundum/korundum-4.7.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/korundum-4.7.3.ebuild,v 1.4 2011/12/27 21:35:45 dilfridge Exp $
-
-EAPI=4
-
-OPENGL_REQUIRED="always"
-KDE_SCM="git"
-
-USE_RUBY="ruby18"
-# No ruby19 for three reasons:
-# 1) it does not build (yet) - will likely be solved soon
-# 2) cmake bails when configuring twice or more - solved with CMAKE_IN_SOURCE_BUILD=1
-# 3) the ebuild can only be installed for one ruby variant, otherwise the compiled
-#    files with identical path+name will overwrite each other - difficult :(
-
-inherit kde4-base ruby-ng
-
-DESCRIPTION="KDE Ruby bindings"
-KEYWORDS="amd64 x86"
-IUSE="akonadi debug kate okular"
-
-# unfortunately single modules cannot be disabled with cmake defines
-# possible more useflags have no effect... does anyone actually build this stuff?
-# may need some hacking, for now semantic-desktop just becomes a hard dependency
-
-DEPEND="
-	$(add_kdebase_dep qtruby)
-	$(add_kdebase_dep smokekde 'akonadi?,kate?,okular?,semantic-desktop')
-	$(add_kdebase_dep smokeqt)
-"
-RDEPEND="${DEPEND}
-"
-
-# Split from kdebindings-ruby in 4.7
-add_blocker kdebindings-ruby
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-	kde4-base_pkg_setup
-}
-
-src_unpack() {
-	local S="${WORKDIR}/${P}"
-	kde4-base_src_unpack
-
-	cd "${WORKDIR}"
-	mkdir all
-	mv ${P} all/ || die "Could not move sources"
-}
-
-all_ruby_prepare() {
-	kde4-base_src_prepare
-}
-
-each_ruby_configure() {
-	CMAKE_USE_DIR=${S}
-	mycmakeargs=(
-		-DRUBY_LIBRARY=$(ruby_get_libruby)
-		-DRUBY_INCLUDE_PATH=$(ruby_get_hdrdir)
-		-DRUBY_EXECUTABLE=${RUBY}
-		$(cmake-utils_use_with akonadi)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_disable kate)
-		$(cmake-utils_use_with okular)
-	)
-	kde4-base_src_configure
-}
-
-each_ruby_compile() {
-	CMAKE_USE_DIR=${S}
-	kde4-base_src_compile
-}
-
-each_ruby_install() {
-	CMAKE_USE_DIR=${S}
-	kde4-base_src_install
-}
diff --git a/kde-base/kpasswdserver/Manifest b/kde-base/kpasswdserver/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/kpasswdserver/Manifest
+++ b/kde-base/kpasswdserver/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/kpasswdserver/kpasswdserver-4.7.3.ebuild b/kde-base/kpasswdserver/kpasswdserver-4.7.3.ebuild
deleted file mode 100644
index 6001d88383f1..000000000000
--- a/kde-base/kpasswdserver/kpasswdserver-4.7.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpasswdserver/kpasswdserver-4.7.3.ebuild,v 1.4 2011/12/07 22:13:44 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDED Password Module"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RESTRICT="test"
-# bug 393097
diff --git a/kde-base/kpat/Manifest b/kde-base/kpat/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/kpat/Manifest
+++ b/kde-base/kpat/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/kpat/kpat-4.7.3.ebuild b/kde-base/kpat/kpat-4.7.3.ebuild
deleted file mode 100644
index 962ab84d65eb..000000000000
--- a/kde-base/kpat/kpat-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/kpat-4.7.3.ebuild,v 1.3 2011/12/07 22:13:58 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE patience game"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kppp/Manifest b/kde-base/kppp/Manifest
index 26b47ed33f66..e6f64a45cee7 100644
--- a/kde-base/kppp/Manifest
+++ b/kde-base/kppp/Manifest
@@ -1,3 +1,2 @@
 DIST kdenetwork-4.6.3.tar.bz2 8693954 RMD160 a70c031107dd56eda618b91482b814e14425cb1d SHA1 6f140dca442be815eda4fb79d51efd9e4588a1f1 SHA256 423424f2bbc18cb6a0bd52305a238a5b7d4b5f483f30c0590f975b0c229be1fb
-DIST kdenetwork-4.7.3.tar.bz2 9947763 RMD160 8d1cdce1dfd5fa4aae6ecb2d55b189e0bcd94981 SHA1 5d8ed6a478d9afdaf19d350f1d2fe7e9dd48b2f7 SHA256 5a5e7bfa7998e38f80667473c590ab11dde8f3dd6a81a5d9e61ca3940354efa4
 DIST kdenetwork-4.7.4.tar.bz2 9966358 RMD160 6974ef88e22a41d2a6f412c0efcf1af1290a77fa SHA1 15d5bdcda0e05de6247b22b96c6ca4a98da8a278 SHA256 6521b32bd35f2f86f87e50251eff953d48a9238593301ae9b7b6f05da85f987f
diff --git a/kde-base/kppp/kppp-4.7.3.ebuild b/kde-base/kppp/kppp-4.7.3.ebuild
deleted file mode 100644
index 2eb31061104f..000000000000
--- a/kde-base/kppp/kppp-4.7.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kppp/kppp-4.7.3.ebuild,v 1.3 2011/12/07 22:13:54 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdenetwork"
-inherit kde4-meta
-
-DESCRIPTION="KDE: A dialer and front-end to pppd."
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="debug"
-
-RDEPEND="
-	net-dialup/ppp
-"
diff --git a/kde-base/kquitapp/Manifest b/kde-base/kquitapp/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/kquitapp/Manifest
+++ b/kde-base/kquitapp/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/kquitapp/kquitapp-4.7.3.ebuild b/kde-base/kquitapp/kquitapp-4.7.3.ebuild
deleted file mode 100644
index 221bc528fa9d..000000000000
--- a/kde-base/kquitapp/kquitapp-4.7.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kquitapp/kquitapp-4.7.3.ebuild,v 1.3 2011/12/07 22:13:37 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="A CLI application quitter"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/krdc/Manifest b/kde-base/krdc/Manifest
index 26b47ed33f66..e6f64a45cee7 100644
--- a/kde-base/krdc/Manifest
+++ b/kde-base/krdc/Manifest
@@ -1,3 +1,2 @@
 DIST kdenetwork-4.6.3.tar.bz2 8693954 RMD160 a70c031107dd56eda618b91482b814e14425cb1d SHA1 6f140dca442be815eda4fb79d51efd9e4588a1f1 SHA256 423424f2bbc18cb6a0bd52305a238a5b7d4b5f483f30c0590f975b0c229be1fb
-DIST kdenetwork-4.7.3.tar.bz2 9947763 RMD160 8d1cdce1dfd5fa4aae6ecb2d55b189e0bcd94981 SHA1 5d8ed6a478d9afdaf19d350f1d2fe7e9dd48b2f7 SHA256 5a5e7bfa7998e38f80667473c590ab11dde8f3dd6a81a5d9e61ca3940354efa4
 DIST kdenetwork-4.7.4.tar.bz2 9966358 RMD160 6974ef88e22a41d2a6f412c0efcf1af1290a77fa SHA1 15d5bdcda0e05de6247b22b96c6ca4a98da8a278 SHA256 6521b32bd35f2f86f87e50251eff953d48a9238593301ae9b7b6f05da85f987f
diff --git a/kde-base/krdc/krdc-4.7.3.ebuild b/kde-base/krdc/krdc-4.7.3.ebuild
deleted file mode 100644
index 83b92107a927..000000000000
--- a/kde-base/krdc/krdc-4.7.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/krdc-4.7.3.ebuild,v 1.3 2011/12/07 22:13:40 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdenetwork"
-inherit kde4-meta
-
-DESCRIPTION="KDE remote desktop connection (RDP and VNC) client"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug jpeg rdesktop vnc zeroconf"
-
-#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 4.3.61
-#telepathy? ( >=net-libs/telepathy-qt4-0.18 ) not yet in portage/overlay
-
-DEPEND="
-	jpeg? ( virtual/jpeg )
-	vnc? ( >=net-libs/libvncserver-0.9 )
-	zeroconf? (
-		|| (
-			net-dns/avahi
-			net-misc/mDNSResponder
-		)
-	)
-"
-RDEPEND="${DEPEND}
-	rdesktop? ( net-misc/rdesktop )
-"
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_TelepathyQt4=OFF
-		$(cmake-utils_use_with jpeg)
-		# $(cmake-utils_use_with telepathy TelepathyQt4)
-		$(cmake-utils_use_with vnc LibVNCServer)
-		$(cmake-utils_use_with zeroconf DNSSD)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kreadconfig/Manifest b/kde-base/kreadconfig/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/kreadconfig/Manifest
+++ b/kde-base/kreadconfig/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/kreadconfig/kreadconfig-4.7.3.ebuild b/kde-base/kreadconfig/kreadconfig-4.7.3.ebuild
deleted file mode 100644
index 810697e42356..000000000000
--- a/kde-base/kreadconfig/kreadconfig-4.7.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kreadconfig/kreadconfig-4.7.3.ebuild,v 1.3 2011/12/07 22:13:36 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE: A command-line tool to read KConfig entries"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kremotecontrol/Manifest b/kde-base/kremotecontrol/Manifest
index f961b744c25e..0b02373ba0f9 100644
--- a/kde-base/kremotecontrol/Manifest
+++ b/kde-base/kremotecontrol/Manifest
@@ -1,3 +1,2 @@
 DIST kdeutils-4.6.3.tar.bz2 3703326 RMD160 1fe6287fed3fa21eef902ee764425171f7345e6c SHA1 1aa735c03689ef49b949278ee31d0d8e8536b7d6 SHA256 d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
-DIST kdeutils-4.7.3.tar.bz2 3802391 RMD160 0e0a73d290baaa289665b49722f04f19ab517dd9 SHA1 23fc9823647152d5d8cc250a55402c8930db4059 SHA256 a8c802f32b9e918d806a4487c25485f86019e4c473f0de6d3086d8ea8e492839
 DIST kdeutils-4.7.4.tar.bz2 3802873 RMD160 24c3af30a407523bdf853059fc38bfbf6e6d4604 SHA1 4630f01f36558eb5494fc562086fbd4e488e411e SHA256 bb50a5069808a0280eff671b2f9c0053f5bbbfdc432760bc35ccf654de833c68
diff --git a/kde-base/kremotecontrol/kremotecontrol-4.7.3.ebuild b/kde-base/kremotecontrol/kremotecontrol-4.7.3.ebuild
deleted file mode 100644
index f6fc72e0e5bf..000000000000
--- a/kde-base/kremotecontrol/kremotecontrol-4.7.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kremotecontrol/kremotecontrol-4.7.3.ebuild,v 1.3 2011/12/07 22:14:02 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeutils"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
-
-DESCRIPTION="KDE frontend for remote controls"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep solid)
-"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	${kde_eclass}_src_unpack
-}
diff --git a/kde-base/kreversi/Manifest b/kde-base/kreversi/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/kreversi/Manifest
+++ b/kde-base/kreversi/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/kreversi/kreversi-4.7.3.ebuild b/kde-base/kreversi/kreversi-4.7.3.ebuild
deleted file mode 100644
index b85cef362bf8..000000000000
--- a/kde-base/kreversi/kreversi-4.7.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/kreversi-4.7.3.ebuild,v 1.3 2011/12/07 22:13:52 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit games-ggz kde4-meta
-
-DESCRIPTION="KDE Board Game"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-src_prepare() {
-	# cmake is doing this really weird
-	sed -i \
-		-e "s:register_ggz_module:#register_ggz_module:g" \
-		${PN}/CMakeLists.txt || die "ggz removal failed"
-
-	kde4-meta_src_prepare
-}
-
-src_install() {
-	kde4-meta_src_install
-	# and also we have to prepare the ggz dir
-	insinto "${GGZ_MODDIR}"
-	newins ${PN}/module.dsc ${P}.dsc
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-	games-ggz_pkg_postinst
-}
-
-pkg_postrm() {
-	kde4-meta_pkg_postrm
-	games-ggz_pkg_postrm
-}
diff --git a/kde-base/krfb/Manifest b/kde-base/krfb/Manifest
index 26b47ed33f66..e6f64a45cee7 100644
--- a/kde-base/krfb/Manifest
+++ b/kde-base/krfb/Manifest
@@ -1,3 +1,2 @@
 DIST kdenetwork-4.6.3.tar.bz2 8693954 RMD160 a70c031107dd56eda618b91482b814e14425cb1d SHA1 6f140dca442be815eda4fb79d51efd9e4588a1f1 SHA256 423424f2bbc18cb6a0bd52305a238a5b7d4b5f483f30c0590f975b0c229be1fb
-DIST kdenetwork-4.7.3.tar.bz2 9947763 RMD160 8d1cdce1dfd5fa4aae6ecb2d55b189e0bcd94981 SHA1 5d8ed6a478d9afdaf19d350f1d2fe7e9dd48b2f7 SHA256 5a5e7bfa7998e38f80667473c590ab11dde8f3dd6a81a5d9e61ca3940354efa4
 DIST kdenetwork-4.7.4.tar.bz2 9966358 RMD160 6974ef88e22a41d2a6f412c0efcf1af1290a77fa SHA1 15d5bdcda0e05de6247b22b96c6ca4a98da8a278 SHA256 6521b32bd35f2f86f87e50251eff953d48a9238593301ae9b7b6f05da85f987f
diff --git a/kde-base/krfb/krfb-4.7.3.ebuild b/kde-base/krfb/krfb-4.7.3.ebuild
deleted file mode 100644
index 9fe039347166..000000000000
--- a/kde-base/krfb/krfb-4.7.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-4.7.3.ebuild,v 1.3 2011/12/07 22:13:47 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdenetwork"
-inherit kde4-meta
-
-DESCRIPTION="VNC-compatible server to share KDE desktops"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	sys-libs/zlib
-	virtual/jpeg
-	!aqua? ( x11-libs/libXdamage )
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/krossjava/Manifest b/kde-base/krossjava/Manifest
index 72dd968416b8..e1c850f2c5fd 100644
--- a/kde-base/krossjava/Manifest
+++ b/kde-base/krossjava/Manifest
@@ -1,3 +1,2 @@
 DIST kdebindings-4.6.3.tar.bz2 7078095 RMD160 f62d84df4957f4449695486bfb117df917f17da9 SHA1 4ecc6ac378c241472aa75680abfafd8d57672653 SHA256 13cf7fc54132303a7bcaf0c03b696d05a07405f51d2cb5ba14e56d35c0762be3
-DIST kross-interpreters-4.7.3.tar.bz2 135118 RMD160 5c355292fdff4eb385976d53dd323775b59165de SHA1 3e31b85d1a27a273450652d9f5a33f2c3c035329 SHA256 ad44804d4fe2785c33ef9866bc005cfa6a5c14f34393f63f6960914328498220
 DIST kross-interpreters-4.7.4.tar.bz2 134908 RMD160 5ba6b8845b52e327ab60c0a74c300c643906c87a SHA1 416e9f25ff2050d9c5518254a7cc7d4cad22b648 SHA256 1d871b0bdf0dd388deb0559a4abb6de5cc0893f7afc99950b6e7891607276fce
diff --git a/kde-base/krossjava/krossjava-4.7.3.ebuild b/kde-base/krossjava/krossjava-4.7.3.ebuild
deleted file mode 100644
index 9ad9d083acd7..000000000000
--- a/kde-base/krossjava/krossjava-4.7.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/krossjava-4.7.3.ebuild,v 1.3 2011/12/07 22:13:59 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kross-interpreters"
-KMMODULE="java"
-KDE_SCM="git"
-inherit java-pkg-2 java-ant-2 kde4-meta eutils
-
-DESCRIPTION="Java plugin for the kdelibs/kross scripting framework."
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug"
-
-DEPEND="
-	>=virtual/jdk-1.5
-"
-RDEPEND="
-	>=virtual/jre-1.5
-"
-
-RESTRICT="test"
-
-pkg_setup() {
-	kde4-meta_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_prepare() {
-	find "${S}" -iname '*.jar' | xargs rm -v
-	kde4-meta_src_prepare
-	java-pkg-2_src_prepare
-}
-
-src_configure() {
-	kde4-meta_src_configure
-	java-ant-2_src_configure
-}
-
-src_compile() {
-	kde4-meta_src_compile
-	cd "${S}/java/${PN}/java/" || die
-	eant makejar
-}
-
-src_install() {
-	kde4-meta_src_install
-	java-pkg_dojar "${ED}/usr/$(get_libdir)/kde4/kross/kross.jar"
-
-	dosym ../../../share/${PN}-${SLOT}/lib/kross.jar \
-		/usr/$(get_libdir)/kde4/kross/kross.jar
-	java-pkg_regso "${ED}/usr/$(get_libdir)/kde4/krossjava.so"
-}
-
-pkg_preinst() {
-	kde4-meta_pkg_preinst
-	java-pkg-2_pkg_preinst
-}
diff --git a/kde-base/krosspython/Manifest b/kde-base/krosspython/Manifest
index 72dd968416b8..e1c850f2c5fd 100644
--- a/kde-base/krosspython/Manifest
+++ b/kde-base/krosspython/Manifest
@@ -1,3 +1,2 @@
 DIST kdebindings-4.6.3.tar.bz2 7078095 RMD160 f62d84df4957f4449695486bfb117df917f17da9 SHA1 4ecc6ac378c241472aa75680abfafd8d57672653 SHA256 13cf7fc54132303a7bcaf0c03b696d05a07405f51d2cb5ba14e56d35c0762be3
-DIST kross-interpreters-4.7.3.tar.bz2 135118 RMD160 5c355292fdff4eb385976d53dd323775b59165de SHA1 3e31b85d1a27a273450652d9f5a33f2c3c035329 SHA256 ad44804d4fe2785c33ef9866bc005cfa6a5c14f34393f63f6960914328498220
 DIST kross-interpreters-4.7.4.tar.bz2 134908 RMD160 5ba6b8845b52e327ab60c0a74c300c643906c87a SHA1 416e9f25ff2050d9c5518254a7cc7d4cad22b648 SHA256 1d871b0bdf0dd388deb0559a4abb6de5cc0893f7afc99950b6e7891607276fce
diff --git a/kde-base/krosspython/krosspython-4.7.3.ebuild b/kde-base/krosspython/krosspython-4.7.3.ebuild
deleted file mode 100644
index 1a107f785d7e..000000000000
--- a/kde-base/krosspython/krosspython-4.7.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krosspython/krosspython-4.7.3.ebuild,v 1.3 2011/12/07 22:13:55 hwoarang Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-KMNAME="kross-interpreters"
-KMMODULE="python"
-PYTHON_DEPEND="2"
-inherit python kde4-meta
-
-DESCRIPTION="Kross scripting framework: Python interpreter"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-	kde4-meta_pkg_setup
-}
diff --git a/kde-base/krossruby/Manifest b/kde-base/krossruby/Manifest
index eea20cce15de..2d9412604d0b 100644
--- a/kde-base/krossruby/Manifest
+++ b/kde-base/krossruby/Manifest
@@ -1,2 +1 @@
-DIST kross-interpreters-4.7.3.tar.bz2 135118 RMD160 5c355292fdff4eb385976d53dd323775b59165de SHA1 3e31b85d1a27a273450652d9f5a33f2c3c035329 SHA256 ad44804d4fe2785c33ef9866bc005cfa6a5c14f34393f63f6960914328498220
 DIST kross-interpreters-4.7.4.tar.bz2 134908 RMD160 5ba6b8845b52e327ab60c0a74c300c643906c87a SHA1 416e9f25ff2050d9c5518254a7cc7d4cad22b648 SHA256 1d871b0bdf0dd388deb0559a4abb6de5cc0893f7afc99950b6e7891607276fce
diff --git a/kde-base/krossruby/krossruby-4.7.3.ebuild b/kde-base/krossruby/krossruby-4.7.3.ebuild
deleted file mode 100644
index ffadb48eb0f6..000000000000
--- a/kde-base/krossruby/krossruby-4.7.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossruby/krossruby-4.7.3.ebuild,v 1.3 2011/12/07 22:13:49 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kross-interpreters"
-KMMODULE="ruby"
-KDE_SCM="git"
-
-USE_RUBY="ruby18"
-# No ruby19 for three reasons:
-# 1) it does not build (yet) - will likely be solved soon
-# 2) cmake bails when configuring twice or more - solved with CMAKE_IN_SOURCE_BUILD=1
-# 3) the ebuild can only be installed for one ruby variant, otherwise the compiled
-#    files with identical path+name will overwrite each other - difficult :(
-
-inherit kde4-meta ruby-ng
-
-DESCRIPTION="Kross scripting framework: Ruby interpreter"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND=""
-RDEPEND=""
-
-# Split from kdebindings-ruby in 4.7
-add_blocker kdebindings-ruby
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-	kde4-meta_pkg_setup
-}
-
-src_unpack() {
-	local S="${WORKDIR}/${P}"
-	kde4-meta_src_unpack
-
-	cd "${WORKDIR}"
-	mkdir all
-	mv ${P} all/ || die "Could not move sources"
-}
-
-all_ruby_prepare() {
-	kde4-meta_src_prepare
-}
-
-each_ruby_configure() {
-	local CMAKE_USE_DIR=${S}
-	local mycmakeargs=(
-		-DRUBY_LIBRARY=$(ruby_get_libruby)
-		-DRUBY_INCLUDE_DIR=$(ruby_get_hdrdir)
-		-DRUBY_EXECUTABLE=${RUBY}
-	)
-	kde4-meta_src_configure
-}
-
-each_ruby_compile() {
-	local CMAKE_USE_DIR=${S}
-	kde4-meta_src_compile
-}
-
-each_ruby_install() {
-	local CMAKE_USE_DIR=${S}
-	kde4-meta_src_install
-}
diff --git a/kde-base/kruler/Manifest b/kde-base/kruler/Manifest
index 3580ca7c2ac5..b4129c845551 100644
--- a/kde-base/kruler/Manifest
+++ b/kde-base/kruler/Manifest
@@ -1,3 +1,2 @@
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
-DIST kruler-4.7.3.tar.bz2 139849 RMD160 869ac316248bd70b7d1f343c90fe3c537dd5367e SHA1 2cc0b9d31248604ab570404a0c67ef325e8ed00e SHA256 fc323ef362249e933c84205d98a19b8e9e9f88e7c8584bc95687b69590a3e203
 DIST kruler-4.7.4.tar.bz2 140029 RMD160 91aff5cfe14cbb7d2ba59ac5211a0b64bb50e319 SHA1 a854213e5342e382d3b9c4a29d1aada654378d0f SHA256 8154d445d1bbf18c83e0a3f5a1bb5af38f011a93a07c42689a5a85297801a871
diff --git a/kde-base/kruler/kruler-4.7.3.ebuild b/kde-base/kruler/kruler-4.7.3.ebuild
deleted file mode 100644
index bf39bcb5938e..000000000000
--- a/kde-base/kruler/kruler-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kruler/kruler-4.7.3.ebuild,v 1.3 2011/12/07 22:13:48 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="A screen ruler for KDE"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/krunner/Manifest b/kde-base/krunner/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/krunner/Manifest
+++ b/kde-base/krunner/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/krunner/krunner-4.7.3.ebuild b/kde-base/krunner/krunner-4.7.3.ebuild
deleted file mode 100644
index d9f14811a4fc..000000000000
--- a/kde-base/krunner/krunner-4.7.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/krunner-4.7.3.ebuild,v 1.3 2011/12/07 22:13:58 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="KDE Command Runner"
-IUSE="debug"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-COMMONDEPEND="
-	$(add_kdebase_dep kcheckpass)
-	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep ksmserver)
-	$(add_kdebase_dep ksysguard)
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep libplasmagenericshell)
-	!aqua? (
-		x11-libs/libXcursor
-		x11-libs/libXScrnSaver
-	)
-"
-DEPEND="${COMMONDEPEND}
-	!aqua? (
-		x11-libs/libXcursor
-		x11-proto/scrnsaverproto
-	)
-"
-RDEPEND="${COMMONDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}"-4.6.2-noxf86misc.patch )
-
-KMEXTRACTONLY="
-	libs/kdm/
-	libs/kephal/
-	libs/ksysguard/
-	libs/kworkspace/
-	libs/plasmagenericshell/
-	kcheckpass/
-	ksmserver/org.kde.KSMServerInterface.xml
-	ksysguard/
-	plasma/screensaver/shell/org.kde.plasma-overlay.App.xml
-"
-
-KMLOADLIBS="libkworkspace"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with opengl OpenGL)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/ksaneplugin/Manifest b/kde-base/ksaneplugin/Manifest
index bc736e44401a..ad7b5e4c0276 100644
--- a/kde-base/ksaneplugin/Manifest
+++ b/kde-base/ksaneplugin/Manifest
@@ -1,3 +1,2 @@
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
-DIST ksaneplugin-4.7.3.tar.bz2 13307 RMD160 f80433ce0d97969d5b9d2ebf74ebdcce2d3a1a6e SHA1 547c298e2f3f7b8f651e3402bf18507321d4a7ce SHA256 b6af933711ed0c99f06f1f09c3db61befa818e28a6429ad31db4529e676e51d8
 DIST ksaneplugin-4.7.4.tar.bz2 13308 RMD160 84022fb53a140e23c65233b1d97e40bee1ec5a21 SHA1 15f7ca6fbabb757898cc0f18685f5e204e6b3f56 SHA256 f89131ab34f53f8411c7d4b4bfbe26279f26b348e82965ae2a8d82559ca1b7e7
diff --git a/kde-base/ksaneplugin/ksaneplugin-4.7.3.ebuild b/kde-base/ksaneplugin/ksaneplugin-4.7.3.ebuild
deleted file mode 100644
index 2c9f2e0a3017..000000000000
--- a/kde-base/ksaneplugin/ksaneplugin-4.7.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksaneplugin/ksaneplugin-4.7.3.ebuild,v 1.3 2011/12/07 22:13:46 hwoarang Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="SANE Plugin for KDE"
-HOMEPAGE="http://www.kipi-plugins.org"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libksane)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kscd/Manifest b/kde-base/kscd/Manifest
index 76bfebff29d3..5dd228e2a189 100644
--- a/kde-base/kscd/Manifest
+++ b/kde-base/kscd/Manifest
@@ -1,3 +1,2 @@
 DIST kdemultimedia-4.6.3.tar.bz2 1611668 RMD160 8824bda18a1f1051dea366a0ff0d6191068476dd SHA1 d5bde19156b65e9b56e0e6de800efc0efe117632 SHA256 b3a6732dead0558610b4b40d3ce28c4b7b5da8869a63436180eacb3aacec533b
-DIST kdemultimedia-4.7.3.tar.bz2 1644497 RMD160 de9d9f9341d91bf0d56fa9468c0441226cb6aba2 SHA1 4db44494e6a2ef886e3513b6a2eb4e526741a6ff SHA256 ad96332218b82c4466debcb165061d87051a917e0321bdc34e4024da9c8c30b1
 DIST kdemultimedia-4.7.4.tar.bz2 1644450 RMD160 c180dfed17735bfef4303802dd8065ed308cdd6a SHA1 e0001afac38e35e3ab7b919d79f74cd57e3c18dd SHA256 c1236ed17f575ff793869e5ade024f892ae36aba27a00edafb3495806fb81b28
diff --git a/kde-base/kscd/kscd-4.7.3.ebuild b/kde-base/kscd/kscd-4.7.3.ebuild
deleted file mode 100644
index b8e9cb8b86e9..000000000000
--- a/kde-base/kscd/kscd-4.7.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-4.7.3.ebuild,v 1.5 2011/12/27 12:23:55 dilfridge Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdemultimedia"
-inherit kde4-meta
-
-DESCRIPTION="KDE CD player"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkcddb)
-	$(add_kdebase_dep libkcompactdisc)
-	media-libs/musicbrainz:3
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-4.7.3-underlinking.patch" )
-
-KMEXTRACTONLY="
-	libkcompactdisc/
-"
-
-src_unpack() {
-	use handbook && KMEXTRA="doc/kcontrol/cddbretrieval"
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-base/kscreensaver/Manifest b/kde-base/kscreensaver/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/kscreensaver/Manifest
+++ b/kde-base/kscreensaver/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/kscreensaver/kscreensaver-4.7.3.ebuild b/kde-base/kscreensaver/kscreensaver-4.7.3.ebuild
deleted file mode 100644
index c99ee9063b5d..000000000000
--- a/kde-base/kscreensaver/kscreensaver-4.7.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-4.7.3.ebuild,v 1.3 2011/12/07 22:13:33 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="KDE screensaver framework"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug pam"
-
-RDEPEND="
-	dev-libs/glib:2
-	$(add_kdebase_dep kcheckpass)
-	>=x11-libs/libxklavier-3.2
-	>=x11-libs/libXrandr-1.2.1
-	x11-libs/libXtst
-	opengl? ( virtual/opengl )
-	pam? ( >=kde-base/kdebase-pam-7 )
-"
-DEPEND="${RDEPEND}
-	x11-proto/randrproto
-"
-
-PATCHES=(
-	"${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
-	"${FILESDIR}/${PN}-4.5.95-nsfw.patch"
-	"${FILESDIR}/${PN}-4.6.4-xf86misc.patch"
-)
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with pam)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kshisen/Manifest b/kde-base/kshisen/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/kshisen/Manifest
+++ b/kde-base/kshisen/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/kshisen/kshisen-4.7.3.ebuild b/kde-base/kshisen/kshisen-4.7.3.ebuild
deleted file mode 100644
index 97cbe0f3d658..000000000000
--- a/kde-base/kshisen/kshisen-4.7.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/kshisen-4.7.3.ebuild,v 1.3 2011/12/07 22:14:03 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="A KDE game similiar to Mahjongg"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkmahjongg)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/ksirk/Manifest b/kde-base/ksirk/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/ksirk/Manifest
+++ b/kde-base/ksirk/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/ksirk/ksirk-4.7.3.ebuild b/kde-base/ksirk/ksirk-4.7.3.ebuild
deleted file mode 100644
index 0816ce72a168..000000000000
--- a/kde-base/ksirk/ksirk-4.7.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirk/ksirk-4.7.3.ebuild,v 1.3 2011/12/07 22:13:53 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Ksirk is a KDE port of the board game risk"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-crypt/qca:2
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/ksmserver/Manifest b/kde-base/ksmserver/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/ksmserver/Manifest
+++ b/kde-base/ksmserver/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/ksmserver/ksmserver-4.7.3.ebuild b/kde-base/ksmserver/ksmserver-4.7.3.ebuild
deleted file mode 100644
index 3d525a77676a..000000000000
--- a/kde-base/ksmserver/ksmserver-4.7.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ksmserver-4.7.3.ebuild,v 1.3 2011/12/07 22:14:02 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="The reliable KDE session manager that talks the standard X11R6"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kcminit)
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep solid)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	kcminit/main.h
-	libs/kworkspace/
-	solid/
-"
-
-KMLOADLIBS="libkworkspace"
diff --git a/kde-base/ksnapshot/Manifest b/kde-base/ksnapshot/Manifest
index 97e22121c0c2..fd5a48e95774 100644
--- a/kde-base/ksnapshot/Manifest
+++ b/kde-base/ksnapshot/Manifest
@@ -1,3 +1,2 @@
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
-DIST ksnapshot-4.7.3.tar.bz2 273946 RMD160 0c14f75eb73665f3eff559af1fb7ec96545908c7 SHA1 e0dd6e093cd487fa6604077371122d84b3e8efb7 SHA256 2768ee54cb6b72c40fa41afb2470bd87d5ce02bcd29108510e71adce34bedcd7
 DIST ksnapshot-4.7.4.tar.bz2 274000 RMD160 b40ed0e640987b905ad1d5da8c8c7c97b92f1802 SHA1 bc40ae740e3a684e47ba1b5af01aeb427bb4336e SHA256 91f512e6c9c9aa75f17375bc6806aa518e55bb32a222c4068364918ccd4ac936
diff --git a/kde-base/ksnapshot/ksnapshot-4.7.3.ebuild b/kde-base/ksnapshot/ksnapshot-4.7.3.ebuild
deleted file mode 100644
index 31d3464d2f83..000000000000
--- a/kde-base/ksnapshot/ksnapshot-4.7.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ksnapshot-4.7.3.ebuild,v 1.3 2011/12/07 22:13:50 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE Screenshot Utility"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug kipi"
-
-DEPEND="
-	kipi? ( $(add_kdebase_dep libkipi) )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-4.7-kipi.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with kipi)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-base/kspaceduel/Manifest b/kde-base/kspaceduel/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/kspaceduel/Manifest
+++ b/kde-base/kspaceduel/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/kspaceduel/kspaceduel-4.7.3.ebuild b/kde-base/kspaceduel/kspaceduel-4.7.3.ebuild
deleted file mode 100644
index bcf4892c27df..000000000000
--- a/kde-base/kspaceduel/kspaceduel-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/kspaceduel-4.7.3.ebuild,v 1.3 2011/12/07 22:13:40 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE Space Game"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/ksplash/Manifest b/kde-base/ksplash/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/ksplash/Manifest
+++ b/kde-base/ksplash/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/ksplash/ksplash-4.7.3.ebuild b/kde-base/ksplash/ksplash-4.7.3.ebuild
deleted file mode 100644
index fded21d81413..000000000000
--- a/kde-base/ksplash/ksplash-4.7.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ksplash-4.7.3.ebuild,v 1.3 2011/12/07 22:13:48 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE splashscreen framework (the splashscreen of KDE itself, not of individual apps)"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="3dnow altivec debug mmx sse sse2 xinerama"
-
-COMMONDEPEND="
-	media-libs/libpng
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${COMMONDEPEND}
-	xinerama? ( x11-proto/xineramaproto )
-"
-RDEPEND="${COMMONDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_has 3dnow X86_3DNOW)
-		$(cmake-utils_use_has altivec PPC_ALTIVEC)
-		$(cmake-utils_use_has mmx X86_MMX)
-		$(cmake-utils_use_has sse X86_SSE)
-		$(cmake-utils_use_has sse2 X86_SSE2)
-		$(cmake-utils_use_with xinerama X11_Xinerama)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/ksquares/Manifest b/kde-base/ksquares/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/ksquares/Manifest
+++ b/kde-base/ksquares/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/ksquares/ksquares-4.7.3.ebuild b/kde-base/ksquares/ksquares-4.7.3.ebuild
deleted file mode 100644
index 72a0c06bdaa8..000000000000
--- a/kde-base/ksquares/ksquares-4.7.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksquares/ksquares-4.7.3.ebuild,v 1.3 2011/12/07 22:13:36 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit games-ggz kde4-meta
-
-DESCRIPTION="KSquares is an implementation of the game squares for KDE4"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-src_prepare() {
-	# cmake is doing this really weird
-	sed -i \
-		-e "s:register_ggz_module:#register_ggz_module:g" \
-		${PN}/src/CMakeLists.txt || die "ggz removal failed"
-
-	kde4-meta_src_prepare
-}
-
-src_install() {
-	kde4-meta_src_install
-	# and also we have to prepare the ggz dir
-	insinto "${GGZ_MODDIR}"
-	newins ${PN}/src/module.dsc ${P}.dsc
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-	games-ggz_pkg_postinst
-}
-
-pkg_postrm() {
-	kde4-meta_pkg_postrm
-	games-ggz_pkg_postrm
-}
diff --git a/kde-base/kstars/Manifest b/kde-base/kstars/Manifest
index 23738c190de8..2fa846920034 100644
--- a/kde-base/kstars/Manifest
+++ b/kde-base/kstars/Manifest
@@ -1,3 +1,2 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
-DIST kstars-4.7.3.tar.bz2 13122885 RMD160 6edce0d470d6c9ee0169ffa4bb1632dbb045b2a5 SHA1 41d333f726d9752a7ddb48f98817d91744adb7b0 SHA256 433e7dc6edad8cd39c0bf7ce8379771a09e83b167f3139953b3811d683b1223c
 DIST kstars-4.7.4.tar.bz2 13123167 RMD160 29120038b3ba6a0b0c7062fbb1a969cb16e07b51 SHA1 d4e489093b440e4246c817821187193e4e53be66 SHA256 7860130fdcb78142e41733511bcf931fa4db3428f61384e4729c95ea68263c7f
diff --git a/kde-base/kstars/kstars-4.7.3.ebuild b/kde-base/kstars/kstars-4.7.3.ebuild
deleted file mode 100644
index 85b460083b01..000000000000
--- a/kde-base/kstars/kstars-4.7.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/kstars-4.7.3.ebuild,v 1.3 2011/12/07 22:13:54 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE Desktop Planetarium"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug fits indi"
-
-DEPEND="
-	dev-cpp/eigen:2
-	$(add_kdebase_dep libkdeedu)
-	fits? ( >=sci-libs/cfitsio-0.390 )
-	indi? ( >=sci-libs/indilib-0.6.2[fits?] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.4.65-solaris.patch
-)
-
-src_configure() {
-	# Bug 308903
-	use ppc64 && append-flags -mminimal-toc
-
-	mycmakeargs=(
-		$(cmake-utils_use_with fits CFitsio)
-		$(cmake-utils_use_with indi)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-base/kstart/Manifest b/kde-base/kstart/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/kstart/Manifest
+++ b/kde-base/kstart/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/kstart/kstart-4.7.3.ebuild b/kde-base/kstart/kstart-4.7.3.ebuild
deleted file mode 100644
index f0a61b12cc83..000000000000
--- a/kde-base/kstart/kstart-4.7.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstart/kstart-4.7.3.ebuild,v 1.3 2011/12/07 22:13:49 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Utility to launch applications with special window properties"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kstartperf/Manifest b/kde-base/kstartperf/Manifest
index 8129826b48d8..2c54c126587e 100644
--- a/kde-base/kstartperf/Manifest
+++ b/kde-base/kstartperf/Manifest
@@ -1,3 +1,2 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
-DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
 DIST kdesdk-4.7.4.tar.bz2 5266656 RMD160 9fc17159fd8cbbf9cfe76ed18dfcf8a269d0270e SHA1 3a0f61204653dc3f9f975732b6f67659c60ecaf3 SHA256 a2142ea51e9172e589b0526879061e5c3e4337f6154d89b0491fef9c68e56f6c
diff --git a/kde-base/kstartperf/kstartperf-4.7.3.ebuild b/kde-base/kstartperf/kstartperf-4.7.3.ebuild
deleted file mode 100644
index 6a14ac7f23b1..000000000000
--- a/kde-base/kstartperf/kstartperf-4.7.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartperf/kstartperf-4.7.3.ebuild,v 1.3 2011/12/07 22:13:51 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdesdk"
-inherit kde4-meta
-
-DESCRIPTION="Measures starting performance of applications"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kstartupconfig/Manifest b/kde-base/kstartupconfig/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/kstartupconfig/Manifest
+++ b/kde-base/kstartupconfig/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/kstartupconfig/kstartupconfig-4.7.3.ebuild b/kde-base/kstartupconfig/kstartupconfig-4.7.3.ebuild
deleted file mode 100644
index 81ae01d3322f..000000000000
--- a/kde-base/kstartupconfig/kstartupconfig-4.7.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartupconfig/kstartupconfig-4.7.3.ebuild,v 1.3 2011/12/07 22:13:49 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Utility to launch applications with special window properties"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kstyles/Manifest b/kde-base/kstyles/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/kstyles/Manifest
+++ b/kde-base/kstyles/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/kstyles/kstyles-4.7.3.ebuild b/kde-base/kstyles/kstyles-4.7.3.ebuild
deleted file mode 100644
index 177aca620729..000000000000
--- a/kde-base/kstyles/kstyles-4.7.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstyles/kstyles-4.7.3.ebuild,v 1.3 2011/12/07 22:13:43 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE: A set of different KDE styles."
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep liboxygenstyle)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	libs/oxygen
-"
diff --git a/kde-base/ksudoku/Manifest b/kde-base/ksudoku/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/ksudoku/Manifest
+++ b/kde-base/ksudoku/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/ksudoku/ksudoku-4.7.3.ebuild b/kde-base/ksudoku/ksudoku-4.7.3.ebuild
deleted file mode 100644
index 76a74eeb0dc1..000000000000
--- a/kde-base/ksudoku/ksudoku-4.7.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksudoku/ksudoku-4.7.3.ebuild,v 1.3 2011/12/07 22:13:35 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-OPENGL_REQUIRED="always"
-inherit kde4-meta
-
-DESCRIPTION="KDE Sudoku"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/ksysguard/Manifest b/kde-base/ksysguard/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/ksysguard/Manifest
+++ b/kde-base/ksysguard/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/ksysguard/ksysguard-4.7.3.ebuild b/kde-base/ksysguard/ksysguard-4.7.3.ebuild
deleted file mode 100644
index 4b99a808470c..000000000000
--- a/kde-base/ksysguard/ksysguard-4.7.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ksysguard-4.7.3.ebuild,v 1.4 2011/12/07 22:13:42 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-CPPUNIT_REQUIRED="optional"
-VIRTUALX_REQUIRED=test
-inherit kde4-meta
-
-DESCRIPTION="KSysguard is a network enabled task manager and system monitor application."
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug lm_sensors test"
-
-COMMONDEPEND="
-	x11-libs/libXrender
-	x11-libs/libXres
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-DEPEND="${COMMONDEPEND}
-	x11-proto/renderproto
-"
-RDEPEND="${COMMONDEPEND}"
-
-RESTRICT="test"
-# bug 393091
-
-KMEXTRA="
-	libs/ksysguard/
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with lm_sensors Sensors)
-	)
-
-	kde4-meta_src_configure
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-	ewarn "Note that ksysguard has powerful features; one of these is the executing of arbitrary"
-	ewarn "programs with elevated privileges (as data sources). So be careful opening worksheets"
-	ewarn "from untrusted sources!"
-}
diff --git a/kde-base/ksystemlog/Manifest b/kde-base/ksystemlog/Manifest
index d117d4e4bed2..4ae3002bd652 100644
--- a/kde-base/ksystemlog/Manifest
+++ b/kde-base/ksystemlog/Manifest
@@ -1,3 +1,2 @@
 DIST kdeadmin-4.6.3.tar.bz2 792325 RMD160 b36d9a7c983f5da9e6a3524d3cde1f28464d1580 SHA1 141e8e794ebd5341940d2d22986b7376a2abefbf SHA256 1db65d3f5afb83affdad921ee034f33d7aeb1aac7fe9a55f4b1d26c385577076
-DIST kdeadmin-4.7.3.tar.bz2 806208 RMD160 5aefc3021a1fea4725295ebe97ba8486a09f2768 SHA1 b2d6d210bc40e8731a9ae8409673f3d71b57de0a SHA256 00b32dfb17a8edd89cdd01083df71b1b177e79c7a6ab7fce679a3d0246647029
 DIST kdeadmin-4.7.4.tar.bz2 807192 RMD160 9082b64533435f23a26bb185a20cd7fa47054e80 SHA1 1a294315645adbbff348a380196d4300a408b70d SHA256 f90ecbe4a34bbe47d862e9af6a26811635120d11f6a3ef9163e2c0d7ee1fc79b
diff --git a/kde-base/ksystemlog/ksystemlog-4.7.3.ebuild b/kde-base/ksystemlog/ksystemlog-4.7.3.ebuild
deleted file mode 100644
index 6c4f4e49873a..000000000000
--- a/kde-base/ksystemlog/ksystemlog-4.7.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystemlog/ksystemlog-4.7.3.ebuild,v 1.3 2011/12/07 22:14:00 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdeadmin"
-
-VIRTUALX_REQUIRED=test
-inherit kde4-meta
-
-DESCRIPTION="KDE system log viewer"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug test"
-
-RESTRICT=test
-# bug 378101
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	if use test; then
-		# beat this stupid test into shape: the test files contain no year, so
-		# comparison succeeds only in 2007 !!!
-		local theyear=$(date +%Y)
-		einfo Setting the current year as ${theyear} in the test files
-		sed -e "s:2007:${theyear}:g" -i ksystemlog/tests/systemAnalyzerTest.cpp
-
-		# one test consistently fails, so comment it out for the moment
-		sed -e "s:systemAnalyzerTest:# dont run systemAnalyzerTest:g" -i ksystemlog/tests/CMakeLists.txt
-	fi
-}
diff --git a/kde-base/ksystraycmd/Manifest b/kde-base/ksystraycmd/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/ksystraycmd/Manifest
+++ b/kde-base/ksystraycmd/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/ksystraycmd/ksystraycmd-4.7.3.ebuild b/kde-base/ksystraycmd/ksystraycmd-4.7.3.ebuild
deleted file mode 100644
index a2b401258a21..000000000000
--- a/kde-base/ksystraycmd/ksystraycmd-4.7.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystraycmd/ksystraycmd-4.7.3.ebuild,v 1.3 2011/12/07 22:13:37 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="Ksystraycmd embeds applications given as argument into the system tray."
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kteatime/Manifest b/kde-base/kteatime/Manifest
index edcac9aab994..8103e4966c24 100644
--- a/kde-base/kteatime/Manifest
+++ b/kde-base/kteatime/Manifest
@@ -1,3 +1,2 @@
 DIST kdetoys-4.6.3.tar.bz2 402892 RMD160 e17cf18bf95fab96814ba77bee7493a7d1901229 SHA1 07eaf12ccabc9209bd5de6a3f0e4ff6c70fca8b0 SHA256 ebbf38ac02a36bfebd8231c3c0d9e94193e98a947d04869e825e3bc404fad7b6
-DIST kdetoys-4.7.3.tar.bz2 413419 RMD160 f082336f17e1fc3234e6a00c1109c7bec2eaf4b6 SHA1 93d6f0a92c805de51fc68469f940f38858f81fbe SHA256 edff03b9ae91b6c79e09a15a136ba4854c5c73c9be9ab4bfffe6ed8684dd6c31
 DIST kdetoys-4.7.4.tar.bz2 413690 RMD160 6751f98bcd0d6cf1257855bd0ccde0be20183406 SHA1 f929e598180f420d7fc6e4642ed56af9eee5a22b SHA256 d04187e1fbc69f6cf1fc950f4231d3ae8b8a8843444852c1b749bea5ea0ad39d
diff --git a/kde-base/kteatime/kteatime-4.7.3.ebuild b/kde-base/kteatime/kteatime-4.7.3.ebuild
deleted file mode 100644
index 216e780f1126..000000000000
--- a/kde-base/kteatime/kteatime-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kteatime/kteatime-4.7.3.ebuild,v 1.3 2011/12/07 22:13:59 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdetoys"
-inherit kde4-meta
-
-DESCRIPTION="KDE utility for making a fine cup of tea"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/ktimer/Manifest b/kde-base/ktimer/Manifest
index f961b744c25e..0b02373ba0f9 100644
--- a/kde-base/ktimer/Manifest
+++ b/kde-base/ktimer/Manifest
@@ -1,3 +1,2 @@
 DIST kdeutils-4.6.3.tar.bz2 3703326 RMD160 1fe6287fed3fa21eef902ee764425171f7345e6c SHA1 1aa735c03689ef49b949278ee31d0d8e8536b7d6 SHA256 d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
-DIST kdeutils-4.7.3.tar.bz2 3802391 RMD160 0e0a73d290baaa289665b49722f04f19ab517dd9 SHA1 23fc9823647152d5d8cc250a55402c8930db4059 SHA256 a8c802f32b9e918d806a4487c25485f86019e4c473f0de6d3086d8ea8e492839
 DIST kdeutils-4.7.4.tar.bz2 3802873 RMD160 24c3af30a407523bdf853059fc38bfbf6e6d4604 SHA1 4630f01f36558eb5494fc562086fbd4e488e411e SHA256 bb50a5069808a0280eff671b2f9c0053f5bbbfdc432760bc35ccf654de833c68
diff --git a/kde-base/ktimer/ktimer-4.7.3.ebuild b/kde-base/ktimer/ktimer-4.7.3.ebuild
deleted file mode 100644
index 172d634a601d..000000000000
--- a/kde-base/ktimer/ktimer-4.7.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimer/ktimer-4.7.3.ebuild,v 1.3 2011/12/07 22:13:45 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeutils"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
-
-DESCRIPTION="KDE Timer"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/ktimetracker/Manifest b/kde-base/ktimetracker/Manifest
index 6a624e13c105..2b0d834b02ae 100644
--- a/kde-base/ktimetracker/Manifest
+++ b/kde-base/ktimetracker/Manifest
@@ -1,3 +1,2 @@
 DIST kdepim-4.4.11.1.tar.bz2 8964708 RMD160 51394b9dcb3aecc4f108e87de37c21e3af820ee1 SHA1 49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf
-DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
 DIST kdepim-4.7.4.tar.bz2 16182345 RMD160 a36035cce2e25bc0cbddb50e4c9d5fdd661a2f26 SHA1 233f6c413eeedd4af7cf15106a2af7b8f29977bf SHA256 17a5e185e1199436864400d930f60979265cf0cd775b37a2e7b5a1a267c76868
diff --git a/kde-base/ktimetracker/ktimetracker-4.7.3.ebuild b/kde-base/ktimetracker/ktimetracker-4.7.3.ebuild
deleted file mode 100644
index 6b625e13011a..000000000000
--- a/kde-base/ktimetracker/ktimetracker-4.7.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ktimetracker-4.7.3.ebuild,v 1.4 2011/12/07 22:13:56 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KTimeTracker tracks time spent on various tasks."
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep kdepim-kresources)
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-	x11-libs/libXScrnSaver
-"
-DEPEND="${RDEPEND}
-	x11-proto/scrnsaverproto
-"
-
-KMEXTRACTONLY="
-	kresources/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-src_unpack() {
-	if use kontact; then
-		KMEXTRA="${KMEXTRA} kontact/plugins/ktimetracker"
-	fi
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-base/ktimezoned/Manifest b/kde-base/ktimezoned/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/ktimezoned/Manifest
+++ b/kde-base/ktimezoned/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/ktimezoned/ktimezoned-4.7.3.ebuild b/kde-base/ktimezoned/ktimezoned-4.7.3.ebuild
deleted file mode 100644
index e7f512e88d03..000000000000
--- a/kde-base/ktimezoned/ktimezoned-4.7.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimezoned/ktimezoned-4.7.3.ebuild,v 1.3 2011/12/07 22:13:42 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Timezone daemon"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/ktouch/Manifest b/kde-base/ktouch/Manifest
index a023f12e6357..7191e65e1901 100644
--- a/kde-base/ktouch/Manifest
+++ b/kde-base/ktouch/Manifest
@@ -1,3 +1,2 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
-DIST ktouch-4.7.3.tar.bz2 1916710 RMD160 43a51fb81cc09a586338efa7dd5e14392f4e7a5f SHA1 46b865ece6e14d4476297d4a3b400d5fab6564ea SHA256 2134bd158c961b7e87fbf52cdae4255438506e518bf42a8724f44a531a8eca2c
 DIST ktouch-4.7.4.tar.bz2 1916232 RMD160 b6bb33ee41a70786a818930fcf9fccc10604bee4 SHA1 92d7e446216bdfdf68e13c9f0ba39d44e02b29c9 SHA256 1716054527993f90e4233648cf6a7e1c0202dd88c9c1cb162a20b22593c97f6d
diff --git a/kde-base/ktouch/ktouch-4.7.3.ebuild b/kde-base/ktouch/ktouch-4.7.3.ebuild
deleted file mode 100644
index 572411dc9b8a..000000000000
--- a/kde-base/ktouch/ktouch-4.7.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ktouch-4.7.3.ebuild,v 1.3 2011/12/07 22:13:32 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE: A program that helps you to learn and practice touch typing"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep knotify)
-"
diff --git a/kde-base/ktraderclient/Manifest b/kde-base/ktraderclient/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/ktraderclient/Manifest
+++ b/kde-base/ktraderclient/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/ktraderclient/ktraderclient-4.7.3.ebuild b/kde-base/ktraderclient/ktraderclient-4.7.3.ebuild
deleted file mode 100644
index d5fc85c22b15..000000000000
--- a/kde-base/ktraderclient/ktraderclient-4.7.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktraderclient/ktraderclient-4.7.3.ebuild,v 1.3 2011/12/07 22:13:34 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="A command-line tool for querying the KDE trader system"
-IUSE="debug"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
diff --git a/kde-base/ktron/Manifest b/kde-base/ktron/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/ktron/Manifest
+++ b/kde-base/ktron/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/ktron/ktron-4.7.3.ebuild b/kde-base/ktron/ktron-4.7.3.ebuild
deleted file mode 100644
index caa226bbc0f0..000000000000
--- a/kde-base/ktron/ktron-4.7.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktron/ktron-4.7.3.ebuild,v 1.3 2011/12/07 22:13:51 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE Tron game"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/ktuberling/Manifest b/kde-base/ktuberling/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/ktuberling/Manifest
+++ b/kde-base/ktuberling/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/ktuberling/ktuberling-4.7.3.ebuild b/kde-base/ktuberling/ktuberling-4.7.3.ebuild
deleted file mode 100644
index e1ee5f74f8eb..000000000000
--- a/kde-base/ktuberling/ktuberling-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ktuberling-4.7.3.ebuild,v 1.3 2011/12/07 22:14:03 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: potato game for kids"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kturtle/Manifest b/kde-base/kturtle/Manifest
index 1d0a2a140d30..ecf5d19842e0 100644
--- a/kde-base/kturtle/Manifest
+++ b/kde-base/kturtle/Manifest
@@ -1,3 +1,2 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
-DIST kturtle-4.7.3.tar.bz2 227298 RMD160 593734d41f41796d59f9ab3ab23ddf15692dfbf0 SHA1 07d5ad5c1b8308c2c8c2ff48e2c0c18adfd051ca SHA256 a77c1fe2cb127363581668cb415ba32713b312414c17bb524c1cdf7f66dd2da8
 DIST kturtle-4.7.4.tar.bz2 227240 RMD160 0c41000e46532900b3f889d818564bc7f24d5b0a SHA1 b3baa81277417f352d4a0bdca61df75515f30c0d SHA256 f7efe3c4c0ea5e381add17258999dfb12bbb6bf4e48891a4758afb25c3120f56
diff --git a/kde-base/kturtle/kturtle-4.7.3.ebuild b/kde-base/kturtle/kturtle-4.7.3.ebuild
deleted file mode 100644
index 52bb3e8fdc28..000000000000
--- a/kde-base/kturtle/kturtle-4.7.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/kturtle-4.7.3.ebuild,v 1.3 2011/12/07 22:13:37 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE: Educational programming environment using the Logo programming language"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep knotify)
-"
diff --git a/kde-base/ktux/Manifest b/kde-base/ktux/Manifest
index edcac9aab994..8103e4966c24 100644
--- a/kde-base/ktux/Manifest
+++ b/kde-base/ktux/Manifest
@@ -1,3 +1,2 @@
 DIST kdetoys-4.6.3.tar.bz2 402892 RMD160 e17cf18bf95fab96814ba77bee7493a7d1901229 SHA1 07eaf12ccabc9209bd5de6a3f0e4ff6c70fca8b0 SHA256 ebbf38ac02a36bfebd8231c3c0d9e94193e98a947d04869e825e3bc404fad7b6
-DIST kdetoys-4.7.3.tar.bz2 413419 RMD160 f082336f17e1fc3234e6a00c1109c7bec2eaf4b6 SHA1 93d6f0a92c805de51fc68469f940f38858f81fbe SHA256 edff03b9ae91b6c79e09a15a136ba4854c5c73c9be9ab4bfffe6ed8684dd6c31
 DIST kdetoys-4.7.4.tar.bz2 413690 RMD160 6751f98bcd0d6cf1257855bd0ccde0be20183406 SHA1 f929e598180f420d7fc6e4642ed56af9eee5a22b SHA256 d04187e1fbc69f6cf1fc950f4231d3ae8b8a8843444852c1b749bea5ea0ad39d
diff --git a/kde-base/ktux/ktux-4.7.3.ebuild b/kde-base/ktux/ktux-4.7.3.ebuild
deleted file mode 100644
index 8e288e9b5d93..000000000000
--- a/kde-base/ktux/ktux-4.7.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ktux-4.7.3.ebuild,v 1.3 2011/12/07 22:13:33 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdetoys"
-inherit kde4-meta
-
-DESCRIPTION="KDE: screensaver featuring the Space-Faring Tux"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-# libkworkspace - only as a stub to provide KDE4Workspace config
-DEPEND="
-	$(add_kdebase_dep kscreensaver)
-	$(add_kdebase_dep libkworkspace)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kubrick/Manifest b/kde-base/kubrick/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/kubrick/Manifest
+++ b/kde-base/kubrick/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/kubrick/kubrick-4.7.3.ebuild b/kde-base/kubrick/kubrick-4.7.3.ebuild
deleted file mode 100644
index 20c38f8ae158..000000000000
--- a/kde-base/kubrick/kubrick-4.7.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kubrick/kubrick-4.7.3.ebuild,v 1.3 2011/12/07 22:13:47 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-OPENGL_REQUIRED="always"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Kubrick is a game based on \"Rubik's Cube\" puzzle."
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kuiserver/Manifest b/kde-base/kuiserver/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/kuiserver/Manifest
+++ b/kde-base/kuiserver/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/kuiserver/kuiserver-4.7.3.ebuild b/kde-base/kuiserver/kuiserver-4.7.3.ebuild
deleted file mode 100644
index bca16d6b756e..000000000000
--- a/kde-base/kuiserver/kuiserver-4.7.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiserver/kuiserver-4.7.3.ebuild,v 1.3 2011/12/07 22:13:36 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Progress Info UI server"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kuiviewer/Manifest b/kde-base/kuiviewer/Manifest
index 8129826b48d8..2c54c126587e 100644
--- a/kde-base/kuiviewer/Manifest
+++ b/kde-base/kuiviewer/Manifest
@@ -1,3 +1,2 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
-DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
 DIST kdesdk-4.7.4.tar.bz2 5266656 RMD160 9fc17159fd8cbbf9cfe76ed18dfcf8a269d0270e SHA1 3a0f61204653dc3f9f975732b6f67659c60ecaf3 SHA256 a2142ea51e9172e589b0526879061e5c3e4337f6154d89b0491fef9c68e56f6c
diff --git a/kde-base/kuiviewer/kuiviewer-4.7.3.ebuild b/kde-base/kuiviewer/kuiviewer-4.7.3.ebuild
deleted file mode 100644
index 49749851fc77..000000000000
--- a/kde-base/kuiviewer/kuiviewer-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiviewer/kuiviewer-4.7.3.ebuild,v 1.3 2011/12/07 22:13:51 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdesdk"
-
-inherit kde4-meta
-
-DESCRIPTION="KDE utility that displays and tests UI files generated by Qt Designer."
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kurifilter-plugins/Manifest b/kde-base/kurifilter-plugins/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/kurifilter-plugins/Manifest
+++ b/kde-base/kurifilter-plugins/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/kurifilter-plugins/kurifilter-plugins-4.7.3.ebuild b/kde-base/kurifilter-plugins/kurifilter-plugins-4.7.3.ebuild
deleted file mode 100644
index 5a345f57ebe3..000000000000
--- a/kde-base/kurifilter-plugins/kurifilter-plugins-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kurifilter-plugins/kurifilter-plugins-4.7.3.ebuild,v 1.3 2011/12/07 22:14:00 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Plugins to manage filtering URIs."
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-RESTRICT="test" # Tests segfault. Last checked on 4.0.3.
diff --git a/kde-base/kuser/Manifest b/kde-base/kuser/Manifest
index d117d4e4bed2..4ae3002bd652 100644
--- a/kde-base/kuser/Manifest
+++ b/kde-base/kuser/Manifest
@@ -1,3 +1,2 @@
 DIST kdeadmin-4.6.3.tar.bz2 792325 RMD160 b36d9a7c983f5da9e6a3524d3cde1f28464d1580 SHA1 141e8e794ebd5341940d2d22986b7376a2abefbf SHA256 1db65d3f5afb83affdad921ee034f33d7aeb1aac7fe9a55f4b1d26c385577076
-DIST kdeadmin-4.7.3.tar.bz2 806208 RMD160 5aefc3021a1fea4725295ebe97ba8486a09f2768 SHA1 b2d6d210bc40e8731a9ae8409673f3d71b57de0a SHA256 00b32dfb17a8edd89cdd01083df71b1b177e79c7a6ab7fce679a3d0246647029
 DIST kdeadmin-4.7.4.tar.bz2 807192 RMD160 9082b64533435f23a26bb185a20cd7fa47054e80 SHA1 1a294315645adbbff348a380196d4300a408b70d SHA256 f90ecbe4a34bbe47d862e9af6a26811635120d11f6a3ef9163e2c0d7ee1fc79b
diff --git a/kde-base/kuser/kuser-4.7.3.ebuild b/kde-base/kuser/kuser-4.7.3.ebuild
deleted file mode 100644
index d02f953f48f4..000000000000
--- a/kde-base/kuser/kuser-4.7.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/kuser-4.7.3.ebuild,v 1.3 2011/12/07 22:13:55 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdeadmin"
-
-inherit kde4-meta
-
-DESCRIPTION="KDE application that helps you manage system users"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-"
-# notify is needed for dialogs
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep knotify)
-"
diff --git a/kde-base/kwallet/Manifest b/kde-base/kwallet/Manifest
index f961b744c25e..0b02373ba0f9 100644
--- a/kde-base/kwallet/Manifest
+++ b/kde-base/kwallet/Manifest
@@ -1,3 +1,2 @@
 DIST kdeutils-4.6.3.tar.bz2 3703326 RMD160 1fe6287fed3fa21eef902ee764425171f7345e6c SHA1 1aa735c03689ef49b949278ee31d0d8e8536b7d6 SHA256 d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
-DIST kdeutils-4.7.3.tar.bz2 3802391 RMD160 0e0a73d290baaa289665b49722f04f19ab517dd9 SHA1 23fc9823647152d5d8cc250a55402c8930db4059 SHA256 a8c802f32b9e918d806a4487c25485f86019e4c473f0de6d3086d8ea8e492839
 DIST kdeutils-4.7.4.tar.bz2 3802873 RMD160 24c3af30a407523bdf853059fc38bfbf6e6d4604 SHA1 4630f01f36558eb5494fc562086fbd4e488e411e SHA256 bb50a5069808a0280eff671b2f9c0053f5bbbfdc432760bc35ccf654de833c68
diff --git a/kde-base/kwallet/kwallet-4.7.3.ebuild b/kde-base/kwallet/kwallet-4.7.3.ebuild
deleted file mode 100644
index a4adbfb30aee..000000000000
--- a/kde-base/kwallet/kwallet-4.7.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwallet/kwallet-4.7.3.ebuild,v 1.3 2011/12/07 22:13:54 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeutils"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
-
-DESCRIPTION="KDE Wallet Management Tool"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kwalletd/Manifest b/kde-base/kwalletd/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/kwalletd/Manifest
+++ b/kde-base/kwalletd/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/kwalletd/kwalletd-4.7.3.ebuild b/kde-base/kwalletd/kwalletd-4.7.3.ebuild
deleted file mode 100644
index de4ac917ba3a..000000000000
--- a/kde-base/kwalletd/kwalletd-4.7.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletd/kwalletd-4.7.3.ebuild,v 1.3 2011/12/07 22:13:40 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE Password Server"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/kwin/kwin-4.7.3.ebuild b/kde-base/kwin/kwin-4.7.3.ebuild
deleted file mode 100644
index 2bef2cd60c59..000000000000
--- a/kde-base/kwin/kwin-4.7.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.7.3.ebuild,v 1.3 2011/12/07 22:13:51 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="KDE window manager"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug gles xinerama"
-
-COMMONDEPEND="
-	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep liboxygenstyle)
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	>=x11-libs/libXrandr-1.2.1
-	x11-libs/libXrender
-	opengl? ( >=media-libs/mesa-7.10 )
-	gles? (
-		|| (  ( >=media-libs/mesa-7.10[egl(+),gles] <media-libs/mesa-7.12[egl(+),gles] )
-			>=media-libs/mesa-7.12[egl(+),gles2] )
-	)
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${COMMONDEPEND}
-	x11-proto/compositeproto
-	x11-proto/damageproto
-	x11-proto/fixesproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	xinerama? ( x11-proto/xineramaproto )
-"
-RDEPEND="${COMMONDEPEND}
-	x11-apps/scripts
-"
-
-KMEXTRACTONLY="
-	ksmserver/
-	libs/kephal/
-	libs/oxygen/
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
-)
-
-# you can use just gles or opengl or none
-REQUIRED_USE="opengl? ( !gles ) gles? ( !opengl )"
-
-src_configure() {
-	# FIXME Remove when activity API moved away from libkworkspace
-	append-cppflags "-I${EPREFIX}/usr/include/kworkspace"
-
-	mycmakeargs=(
-		$(cmake-utils_use_with gles OpenGLES)
-		$(cmake-utils_use gles KWIN_BUILD_WITH_OPENGLES)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with xinerama X11_Xinerama)
-		-DWITH_X11_Xcomposite=ON
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kwordquiz/Manifest b/kde-base/kwordquiz/Manifest
index 7303899eb963..3a5a8608502f 100644
--- a/kde-base/kwordquiz/Manifest
+++ b/kde-base/kwordquiz/Manifest
@@ -1,3 +1,2 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
-DIST kwordquiz-4.7.3.tar.bz2 1298968 RMD160 8b55c51b3bae4ac406d00e5b5b65d3dac94812b4 SHA1 616c16a94066ec2930bc0795f8053be221c871e5 SHA256 8b499dc5d763ee28a52f6b6d271cae24640706735c3641d843aef187207cd508
 DIST kwordquiz-4.7.4.tar.bz2 1298948 RMD160 57db04911d2524b688caa204c7122cab8994012f SHA1 c726b0856234ce78fab0ecd61072cdb035e66513 SHA256 b3e9ece3004b4257ba0664ab957123eb16647788a69052721a1ff190d440ca4d
diff --git a/kde-base/kwordquiz/kwordquiz-4.7.3.ebuild b/kde-base/kwordquiz/kwordquiz-4.7.3.ebuild
deleted file mode 100644
index edfc26902c57..000000000000
--- a/kde-base/kwordquiz/kwordquiz-4.7.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/kwordquiz-4.7.3.ebuild,v 1.3 2011/12/07 22:13:57 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE: A powerful flashcard and vocabulary learning program"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkdeedu)
-"
diff --git a/kde-base/kwrite/Manifest b/kde-base/kwrite/Manifest
index 07d0de6a8197..5d1ae199436c 100644
--- a/kde-base/kwrite/Manifest
+++ b/kde-base/kwrite/Manifest
@@ -1,3 +1,2 @@
-DIST kate-4.7.3.tar.bz2 2038690 RMD160 c5809a4b915dc6b2c55d1bef9d1ebfa16606e5c7 SHA1 d67e871a49d426246f2e555ace0ad5a303c41045 SHA256 154dd3dfc16745ea567834eac7d082990d2251a79c6161c9fc4d34566936fc95
 DIST kate-4.7.4.tar.bz2 2041564 RMD160 01a5bdc2f647d2c061313a76ccd56bfb916e3373 SHA1 b808f01213e0e44607e8f2577f9d1b4f88e14388 SHA256 be8e40822a0a388cf3edc56cfc22a13b84460d8ac26c6c6fc457a5f44e6ccd5d
 DIST kdebase-4.6.3.tar.bz2 2682586 RMD160 38784d7a5a708703f5a22e39dc5f83ef7aecd833 SHA1 69cfba74099cdce27f7f72725288f025979b41f3 SHA256 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
diff --git a/kde-base/kwrite/kwrite-4.7.3.ebuild b/kde-base/kwrite/kwrite-4.7.3.ebuild
deleted file mode 100644
index d3762ea57487..000000000000
--- a/kde-base/kwrite/kwrite-4.7.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrite/kwrite-4.7.3.ebuild,v 1.3 2011/12/07 22:13:58 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kate"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE MDI editor/IDE"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep katepart)
-"
diff --git a/kde-base/kwrited/Manifest b/kde-base/kwrited/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/kwrited/Manifest
+++ b/kde-base/kwrited/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/kwrited/kwrited-4.7.3.ebuild b/kde-base/kwrited/kwrited-4.7.3.ebuild
deleted file mode 100644
index 2175c665d21b..000000000000
--- a/kde-base/kwrited/kwrited-4.7.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrited/kwrited-4.7.3.ebuild,v 1.3 2011/12/07 22:13:57 hwoarang Exp $
-
-EAPI=4
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE daemon listening for wall and write messages."
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	>=sys-libs/libutempter-1.1.5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/libkcddb/Manifest b/kde-base/libkcddb/Manifest
index 76bfebff29d3..5dd228e2a189 100644
--- a/kde-base/libkcddb/Manifest
+++ b/kde-base/libkcddb/Manifest
@@ -1,3 +1,2 @@
 DIST kdemultimedia-4.6.3.tar.bz2 1611668 RMD160 8824bda18a1f1051dea366a0ff0d6191068476dd SHA1 d5bde19156b65e9b56e0e6de800efc0efe117632 SHA256 b3a6732dead0558610b4b40d3ce28c4b7b5da8869a63436180eacb3aacec533b
-DIST kdemultimedia-4.7.3.tar.bz2 1644497 RMD160 de9d9f9341d91bf0d56fa9468c0441226cb6aba2 SHA1 4db44494e6a2ef886e3513b6a2eb4e526741a6ff SHA256 ad96332218b82c4466debcb165061d87051a917e0321bdc34e4024da9c8c30b1
 DIST kdemultimedia-4.7.4.tar.bz2 1644450 RMD160 c180dfed17735bfef4303802dd8065ed308cdd6a SHA1 e0001afac38e35e3ab7b919d79f74cd57e3c18dd SHA256 c1236ed17f575ff793869e5ade024f892ae36aba27a00edafb3495806fb81b28
diff --git a/kde-base/libkcddb/libkcddb-4.7.3.ebuild b/kde-base/libkcddb/libkcddb-4.7.3.ebuild
deleted file mode 100644
index b20868e4592d..000000000000
--- a/kde-base/libkcddb/libkcddb-4.7.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcddb/libkcddb-4.7.3.ebuild,v 1.3 2011/12/07 22:13:45 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdemultimedia"
-inherit kde4-meta
-
-DESCRIPTION="KDE library for CDDB"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug musicbrainz"
-
-# tests require network access and compare static data with online data
-# bug 280996
-RESTRICT=test
-
-DEPEND="
-	musicbrainz? ( media-libs/musicbrainz:3 )
-"
-RDEPEND="${DEPEND}"
-
-KMSAVELIBS="true"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with musicbrainz MusicBrainz3)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/libkcompactdisc/Manifest b/kde-base/libkcompactdisc/Manifest
index 76bfebff29d3..5dd228e2a189 100644
--- a/kde-base/libkcompactdisc/Manifest
+++ b/kde-base/libkcompactdisc/Manifest
@@ -1,3 +1,2 @@
 DIST kdemultimedia-4.6.3.tar.bz2 1611668 RMD160 8824bda18a1f1051dea366a0ff0d6191068476dd SHA1 d5bde19156b65e9b56e0e6de800efc0efe117632 SHA256 b3a6732dead0558610b4b40d3ce28c4b7b5da8869a63436180eacb3aacec533b
-DIST kdemultimedia-4.7.3.tar.bz2 1644497 RMD160 de9d9f9341d91bf0d56fa9468c0441226cb6aba2 SHA1 4db44494e6a2ef886e3513b6a2eb4e526741a6ff SHA256 ad96332218b82c4466debcb165061d87051a917e0321bdc34e4024da9c8c30b1
 DIST kdemultimedia-4.7.4.tar.bz2 1644450 RMD160 c180dfed17735bfef4303802dd8065ed308cdd6a SHA1 e0001afac38e35e3ab7b919d79f74cd57e3c18dd SHA256 c1236ed17f575ff793869e5ade024f892ae36aba27a00edafb3495806fb81b28
diff --git a/kde-base/libkcompactdisc/libkcompactdisc-4.7.3.ebuild b/kde-base/libkcompactdisc/libkcompactdisc-4.7.3.ebuild
deleted file mode 100644
index 8a0f0af00b2c..000000000000
--- a/kde-base/libkcompactdisc/libkcompactdisc-4.7.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcompactdisc/libkcompactdisc-4.7.3.ebuild,v 1.3 2011/12/07 22:13:50 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdemultimedia"
-inherit kde4-meta
-
-DESCRIPTION="KDE library for playing & ripping CDs"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="alsa debug"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with alsa)
-	)
-	kde4-meta_src_configure
-}
diff --git a/kde-base/libkdcraw/Manifest b/kde-base/libkdcraw/Manifest
index ab6ca32a601a..3722813e4be0 100644
--- a/kde-base/libkdcraw/Manifest
+++ b/kde-base/libkdcraw/Manifest
@@ -1,3 +1,2 @@
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
-DIST libkdcraw-4.7.3.tar.bz2 287684 RMD160 fb3b58e1dccaa8eb6b7d64626c1fa10d744335c1 SHA1 084f6aff760957d2005dd571dad178ca685abb68 SHA256 0c41ac80b0ab9a278c0975b3ec995cdf5c79458bcf8df738bddda6be91f31182
 DIST libkdcraw-4.7.4.tar.bz2 287733 RMD160 4f1822ecf871fc12acc43bdd9a5e2d766c28019e SHA1 f97516a2da26da3c15075a007bec7c8f9860379b SHA256 f643e01918c622bb71c64d5654e6be95eda0eeb78b412766e83f10c253b4c893
diff --git a/kde-base/libkdcraw/libkdcraw-4.7.3.ebuild b/kde-base/libkdcraw/libkdcraw-4.7.3.ebuild
deleted file mode 100644
index ab6be939864b..000000000000
--- a/kde-base/libkdcraw/libkdcraw-4.7.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdcraw/libkdcraw-4.7.3.ebuild,v 1.3 2011/12/07 22:13:38 hwoarang Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE digital camera raw image library wrapper"
-HOMEPAGE="http://www.kipi-plugins.org"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	media-libs/lcms:0
-	virtual/jpeg
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/libkdeedu/Manifest b/kde-base/libkdeedu/Manifest
index 05a3bd9befc3..021c7a33069c 100644
--- a/kde-base/libkdeedu/Manifest
+++ b/kde-base/libkdeedu/Manifest
@@ -1,3 +1,2 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
-DIST libkdeedu-4.7.3.tar.bz2 223286 RMD160 35f0212af28d33cb43132b47b082c5a6ab78e77b SHA1 d2a1e88c6135fa23cea7670dfbb7c8634dc9c870 SHA256 c653d473199d6871fbbe4cdd029e1c92dcb523e6e32693aa858b8c0ba9bf24e6
 DIST libkdeedu-4.7.4.tar.bz2 223246 RMD160 d207beba159bb8fa94e0263b63cdd6dbe42cafa9 SHA1 2f508c6efa9ef9561d25578000c7d5bb5ed1c5ee SHA256 0ac82f24d5d8728e2237505d9686e11a519ba94f80c2ca3baa0157a4cb4348bd
diff --git a/kde-base/libkdeedu/libkdeedu-4.7.3.ebuild b/kde-base/libkdeedu/libkdeedu-4.7.3.ebuild
deleted file mode 100644
index 105409fe25fd..000000000000
--- a/kde-base/libkdeedu/libkdeedu-4.7.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdeedu/libkdeedu-4.7.3.ebuild,v 1.3 2011/12/07 22:13:41 hwoarang Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="Common library for KDE educational apps"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-# 4 of 4 tests fail. Last checked for 4.6.1. Tests are fundamentally broken,
-# see bug 258857 for details.
-RESTRICT=test
-
-add_blocker kvtml-data
diff --git a/kde-base/libkdegames/Manifest b/kde-base/libkdegames/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/libkdegames/Manifest
+++ b/kde-base/libkdegames/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/libkdegames/libkdegames-4.7.3.ebuild b/kde-base/libkdegames/libkdegames-4.7.3.ebuild
deleted file mode 100644
index 3b42c3c0acd9..000000000000
--- a/kde-base/libkdegames/libkdegames-4.7.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/libkdegames-4.7.3.ebuild,v 1.3 2011/12/07 22:13:47 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="Base library common to many KDE games."
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	>=dev-games/ggz-client-libs-0.0.14
-"
-RDEPEND="${DEPEND}"
-
-KMSAVELIBS="true"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.0-darwin.patch
-)
diff --git a/kde-base/libkexiv2/Manifest b/kde-base/libkexiv2/Manifest
index c157f1e7a179..9c62e47bbedb 100644
--- a/kde-base/libkexiv2/Manifest
+++ b/kde-base/libkexiv2/Manifest
@@ -1,3 +1,2 @@
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
-DIST libkexiv2-4.7.3.tar.bz2 132528 RMD160 d30f6dc5e98d952e444ba6f5805a1ad11448e69e SHA1 daaf507f75855660ae9f1af00158c2746c574902 SHA256 5bf5bcb302fc0630cc8f6f1fa538894dd2f1a06271beff4f1ce90c72e86c3c94
 DIST libkexiv2-4.7.4.tar.bz2 132525 RMD160 224ba8856d70f0c86e8831cb207b2d654cd0b80e SHA1 19031140c87d9d7003fef564b6927c6f69d7e3d3 SHA256 0a1a3ffbedec9f60f8a3beb3dcefb3282ebdf2b5db3a779447590b1eb5bc1571
diff --git a/kde-base/libkexiv2/libkexiv2-4.7.3.ebuild b/kde-base/libkexiv2/libkexiv2-4.7.3.ebuild
deleted file mode 100644
index 3d466d8e005d..000000000000
--- a/kde-base/libkexiv2/libkexiv2-4.7.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkexiv2/libkexiv2-4.7.3.ebuild,v 1.3 2011/12/07 22:13:44 hwoarang Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE Image Plugin Interface: an exiv2 library wrapper"
-HOMEPAGE="http://www.kipi-plugins.org"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	>=media-gfx/exiv2-0.20
-	media-libs/lcms:0
-	virtual/jpeg
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/libkipi/Manifest b/kde-base/libkipi/Manifest
index d294f4bd244f..60133a620815 100644
--- a/kde-base/libkipi/Manifest
+++ b/kde-base/libkipi/Manifest
@@ -1,3 +1,2 @@
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
-DIST libkipi-4.7.3.tar.bz2 78152 RMD160 b3659716ba622d3ead7008236a518fca791ee940 SHA1 9c6d4406a1292cfe81fa27508ffe4d96633417bf SHA256 3dd71c84f8e0c78e7c470134a7328bbaee084023fc2c1da51f8850e0553f0785
 DIST libkipi-4.7.4.tar.bz2 78160 RMD160 f65131ce24bed8d17902530ebc7af68e0720110d SHA1 3225ac0c55f5e4fef71a8baee8d3c49efff6adbf SHA256 4cd361e2e8dfa2c99110908700535207dadd9f3709ae93939d16caf2bcdfd105
diff --git a/kde-base/libkipi/libkipi-4.7.3.ebuild b/kde-base/libkipi/libkipi-4.7.3.ebuild
deleted file mode 100644
index a4a17238db40..000000000000
--- a/kde-base/libkipi/libkipi-4.7.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkipi/libkipi-4.7.3.ebuild,v 1.3 2011/12/07 22:13:39 hwoarang Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="A library for image plugins accross KDE applications."
-HOMEPAGE="http://www.kipi-plugins.org"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/libkmahjongg/Manifest b/kde-base/libkmahjongg/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/libkmahjongg/Manifest
+++ b/kde-base/libkmahjongg/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/libkmahjongg/libkmahjongg-4.7.3.ebuild b/kde-base/libkmahjongg/libkmahjongg-4.7.3.ebuild
deleted file mode 100644
index f2dcf5e41c6d..000000000000
--- a/kde-base/libkmahjongg/libkmahjongg-4.7.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmahjongg/libkmahjongg-4.7.3.ebuild,v 1.3 2011/12/07 22:13:36 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="LibKMahjongg for KDE"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-KMLOADLIBS="libkdegames"
diff --git a/kde-base/libkonq/Manifest b/kde-base/libkonq/Manifest
index d0cd4f15d1e8..7af0c2c0ae27 100644
--- a/kde-base/libkonq/Manifest
+++ b/kde-base/libkonq/Manifest
@@ -1,3 +1,2 @@
-DIST kde-baseapps-4.7.3.tar.bz2 2685074 RMD160 270f3f3ae7b473651517db8818160f16e4faf544 SHA1 952dc26d0d908b41973a8d7b4d27765bf5128d58 SHA256 e9fb0c5da9e9a255c1a1735dfa518dcadc1ea23c68a467164597ff3dbf51c8df
 DIST kde-baseapps-4.7.4.tar.bz2 2684721 RMD160 cedc577cb3449e36b7e7dab1192688c8014c46d1 SHA1 ad4b6d8479bcf8be49b5f53ee8fdcc1b3d1106d6 SHA256 0a59e87b0019bb5d80abbc9cb2fc691ec838d43e9b168e7a15b11d40ac1db51c
 DIST kdebase-4.6.3.tar.bz2 2682586 RMD160 38784d7a5a708703f5a22e39dc5f83ef7aecd833 SHA1 69cfba74099cdce27f7f72725288f025979b41f3 SHA256 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
diff --git a/kde-base/libkonq/libkonq-4.7.3.ebuild b/kde-base/libkonq/libkonq-4.7.3.ebuild
deleted file mode 100644
index e0787f4a5d28..000000000000
--- a/kde-base/libkonq/libkonq-4.7.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/libkonq-4.7.3.ebuild,v 1.3 2011/12/07 22:13:38 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-baseapps"
-KMMODULE="lib/konq"
-CPPUNIT_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="The embeddable part of konqueror"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-RESTRICT="test"
-
-KMSAVELIBS="true"
-
-PATCHES=( "${FILESDIR}/${PN}-4.5.56-cmake.patch" )
diff --git a/kde-base/libksane/Manifest b/kde-base/libksane/Manifest
index b1307beca618..e6d2daef376e 100644
--- a/kde-base/libksane/Manifest
+++ b/kde-base/libksane/Manifest
@@ -1,3 +1,2 @@
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
-DIST libksane-4.7.3.tar.bz2 82840 RMD160 390f9596a211db51190eadcfb9246f25e4ffa524 SHA1 d1efdd1f5f7f99ba173ddcc88b2ddee343ecf96b SHA256 3516663048f4401ef8b14323b6a5fc8324c5b51500258a28e2d2faaaa68f193a
 DIST libksane-4.7.4.tar.bz2 82851 RMD160 cd20c158dc8638d0e69a840304e4812419f021fd SHA1 3c7a8d5b7fd80175684a0373fae26197e8158565 SHA256 75b963d45fbd3b9e6bdf28e50674fe10c88443ff2314df2071ddceeaa432622d
diff --git a/kde-base/libksane/libksane-4.7.3.ebuild b/kde-base/libksane/libksane-4.7.3.ebuild
deleted file mode 100644
index 041333a63728..000000000000
--- a/kde-base/libksane/libksane-4.7.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libksane/libksane-4.7.3.ebuild,v 1.3 2011/12/07 22:13:53 hwoarang Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="SANE Library interface for KDE"
-HOMEPAGE="http://www.kipi-plugins.org"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-LICENSE="LGPL-2"
-
-DEPEND="
-	media-gfx/sane-backends
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/libkworkspace/Manifest b/kde-base/libkworkspace/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/libkworkspace/Manifest
+++ b/kde-base/libkworkspace/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/libkworkspace/libkworkspace-4.7.3-r1.ebuild b/kde-base/libkworkspace/libkworkspace-4.7.3-r1.ebuild
deleted file mode 100644
index 1ab641b6c512..000000000000
--- a/kde-base/libkworkspace/libkworkspace-4.7.3-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/libkworkspace-4.7.3-r1.ebuild,v 1.1 2011/12/18 00:03:00 dilfridge Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-KMMODULE="libs/kworkspace"
-inherit kde4-meta
-
-DESCRIPTION="A library for KDE desktop applications"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-KMEXTRACTONLY="
-	ksmserver/org.kde.KSMServerInterface.xml
-	kwin/org.kde.KWin.xml
-"
-
-KMSAVELIBS="true"
-
-DEPEND="
-	x11-libs/libxkbfile
-	x11-libs/libXcomposite
-"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	sed -i -e 's/install( FILES kdisplaymanager.h/install( FILES kdisplaymanager.h screenpreviewwidget.h/' \
-		libs/kworkspace/CMakeLists.txt || die "failed to provide screenpreviewwidget.h"
-
-	kde4-meta_src_prepare
-}
diff --git a/kde-base/liboxygenstyle/Manifest b/kde-base/liboxygenstyle/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/liboxygenstyle/Manifest
+++ b/kde-base/liboxygenstyle/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/liboxygenstyle/files/liboxygenstyle-4.7.4-enablefinal.patch b/kde-base/liboxygenstyle/files/liboxygenstyle-4.7.4-enablefinal.patch
deleted file mode 100644
index 369924858e20..000000000000
--- a/kde-base/liboxygenstyle/files/liboxygenstyle-4.7.4-enablefinal.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -U2 -rxi kde-workspace-4.7.3.orig/libs/oxygen/oxygenhelper.cpp kde-workspace-4.7.3/libs/oxygen/oxygenhelper.cpp
---- kde-workspace-4.7.3.orig/libs/oxygen/oxygenhelper.cpp	2011-10-28 09:42:34.000000000 +0200
-+++ kde-workspace-4.7.3/libs/oxygen/oxygenhelper.cpp	2011-12-25 13:39:03.487455177 +0100
-@@ -37,4 +37,5 @@
- #include <X11/Xlib.h>
- #include <X11/Xatom.h>
-+#include <fixx11h.h>
- #endif
- 
diff --git a/kde-base/liboxygenstyle/liboxygenstyle-4.7.3.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-4.7.3.ebuild
deleted file mode 100644
index 5d12656d1e8c..000000000000
--- a/kde-base/liboxygenstyle/liboxygenstyle-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/liboxygenstyle/liboxygenstyle-4.7.3.ebuild,v 1.3 2011/12/07 22:13:41 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-KMMODULE="libs/oxygen"
-inherit kde4-meta
-
-DESCRIPTION="Library to support the Oxygen style in KDE"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/liboxygenstyle/liboxygenstyle-4.7.4.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-4.7.4.ebuild
index e77be4e0f1b6..089d9ac2435c 100644
--- a/kde-base/liboxygenstyle/liboxygenstyle-4.7.4.ebuild
+++ b/kde-base/liboxygenstyle/liboxygenstyle-4.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/kde-base/liboxygenstyle/liboxygenstyle-4.7.4.ebuild,v 1.4 2012/01/16 23:36:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/liboxygenstyle/liboxygenstyle-4.7.4.ebuild,v 1.5 2012/01/17 12:09:49 johu Exp $
 
 EAPI=4
 
@@ -11,5 +11,3 @@ inherit kde4-meta
 DESCRIPTION="Library to support the Oxygen style in KDE"
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
-
-PATCHES=( "${FILESDIR}/${PN}-4.7.4-enablefinal.patch" )
diff --git a/kde-base/libplasmaclock/Manifest b/kde-base/libplasmaclock/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/libplasmaclock/Manifest
+++ b/kde-base/libplasmaclock/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/libplasmaclock/libplasmaclock-4.7.3.ebuild b/kde-base/libplasmaclock/libplasmaclock-4.7.3.ebuild
deleted file mode 100644
index 9039ecac3e79..000000000000
--- a/kde-base/libplasmaclock/libplasmaclock-4.7.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmaclock/libplasmaclock-4.7.3.ebuild,v 1.3 2011/12/07 22:13:50 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-KMMODULE="libs/plasmaclock"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="Libraries for KDE Plasma's clocks"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug +holidays"
-
-DEPEND="
-	$(add_kdebase_dep kephal)
-	holidays? ( $(add_kdebase_dep kdepimlibs) )
-"
-RDEPEND="${DEPEND}"
-
-KMSAVELIBS="true"
-
-KMEXTRACTONLY="
-	libs/kephal/
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with holidays KdepimLibs)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/libplasmagenericshell/Manifest b/kde-base/libplasmagenericshell/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/libplasmagenericshell/Manifest
+++ b/kde-base/libplasmagenericshell/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/libplasmagenericshell/libplasmagenericshell-4.7.3.ebuild b/kde-base/libplasmagenericshell/libplasmagenericshell-4.7.3.ebuild
deleted file mode 100644
index 65ea28c469e5..000000000000
--- a/kde-base/libplasmagenericshell/libplasmagenericshell-4.7.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmagenericshell/libplasmagenericshell-4.7.3.ebuild,v 1.3 2011/12/07 22:14:02 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-KMMODULE="libs/plasmagenericshell"
-inherit kde4-meta
-
-DESCRIPTION="Libraries for the KDE Plasma shell"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug test"
-
-DEPEND="
-	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep libkworkspace)
-"
-
-RDEPEND="${DEPEND}"
-
-KMSAVELIBS="true"
-
-KMEXTRACTONLY="
-	libs/kephal/kephal/
-	plasma/desktop/shell/data/
-"
diff --git a/kde-base/libtaskmanager/Manifest b/kde-base/libtaskmanager/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/libtaskmanager/Manifest
+++ b/kde-base/libtaskmanager/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/libtaskmanager/libtaskmanager-4.7.3.ebuild b/kde-base/libtaskmanager/libtaskmanager-4.7.3.ebuild
deleted file mode 100644
index de901636afce..000000000000
--- a/kde-base/libtaskmanager/libtaskmanager-4.7.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libtaskmanager/libtaskmanager-4.7.3.ebuild,v 1.3 2011/12/07 22:13:32 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-KMMODULE="libs/taskmanager"
-inherit kde4-meta
-
-DESCRIPTION="A library that provides basic taskmanager functionality"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep libkworkspace)
-"
-RDEPEND="${DEPEND}"
-
-KMSAVELIBS="true"
-
-KMEXTRACTONLY="
-	libs/kephal/
-	libs/kworkspace/
-"
diff --git a/kde-base/lokalize/Manifest b/kde-base/lokalize/Manifest
index 8129826b48d8..2c54c126587e 100644
--- a/kde-base/lokalize/Manifest
+++ b/kde-base/lokalize/Manifest
@@ -1,3 +1,2 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
-DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
 DIST kdesdk-4.7.4.tar.bz2 5266656 RMD160 9fc17159fd8cbbf9cfe76ed18dfcf8a269d0270e SHA1 3a0f61204653dc3f9f975732b6f67659c60ecaf3 SHA256 a2142ea51e9172e589b0526879061e5c3e4337f6154d89b0491fef9c68e56f6c
diff --git a/kde-base/lokalize/files/lokalize-4.6.1-enablefinal.patch b/kde-base/lokalize/files/lokalize-4.6.1-enablefinal.patch
deleted file mode 100644
index 31034f9e634b..000000000000
--- a/kde-base/lokalize/files/lokalize-4.6.1-enablefinal.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- kdesdk-4.5.4/lokalize/src/project/projectmodel.cpp.orig	2010-12-26 18:42:44.132000006 +0100
-+++ kdesdk-4.5.4/lokalize/src/project/projectmodel.cpp	2010-12-26 18:42:44.132000006 +0100
-@@ -1233,21 +1233,6 @@
- {
- }
- 
--static void initDb(QSqlDatabase& db)
--{
--    QSqlQuery queryMain(db);
--    queryMain.exec("PRAGMA encoding = \"UTF-8\"");
--    queryMain.exec("CREATE TABLE IF NOT EXISTS metainfo ("
--                   "filepath INTEGER PRIMARY KEY ON CONFLICT REPLACE, "// AUTOINCREMENT,"
--                   //"filepath TEXT UNIQUE ON CONFLICT REPLACE, "
--                   "metainfo BLOB, "//XLIFF markup info, see catalog/catalogstring.h catalog/xliff/*
--                   "changedate INTEGER"
--                   ")");
--
--    //queryMain.exec("CREATE INDEX IF NOT EXISTS filepath_index ON metainfo ("filepath)");
--}
--
--
- static KFileMetaInfo cachedMetaInfo(const KFileItem& file)
- {
-     QString dbName="metainfocache";
-@@ -1257,7 +1242,16 @@
-         db.setDatabaseName(KStandardDirs::locateLocal("appdata", dbName+".sqlite"));
-         if (KDE_ISUNLIKELY( !db.open() ))
-             return KFileMetaInfo(file.url());
--        initDb(db);
-+        QSqlQuery queryMain(db);
-+        queryMain.exec("PRAGMA encoding = \"UTF-8\"");
-+        queryMain.exec("CREATE TABLE IF NOT EXISTS metainfo ("
-+                       "filepath INTEGER PRIMARY KEY ON CONFLICT REPLACE, "// AUTOINCREMENT,"
-+                       //"filepath TEXT UNIQUE ON CONFLICT REPLACE, "
-+                       "metainfo BLOB, "//XLIFF markup info, see catalog/catalogstring.h catalog/xliff/*
-+                       "changedate INTEGER"
-+                       ")");
-+
-+        //queryMain.exec("CREATE INDEX IF NOT EXISTS filepath_index ON metainfo ("filepath)");
-     }
-     QSqlDatabase db=QSqlDatabase::database(dbName);
-     if (!db.isOpen())
diff --git a/kde-base/lokalize/lokalize-4.6.3.ebuild b/kde-base/lokalize/lokalize-4.6.3.ebuild
index eeee8060471a..023371027e0e 100644
--- a/kde-base/lokalize/lokalize-4.6.3.ebuild
+++ b/kde-base/lokalize/lokalize-4.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/lokalize-4.6.3.ebuild,v 1.4 2011/06/26 01:54:35 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/lokalize-4.6.3.ebuild,v 1.5 2012/01/17 11:52:30 johu Exp $
 
 EAPI=3
 
@@ -24,8 +24,6 @@ RDEPEND="${DEPEND}
 	$(add_kdebase_dep pykde4)
 "
 
-PATCHES=( "${FILESDIR}/${PN}"-4.6.1-enablefinal.patch )
-
 pkg_setup() {
 	kde4-meta_pkg_setup
 	python_set_active_version 2
diff --git a/kde-base/lokalize/lokalize-4.7.3.ebuild b/kde-base/lokalize/lokalize-4.7.3.ebuild
deleted file mode 100644
index 3263bc0a8a94..000000000000
--- a/kde-base/lokalize/lokalize-4.7.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/lokalize-4.7.3.ebuild,v 1.3 2011/12/07 22:13:46 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdesdk"
-PYTHON_DEPEND="2"
-inherit python kde4-meta
-
-DESCRIPTION="KDE4 translation tool"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug semantic-desktop"
-
-DEPEND="
-	>=app-text/hunspell-1.2.8
-	>=x11-libs/qt-sql-4.5.0:4[sqlite]
-	semantic-desktop? ( dev-libs/soprano )
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdesdk-strigi-analyzer)
-	$(add_kdebase_dep krosspython)
-	$(add_kdebase_dep pykde4)
-"
-
-PATCHES=( "${FILESDIR}/${PN}"-4.6.5-hunspell.patch )
-
-pkg_setup() {
-	kde4-meta_pkg_setup
-	python_pkg_setup
-	python_set_active_version 2
-}
-
-src_install() {
-	kde4-meta_src_install
-	python_convert_shebangs -q -r $(python_get_version) "${ED}/usr/share/apps/${PN}"
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-	echo
-	elog "To be able to autofetch KDE translations in new project wizard, install subversion client:"
-	elog "	emerge -vau subversion"
-	echo
-}
diff --git a/kde-base/lskat/Manifest b/kde-base/lskat/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/lskat/Manifest
+++ b/kde-base/lskat/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/lskat/lskat-4.7.3.ebuild b/kde-base/lskat/lskat-4.7.3.ebuild
deleted file mode 100644
index 6a1706eebc99..000000000000
--- a/kde-base/lskat/lskat-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/lskat-4.7.3.ebuild,v 1.3 2011/12/07 22:13:41 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="Skat game for KDE"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/marble/Manifest b/kde-base/marble/Manifest
index 16b7f30a0de8..a750e37dc124 100644
--- a/kde-base/marble/Manifest
+++ b/kde-base/marble/Manifest
@@ -1,3 +1,2 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
-DIST marble-4.7.3.tar.bz2 21068336 RMD160 3518116c5e6f3d3bfa68e80f6eec7dfaed69193f SHA1 980a8dae9c7a0f8483fde5dc839fae834763933a SHA256 9d39da22c4094e6265e884451fe5efc5e34166772ccff37c63c18a2f4d48a557
 DIST marble-4.7.4.tar.bz2 21068089 RMD160 f0eec0300ca87dbb50b94563c86fbb56eb72cfd7 SHA1 e560c355a8d91bbb61b9f2e6c7cb11bd79eba1ab SHA256 e6a735cceca8cb2df9bff7c79b7af35dca4c3f2a5f5d3cff2847e34acd95d40b
diff --git a/kde-base/marble/marble-4.7.3.ebuild b/kde-base/marble/marble-4.7.3.ebuild
deleted file mode 100644
index b48ceeaf1221..000000000000
--- a/kde-base/marble/marble-4.7.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.3.ebuild,v 1.4 2011/12/07 22:13:45 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_REQUIRED="optional"
-CPPUNIT_REQUIRED="optional"
-PYTHON_DEPEND="python? 2"
-KDE_SCM="git"
-inherit kde4-base python
-
-DESCRIPTION="Generic geographical map widget"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug designer-plugin gps +kde plasma python"
-
-# tests fail / segfault. Last checked for 4.2.88
-RESTRICT=test
-
-DEPEND="
-	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
-	python? (
-		>=dev-python/PyQt4-4.4.4-r1
-		kde? ( $(add_kdebase_dep pykde4) )
-	)
-"
-RDEPEND="${DEPEND}
-"
-
-REQUIRED_USE="plasma? ( kde )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.7-magic-r1.patch"
-)
-
-pkg_setup() {
-	python_set_active_version 2
-	kde4-base_pkg_setup
-	python_pkg_setup
-}
-
-src_prepare() {
-	kde4-base_src_prepare
-	python_convert_shebangs -r $(python_get_version) .
-
-	find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
-		$(cmake-utils_use python EXPERIMENTAL_PYTHON_BINDINGS)
-		$(cmake-utils_use_with python PyQt4)
-		$(cmake-utils_use_with python PythonLibrary)
-		$(cmake-utils_use_with python SIP)
-		$(cmake-utils_use_with gps libgps)
-		$(cmake-utils_use !kde QTONLY)
-		$(cmake-utils_use_with plasma)
-		-DWITH_liblocation=0
-		$(use kde && cmake-utils_use_with python PyKDE4)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-base/mplayerthumbs/Manifest b/kde-base/mplayerthumbs/Manifest
index 76bfebff29d3..5dd228e2a189 100644
--- a/kde-base/mplayerthumbs/Manifest
+++ b/kde-base/mplayerthumbs/Manifest
@@ -1,3 +1,2 @@
 DIST kdemultimedia-4.6.3.tar.bz2 1611668 RMD160 8824bda18a1f1051dea366a0ff0d6191068476dd SHA1 d5bde19156b65e9b56e0e6de800efc0efe117632 SHA256 b3a6732dead0558610b4b40d3ce28c4b7b5da8869a63436180eacb3aacec533b
-DIST kdemultimedia-4.7.3.tar.bz2 1644497 RMD160 de9d9f9341d91bf0d56fa9468c0441226cb6aba2 SHA1 4db44494e6a2ef886e3513b6a2eb4e526741a6ff SHA256 ad96332218b82c4466debcb165061d87051a917e0321bdc34e4024da9c8c30b1
 DIST kdemultimedia-4.7.4.tar.bz2 1644450 RMD160 c180dfed17735bfef4303802dd8065ed308cdd6a SHA1 e0001afac38e35e3ab7b919d79f74cd57e3c18dd SHA256 c1236ed17f575ff793869e5ade024f892ae36aba27a00edafb3495806fb81b28
diff --git a/kde-base/mplayerthumbs/mplayerthumbs-4.7.3.ebuild b/kde-base/mplayerthumbs/mplayerthumbs-4.7.3.ebuild
deleted file mode 100644
index defb5b26c9b0..000000000000
--- a/kde-base/mplayerthumbs/mplayerthumbs-4.7.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/mplayerthumbs/mplayerthumbs-4.7.3.ebuild,v 1.3 2011/12/07 22:13:31 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdemultimedia"
-inherit kde4-meta
-
-DESCRIPTION="A Thumbnail Generator for Video Files on KDE filemanagers."
-HOMEPAGE="http://www.kde-apps.org/content/show.php?content=41180"
-LICENSE="GPL-2"
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	|| (
-		$(add_kdebase_dep dolphin)
-		$(add_kdebase_dep konqueror)
-	)
-"
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_PHONON_SUPPORT=ON
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/nepomuk/Manifest b/kde-base/nepomuk/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/nepomuk/Manifest
+++ b/kde-base/nepomuk/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/nepomuk/nepomuk-4.7.3.ebuild b/kde-base/nepomuk/nepomuk-4.7.3.ebuild
deleted file mode 100644
index 767408b35978..000000000000
--- a/kde-base/nepomuk/nepomuk-4.7.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk/nepomuk-4.7.3.ebuild,v 1.4 2011/12/07 22:13:37 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="Nepomuk KDE4 client"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	>=app-misc/strigi-0.6.3[dbus,qt4]
-	>=dev-libs/soprano-2.6.51[dbus,raptor,redland,virtuoso]
-	$(add_kdebase_dep kdelibs 'semantic-desktop')
-	!kde-misc/nepomukcontroller
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-# bug 392989
diff --git a/kde-base/nsplugins/Manifest b/kde-base/nsplugins/Manifest
index d0cd4f15d1e8..7af0c2c0ae27 100644
--- a/kde-base/nsplugins/Manifest
+++ b/kde-base/nsplugins/Manifest
@@ -1,3 +1,2 @@
-DIST kde-baseapps-4.7.3.tar.bz2 2685074 RMD160 270f3f3ae7b473651517db8818160f16e4faf544 SHA1 952dc26d0d908b41973a8d7b4d27765bf5128d58 SHA256 e9fb0c5da9e9a255c1a1735dfa518dcadc1ea23c68a467164597ff3dbf51c8df
 DIST kde-baseapps-4.7.4.tar.bz2 2684721 RMD160 cedc577cb3449e36b7e7dab1192688c8014c46d1 SHA1 ad4b6d8479bcf8be49b5f53ee8fdcc1b3d1106d6 SHA256 0a59e87b0019bb5d80abbc9cb2fc691ec838d43e9b168e7a15b11d40ac1db51c
 DIST kdebase-4.6.3.tar.bz2 2682586 RMD160 38784d7a5a708703f5a22e39dc5f83ef7aecd833 SHA1 69cfba74099cdce27f7f72725288f025979b41f3 SHA256 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
diff --git a/kde-base/nsplugins/files/nsplugins-4.6.1-enablefinal.patch b/kde-base/nsplugins/files/nsplugins-4.6.1-enablefinal.patch
deleted file mode 100644
index e955cc0af14a..000000000000
--- a/kde-base/nsplugins/files/nsplugins-4.6.1-enablefinal.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- nsplugins/viewer/scripting.h.orig	2010-12-26 01:50:16.704000278 +0100
-+++ nsplugins/viewer/scripting.h	2010-12-26 01:57:20.581000171 +0100
-@@ -20,6 +20,9 @@
- 
- */
- 
-+#ifndef VIEWER_SCRIPTING_H
-+#define VIEWER_SCRIPTING_H
-+
- #include "nsplugin.h"
- #include "sdk/npruntime.h"
- #include <kparts/browserextension.h>
-@@ -93,5 +96,6 @@
- 
- } // namespace kdeNsPluginViewer
- 
--// kate: indent-width 4; replace-tabs on; tab-width 4; space-indent on;
-+#endif
- 
-+// kate: indent-width 4; replace-tabs on; tab-width 4; space-indent on;
diff --git a/kde-base/nsplugins/nsplugins-4.6.3.ebuild b/kde-base/nsplugins/nsplugins-4.6.3.ebuild
index 9ff64bf15761..c81d203e7582 100644
--- a/kde-base/nsplugins/nsplugins-4.6.3.ebuild
+++ b/kde-base/nsplugins/nsplugins-4.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-4.6.3.ebuild,v 1.4 2011/06/26 01:54:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-4.6.3.ebuild,v 1.5 2012/01/17 11:48:28 johu Exp $
 
 EAPI=4
 
@@ -21,5 +21,3 @@ RDEPEND="${DEPEND}
 KMEXTRACTONLY="
 	konqueror/settings/
 "
-
-PATCHES=( "${FILESDIR}/${PN}"-4.6.1-enablefinal.patch )
diff --git a/kde-base/nsplugins/nsplugins-4.7.3.ebuild b/kde-base/nsplugins/nsplugins-4.7.3.ebuild
deleted file mode 100644
index 33f0539da67a..000000000000
--- a/kde-base/nsplugins/nsplugins-4.7.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-4.7.3.ebuild,v 1.3 2011/12/07 22:13:36 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-baseapps"
-inherit kde4-meta
-
-DESCRIPTION="Netscape plugins support for Konqueror."
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	x11-libs/libXt
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep konqueror)
-"
-
-KMEXTRACTONLY="
-	konqueror/settings/
-"
-
-PATCHES=( "${FILESDIR}/${PN}"-4.6.1-enablefinal.patch )
diff --git a/kde-base/nsplugins/nsplugins-4.7.4.ebuild b/kde-base/nsplugins/nsplugins-4.7.4.ebuild
index 0f2c0a98a875..ab2ac3d35e84 100644
--- a/kde-base/nsplugins/nsplugins-4.7.4.ebuild
+++ b/kde-base/nsplugins/nsplugins-4.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/kde-base/nsplugins/nsplugins-4.7.4.ebuild,v 1.3 2012/01/16 23:41:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-4.7.4.ebuild,v 1.4 2012/01/17 11:48:28 johu Exp $
 
 EAPI=4
 
@@ -21,5 +21,3 @@ RDEPEND="${DEPEND}
 KMEXTRACTONLY="
 	konqueror/settings/
 "
-
-PATCHES=( "${FILESDIR}/${PN}"-4.6.1-enablefinal.patch )
diff --git a/kde-base/okteta/Manifest b/kde-base/okteta/Manifest
index 8129826b48d8..2c54c126587e 100644
--- a/kde-base/okteta/Manifest
+++ b/kde-base/okteta/Manifest
@@ -1,3 +1,2 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
-DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
 DIST kdesdk-4.7.4.tar.bz2 5266656 RMD160 9fc17159fd8cbbf9cfe76ed18dfcf8a269d0270e SHA1 3a0f61204653dc3f9f975732b6f67659c60ecaf3 SHA256 a2142ea51e9172e589b0526879061e5c3e4337f6154d89b0491fef9c68e56f6c
diff --git a/kde-base/okteta/okteta-4.7.3.ebuild b/kde-base/okteta/okteta-4.7.3.ebuild
deleted file mode 100644
index f33a50ddb4d1..000000000000
--- a/kde-base/okteta/okteta-4.7.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/okteta-4.7.3.ebuild,v 1.3 2011/12/07 22:13:37 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdesdk"
-inherit kde4-meta
-
-DESCRIPTION="KDE hexeditor"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-crypt/qca:2
-"
-RDEPEND="${DEPEND}"
-
-# Tests hang, last checked in 4.3.3
-RESTRICT="test"
diff --git a/kde-base/okular/Manifest b/kde-base/okular/Manifest
index 95c9408bbbf1..c27146493899 100644
--- a/kde-base/okular/Manifest
+++ b/kde-base/okular/Manifest
@@ -1,3 +1,2 @@
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
-DIST okular-4.7.3.tar.bz2 1172549 RMD160 e0b0ede6523e2bb472657f8a77ae3c6cccbb3ea9 SHA1 a14700386f386cc50f7dd6785eeb93dae10a0362 SHA256 4cf762b04e9ba28edf4b83c05b0299eb6d078de416a19dd1d745551478a476f1
 DIST okular-4.7.4.tar.bz2 1172730 RMD160 ff624527c8c15026a69304bc792c4b36542d0f0a SHA1 5f02bbfeff81b55e0fd5d9e973cb927909faccb1 SHA256 2b22733a253dc47547229e02fcb4366bad8cf339b7cd3b243f41836fdb73a10f
diff --git a/kde-base/okular/okular-4.7.3.ebuild b/kde-base/okular/okular-4.7.3.ebuild
deleted file mode 100644
index 1a6579817b18..000000000000
--- a/kde-base/okular/okular-4.7.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.7.3.ebuild,v 1.3 2011/12/07 22:14:02 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="Okular is an universal document viewer based on KPDF for KDE 4."
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="chm crypt debug djvu ebook +jpeg +ps +pdf +tiff"
-
-DEPEND="
-	media-libs/freetype
-	media-libs/qimageblitz
-	sys-libs/zlib
-	chm? ( dev-libs/chmlib )
-	crypt? ( app-crypt/qca:2 )
-	djvu? ( app-text/djvu )
-	ebook? ( app-text/ebook-tools )
-	jpeg? ( virtual/jpeg:0 )
-	pdf? ( >=app-text/poppler-0.12.3-r3[lcms,qt4,-exceptions(-)] )
-	ps? ( app-text/libspectre )
-	tiff? ( media-libs/tiff )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with chm)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with djvu DjVuLibre)
-		$(cmake-utils_use_with ebook EPub)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with ps LibSpectre)
-		$(cmake-utils_use_with pdf PopplerQt4)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with tiff)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-base/oxygen-icons/Manifest b/kde-base/oxygen-icons/Manifest
index f7b05746c607..8674089b85fb 100644
--- a/kde-base/oxygen-icons/Manifest
+++ b/kde-base/oxygen-icons/Manifest
@@ -1,6 +1,4 @@
 DIST oxygen-icons-4.6.2.tar.bz2 315693544 RMD160 b859aab84747b783daba759bfb4df0fb6b84048b SHA1 dc97ca3e52bd00f93fb8438e8f368aa3c1567d9f SHA256 41c7b9031685f32717c1c03ece9a7ff9d7020c4fc921c70d397d446d9ad2c5a3
 DIST oxygen-icons-4.6.2.tar.xz 26034404 RMD160 19dbd26235978d8b5996c8017fbd4f29d69851cf SHA1 110ae7130846c9e2c18050d6491fe7962ea9847b SHA256 a909831b880ac9c13d354d9195323da45ae9bd206019b5876f881d17e854278e
-DIST oxygen-icons-4.7.2.tar.bz2 373227985 RMD160 5974cd729ac8d7141e6928b8558c5c9221b573ff SHA1 0bb63c06b8b13c9061400099e4056bbd1ef0eb23 SHA256 1e71049ddb014d9bc724fce7dc96441a90e0eeaa95b994d9ade0eac8b29d2420
-DIST oxygen-icons-4.7.2.tar.xz 28738940 RMD160 3647d3c2b6892ef6a05d41dd0dbfb67622245be9 SHA1 f3fc3d214c3618941ba87f157aec5eca91b0becb SHA256 434567a0ccab44259adb0ed3e2a14c103faebea3116153cc64fc5e61840a8219
 DIST oxygen-icons-4.7.4.tar.bz2 373227929 RMD160 dc9ec2a323f117e154b75ee5a5eab6669cd835bc SHA1 b8ebe40c26be41558ac26151894f975ac278b791 SHA256 b209dbf89186ed966186c125c42bb1b3c7f54685b3c5d038f98f35ae8507dd2b
 DIST oxygen-icons-4.7.4.tar.xz 28739100 RMD160 6c9250a31713dacd3bf9121feb3b67810ae1d08a SHA1 62efac8f42119ffa8b33190cd32bcf6a428b1f35 SHA256 addbddb0053a6af3940a39134b2edc5a6c45c907177f4799cf70144d5e7fd29e
diff --git a/kde-base/oxygen-icons/oxygen-icons-4.7.3.ebuild b/kde-base/oxygen-icons/oxygen-icons-4.7.3.ebuild
deleted file mode 100644
index b1113546c30d..000000000000
--- a/kde-base/oxygen-icons/oxygen-icons-4.7.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/oxygen-icons/oxygen-icons-4.7.3.ebuild,v 1.3 2011/12/07 22:13:45 hwoarang Exp $
-
-EAPI=4
-
-if [[ ${PV} == *9999 ]]; then
-	KMNAME="kdesupport"
-else
-	# Upstream does not ship releases properly so we dont want all versions
-	MY_PV="4.7.2"
-	MY_P="${PN}-${MY_PV}"
-fi
-KDE_REQUIRED="never"
-inherit kde4-base
-
-DESCRIPTION="Oxygen SVG icon theme."
-HOMEPAGE="http://www.oxygen-icons.org/"
-# Note that the upstream tarball is .bz2, ours is .xz -- if upstream
-# changes its compression format to .xz, we will need to change the
-# filename of one of the tarballs
-[[ ${PV} == *9999 ]] || \
-SRC_URI="
-	!bindist? ( http://dev.gentoo.org/~alexxy/distfiles/${MY_P}.tar.xz )
-	bindist? ( ${SRC_URI//${PV}/${MY_PV}} )
-"
-
-LICENSE="LGPL-3"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="aqua bindist"
-
-DEPEND="
-	!bindist? ( app-arch/xz-utils )
-"
-RDEPEND=""
-
-[[ ${PV} == *9999 ]] || S=${WORKDIR}/${MY_P}
diff --git a/kde-base/palapeli/Manifest b/kde-base/palapeli/Manifest
index 8848f67800d8..4ad4da56e9e9 100644
--- a/kde-base/palapeli/Manifest
+++ b/kde-base/palapeli/Manifest
@@ -1,3 +1,2 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
-DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
diff --git a/kde-base/palapeli/palapeli-4.7.3.ebuild b/kde-base/palapeli/palapeli-4.7.3.ebuild
deleted file mode 100644
index 3b9076ac32db..000000000000
--- a/kde-base/palapeli/palapeli-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/palapeli/palapeli-4.7.3.ebuild,v 1.3 2011/12/07 22:14:01 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE jigsaw puzzle game"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/parley/Manifest b/kde-base/parley/Manifest
index 0df0bfb91312..36d2df291904 100644
--- a/kde-base/parley/Manifest
+++ b/kde-base/parley/Manifest
@@ -1,3 +1,2 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
-DIST parley-4.7.3.tar.bz2 10557966 RMD160 b827c70b5324139baa55613cf07c430b6c989e21 SHA1 a5d06f373976554d58c8aae279e411a6be028826 SHA256 aa39114fcccb9c4f99d7d38e96da6f368bec75d33c4eb64346a59bf007faf04f
 DIST parley-4.7.4.tar.bz2 10557543 RMD160 e5064f5588199cd01fee601bb12029ff55a226c1 SHA1 e61d0192dce0e1427ee41ff96f1bcb73c77cbcef SHA256 186d4f85307e6df51da4369d7386ebe29eba4d91e9c570081d58f1d814d1f771
diff --git a/kde-base/parley/parley-4.7.3.ebuild b/kde-base/parley/parley-4.7.3.ebuild
deleted file mode 100644
index da7fa8549314..000000000000
--- a/kde-base/parley/parley-4.7.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/parley/parley-4.7.3.ebuild,v 1.3 2011/12/07 22:13:55 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE Educational: vocabulary trainer"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug +plasma"
-
-DEPEND="
-	$(add_kdebase_dep libkdeedu)
-"
-
-KMEXTRACTONLY="
-	libkdeedu/keduvocdocument
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with plasma)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-base/perlkde/Manifest b/kde-base/perlkde/Manifest
index d04fd985afde..f5ec89df9911 100644
--- a/kde-base/perlkde/Manifest
+++ b/kde-base/perlkde/Manifest
@@ -1,2 +1 @@
-DIST perlkde-4.7.3.tar.bz2 40153 RMD160 938a7c83053ac1efc00c74ac8cef6152bcdfcb4f SHA1 e0cc0d644084f1c71b6afc30d5467c49ba9a9fab SHA256 0309b3fea6cf5be8540a60d190e87510329543ca5408b3f836e62d55eca2ddf9
 DIST perlkde-4.7.4.tar.bz2 40152 RMD160 5c647fd964ab22580c7da22c2d3e70e57f74b90b SHA1 7116668ecd5baf55734a8349a2f0b04d0e701898 SHA256 43a52b5eb57a1ea5e6ae6cc4179d91384a1afb5be816b82adcaa5a2f14434adf
diff --git a/kde-base/perlkde/perlkde-4.7.3.ebuild b/kde-base/perlkde/perlkde-4.7.3.ebuild
deleted file mode 100644
index e482310101e5..000000000000
--- a/kde-base/perlkde/perlkde-4.7.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/perlkde/perlkde-4.7.3.ebuild,v 1.3 2011/12/07 22:13:48 hwoarang Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE Perl bindings"
-KEYWORDS="amd64 x86"
-IUSE="akonadi attica debug kate okular semantic-desktop test"
-
-RDEPEND="
-	>=dev-lang/perl-5.10.1
-	$(add_kdebase_dep perlqt)
-	$(add_kdebase_dep smokekde 'akonadi?,attica?,kate?,okular?,semantic-desktop=')
-	semantic-desktop? ( >=dev-libs/soprano-2.6.51 )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/List-MoreUtils )
-"
-
-# Split from kdebindings-perl in 4.7
-add_blocker kdebindings-perl
-
-PATCHES=( "${FILESDIR}/${PN}-4.7.2-vendor.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with akonadi)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_disable kate)
-		$(cmake-utils_use_with okular)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-	)
-	kde4-base_src_configure
-}
diff --git a/kde-base/perlqt/Manifest b/kde-base/perlqt/Manifest
index c9e80e2ff110..a55a98d3cb43 100644
--- a/kde-base/perlqt/Manifest
+++ b/kde-base/perlqt/Manifest
@@ -1,2 +1 @@
-DIST perlqt-4.7.3.tar.bz2 1955899 RMD160 bce317a5ae53af3bb029698c7605044f3d41496d SHA1 6e69719edccb23e3ced7ba30b72e88d214d6f54e SHA256 59c7eb34b5812caca5ce7667c4e2e6d1e442b573429b3f6ca3c8d4a574cfeef5
 DIST perlqt-4.7.4.tar.bz2 1956219 RMD160 e9504cf93d92768354ef46d756d3d47ce9b6922f SHA1 b4b3d8ce2b08af62202f5ae79fe57bde60dd9a85 SHA256 cb7e1e1e22b2fc254d7b420fb682bfc09f74318337cfd3e863e9d56948df22ec
diff --git a/kde-base/perlqt/perlqt-4.7.3.ebuild b/kde-base/perlqt/perlqt-4.7.3.ebuild
deleted file mode 100644
index aa9a8dc86c20..000000000000
--- a/kde-base/perlqt/perlqt-4.7.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/perlqt/perlqt-4.7.3.ebuild,v 1.5 2011/12/07 22:14:01 hwoarang Exp $
-
-EAPI=4
-
-DECLARATIVE_REQUIRED="optional"
-MULTIMEDIA_REQUIRED="optional"
-OPENGL_REQUIRED="optional"
-QTHELP_REQUIRED="optional"
-KDE_REQUIRED="never"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="Qt Perl bindings"
-KEYWORDS="amd64 x86"
-IUSE="debug phonon qimageblitz qscintilla qwt webkit"
-
-RDEPEND="
-	>=dev-lang/perl-5.10.1
-	dev-perl/List-MoreUtils
-	$(add_kdebase_dep smokeqt 'declarative?,multimedia?,opengl?,phonon?,qimageblitz?,qscintilla?,qthelp?,qwt?,webkit?')
-"
-DEPEND=${RDEPEND}
-
-# Split from kdebindings-perl in 4.7
-add_blocker kdebindings-perl
-
-RESTRICT="test"
-# bug 392991
-
-PATCHES=( "${FILESDIR}/${PN}-4.7.2-vendor.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_Qt3Support=ON
-		$(cmake-utils_use_disable declarative QtDeclarative)
-		$(cmake-utils_use_disable multimedia QtMultimedia)
-		$(cmake-utils_use_disable opengl QtOpenGL)
-		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with qimageblitz QImageBlitz)
-		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_disable qthelp QtHelp)
-		$(cmake-utils_use_disable qwt)
-		$(cmake-utils_use_disable webkit QtWebKit)
-	)
-	kde4-base_src_configure
-}
diff --git a/kde-base/phonon-kde/Manifest b/kde-base/phonon-kde/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/phonon-kde/Manifest
+++ b/kde-base/phonon-kde/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/phonon-kde/phonon-kde-4.7.3.ebuild b/kde-base/phonon-kde/phonon-kde-4.7.3.ebuild
deleted file mode 100644
index 734855860634..000000000000
--- a/kde-base/phonon-kde/phonon-kde-4.7.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.7.3.ebuild,v 1.3 2011/12/07 22:13:51 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-KMMODULE="phonon"
-inherit kde4-meta
-
-DESCRIPTION="Phonon KDE Integration"
-HOMEPAGE="http://phonon.kde.org"
-
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-IUSE="alsa debug xine pulseaudio"
-
-DEPEND="
-	>=media-libs/phonon-4.4.3[xine?]
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? (
-		dev-libs/glib:2
-		media-libs/libcanberra
-		>=media-sound/pulseaudio-0.9.21[glib]
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		-DBUILD_tests=OFF
-		$(cmake-utils_use_with alsa)
-		$(cmake-utils_use_with xine)
-		$(cmake-utils_use_with pulseaudio PulseAudio)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/plasma-apps/Manifest b/kde-base/plasma-apps/Manifest
index d0cd4f15d1e8..7af0c2c0ae27 100644
--- a/kde-base/plasma-apps/Manifest
+++ b/kde-base/plasma-apps/Manifest
@@ -1,3 +1,2 @@
-DIST kde-baseapps-4.7.3.tar.bz2 2685074 RMD160 270f3f3ae7b473651517db8818160f16e4faf544 SHA1 952dc26d0d908b41973a8d7b4d27765bf5128d58 SHA256 e9fb0c5da9e9a255c1a1735dfa518dcadc1ea23c68a467164597ff3dbf51c8df
 DIST kde-baseapps-4.7.4.tar.bz2 2684721 RMD160 cedc577cb3449e36b7e7dab1192688c8014c46d1 SHA1 ad4b6d8479bcf8be49b5f53ee8fdcc1b3d1106d6 SHA256 0a59e87b0019bb5d80abbc9cb2fc691ec838d43e9b168e7a15b11d40ac1db51c
 DIST kdebase-4.6.3.tar.bz2 2682586 RMD160 38784d7a5a708703f5a22e39dc5f83ef7aecd833 SHA1 69cfba74099cdce27f7f72725288f025979b41f3 SHA256 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
diff --git a/kde-base/plasma-apps/plasma-apps-4.7.3.ebuild b/kde-base/plasma-apps/plasma-apps-4.7.3.ebuild
deleted file mode 100644
index 3ee88ab29e48..000000000000
--- a/kde-base/plasma-apps/plasma-apps-4.7.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-apps/plasma-apps-4.7.3.ebuild,v 1.3 2011/12/07 22:13:41 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-baseapps"
-KMMODULE="plasma"
-inherit kde4-meta
-
-DESCRIPTION="Additional Applets for Plasma"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkonq)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/plasma-runtime/Manifest b/kde-base/plasma-runtime/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/plasma-runtime/Manifest
+++ b/kde-base/plasma-runtime/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/plasma-runtime/plasma-runtime-4.7.3.ebuild b/kde-base/plasma-runtime/plasma-runtime-4.7.3.ebuild
deleted file mode 100644
index 7265b605db03..000000000000
--- a/kde-base/plasma-runtime/plasma-runtime-4.7.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-runtime/plasma-runtime-4.7.3.ebuild,v 1.4 2011/12/16 22:39:26 dilfridge Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-KMMODULE="plasma"
-DECLARATIVE_REQUIRED="always"
-inherit kde4-meta
-
-DESCRIPTION="Script engine and package tool for plasma"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-# file collisions, bug 394997
-add_blocker plasma-workspace 4.4.50
diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.7.3-r7.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.7.3-r7.ebuild
deleted file mode 100644
index cc2b16afbb71..000000000000
--- a/kde-base/plasma-workspace/plasma-workspace-4.7.3-r7.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.7.3-r7.ebuild,v 1.3 2011/12/07 22:13:35 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-KMMODULE="plasma"
-PYTHON_DEPEND="python? 2"
-inherit python kde4-meta
-
-DESCRIPTION="Plasma: KDE desktop framework"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug google-gadgets gps python qalculate +rss semantic-desktop xinerama"
-
-COMMONDEPEND="
-	$(add_kdebase_dep kactivities)
-	$(add_kdebase_dep kdelibs 'semantic-desktop=')
-	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep ksysguard)
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep libplasmagenericshell)
-	$(add_kdebase_dep libtaskmanager)
-	$(add_kdebase_dep solid)
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	google-gadgets? ( >=x11-misc/google-gadgets-0.11.0[qt4] )
-	gps? ( >=sci-geosciences/gpsd-2.37 )
-	python? (
-		>=dev-python/PyQt4-4.4.0[X]
-		>=dev-python/sip-4.7.1
-		$(add_kdebase_dep pykde4)
-	)
-	qalculate? ( sci-libs/libqalculate )
-	rss? (
-		$(add_kdebase_dep kdepimlibs 'semantic-desktop=')
-		$(add_kdebase_dep libplasmaclock 'holidays')
-	)
-	!rss? ( $(add_kdebase_dep libplasmaclock '-holidays') )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${COMMONDEPEND}
-	rss? ( dev-libs/boost )
-	x11-proto/compositeproto
-	x11-proto/damageproto
-	x11-proto/fixesproto
-	x11-proto/renderproto
-	xinerama? ( x11-proto/xineramaproto )
-"
-RDEPEND="${COMMONDEPEND}
-	$(add_kdebase_dep activitymanager)
-	$(add_kdebase_dep plasma-runtime)
-"
-
-KMEXTRA="
-	statusnotifierwatcher/
-"
-KMEXTRACTONLY="
-	krunner/dbus/org.freedesktop.ScreenSaver.xml
-	krunner/dbus/org.kde.krunner.App.xml
-	ksmserver/org.kde.KSMServerInterface.xml
-	libs/kephal/
-	libs/kworkspace/
-	libs/taskmanager/
-	libs/plasmagenericshell/
-	libs/ksysguard/
-	ksysguard/
-"
-
-KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
-	"${FILESDIR}/${PN}-4.7.3-weathercrash.patch"
-	"${FILESDIR}/${PN}-4.7.3-taskcrash.patch"
-	"${FILESDIR}/${PN}-4.7.3-calendarcrash.patch"
-	"${FILESDIR}/${PN}-4.7.3-layoutcrash.patch"
-	"${FILESDIR}/${PN}-4.7.3-deletedwidget.patch"
-)
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-	kde4-meta_pkg_setup
-}
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA+=" doc/plasma-desktop"
-	fi
-
-	kde4-meta_src_unpack
-}
-
-src_prepare() {
-	sed -i -e '1ifind_package(KdepimLibs)' plasma/CMakeLists.txt || die
-
-	kde4-meta_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with google-gadgets Googlegadgets)
-		$(cmake-utils_use_with gps libgps)
-		$(cmake-utils_use_with python SIP)
-		$(cmake-utils_use_with python PyQt4)
-		$(cmake-utils_use_with python PyKDE4)
-		$(cmake-utils_use_with qalculate)
-		$(cmake-utils_use_with rss KdepimLibs)
-		$(cmake-utils_use_with semantic-desktop Akonadi)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with xinerama X11_Xinerama)
-		-DWITH_Xmms=OFF
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	rm -f \
-		"${ED}$(python_get_sitedir)"/PyKDE4/*.py[co] \
-		"${ED}"/usr/share/apps/plasma_scriptengine_python/*.py[co]
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	if use python; then
-		python_mod_optimize \
-			PyKDE4 \
-			/usr/share/apps/plasma_scriptengine_python
-	fi
-}
-
-pkg_postrm() {
-	kde4-meta_pkg_postrm
-
-	if [[ -d ${EPREFIX}/usr/share/apps/plasma_scriptengine_python ]]; then
-		python_mod_cleanup \
-			PyKDE4 \
-			/usr/share/apps/plasma_scriptengine_python
-	fi
-}
diff --git a/kde-base/powerdevil/Manifest b/kde-base/powerdevil/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/powerdevil/Manifest
+++ b/kde-base/powerdevil/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/powerdevil/powerdevil-4.7.3.ebuild b/kde-base/powerdevil/powerdevil-4.7.3.ebuild
deleted file mode 100644
index 2f88bf486547..000000000000
--- a/kde-base/powerdevil/powerdevil-4.7.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/powerdevil-4.7.3.ebuild,v 1.3 2011/12/07 22:13:31 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="PowerDevil is an utility for KDE4 for Laptop Powermanagement."
-HOMEPAGE="http://www.kde-apps.org/content/show.php/PowerDevil?content=85078"
-LICENSE="GPL-2"
-
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug +pm-utils"
-
-DEPEND="
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep solid)
-"
-RDEPEND="${DEPEND}
-	pm-utils? ( sys-power/pm-utils )
-"
-
-KMEXTRACTONLY="
-	krunner/
-	ksmserver/org.kde.KSMServerInterface.xml
-"
diff --git a/kde-base/printer-applet/Manifest b/kde-base/printer-applet/Manifest
index f961b744c25e..0b02373ba0f9 100644
--- a/kde-base/printer-applet/Manifest
+++ b/kde-base/printer-applet/Manifest
@@ -1,3 +1,2 @@
 DIST kdeutils-4.6.3.tar.bz2 3703326 RMD160 1fe6287fed3fa21eef902ee764425171f7345e6c SHA1 1aa735c03689ef49b949278ee31d0d8e8536b7d6 SHA256 d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
-DIST kdeutils-4.7.3.tar.bz2 3802391 RMD160 0e0a73d290baaa289665b49722f04f19ab517dd9 SHA1 23fc9823647152d5d8cc250a55402c8930db4059 SHA256 a8c802f32b9e918d806a4487c25485f86019e4c473f0de6d3086d8ea8e492839
 DIST kdeutils-4.7.4.tar.bz2 3802873 RMD160 24c3af30a407523bdf853059fc38bfbf6e6d4604 SHA1 4630f01f36558eb5494fc562086fbd4e488e411e SHA256 bb50a5069808a0280eff671b2f9c0053f5bbbfdc432760bc35ccf654de833c68
diff --git a/kde-base/printer-applet/printer-applet-4.7.3.ebuild b/kde-base/printer-applet/printer-applet-4.7.3.ebuild
deleted file mode 100644
index bbff0abe30ac..000000000000
--- a/kde-base/printer-applet/printer-applet-4.7.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2011 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.7.3.ebuild,v 1.3 2011/12/07 22:13:43 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-PYTHON_DEPEND="2"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeutils"
-	kde_eclass="kde4-meta"
-fi
-inherit python ${kde_eclass}
-
-DESCRIPTION="KDE printer system tray utility"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=app-admin/system-config-printer-common-1.2.2
-	$(add_kdebase_dep pykde4)
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	${kde_eclass}_pkg_setup
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	${kde_eclass}_src_prepare
-
-	# Rename printer-applet -> printer-applet-kde
-	local newname="printer-applet-kde"
-	local srcdir=.
-	[[ ${kde_eclass} == "kde4-meta" ]] && srcdir="${KMMODULE}"
-	sed -e "/PYKDE4_ADD_EXECUTABLE/s/ printer-applet[[:space:]]*)/ ${newname})/" \
-		-e "/install/s/)/ RENAME ${newname}.desktop)/" \
-		-i "${srcdir}"/CMakeLists.txt || die "failed to rename printer-applet executable"
-	sed -e "/Exec/s/printer-applet/${newname}/" \
-		-i "${srcdir}"/printer-applet.desktop || die "failed to patch .desktop file"
-}
-
-src_install() {
-	${kde_eclass}_src_install
-	python_convert_shebangs -q -r $(python_get_version) "${ED}"
-}
-
-pkg_postrm() {
-	python_mod_cleanup "${PREFIX}share/apps/${PN}"
-}
diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index 16f9774c332c..ba11c98a512f 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -1,3 +1,2 @@
 DIST kdebindings-4.6.3.tar.bz2 7078095 RMD160 f62d84df4957f4449695486bfb117df917f17da9 SHA1 4ecc6ac378c241472aa75680abfafd8d57672653 SHA256 13cf7fc54132303a7bcaf0c03b696d05a07405f51d2cb5ba14e56d35c0762be3
-DIST pykde4-4.7.3.tar.bz2 2106262 RMD160 251b979fc6d4e2186278f8eb84b332a59aff2cdd SHA1 16063793d39fdc9f5b9916cab49236103ce79da2 SHA256 c580432d645361355400c27e84779d3ca1209d979624b147ffd742c986665aca
 DIST pykde4-4.7.4.tar.bz2 2106112 RMD160 e76109c25e425ca93bb057a466fcbe9e78a9b857 SHA1 cac4b94098dba73d58fb4f7d73d7c65c306517d1 SHA256 ff9ec71867dec95086c5ec5dfc4d4a681bb3c76ff4942a12cc4efd0ce2cf871d
diff --git a/kde-base/pykde4/pykde4-4.7.3.ebuild b/kde-base/pykde4/pykde4-4.7.3.ebuild
deleted file mode 100644
index 0516e4e42b13..000000000000
--- a/kde-base/pykde4/pykde4-4.7.3.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.7.3.ebuild,v 1.3 2011/12/07 22:13:52 hwoarang Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="*:2.5"
-RESTRICT_PYTHON_ABIS="*-jython 2.4"
-PYTHON_USE_WITH="threads"
-SUPPORT_PYTHON_ABIS="1"
-
-OPENGL_REQUIRED="always"
-KDE_SCM="git"
-inherit python portability kde4-base
-
-DESCRIPTION="Python bindings for KDE4"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc examples semantic-desktop"
-
-# blocker added due to compatibility issues and error during compile time
-RDEPEND="
-	>=dev-python/sip-4.12.3-r2
-	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop=')
-	semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
-	aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,aqua] )
-	!aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,X] )
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.6.3-python-3.2.patch
-)
-
-pkg_setup() {
-	python_pkg_setup
-	kde4-base_pkg_setup
-
-	have_python2=false
-
-	scan_python_versions() {
-		[[ ${PYTHON_ABI} == 2.* ]] && have_python2=true
-		:
-	}
-	python_execute_function -q scan_python_versions
-	if ! ${have_python2}; then
-		ewarn "You do not have a Python 2 version selected."
-		ewarn "kpythonpluginfactory will not be built"
-	fi
-}
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	if ! use examples; then
-		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i CMakeLists.txt \
-			|| die "Failed to disable examples"
-	fi
-
-	# See bug 322351
-	use arm && epatch "${FILESDIR}/${PN}-4.4.4-arm-sip.patch"
-
-	sed -i -e 's/kpythonpluginfactory /kpython${PYTHON_SHORT_VERSION}pluginfactory /g' kpythonpluginfactory/CMakeLists.txt
-
-	if ${have_python2}; then
-		mkdir -p "${WORKDIR}/wrapper" || die "failed to copy wrapper"
-		cp "${FILESDIR}/kpythonpluginfactorywrapper.c" "${WORKDIR}/wrapper" || die "failed to copy wrapper"
-	fi
-}
-
-src_configure() {
-	configuration() {
-		local mycmakeargs=(
-			-DWITH_PolkitQt=OFF
-			-DWITH_QScintilla=OFF
-			$(cmake-utils_use_with semantic-desktop Soprano)
-			$(cmake-utils_use_with semantic-desktop Nepomuk)
-			$(cmake-utils_use_with semantic-desktop KdepimLibs)
-			-DPYTHON_EXECUTABLE=$(PYTHON -a)
-		)
-		local CMAKE_BUILD_DIR=${S}_build-${PYTHON_ABI}
-		kde4-base_src_configure
-	}
-
-	python_execute_function configuration
-}
-
-echo_and_run() {
-	echo "$@"
-	"$@"
-}
-
-src_compile() {
-	compilation() {
-		local CMAKE_BUILD_DIR=${S}_build-${PYTHON_ABI}
-		kde4-base_src_compile
-	}
-	python_execute_function compilation
-
-	if ${have_python2}; then
-		cd "${WORKDIR}/wrapper"
-		echo_and_run libtool --tag=CC --mode=compile $(tc-getCC) \
-			-shared \
-			${CFLAGS} ${CPPFLAGS} \
-			-DEPREFIX="\"${EPREFIX}\"" \
-			-DPLUGIN_DIR="\"/usr/$(get_libdir)/kde4\"" -c \
-			-o kpythonpluginfactorywrapper.lo \
-			kpythonpluginfactorywrapper.c
-		echo_and_run libtool --tag=CC --mode=link $(tc-getCC) \
-			-shared -module -avoid-version \
-			${CFLAGS} ${LDFLAGS} \
-			-o kpythonpluginfactory.la \
-			-rpath "${EPREFIX}/usr/$(get_libdir)/kde4" \
-			kpythonpluginfactorywrapper.lo \
-			$(dlopen_lib)
-	fi
-}
-
-src_install() {
-	installation() {
-		cd "${S}_build-${PYTHON_ABI}"
-		emake DESTDIR="${T}/images/${PYTHON_ABI}" install
-	}
-	python_execute_function installation
-
-	python_merge_intermediate_installation_images "${T}/images"
-
-	# As we don't call the eclass's src_install, we have to install the docs manually
-	DOCS=("${S}"/{AUTHORS,NEWS,README})
-	use doc && HTML_DOCS=("${S}/docs/html/")
-	base_src_install_docs
-
-	if ${have_python2}; then
-		cd "${WORKDIR}/wrapper"
-		echo_and_run libtool --mode=install install kpythonpluginfactory.la "${ED}/usr/$(get_libdir)/kde4/kpythonpluginfactory.la"
-		rm "${ED}/usr/$(get_libdir)/kde4/kpythonpluginfactory.la"
-	fi
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	python_mod_optimize PyKDE4 PyQt4/uic/pykdeuic4.py PyQt4/uic/widget-plugins/kde4.py
-
-	if use examples; then
-		echo
-		elog "PyKDE4 examples have been installed to"
-		elog "${EPREFIX}/usr/share/apps/${PN}/examples"
-		echo
-	fi
-}
-
-pkg_postrm() {
-	kde4-base_pkg_postrm
-
-	python_mod_cleanup PyKDE4 PyQt4/uic/pykdeuic4.py PyQt4/uic/widget-plugins/kde4.py
-}
diff --git a/kde-base/qguiplatformplugin_kde/Manifest b/kde-base/qguiplatformplugin_kde/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/qguiplatformplugin_kde/Manifest
+++ b/kde-base/qguiplatformplugin_kde/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.7.3.ebuild b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.7.3.ebuild
deleted file mode 100644
index 2c455c6e3833..000000000000
--- a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.7.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.7.3.ebuild,v 1.3 2011/12/07 22:13:56 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="Helps integration of pure Qt applications with KDE Workspace"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/qtruby/Manifest b/kde-base/qtruby/Manifest
index 22b508037e00..009558d04498 100644
--- a/kde-base/qtruby/Manifest
+++ b/kde-base/qtruby/Manifest
@@ -1,2 +1 @@
-DIST qtruby-4.7.3.tar.bz2 614672 RMD160 32527ca6ebf76a8e1f9e76a6fdc031b2d4a3d8d7 SHA1 2e3b36ece9039ccd39be76145575015503c6283c SHA256 f2a467a96180e1684a83cb2db365c6003f006e2a23a5086ceb2975289e8aee24
 DIST qtruby-4.7.4.tar.bz2 613735 RMD160 c21475bee2d542b28746ddac6360ea5d0961ec7b SHA1 e49e38a59238cf6f5ec9c2d9afc06f3330369fc7 SHA256 de7a84236b5d438b38aa9c8ea9d335d37715a3471d1c9ba648d2e2855d434016
diff --git a/kde-base/qtruby/qtruby-4.7.3.ebuild b/kde-base/qtruby/qtruby-4.7.3.ebuild
deleted file mode 100644
index 5e75d1d2d6f6..000000000000
--- a/kde-base/qtruby/qtruby-4.7.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/qtruby-4.7.3.ebuild,v 1.3 2011/12/07 22:13:46 hwoarang Exp $
-
-EAPI=4
-
-OPENGL_REQUIRED="always"
-DECLARATIVE_REQUIRED="optional"
-KDE_REQUIRED="never"
-KDE_SCM="git"
-USE_RUBY="ruby18"
-# No ruby19 for three reasons:
-# 1) it does not build (yet) - will likely be solved soon
-# 2) cmake bails when configuring twice or more - solved with CMAKE_IN_SOURCE_BUILD=1
-# 3) the ebuild can only be installed for one ruby variant, otherwise the compiled
-#    files with identical path+name will overwrite each other - difficult :(
-
-inherit kde4-base ruby-ng
-
-DESCRIPTION="Qt Ruby bindings"
-KEYWORDS="amd64 x86"
-IUSE="debug phonon qscintilla qwt webkit"
-
-DEPEND="
-	$(add_kdebase_dep smokeqt 'declarative?,opengl,phonon?,qscintilla?,qwt?,webkit?')
-"
-
-RDEPEND="${DEPEND}
-"
-
-# Split from kdebindings-ruby in 4.7
-add_blocker kdebindings-ruby
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-	kde4-base_pkg_setup
-}
-
-src_unpack() {
-	local S="${WORKDIR}/${P}"
-	kde4-base_src_unpack
-
-	cd "${WORKDIR}"
-	mkdir all
-	mv ${P} all/ || die "Could not move sources"
-}
-
-all_ruby_prepare() {
-	kde4-base_src_prepare
-}
-
-each_ruby_configure() {
-	local CMAKE_USE_DIR=${S}
-	mycmakeargs=(
-		-DRUBY_LIBRARY=$(ruby_get_libruby)
-		-DRUBY_INCLUDE_PATH=$(ruby_get_hdrdir)
-		-DRUBY_EXECUTABLE=${RUBY}
-		$(cmake-utils_use_disable declarative QtDeclarative)
-		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_with qwt Qwt5)
-		$(cmake-utils_use_disable webkit QtWebKit)
-	)
-	kde4-base_src_configure
-}
-
-each_ruby_compile() {
-	local CMAKE_USE_DIR=${S}
-	kde4-base_src_compile
-}
-
-each_ruby_install() {
-	local CMAKE_USE_DIR=${S}
-	kde4-base_src_install
-}
diff --git a/kde-base/qyoto/Manifest b/kde-base/qyoto/Manifest
index 9377d630f83e..cf11131cd2d5 100644
--- a/kde-base/qyoto/Manifest
+++ b/kde-base/qyoto/Manifest
@@ -1,2 +1 @@
-DIST qyoto-4.7.3.tar.bz2 553569 RMD160 13cc1bfdba8f34cff4a939fee2837abe5958d785 SHA1 676042633b8c426adf1f47ad143f5db20ae257ef SHA256 c4bfc59c5bbd5c33c5e9668384e851407a980247b1a1e880dbb0fa102c7c26ba
 DIST qyoto-4.7.4.tar.bz2 553768 RMD160 74aa5e5d090a881ef0c0cd67996746175b1540cb SHA1 8f2412a8bbb343bdb1e14c0fc6ef3681afe9d601 SHA256 5fa2f0781c5f558e9cce8b03e45ecba59f3e708de4ba9671942898850d0358d5
diff --git a/kde-base/qyoto/qyoto-4.7.3.ebuild b/kde-base/qyoto/qyoto-4.7.3.ebuild
deleted file mode 100644
index f823f0e85fd3..000000000000
--- a/kde-base/qyoto/qyoto-4.7.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qyoto/qyoto-4.7.3.ebuild,v 1.3 2011/12/07 22:13:39 hwoarang Exp $
-
-EAPI=4
-
-KDE_REQUIRED="never"
-KDE_SCM="git"
-inherit kde4-base mono
-
-DESCRIPTION="C# bindings for Qt"
-KEYWORDS="amd64 x86"
-IUSE="debug +phonon qscintilla webkit"
-
-DEPEND="
-	dev-lang/mono
-	$(add_kdebase_dep smokeqt 'opengl,phonon?,qscintilla?,webkit?')
-"
-RDEPEND="${DEPEND}"
-
-# Split from kdebindings-csharp in 4.7
-add_blocker kdebindings-csharp
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_disable qscintilla QScintilla)
-		$(cmake-utils_use_disable webkit QtWebKit)
-	)
-	kde4-base_src_configure
-}
diff --git a/kde-base/renamedlg-plugins/Manifest b/kde-base/renamedlg-plugins/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/renamedlg-plugins/Manifest
+++ b/kde-base/renamedlg-plugins/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/renamedlg-plugins/renamedlg-plugins-4.7.3.ebuild b/kde-base/renamedlg-plugins/renamedlg-plugins-4.7.3.ebuild
deleted file mode 100644
index e75c461047a3..000000000000
--- a/kde-base/renamedlg-plugins/renamedlg-plugins-4.7.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/renamedlg-plugins/renamedlg-plugins-4.7.3.ebuild,v 1.3 2011/12/07 22:13:37 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-KMMODULE="renamedlgplugins"
-inherit kde4-meta
-
-DESCRIPTION="KDE RenameDlg plugins"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/rocs/Manifest b/kde-base/rocs/Manifest
index c41c5b55131c..46724af1a134 100644
--- a/kde-base/rocs/Manifest
+++ b/kde-base/rocs/Manifest
@@ -1,3 +1,2 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
-DIST rocs-4.7.3.tar.bz2 344842 RMD160 d8dfc43d23c693bea9c7372c088a1647aa88051e SHA1 5c7d4115f029e09a006912bf816d4ce396a9b49a SHA256 1b3ef7226c98debdb7f27457fef8b913f8312ee4c54710a0bd293fcc41e57c2c
 DIST rocs-4.7.4.tar.bz2 344810 RMD160 d3964855c59f96029407c503e8c59a46d34339ef SHA1 f808118fcd5df59a9a808747be940a88b30cf6f3 SHA256 644ca36be6cf7e7dbcbd86c5d26500f32b70d9ca71818876495f12a355771f63
diff --git a/kde-base/rocs/rocs-4.7.3.ebuild b/kde-base/rocs/rocs-4.7.3.ebuild
deleted file mode 100644
index 8b49dd368124..000000000000
--- a/kde-base/rocs/rocs-4.7.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/rocs-4.7.3.ebuild,v 1.4 2011/12/07 22:14:03 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE4 interface to work with Graph Theory"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="dev-libs/boost"
-DEPEND="
-	${RDEPEND}
-	>=dev-cpp/eigen-2.0.3:2
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.7.3-boost.patch
-)
-
-RESTRICT="test"
-# bug 376909
diff --git a/kde-base/smokegen/Manifest b/kde-base/smokegen/Manifest
index 32a68f4619da..52ddc6904f9b 100644
--- a/kde-base/smokegen/Manifest
+++ b/kde-base/smokegen/Manifest
@@ -1,2 +1 @@
-DIST smokegen-4.7.3.tar.bz2 149081 RMD160 cb6b1a3a654c242da74e5d4a02f60b26a5b13cd7 SHA1 ede4095fdb190b3bef13b246111e7d79903ad77e SHA256 2562497763b913d8d03c7dbad02bf0bc8b6ecd140e7954230984ac2d3b6a4853
 DIST smokegen-4.7.4.tar.bz2 149125 RMD160 c6b5c5627e684c65c78eb2966972164473f49f33 SHA1 068d37e2404311b9caa23d78ee7fa262188a8622 SHA256 281e5022026d4f59eb5060425b6e14d61e40c37d369cfbeb03888e10b4eeaa65
diff --git a/kde-base/smokegen/smokegen-4.7.3.ebuild b/kde-base/smokegen/smokegen-4.7.3.ebuild
deleted file mode 100644
index 1b727be0e5db..000000000000
--- a/kde-base/smokegen/smokegen-4.7.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smokegen/smokegen-4.7.3.ebuild,v 1.3 2011/12/07 22:13:34 hwoarang Exp $
-
-EAPI=4
-
-KDE_REQUIRED="never"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="Scripting Meta Object Kompiler Engine - generators"
-KEYWORDS="amd64 x86"
-IUSE="aqua debug"
-
-DEPEND="
-	x11-libs/qt-core:4[aqua=]
-"
-RDEPEND="${DEPEND}"
-
-add_blocker smoke
diff --git a/kde-base/smokekde/Manifest b/kde-base/smokekde/Manifest
index ef5c24da5352..a5da6bc28a24 100644
--- a/kde-base/smokekde/Manifest
+++ b/kde-base/smokekde/Manifest
@@ -1,2 +1 @@
-DIST smokekde-4.7.3.tar.bz2 37506 RMD160 370a5c752944d412e6584257b2e148f608329678 SHA1 a25114d92c540f16af9022366ca2b5da447a1531 SHA256 9a4b0d54b60ac5e86de9e7e469022d97de22848d6b2fdd60068ebc975bea5750
 DIST smokekde-4.7.4.tar.bz2 37507 RMD160 a79ee4f9c1cc54f93be23c9090137712a7f521ac SHA1 c3e2bd07158c4bc6a19123d5ae8e81529b52e07b SHA256 088ff6b1ee0f997152bb713684f6ae34f82ccbdd9f895a92605c1c13832fad33
diff --git a/kde-base/smokekde/smokekde-4.7.3.ebuild b/kde-base/smokekde/smokekde-4.7.3.ebuild
deleted file mode 100644
index 4ec5e483ee21..000000000000
--- a/kde-base/smokekde/smokekde-4.7.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smokekde/smokekde-4.7.3.ebuild,v 1.3 2011/12/07 22:13:58 hwoarang Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-
-inherit kde4-base
-
-DESCRIPTION="Scripting Meta Object Kompiler Engine - KDE bindings"
-KEYWORDS="amd64 x86"
-IUSE="akonadi attica debug kate okular semantic-desktop"
-
-DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop=')
-	$(add_kdebase_dep smokeqt)
-	akonadi? ( $(add_kdebase_dep kdepimlibs) )
-	attica? ( dev-libs/libattica )
-	kate? ( $(add_kdebase_dep kate) )
-	okular? ( $(add_kdebase_dep okular) )
-"
-RDEPEND="${DEPEND}"
-
-add_blocker smoke
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with akonadi)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_disable kate)
-		$(cmake-utils_use_with okular)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-	)
-	kde4-base_src_configure
-}
diff --git a/kde-base/smokeqt/Manifest b/kde-base/smokeqt/Manifest
index 81740e95e78f..ea14a925c445 100644
--- a/kde-base/smokeqt/Manifest
+++ b/kde-base/smokeqt/Manifest
@@ -1,2 +1 @@
-DIST smokeqt-4.7.3.tar.bz2 29848 RMD160 9b4c84b76d1978ebea253efcf50c6f67bbf0836d SHA1 cf1c4b7116695f0842972b2985eca65f6b63702e SHA256 2bbef76c46d1e3498063c09c426d3fbd74c907cd6d55df15f0aaf45ef5c8b997
 DIST smokeqt-4.7.4.tar.bz2 29814 RMD160 bb179bc6b0d25ee1bfcc4bb523ced934e231c17d SHA1 2b1033732d166946db3096ddbf6eb9a6ddb61877 SHA256 eeae8780c52a1777241ba760c7b6d3351eab4d65c1301589b2b5e9e00fc28152
diff --git a/kde-base/smokeqt/smokeqt-4.7.3.ebuild b/kde-base/smokeqt/smokeqt-4.7.3.ebuild
deleted file mode 100644
index 01b5d14ab039..000000000000
--- a/kde-base/smokeqt/smokeqt-4.7.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smokeqt/smokeqt-4.7.3.ebuild,v 1.3 2011/12/07 22:13:36 hwoarang Exp $
-
-EAPI=4
-
-DECLARATIVE_REQUIRED="optional"
-MULTIMEDIA_REQUIRED="optional"
-QTHELP_REQUIRED="optional"
-OPENGL_REQUIRED="optional"
-KDE_REQUIRED="never"
-
-KDE_SCM="git"
-
-inherit kde4-base
-
-DESCRIPTION="Scripting Meta Object Kompiler Engine - Qt bindings"
-KEYWORDS="amd64 x86"
-IUSE="debug +phonon qimageblitz qscintilla qwt webkit"
-
-# Maybe make more of Qt optional?
-DEPEND="
-	$(add_kdebase_dep smokegen)
-	x11-libs/qt-core:4
-	x11-libs/qt-dbus:4
-	x11-libs/qt-gui:4
-	x11-libs/qt-script:4
-	x11-libs/qt-sql:4
-	x11-libs/qt-svg:4
-	x11-libs/qt-test:4
-	phonon? ( >=media-libs/phonon-4.4.3 )
-	qimageblitz? ( >=media-libs/qimageblitz-0.0.4 )
-	qscintilla? ( x11-libs/qscintilla )
-	qwt? ( x11-libs/qwt:5 )
-	webkit? ( x11-libs/qt-webkit:4 )
-"
-RDEPEND="${DEPEND}"
-
-# Split in 4.7
-add_blocker smoke
-
-src_configure() {
-	mycmakeargs=(
-		-DDISABLE_Qt3Support=ON
-		-DWITH_QT3_SUPPORT=OFF
-		$(cmake-utils_use_disable declarative QtDeclarative)
-		$(cmake-utils_use_disable multimedia QtMultimedia)
-		$(cmake-utils_use_disable opengl QtOpenGL)
-		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with qimageblitz QImageBlitz)
-		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_disable qthelp QtHelp)
-		$(cmake-utils_use_disable qwt Qwt5)
-		$(cmake-utils_use_disable webkit QtWebKit)
-	)
-	kde4-base_src_configure
-}
diff --git a/kde-base/solid-runtime/Manifest b/kde-base/solid-runtime/Manifest
index ccf48cf1476e..18aa7b30d850 100644
--- a/kde-base/solid-runtime/Manifest
+++ b/kde-base/solid-runtime/Manifest
@@ -1,3 +1,2 @@
-DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
diff --git a/kde-base/solid-runtime/solid-runtime-4.7.3.ebuild b/kde-base/solid-runtime/solid-runtime-4.7.3.ebuild
deleted file mode 100644
index 3b689c0df16a..000000000000
--- a/kde-base/solid-runtime/solid-runtime-4.7.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid-runtime/solid-runtime-4.7.3.ebuild,v 1.4 2011/12/16 22:43:18 dilfridge Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-KMNOMODULE=true
-inherit kde4-meta
-
-DESCRIPTION="KDE SC solid runtime modules (autoeject, automounter and others)"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-KMEXTRA="
-	solid-device-automounter/
-	solid-hardware/
-	solid-networkstatus/
-	solidautoeject/
-	soliduiserver/
-"
-
-# file collisions, bug 395001
-add_blocker solid 4.4.50
diff --git a/kde-base/solid/Manifest b/kde-base/solid/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/solid/Manifest
+++ b/kde-base/solid/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/solid/solid-4.7.3.ebuild b/kde-base/solid/solid-4.7.3.ebuild
deleted file mode 100644
index 940d41d5360e..000000000000
--- a/kde-base/solid/solid-4.7.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/solid-4.7.3.ebuild,v 1.3 2011/12/07 22:13:41 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-CPPUNIT_REQUIRED="test"
-inherit kde4-meta
-
-DESCRIPTION="Solid: the KDE hardware library"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug bluetooth networkmanager wicd"
-
-DEPEND="
-	networkmanager? ( net-misc/networkmanager )
-	wicd? ( net-misc/wicd )
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep solid-runtime)
-"
-
-PDEPEND="bluetooth? ( net-wireless/bluedevil )"
-
-KMEXTRA="
-	libs/solid/
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with networkmanager NetworkManager)
-		$(cmake-utils_use_build wicd)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/step/Manifest b/kde-base/step/Manifest
index a77ad30c9036..65cae28fe1c2 100644
--- a/kde-base/step/Manifest
+++ b/kde-base/step/Manifest
@@ -1,3 +1,2 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
-DIST step-4.7.3.tar.bz2 398824 RMD160 9f368272807845dc5e767466338ea18792463b8f SHA1 411695882916a8a1d0db86426a0d8f935fab21ad SHA256 3482aa002356d1e95a11492cc1adca1aabc4d97432c7fc099fe5611fe1059adb
 DIST step-4.7.4.tar.bz2 398346 RMD160 17fd9ba7499c87a81e07e0a63d59352852f312d1 SHA1 30dba80e6f34124fd5a8ebf6688e261ab109d0d4 SHA256 cb4f7ccc7cee08e46f3173e1a82a3d96e7e20a70b9792d3387dafe4218040a00
diff --git a/kde-base/step/step-4.7.3.ebuild b/kde-base/step/step-4.7.3.ebuild
deleted file mode 100644
index b56046e91297..000000000000
--- a/kde-base/step/step-4.7.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/step/step-4.7.3.ebuild,v 1.3 2011/12/07 22:14:00 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="The KDE physics simulator"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug +gsl +qalculate"
-
-DEPEND="
-	>=dev-cpp/eigen-2.0.3:2
-	sci-libs/cln
-	>=sci-mathematics/gmm-3.0
-	gsl? ( >=sci-libs/gsl-1.9-r1 )
-	qalculate? ( >=sci-libs/libqalculate-0.9.5 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.2-solaris.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with gsl)
-		$(cmake-utils_use_with qalculate)
-	)
-	kde4-base_src_configure
-}
diff --git a/kde-base/superkaramba/Manifest b/kde-base/superkaramba/Manifest
index f961b744c25e..0b02373ba0f9 100644
--- a/kde-base/superkaramba/Manifest
+++ b/kde-base/superkaramba/Manifest
@@ -1,3 +1,2 @@
 DIST kdeutils-4.6.3.tar.bz2 3703326 RMD160 1fe6287fed3fa21eef902ee764425171f7345e6c SHA1 1aa735c03689ef49b949278ee31d0d8e8536b7d6 SHA256 d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
-DIST kdeutils-4.7.3.tar.bz2 3802391 RMD160 0e0a73d290baaa289665b49722f04f19ab517dd9 SHA1 23fc9823647152d5d8cc250a55402c8930db4059 SHA256 a8c802f32b9e918d806a4487c25485f86019e4c473f0de6d3086d8ea8e492839
 DIST kdeutils-4.7.4.tar.bz2 3802873 RMD160 24c3af30a407523bdf853059fc38bfbf6e6d4604 SHA1 4630f01f36558eb5494fc562086fbd4e488e411e SHA256 bb50a5069808a0280eff671b2f9c0053f5bbbfdc432760bc35ccf654de833c68
diff --git a/kde-base/superkaramba/superkaramba-4.7.3.ebuild b/kde-base/superkaramba/superkaramba-4.7.3.ebuild
deleted file mode 100644
index 61fb067f63ae..000000000000
--- a/kde-base/superkaramba/superkaramba-4.7.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/superkaramba-4.7.3.ebuild,v 1.3 2011/12/07 22:13:43 hwoarang Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="python? 2"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeutils"
-	kde_eclass="kde4-meta"
-fi
-inherit python ${kde_eclass}
-
-DESCRIPTION="A tool to create interactive applets for the KDE desktop."
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug python"
-
-DEPEND="
-	media-libs/qimageblitz
-	python? ( $(add_kdebase_dep pykde4) )
-"
-RDEPEND="${DEPEND}
-	python? ( $(add_kdebase_dep krosspython) )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-as-needed.patch" )
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-	${kde_eclass}_pkg_setup
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with python PythonLibs)
-	)
-
-	${kde_eclass}_src_configure
-}
diff --git a/kde-base/svgpart/Manifest b/kde-base/svgpart/Manifest
index 09348be58dc9..5f086708b1ef 100644
--- a/kde-base/svgpart/Manifest
+++ b/kde-base/svgpart/Manifest
@@ -1,3 +1,2 @@
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
-DIST svgpart-4.7.3.tar.bz2 9161 RMD160 1951c2462490d445613a224e50ec9e8459f0cfb2 SHA1 fa7f8cac53f6041f18a2bee09c2aa3885e27f7c7 SHA256 2310151ffdf5dd8d970b329d9c67e393a7bcafc5a4dadd8adbd50f3d20e1c9f3
 DIST svgpart-4.7.4.tar.bz2 9148 RMD160 8e704ed864d5ad39b7e4c19379b0618e11758e0a SHA1 38dcb3c468ca359e7b0a0027523b8156de6a06a1 SHA256 9c7d04ceb189fe7c6f10edfdf8bde89c45ab95c4800a55dc75d41bbaac17d014
diff --git a/kde-base/svgpart/svgpart-4.7.3.ebuild b/kde-base/svgpart/svgpart-4.7.3.ebuild
deleted file mode 100644
index 6c44eefb3c22..000000000000
--- a/kde-base/svgpart/svgpart-4.7.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/svgpart/svgpart-4.7.3.ebuild,v 1.3 2011/12/07 22:13:39 hwoarang Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="Svgpart is a kpart for viewing SVGs"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/sweeper/Manifest b/kde-base/sweeper/Manifest
index f961b744c25e..0b02373ba0f9 100644
--- a/kde-base/sweeper/Manifest
+++ b/kde-base/sweeper/Manifest
@@ -1,3 +1,2 @@
 DIST kdeutils-4.6.3.tar.bz2 3703326 RMD160 1fe6287fed3fa21eef902ee764425171f7345e6c SHA1 1aa735c03689ef49b949278ee31d0d8e8536b7d6 SHA256 d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
-DIST kdeutils-4.7.3.tar.bz2 3802391 RMD160 0e0a73d290baaa289665b49722f04f19ab517dd9 SHA1 23fc9823647152d5d8cc250a55402c8930db4059 SHA256 a8c802f32b9e918d806a4487c25485f86019e4c473f0de6d3086d8ea8e492839
 DIST kdeutils-4.7.4.tar.bz2 3802873 RMD160 24c3af30a407523bdf853059fc38bfbf6e6d4604 SHA1 4630f01f36558eb5494fc562086fbd4e488e411e SHA256 bb50a5069808a0280eff671b2f9c0053f5bbbfdc432760bc35ccf654de833c68
diff --git a/kde-base/sweeper/sweeper-4.7.3.ebuild b/kde-base/sweeper/sweeper-4.7.3.ebuild
deleted file mode 100644
index b8fd8ace268f..000000000000
--- a/kde-base/sweeper/sweeper-4.7.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/sweeper/sweeper-4.7.3.ebuild,v 1.3 2011/12/07 22:14:03 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeutils"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
-
-DESCRIPTION="KDE Privacy Settings Widget"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/system-config-printer-kde/Manifest b/kde-base/system-config-printer-kde/Manifest
index d117d4e4bed2..4ae3002bd652 100644
--- a/kde-base/system-config-printer-kde/Manifest
+++ b/kde-base/system-config-printer-kde/Manifest
@@ -1,3 +1,2 @@
 DIST kdeadmin-4.6.3.tar.bz2 792325 RMD160 b36d9a7c983f5da9e6a3524d3cde1f28464d1580 SHA1 141e8e794ebd5341940d2d22986b7376a2abefbf SHA256 1db65d3f5afb83affdad921ee034f33d7aeb1aac7fe9a55f4b1d26c385577076
-DIST kdeadmin-4.7.3.tar.bz2 806208 RMD160 5aefc3021a1fea4725295ebe97ba8486a09f2768 SHA1 b2d6d210bc40e8731a9ae8409673f3d71b57de0a SHA256 00b32dfb17a8edd89cdd01083df71b1b177e79c7a6ab7fce679a3d0246647029
 DIST kdeadmin-4.7.4.tar.bz2 807192 RMD160 9082b64533435f23a26bb185a20cd7fa47054e80 SHA1 1a294315645adbbff348a380196d4300a408b70d SHA256 f90ecbe4a34bbe47d862e9af6a26811635120d11f6a3ef9163e2c0d7ee1fc79b
diff --git a/kde-base/system-config-printer-kde/system-config-printer-kde-4.7.3.ebuild b/kde-base/system-config-printer-kde/system-config-printer-kde-4.7.3.ebuild
deleted file mode 100644
index ddc95359781b..000000000000
--- a/kde-base/system-config-printer-kde/system-config-printer-kde-4.7.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/system-config-printer-kde/system-config-printer-kde-4.7.3.ebuild,v 1.3 2011/12/07 22:13:46 hwoarang Exp $
-
-EAPI=4
-
-KMNAME="kdeadmin"
-PYTHON_DEPEND="2"
-inherit python kde4-meta
-
-DESCRIPTION="KDE port of Red Hat's Gnome system-config-printer"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=app-admin/system-config-printer-common-1.2.2
-	>=dev-python/pycups-1.9.49
-	$(add_kdebase_dep pykde4)
-"
-RDEPEND="${DEPEND}
-	net-print/cups[dbus]
-"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-	kde4-meta_pkg_setup
-}
-
-src_install() {
-	kde4-meta_src_install
-	python_convert_shebangs -q -r $(python_get_version) "${ED}"
-}
-
-pkg_postrm() {
-	python_mod_cleanup "${PREFIX}share/apps/${PN}"
-}
diff --git a/kde-base/systemsettings/Manifest b/kde-base/systemsettings/Manifest
index 0e3e9b9a7f25..edfa04d15e39 100644
--- a/kde-base/systemsettings/Manifest
+++ b/kde-base/systemsettings/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
diff --git a/kde-base/systemsettings/files/systemsettings-4.7.3-enablefinal.patch b/kde-base/systemsettings/files/systemsettings-4.7.3-enablefinal.patch
deleted file mode 100644
index c57f1978e10d..000000000000
--- a/kde-base/systemsettings/files/systemsettings-4.7.3-enablefinal.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -U2 -rxi kde-workspace-4.7.3.orig/kcontrol/keyboard/keyboard_config.cpp kde-workspace-4.7.3/kcontrol/keyboard/keyboard_config.cpp
---- kde-workspace-4.7.3.orig/kcontrol/keyboard/keyboard_config.cpp	2011-05-20 22:32:06.000000000 +0200
-+++ kde-workspace-4.7.3/kcontrol/keyboard/keyboard_config.cpp	2011-12-25 12:46:50.529622540 +0100
-@@ -25,5 +25,5 @@
- 
- static const char* SWITCHING_POLICIES[] = {"Global", "Desktop", "WinClass", "Window", NULL };
--static const char* LIST_SEPARATOR = ",";
-+#define LIST_SEPARATOR ","
- //static const char* DEFAULT_LAYOUT = "us";
- static const char* DEFAULT_MODEL = "pc104";
-@@ -183,2 +183,4 @@
- 	return layouts.mid(layoutLoopCount, layouts.size());
- }
-+
-+#undef LIST_SEPARATOR
-diff -U2 -rxi kde-workspace-4.7.3.orig/kcontrol/keyboard/layout_memory_persister.cpp kde-workspace-4.7.3/kcontrol/keyboard/layout_memory_persister.cpp
---- kde-workspace-4.7.3.orig/kcontrol/keyboard/layout_memory_persister.cpp	2011-05-20 22:32:06.000000000 +0200
-+++ kde-workspace-4.7.3/kcontrol/keyboard/layout_memory_persister.cpp	2011-12-25 12:46:05.173189572 +0100
-@@ -42,5 +42,5 @@
- static const char* LAYOUTS_ATTRIBUTE = "layouts";
- 
--static const char* LIST_SEPARATOR = ",";
-+#define LIST_SEPARATOR ","
- 
- static const char* REL_SESSION_FILE_PATH = "/session/keyboard/layout_memory.xml";
-@@ -259,2 +259,4 @@
- 	return !windowMode;
- }
-+
-+#undef LIST_SEPARATOR
diff --git a/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild b/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild
deleted file mode 100644
index f655fbefec5b..000000000000
--- a/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild,v 1.3 2011/12/25 13:44:59 dilfridge Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="System settings utility"
-IUSE="debug gtk +usb xinerama"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-COMMONDEPEND="
-	dev-libs/glib:2
-	$(add_kdebase_dep libkworkspace)
-	media-libs/fontconfig
-	>=media-libs/freetype-2
-	>=x11-libs/libxklavier-3.2
-	x11-libs/libXcursor
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	opengl? ( virtual/opengl )
-	usb? ( =virtual/libusb-0* )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${COMMONDEPEND}
-	x11-proto/kbproto
-	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )
-"
-RDEPEND="${COMMONDEPEND}
-	sys-libs/timezone-data
-	x11-apps/setxkbmap
-	x11-misc/xkeyboard-config
-	gtk? ( kde-misc/kcm-gtk-config )
-"
-
-RESTRICT="test"
-# bug 393133
-
-KMEXTRA="
-	kcontrol/
-"
-KMEXTRACTONLY="
-	krunner/dbus/org.kde.krunner.App.xml
-	krunner/dbus/org.kde.screensaver.xml
-	kwin/
-	libs/
-	plasma/
-"
-
-add_blocker kdeaccessibility-colorschemes '<4.6.50'
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
-	"${FILESDIR}/${P}-fix-keyboard-layout-switch.patch"
-	"${FILESDIR}/${P}-enablefinal.patch"
-)
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA+="
-			doc/kcontrol
-			doc/kfontview
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
-
-src_prepare() {
-	sed -i -e 's/systemsettingsrc DESTINATION ${SYSCONF_INSTALL_DIR}/systemsettingsrc DESTINATION ${CONFIG_INSTALL_DIR}/' \
-		systemsettings/CMakeLists.txt \
-		|| die "Failed to fix systemsettingsrc install location"
-
-	kde4-meta_src_prepare
-}
-
-# FIXME: is have_openglxvisual found without screensaver
-src_configure() {
-	# Old keyboard-detection code is unmaintained,
-	# so we force the new stuff, using libxklavier.
-	mycmakeargs=(
-		-DUSE_XKLAVIER=ON -DWITH_LibXKlavier=ON
-		-DWITH_GLIB2=ON -DWITH_GObject=ON
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with usb)
-		$(cmake-utils_use_with xinerama X11_Xinerama)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/systemsettings/systemsettings-4.7.3.ebuild b/kde-base/systemsettings/systemsettings-4.7.3.ebuild
deleted file mode 100644
index d52938df83f0..000000000000
--- a/kde-base/systemsettings/systemsettings-4.7.3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.3.ebuild,v 1.4 2011/12/07 22:13:58 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="System settings utility"
-IUSE="debug gtk +usb xinerama"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-COMMONDEPEND="
-	dev-libs/glib:2
-	$(add_kdebase_dep libkworkspace)
-	media-libs/fontconfig
-	>=media-libs/freetype-2
-	>=x11-libs/libxklavier-3.2
-	x11-libs/libXcursor
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	opengl? ( virtual/opengl )
-	usb? ( =virtual/libusb-0* )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${COMMONDEPEND}
-	x11-proto/kbproto
-	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )
-"
-RDEPEND="${COMMONDEPEND}
-	sys-libs/timezone-data
-	x11-apps/setxkbmap
-	x11-misc/xkeyboard-config
-	gtk? ( kde-misc/kcm-gtk-config )
-"
-
-RESTRICT="test"
-# bug 393133
-
-KMEXTRA="
-	kcontrol/
-"
-KMEXTRACTONLY="
-	krunner/dbus/org.kde.krunner.App.xml
-	krunner/dbus/org.kde.screensaver.xml
-	kwin/
-	libs/
-	plasma/
-"
-
-add_blocker kdeaccessibility-colorschemes '<4.6.50'
-
-PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" )
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA+="
-			doc/kcontrol
-			doc/kfontview
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
-
-src_prepare() {
-	sed -i -e 's/systemsettingsrc DESTINATION ${SYSCONF_INSTALL_DIR}/systemsettingsrc DESTINATION ${CONFIG_INSTALL_DIR}/' \
-		systemsettings/CMakeLists.txt \
-		|| die "Failed to fix systemsettingsrc install location"
-
-	kde4-meta_src_prepare
-}
-
-# FIXME: is have_openglxvisual found without screensaver
-src_configure() {
-	# Old keyboard-detection code is unmaintained,
-	# so we force the new stuff, using libxklavier.
-	mycmakeargs=(
-		-DUSE_XKLAVIER=ON -DWITH_LibXKlavier=ON
-		-DWITH_GLIB2=ON -DWITH_GObject=ON
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with usb)
-		$(cmake-utils_use_with xinerama X11_Xinerama)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/systemsettings/systemsettings-4.7.4.ebuild b/kde-base/systemsettings/systemsettings-4.7.4.ebuild
index e818e5697681..b9af1fe2e165 100644
--- a/kde-base/systemsettings/systemsettings-4.7.4.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.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/kde-base/systemsettings/systemsettings-4.7.4.ebuild,v 1.4 2012/01/16 23:55:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.4.ebuild,v 1.5 2012/01/17 12:06:26 johu Exp $
 
 EAPI=4
 
@@ -59,7 +59,6 @@ add_blocker kdeaccessibility-colorschemes '<4.6.50'
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
-	"${FILESDIR}/${PN}-4.7.3-enablefinal.patch"
 )
 
 src_unpack() {
diff --git a/kde-base/thumbnailers/Manifest b/kde-base/thumbnailers/Manifest
index 7880c8069fc1..5ebeab3313d3 100644
--- a/kde-base/thumbnailers/Manifest
+++ b/kde-base/thumbnailers/Manifest
@@ -1,3 +1,2 @@
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
-DIST kdegraphics-thumbnailers-4.7.3.tar.bz2 43201 RMD160 e91207861507643c2161335ea16bea93034d763e SHA1 219fd55d94d695cee8c7b650dbe8088cc9807e5c SHA256 d07734479fa9cc96cdab0671e51c8f3b256769014e5a68849b292698be5ff287
 DIST kdegraphics-thumbnailers-4.7.4.tar.bz2 43171 RMD160 4ad91b921c9ee3619acd8f87f9dc28fa610c96db SHA1 0e1636da30c78ad2c186bcd30c0566406b920126 SHA256 d9e6397883a34d6ba4fa7268ee2954b7d8eb2ed5d5e54a73a38f5487980cc5db
diff --git a/kde-base/thumbnailers/thumbnailers-4.7.3.ebuild b/kde-base/thumbnailers/thumbnailers-4.7.3.ebuild
deleted file mode 100644
index 87284aaa871f..000000000000
--- a/kde-base/thumbnailers/thumbnailers-4.7.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/thumbnailers/thumbnailers-4.7.3.ebuild,v 1.3 2011/12/07 22:13:38 hwoarang Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-KMNAME="kdegraphics-thumbnailers"
-inherit kde4-base
-
-DESCRIPTION="KDE 4 thumbnail generators for PDF/PS files"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkdcraw)
-	$(add_kdebase_dep libkexiv2)
-	media-libs/lcms:0
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${KMNAME}-${PV}"
diff --git a/kde-base/umbrello/Manifest b/kde-base/umbrello/Manifest
index 8129826b48d8..2c54c126587e 100644
--- a/kde-base/umbrello/Manifest
+++ b/kde-base/umbrello/Manifest
@@ -1,3 +1,2 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
-DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
 DIST kdesdk-4.7.4.tar.bz2 5266656 RMD160 9fc17159fd8cbbf9cfe76ed18dfcf8a269d0270e SHA1 3a0f61204653dc3f9f975732b6f67659c60ecaf3 SHA256 a2142ea51e9172e589b0526879061e5c3e4337f6154d89b0491fef9c68e56f6c
diff --git a/kde-base/umbrello/umbrello-4.7.3.ebuild b/kde-base/umbrello/umbrello-4.7.3.ebuild
deleted file mode 100644
index a051c3b37230..000000000000
--- a/kde-base/umbrello/umbrello-4.7.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-4.7.3.ebuild,v 1.3 2011/12/07 22:13:50 hwoarang Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdesdk"
-
-inherit kde4-meta
-
-DESCRIPTION="KDE UML Modeller"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
diff --git a/kde-misc/customizable-weather/Manifest b/kde-misc/customizable-weather/Manifest
index 0a01461b57c1..407ab3fc78d8 100644
--- a/kde-misc/customizable-weather/Manifest
+++ b/kde-misc/customizable-weather/Manifest
@@ -1,3 +1,3 @@
 DIST 98925-cwp-1.5.1.tar.bz2 193340 RMD160 90a99c6b887e77bd0537bdeeadb99ec0e775501b SHA1 4c066de38cb13d05226a8f4b6a4b0e43a6284f4a SHA256 adf4da8feb59eeb8814a9c23f88290f3c8707b3618530e22978d2d9cd88ea156
-DIST 98925-cwp-1.5.6.tar.bz2 193410 RMD160 0ffac1ca9e73f267cbe9fc2beab4f1e617462bfd SHA1 aa18d0e3e15bb58f775d57cba875c82fcb60532a SHA256 3ff5351ffdc4e5167ab1226f2b21ad167d2060211fc69b589ec5610e7ccae664
 DIST 98925-cwp-1.5.7.tar.bz2 193267 RMD160 78d541f6e5783df4dc7f0e17f01deea57560aaea SHA1 08a367a85442bff7b82cb91fa070c00a327166a7 SHA256 1f2066b317d60331e5dcf1d1c80e929cc3f55319061bb30b706f51fb4dc58010
+DIST 98925-cwp-1.5.8.tar.bz2 193223 RMD160 74daba93f7d857c82c9bda12f670a876c055349d SHA1 fdc8564ec7f89fadf2b0cb228ad4dc0788d4d209 SHA256 daa245d256fc6047480e6a5096867c683bc5ff4424307365e6b39cddaf9c60b9
diff --git a/kde-misc/customizable-weather/customizable-weather-1.5.6.ebuild b/kde-misc/customizable-weather/customizable-weather-1.5.8.ebuild
similarity index 91%
rename from kde-misc/customizable-weather/customizable-weather-1.5.6.ebuild
rename to kde-misc/customizable-weather/customizable-weather-1.5.8.ebuild
index 9d1f44fa171e..e0f75aa54902 100644
--- a/kde-misc/customizable-weather/customizable-weather-1.5.6.ebuild
+++ b/kde-misc/customizable-weather/customizable-weather-1.5.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/kde-misc/customizable-weather/customizable-weather-1.5.6.ebuild,v 1.1 2012/01/04 14:47:31 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/customizable-weather/customizable-weather-1.5.8.ebuild,v 1.1 2012/01/17 17:07:23 johu Exp $
 
 EAPI=4
 
diff --git a/kde-misc/kdiff3/kdiff3-0.9.96.ebuild b/kde-misc/kdiff3/kdiff3-0.9.96.ebuild
index 8830de10c958..0d9abe850d79 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.96.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.96.ebuild
@@ -1,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-misc/kdiff3/kdiff3-0.9.96.ebuild,v 1.4 2012/01/16 17:37:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild,v 1.5 2012/01/17 07:22:20 johu Exp $
 
 EAPI=4
 
@@ -50,8 +50,7 @@ src_unpack(){
 src_prepare() {
 	if ! use kde; then
 		# adapt to Gentoo paths
-		sed -e s,documentation.path.*$,documentation.path\ =\
-		"${EPREFIX}"/usr/share/doc/"${PF}", \
+		sed -e s,documentation.path.*$,documentation.path\ =\ "${EPREFIX}"/usr/share/doc/"${PF}", \
 		-e s,target.path.*$,target.path\ =\ "${EPREFIX}"/usr/bin, \
 		"${S}"/src-QT4/kdiff3.pro > "${S}"/src-QT4/kdiff3_fixed.pro
 	else
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index 96b3bdb4dec6..26b3039a6584 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1 +1,2 @@
 DIST tellico-2.3.4.tar.bz2 2910721 RMD160 b33578911b77eee9205007852ee2964afe4ada92 SHA1 7e753d99d701d01aea6c89eb8405150daa8ddcfc SHA256 376d8e8db8fcf19f77300e10921991d67d3d99e1abb88eda97900932c6e486fd
+DIST tellico-2.3.5.tar.bz2 4402734 RMD160 83ab99ca415c8e5a9caed1cf7f684ff5fc76b8f5 SHA1 336f34e378a711d951bdbb7784a04a6451a5c314 SHA256 b31db35589cae7f9af56a17e6589f8c5de68e36d9fc5fbaea4154e8238bf041c
diff --git a/kde-misc/tellico/tellico-2.3.5.ebuild b/kde-misc/tellico/tellico-2.3.5.ebuild
new file mode 100644
index 000000000000..31bff27fabf8
--- /dev/null
+++ b/kde-misc/tellico/tellico-2.3.5.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/kde-misc/tellico/tellico-2.3.5.ebuild,v 1.1 2012/01/17 17:45:34 johu Exp $
+
+EAPI=4
+
+KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et eu fi fr ga gl hu ia it ja lt ms nb nds nl nn
+pl pt pt_BR ro ru sk sv tr ug uk zh_CN zh_TW"
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="A collection manager for the KDE environment"
+HOMEPAGE="http://tellico-project.org/"
+SRC_URI="http://tellico-project.org/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="addressbook cddb debug musicbrainz pdf scanner semantic-desktop taglib v4l xmp yaz"
+
+DEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/qjson
+	$(add_kdebase_dep kdelibs 'semantic-desktop?')
+	media-libs/qimageblitz
+	x11-libs/qt-dbus:4
+	addressbook? ( $(add_kdebase_dep kdepimlibs) )
+	cddb? ( $(add_kdebase_dep libkcddb) )
+	pdf? ( >=app-text/poppler-0.12.3-r3[qt4] )
+	musicbrainz? ( >=media-libs/musicbrainz-2.1.5 )
+	scanner? ( $(add_kdebase_dep libksane) )
+	semantic-desktop? ( dev-libs/soprano[raptor,redland] )
+	taglib? ( >=media-libs/taglib-1.5 )
+	v4l? ( >=media-libs/libv4l-0.8.3 )
+	xmp? ( >=media-libs/exempi-2 )
+	yaz? ( >=dev-libs/yaz-2 )
+"
+RDEPEND="${DEPEND}"
+
+# tests need network access and well-defined server responses
+RESTRICT="test"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_enable v4l WEBCAM)
+		$(cmake-utils_use_with xmp Exempi)
+		$(cmake-utils_use_with scanner KSane)
+		$(cmake-utils_use_with cddb Kcddb)
+		$(cmake-utils_use_with addressbook KdepimLibs)
+		$(cmake-utils_use_with pdf PopplerQt4)
+		$(cmake-utils_use_with taglib)
+		$(cmake-utils_use_with yaz)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/lxde-base/lxpolkit/lxpolkit-0.1.0-r1.ebuild b/lxde-base/lxpolkit/lxpolkit-0.1.0-r1.ebuild
index 6ec364449f65..12ab460b0d83 100644
--- a/lxde-base/lxpolkit/lxpolkit-0.1.0-r1.ebuild
+++ b/lxde-base/lxpolkit/lxpolkit-0.1.0-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/lxde-base/lxpolkit/lxpolkit-0.1.0-r1.ebuild,v 1.2 2011/10/18 21:26:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpolkit/lxpolkit-0.1.0-r1.ebuild,v 1.3 2012/01/17 13:51:31 ago Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/project/lxde/LXPolkit/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=sys-auth/polkit-0.102
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 6c5b39558951..a3d0f8bb857d 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,7 +1,4 @@
-DIST mutt-1.5.20-gentoo-patches-r11.tar.bz2 96779 RMD160 f6c54fdba2853caecb1fabc0d59c660f5628c9f3 SHA1 2f8781ed7b73311a4fbe3816c58c4cfa6ddb18a9 SHA256 82284ddfc062fc0f037d2b94ace88bad2f0587d498ddd92a241f6f3b432635c8
-DIST mutt-1.5.20.tar.gz 3635047 RMD160 df582f79364b9fd70a0001e76a119d8f78275ebb SHA1 d2bec7a33771f128ca49b1723b06b6d248a35d31 SHA256 9579fc079d74ff5c89223ff09df402ef4e508ba8ca925c49e74aa09c02a9a796
 DIST mutt-1.5.21-gentoo-patches-r1.tar.bz2 68796 RMD160 10b38c663d39e169c3c456e5cbf7bd855c203186 SHA1 2df153ce3870576e8dba84a6f54df698333587e8 SHA256 89b67ad863941aacdc2b1c9d3fd4f90f7b0cb50bd5fc10c9284a82ce6e7687c0
-DIST mutt-1.5.21-gentoo-patches-r2.tar.bz2 72256 RMD160 cd028c7d12e1885d8ea98ff60554a5fbf98e1922 SHA1 28ef259d8a964bbe46f72169ab597825819f244e SHA256 0ad8dcfbcb5b31321c7e96909d53a5d1e8e2f69241f9ddb0f36f69cf086ed615
-DIST mutt-1.5.21-gentoo-patches-r3.tar.bz2 73761 RMD160 75c016384a9cd37006cb9246e348b876f8316ef2 SHA1 30762d027e36b85db0c071dd18575a39c9263844 SHA256 d371712919c11d975a27c62dd91071898f2344bdbe3653b9e58ff9a152bf753b
 DIST mutt-1.5.21-gentoo-patches-r7.tar.bz2 77409 RMD160 4513c4a72e86c2540199811dc472bb9044f0f682 SHA1 eacde1904bc03f0b8717ea9449748d39f54e3d35 SHA256 963e7feb561166dc6ceb7e72e542c7af206aadbb46dd422c9ec39b3e91652bee
+DIST mutt-1.5.21-gentoo-patches-r8.tar.bz2 85248 RMD160 6d362ac1d129040b64d84f93824c56d0cec5e350 SHA1 f54f74aaf8edec297421f22e3cf93d4b6b22bcd3 SHA256 c3d8d54bb8a297b39b7c34a4fc05ca1bf4998f607d126ec7f93aa2b13fca04d5
 DIST mutt-1.5.21.tar.gz 3716886 RMD160 b235a42972ae410592253cdc117a90baf279f47a SHA1 a8475f2618ce5d5d33bff85c0affdf21ab1d76b9 SHA256 2141f36e8d0f4f71c9ca6780001e7cc679fe313e643953fc07f001223e67c4a0
diff --git a/mail-client/mutt/mutt-1.5.20-r18.ebuild b/mail-client/mutt/mutt-1.5.20-r18.ebuild
deleted file mode 100644
index 579dfd6bf472..000000000000
--- a/mail-client/mutt/mutt-1.5.20-r18.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r18.ebuild,v 1.8 2010/10/10 11:56:54 armin76 Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic autotools
-
-PATCHSET_REV="-r11"
-
-DESCRIPTION="a small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org"
-SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
-	http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl tokyocabinet"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-RDEPEND=">=sys-libs/ncurses-5.2
-	tokyocabinet?  ( dev-db/tokyocabinet )
-	!tokyocabinet? (
-		qdbm?  ( dev-db/qdbm )
-		!qdbm? (
-			gdbm?  ( sys-libs/gdbm )
-			!gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
-		)
-	)
-	imap?    (
-		gnutls?  ( >=net-libs/gnutls-1.0.17 )
-		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
-		sasl?    ( >=dev-libs/cyrus-sasl-2 )
-	)
-	pop?     (
-		gnutls?  ( >=net-libs/gnutls-1.0.17 )
-		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
-		sasl?    ( >=dev-libs/cyrus-sasl-2 )
-	)
-	smtp?     (
-		gnutls?  ( >=net-libs/gnutls-1.0.17 )
-		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
-		sasl?    ( >=dev-libs/cyrus-sasl-2 )
-	)
-	idn?     ( net-dns/libidn )
-	gpg?   ( >=app-crypt/gpgme-0.9.0 )
-	smime?   ( >=dev-libs/openssl-0.9.6 )
-	app-misc/mime-types"
-DEPEND="${RDEPEND}
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
-
-PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
-
-src_prepare() {
-	# Post-release hot-fixes grabbed from HG, this is what all following
-	# patches are based on in my Mercurial patchqueue (mq).
-	# If you ever take over or need to modify patches here, just ask me
-	# (grobian) for a Mercurial clone of my gentoo branch(es) and
-	# patchqueue as it'll save you a lot of work.
-	for rev in $(eval echo {0..${PR#r}}) ; do
-		local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
-		[[ -e ${revpatch} ]] && \
-			epatch "${revpatch}"
-	done
-
-	# this patch is non-generic and only works because we use a sysconfdir
-	# different from the one used by the mailbase ebuild
-	use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch
-
-	# must have fixes to compile or behave correctly, upstream
-	# ignores, disagrees or simply doesn't respond/apply
-	epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection
-	epatch "${PATCHDIR}"/interix-btowc.patch
-	epatch "${PATCHDIR}"/solaris-ncurses-chars.patch
-	epatch "${PATCHDIR}"/gpgme-1.2.0.patch
-	# same category, but functional bits
-	epatch "${PATCHDIR}"/dont-reveal-bbc.patch
-	epatch "${PATCHDIR}"/realpath-slowness.patch
-
-	# the big feature patches that upstream doesn't want to include, but
-	# nearly every distro has due to their usefulness
-	for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
-		epatch "${p}"
-	done
-
-	use sidebar && epatch "${PATCHDIR}"/sidebar.20090619.patch
-
-	# patch version string for bug reports
-	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \
-		muttlib.c || die "failed patching in Gentoo version"
-
-	# many patches touch the buildsystem, we always need this
-	AT_M4DIR="m4" eautoreconf
-
-	# the configure script contains some "cleverness" whether or not to setgid
-	# the dotlock program, resulting in bugs like #278332
-	sed -i -e 's/@DOTLOCK_GROUP@//' \
-		Makefile.in || die "sed failed"
-
-	# don't just build documentation (lengthy process, with big dependencies)
-	if use !doc ; then
-		sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
-	fi
-}
-
-src_configure() {
-	local myconf="
-		$(use_enable crypt pgp) \
-		$(use_enable debug) \
-		$(use_enable gpg gpgme) \
-		$(use_enable imap) \
-		$(use_enable nls) \
-		$(use_enable nntp) \
-		$(use_enable pop) \
-		$(use_enable smime) \
-		$(use_enable smtp) \
-		$(use_with idn) \
-		$(use_with !nntp mixmaster) \
-		--enable-compressed \
-		--enable-external-dotlock \
-		--enable-nfs-fix \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--with-curses \
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PN}-${PVR} \
-		--with-regex \
-		--with-exec-shell=${EPREFIX}/bin/sh"
-
-	case $CHOST in
-		*-solaris*)
-			# Solaris has no flock in the standard headers
-			myconf="${myconf} --enable-fcntl --disable-flock"
-		;;
-		*)
-			myconf="${myconf} --disable-fcntl --enable-flock"
-		;;
-	esac
-
-	# mutt prioritizes gdbm over bdb, so we will too.
-	# hcache feature requires at least one database is in USE.
-	if use tokyocabinet; then
-		myconf="${myconf} --enable-hcache \
-			--with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
-	elif use qdbm; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
-	elif use gdbm ; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
-	elif use berkdb; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
-	else
-		myconf="${myconf} --disable-hcache \
-			--without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
-	fi
-
-	# there's no need for gnutls, ssl or sasl without socket support
-	if use pop || use imap || use smtp ; then
-		if use gnutls; then
-			myconf="${myconf} --with-gnutls"
-		elif use ssl; then
-			myconf="${myconf} --with-ssl"
-		fi
-		# not sure if this should be mutually exclusive with the other two
-		myconf="${myconf} $(use_with sasl)"
-	else
-		myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
-	fi
-
-	if use mbox; then
-		myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
-	else
-		myconf="${myconf} --with-homespool=Maildir"
-	fi
-
-	econf ${myconf} || die "configure failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	find "${ED}"/usr/share/doc -type f | grep -v "html\|manual" | xargs gzip
-	if use mbox; then
-		insinto /etc/mutt
-		newins "${FILESDIR}"/Muttrc.mbox Muttrc
-	else
-		insinto /etc/mutt
-		doins "${FILESDIR}"/Muttrc
-	fi
-
-	# A newer file is provided by app-misc/mime-types. So we link it.
-	rm "${ED}"/etc/${PN}/mime.types
-	dosym /etc/mime.types /etc/${PN}/mime.types
-
-	# A man-page is always handy
-	if use !doc; then
-		cp doc/mutt.man mutt.1
-		cp doc/muttbug.man flea.1
-		doman mutt.1 flea.1
-	else
-		# nuke manpages that should be provided by an MTA, bug #177605
-		rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
-			|| ewarn "failed to remove files, please file a bug"
-	fi
-
-	if use !prefix ; then
-		fowners root:mail /usr/bin/mutt_dotlock
-		fperms g+s /usr/bin/mutt_dotlock
-	fi
-
-	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_postinst() {
-	echo
-	elog "If you are new to mutt you may want to take a look at"
-	elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
-	elog "   http://www.gentoo.org/doc/en/guide-to-mutt.xml"
-	echo
-}
diff --git a/mail-client/mutt/mutt-1.5.21-r3.ebuild b/mail-client/mutt/mutt-1.5.21-r3.ebuild
deleted file mode 100644
index ffe0b52ec7dc..000000000000
--- a/mail-client/mutt/mutt-1.5.21-r3.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.21-r3.ebuild,v 1.2 2011/08/17 20:11:31 grobian Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic autotools
-
-PATCHSET_REV="-r3"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org"
-SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
-	http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl tokyocabinet"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-RDEPEND=">=sys-libs/ncurses-5.2
-	tokyocabinet?  ( dev-db/tokyocabinet )
-	!tokyocabinet? (
-		qdbm?  ( dev-db/qdbm )
-		!qdbm? (
-			gdbm?  ( sys-libs/gdbm )
-			!gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
-		)
-	)
-	imap?    (
-		gnutls?  ( >=net-libs/gnutls-1.0.17 )
-		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
-		sasl?    ( >=dev-libs/cyrus-sasl-2 )
-	)
-	pop?     (
-		gnutls?  ( >=net-libs/gnutls-1.0.17 )
-		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
-		sasl?    ( >=dev-libs/cyrus-sasl-2 )
-	)
-	smtp?     (
-		gnutls?  ( >=net-libs/gnutls-1.0.17 )
-		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
-		sasl?    ( >=dev-libs/cyrus-sasl-2 )
-	)
-	idn?     ( net-dns/libidn )
-	gpg?   ( >=app-crypt/gpgme-0.9.0 )
-	smime?   ( >=dev-libs/openssl-0.9.6 )
-	app-misc/mime-types"
-DEPEND="${RDEPEND}
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
-
-PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
-
-src_prepare() {
-	# Post-release hot-fixes grabbed from HG, this is what all following
-	# patches are based on in my Mercurial patchqueue (mq).
-	# If you ever take over or need to modify patches here, just check
-	# out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and
-	# the patchqueue as it'll save you a lot of work.
-	# http://prefix.gentooexperimental.org:8000/mutt/
-	# http://prefix.gentooexperimental.org:8000/mutt-patches/
-	for rev in $(eval echo {0..${PR#r}}) ; do
-		local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
-		[[ -e ${revpatch} ]] && \
-			epatch "${revpatch}"
-	done
-
-	# this patch is non-generic and only works because we use a sysconfdir
-	# different from the one used by the mailbase ebuild
-	use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch
-
-	# must have fixes to compile or behave correctly, upstream
-	# ignores, disagrees or simply doesn't respond/apply
-	epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection
-	epatch "${PATCHDIR}"/interix-btowc.patch
-	epatch "${PATCHDIR}"/solaris-ncurses-chars.patch
-	epatch "${PATCHDIR}"/gpgme-1.2.0.patch
-	# same category, but functional bits
-	epatch "${PATCHDIR}"/dont-reveal-bbc.patch
-
-	# the big feature patches that upstream doesn't want to include, but
-	# nearly every distro has due to their usefulness
-	for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
-		epatch "${p}"
-	done
-
-	# we conditionalise this one, simply because it has considerable
-	# impact on the code
-	use sidebar && epatch "${PATCHDIR}"/sidebar.patch
-
-	# patch version string for bug reports
-	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \
-		muttlib.c || die "failed patching in Gentoo version"
-
-	# many patches touch the buildsystem, we always need this
-	AT_M4DIR="m4" eautoreconf
-
-	# the configure script contains some "cleverness" whether or not to setgid
-	# the dotlock program, resulting in bugs like #278332
-	sed -i -e 's/@DOTLOCK_GROUP@//' \
-		Makefile.in || die "sed failed"
-
-	# don't just build documentation (lengthy process, with big dependencies)
-	if use !doc ; then
-		sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
-	fi
-}
-
-src_configure() {
-	local myconf="
-		$(use_enable crypt pgp) \
-		$(use_enable debug) \
-		$(use_enable gpg gpgme) \
-		$(use_enable imap) \
-		$(use_enable nls) \
-		$(use_enable nntp) \
-		$(use_enable pop) \
-		$(use_enable smime) \
-		$(use_enable smtp) \
-		$(use_with idn) \
-		$(use_with !nntp mixmaster) \
-		--enable-compressed \
-		--enable-external-dotlock \
-		--enable-nfs-fix \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--with-curses \
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PN}-${PVR} \
-		--with-regex \
-		--with-exec-shell=${EPREFIX}/bin/sh"
-
-	case $CHOST in
-		*-solaris*)
-			# Solaris has no flock in the standard headers
-			myconf="${myconf} --enable-fcntl --disable-flock"
-		;;
-		*)
-			myconf="${myconf} --disable-fcntl --enable-flock"
-		;;
-	esac
-
-	# mutt prioritizes gdbm over bdb, so we will too.
-	# hcache feature requires at least one database is in USE.
-	if use tokyocabinet; then
-		myconf="${myconf} --enable-hcache \
-			--with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
-	elif use qdbm; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
-	elif use gdbm ; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
-	elif use berkdb; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
-	else
-		myconf="${myconf} --disable-hcache \
-			--without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
-	fi
-
-	# there's no need for gnutls, ssl or sasl without socket support
-	if use pop || use imap || use smtp ; then
-		if use gnutls; then
-			myconf="${myconf} --with-gnutls"
-		elif use ssl; then
-			myconf="${myconf} --with-ssl"
-		fi
-		# not sure if this should be mutually exclusive with the other two
-		myconf="${myconf} $(use_with sasl)"
-	else
-		myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
-	fi
-
-	if use mbox; then
-		myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
-	else
-		myconf="${myconf} --with-homespool=Maildir"
-	fi
-
-	econf ${myconf} || die "configure failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	if use mbox; then
-		insinto /etc/mutt
-		newins "${FILESDIR}"/Muttrc.mbox Muttrc
-	else
-		insinto /etc/mutt
-		doins "${FILESDIR}"/Muttrc
-	fi
-
-	# A newer file is provided by app-misc/mime-types. So we link it.
-	rm "${ED}"/etc/${PN}/mime.types
-	dosym /etc/mime.types /etc/${PN}/mime.types
-
-	# A man-page is always handy
-	if use !doc; then
-		cp doc/mutt.man mutt.1
-		cp doc/muttbug.man flea.1
-		doman mutt.1 flea.1
-	else
-		# nuke manpages that should be provided by an MTA, bug #177605
-		rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
-			|| ewarn "failed to remove files, please file a bug"
-	fi
-
-	if use !prefix ; then
-		fowners root:mail /usr/bin/mutt_dotlock
-		fperms g+s /usr/bin/mutt_dotlock
-	fi
-
-	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_postinst() {
-	echo
-	elog "If you are new to mutt you may want to take a look at"
-	elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
-	elog "   http://www.gentoo.org/doc/en/guide-to-mutt.xml"
-	echo
-}
diff --git a/mail-client/mutt/mutt-1.5.21-r2.ebuild b/mail-client/mutt/mutt-1.5.21-r8.ebuild
similarity index 92%
rename from mail-client/mutt/mutt-1.5.21-r2.ebuild
rename to mail-client/mutt/mutt-1.5.21-r8.ebuild
index 6beed8f1cb56..b6420eb5630f 100644
--- a/mail-client/mutt/mutt-1.5.21-r2.ebuild
+++ b/mail-client/mutt/mutt-1.5.21-r8.ebuild
@@ -1,19 +1,19 @@
-# 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/mail-client/mutt/mutt-1.5.21-r2.ebuild,v 1.2 2011/08/17 20:11:31 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.21-r8.ebuild,v 1.1 2012/01/17 16:28:34 grobian Exp $
 
 EAPI="3"
 
 inherit eutils flag-o-matic autotools
 
-PATCHSET_REV="-r2"
+PATCHSET_REV="-r8"
 
 DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org"
+HOMEPAGE="http://www.mutt.org/"
 SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
 	mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
 	http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl tokyocabinet"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl selinux sidebar smime smtp ssl tokyocabinet"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
@@ -42,8 +42,9 @@ RDEPEND=">=sys-libs/ncurses-5.2
 		sasl?    ( >=dev-libs/cyrus-sasl-2 )
 	)
 	idn?     ( net-dns/libidn )
-	gpg?   ( >=app-crypt/gpgme-0.9.0 )
+	gpg?     ( >=app-crypt/gpgme-0.9.0 )
 	smime?   ( >=dev-libs/openssl-0.9.6 )
+	selinux? ( sec-policy/selinux-mutt )
 	app-misc/mime-types"
 DEPEND="${RDEPEND}
 	net-mail/mailbase
@@ -91,7 +92,11 @@ src_prepare() {
 
 	# we conditionalise this one, simply because it has considerable
 	# impact on the code
-	use sidebar && epatch "${PATCHDIR}"/sidebar.patch
+	if use sidebar ; then
+		epatch "${PATCHDIR}"/sidebar.patch
+		epatch "${PATCHDIR}"/sidebar-utf8.patch
+		epatch "${PATCHDIR}"/sidebar-dotpathsep.patch
+	fi
 
 	# patch version string for bug reports
 	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \
@@ -200,9 +205,11 @@ src_install() {
 
 	# A man-page is always handy
 	if use !doc; then
+		make -C doc DESTDIR="${D}" muttrc.man || die
 		cp doc/mutt.man mutt.1
 		cp doc/muttbug.man flea.1
-		doman mutt.1 flea.1
+		cp doc/muttrc.man muttrc.5
+		doman mutt.1 flea.1 muttrc.5
 	else
 		# nuke manpages that should be provided by an MTA, bug #177605
 		rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
diff --git a/mail-filter/spamdyke/Manifest b/mail-filter/spamdyke/Manifest
index 1cf588037c5d..c1395858aedf 100644
--- a/mail-filter/spamdyke/Manifest
+++ b/mail-filter/spamdyke/Manifest
@@ -1,3 +1,4 @@
 DIST spamdyke-4.0.10.tgz 454117 RMD160 2f31c939c949038265039c10704dfed3cea68802 SHA1 69a94678a78ab845030177fa2916438b0ee98d9e SHA256 daacc661c149f41fe12229da805f849c0dae2595f7b051c5091589502f8341f3
 DIST spamdyke-4.2.0.tgz 502879 RMD160 eb325e06f69de48934ade4140da30adff5b5dd60 SHA1 8434906f761e5d81337150e77c4a9291a49bf5e3 SHA256 eb5fd04893f12bc6613c7afd9d7884f1d66eaaed17c4af58abc567e9de6ab416
 DIST spamdyke-4.2.1.tgz 511744 RMD160 34b7d1c24b3d397aa414e11e60d336970b495dba SHA1 827981420c9cee470172be44325c3af84f503b6d SHA256 a60ebbc0f5302156fc9a4a6637831c41ba058ec52ffe6074833dbdbabfcf132e
+DIST spamdyke-4.3.0.tgz 525399 RMD160 cbe6007ed7022e2546078ea06a7fd1f3425c50a0 SHA1 709febd5eb5852d21e8189a496d9c16120aaaee2 SHA256 6a217cfd513c3414d859cc107cc7528f94b1c452764ed192ef5774eddf4111c3
diff --git a/mail-filter/spamdyke/files/spamdyke-4.3.0-gcc46.patch b/mail-filter/spamdyke/files/spamdyke-4.3.0-gcc46.patch
new file mode 100644
index 000000000000..f9428bee6bf0
--- /dev/null
+++ b/mail-filter/spamdyke/files/spamdyke-4.3.0-gcc46.patch
@@ -0,0 +1,10 @@
+--- configure.ac.old	2011-04-07 09:37:58.000000000 +0200
++++ configure.ac	2011-04-07 09:38:12.000000000 +0200
+@@ -22,7 +22,6 @@
+ AC_CONFIG_HEADER([config.h])
+ 
+ AC_LANG_WERROR
+-CFLAGS=-Wall
+ 
+ # Checks for programs.
+ AC_PROG_CC([[gcc]])
diff --git a/mail-filter/spamdyke/spamdyke-4.2.1.ebuild b/mail-filter/spamdyke/spamdyke-4.2.1.ebuild
index 5f10a8df8bb3..552747c04070 100644
--- a/mail-filter/spamdyke/spamdyke-4.2.1.ebuild
+++ b/mail-filter/spamdyke/spamdyke-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamdyke/spamdyke-4.2.1.ebuild,v 1.2 2012/01/15 16:19:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamdyke/spamdyke-4.2.1.ebuild,v 1.3 2012/01/17 11:33:35 ago Exp $
 
 EAPI="2"
 inherit eutils autotools
@@ -11,7 +11,7 @@ SRC_URI="http://www.spamdyke.org/releases/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+tls"
 
 DEPEND="tls? ( dev-libs/openssl )"
diff --git a/mail-filter/spamdyke/spamdyke-4.3.0.ebuild b/mail-filter/spamdyke/spamdyke-4.3.0.ebuild
new file mode 100644
index 000000000000..e839516d1f66
--- /dev/null
+++ b/mail-filter/spamdyke/spamdyke-4.3.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamdyke/spamdyke-4.3.0.ebuild,v 1.2 2012/01/17 22:59:11 ago Exp $
+
+EAPI="2"
+inherit eutils autotools
+
+DESCRIPTION="A drop-in connection-time spam filter for qmail"
+HOMEPAGE="http://www.spamdyke.org/"
+SRC_URI="http://www.spamdyke.org/releases/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+tls"
+
+DEPEND="tls? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}
+	virtual/qmail"
+
+S=${WORKDIR}/${P}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc46.patch
+	echo "# Configuration option for ${PN}" > ${PN}.conf
+	if use tls; then
+		echo "tls-certificate-file=/var/qmail/control/clientcert.pem" \
+			>> ${PN}.conf
+	fi
+	echo "graylist-level=always-create-dir" >> ${PN}.conf
+	echo "graylist-dir=/var/tmp/${PN}/graylist" >> ${PN}.conf
+	echo "reject-empty-rdns" >> ${PN}.conf
+	echo "reject-unresolvable-rdns" >> ${PN}.conf
+	echo "dns-blacklist-entry=zen.spamhaus.org" >> ${PN}.conf
+	echo "local-domains-file=/var/qmail/control/rcpthosts" >> ${PN}.conf
+	sed -i \
+		-e "/STRIP_CMD/d" \
+		Makefile.in || die "sed on Makefile.in failed"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable tls) || die "econf failed"
+	cd ../utils
+	econf || die "econf failed in utils"
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" || die "emake failed"
+	cd ../utils
+	emake CFLAGS="${CFLAGS}" || die "emake in utils died"
+}
+
+src_install() {
+	dobin ${PN} || die "Installing ${PN} binary failed"
+	insinto /etc/${PN}
+	doins ${PN}.conf || die "Installing ${PN} configuration file failed"
+	dodir /var/tmp/${PN}/graylist
+	fowners -R qmaild /var/tmp/${PN}/graylist
+	cd ../utils
+	dobin domain2path || die "Installing domain2path binary failed"
+	cd ../documentation
+	dodoc {Changelog,INSTALL,UPGRADING}.txt
+	dohtml FAQ.html \
+		README.html \
+		README_ip_file_format.html \
+		README_rdns_directory_format.html \
+		README_rdns_file_format.html
+}
+
+pkg_postinst() {
+	elog "In /var/qmail/control/conf-smtpd insert the line:"
+	elog "QMAIL_SMTP_PRE=\"${QMAIL_SMTP_PRE} spamdyke -f /etc/${PN}/${PN}.conf\""
+	elog "Run spamdyke with the '-h' flag to see the available options and"
+	elog "update /etc/spamdyke/spamdyke.conf accordingly"
+}
diff --git a/media-fonts/essays1743/essays1743-1.203.1.ebuild b/media-fonts/essays1743/essays1743-1.203.1.ebuild
index 0507731a8a5c..e9f382c2c73b 100644
--- a/media-fonts/essays1743/essays1743-1.203.1.ebuild
+++ b/media-fonts/essays1743/essays1743-1.203.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-fonts/essays1743/essays1743-1.203.1.ebuild,v 1.3 2012/01/15 19:05:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/essays1743/essays1743-1.203.1.ebuild,v 1.4 2012/01/17 21:25:19 jer Exp $
 
 inherit versionator font
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.thibault.org/fonts/essays/${PN}-${MY_PV}-ttf.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/media-libs/memphis/memphis-0.2.3.ebuild b/media-libs/memphis/memphis-0.2.3.ebuild
index 0ccc8dc4c8f2..1adef482a948 100644
--- a/media-libs/memphis/memphis-0.2.3.ebuild
+++ b/media-libs/memphis/memphis-0.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/memphis/memphis-0.2.3.ebuild,v 1.8 2011/12/22 07:36:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/memphis/memphis-0.2.3.ebuild,v 1.9 2012/01/17 08:07:35 jlec Exp $
 
 EAPI=4
 
@@ -24,21 +24,13 @@ RDEPEND="
 	introspection? ( dev-libs/gobject-introspection )
 	vala? ( dev-lang/vala:0.12 )"
 DEPEND="${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-1.12 )"
+	dev-util/gtk-doc"
 
 AUTOTOOLS_IN_SOURCE_BUILD=1
 
 DOCS=(AUTHORS ChangeLog NEWS README)
 
-PATCHES=(
-	"${FILESDIR}"/${P}-link_gobject.patch
-	)
-
-src_prepare() {
-	autotools-utils_src_prepare
-#	bug 395497, no elibtoolize
-	AT_NOELIBTOOLIZE="yes" eautoreconf
-}
+PATCHES=( "${FILESDIR}"/${P}-link_gobject.patch )
 
 src_configure() {
 	unset VALAC
diff --git a/media-libs/memphis/metadata.xml b/media-libs/memphis/metadata.xml
index f4a917d6117a..19dacf92ebc6 100644
--- a/media-libs/memphis/metadata.xml
+++ b/media-libs/memphis/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>jlec@gentoo.org</email>
-</maintainer>
-<use>
-  <flag name='introspection'>Use dev-libs/gobject-introspection for introspection</flag>
-  <flag name='vala'>Add support for Vala</flag>
-</use>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="introspection">Use dev-libs/gobject-introspection for introspection</flag>
+		<flag name="vala">Add support for Vala</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-libs/opengtl/Manifest b/media-libs/opengtl/Manifest
index 2f6ad8ab1382..6da917ea2cfe 100644
--- a/media-libs/opengtl/Manifest
+++ b/media-libs/opengtl/Manifest
@@ -1,2 +1,3 @@
 DIST OpenGTL-0.9.15.1.tar.bz2 496181 RMD160 b161177daa57b104f45cfa3eafcc91b2203a60aa SHA1 ddd25b1f5eb11ae0b438c67d5a2a73481e919a0a SHA256 7ee13c09b0a0d7099367b713fce5a3a14cf72865bf6169ebc39ec4958c445028
 DIST OpenGTL-0.9.15.2.tar.bz2 495966 RMD160 e77ba56b0dfe92361724aae02c5817248355b52d SHA1 b6beea4086a0907dcdb326d421d253f368689b45 SHA256 306427f2814439703f13b6ee17092c466172c4df57cdb896b6e5eadfa1154ae2
+DIST OpenGTL-0.9.16.tar.bz2 533833 RMD160 77cac5891ff5c620092c815d80681373cf3d9145 SHA1 3cfe4a08e5778c13f7e74dfc822adb68f97ad048 SHA256 81e81a53eeeb07e9e6a6ecfd0d960c10453fedc041ab7d885e66ee3053757107
diff --git a/media-libs/opengtl/opengtl-0.9.16.ebuild b/media-libs/opengtl/opengtl-0.9.16.ebuild
new file mode 100644
index 000000000000..005553a926ee
--- /dev/null
+++ b/media-libs/opengtl/opengtl-0.9.16.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/media-libs/opengtl/opengtl-0.9.16.ebuild,v 1.1 2012/01/17 20:27:53 johu Exp $
+
+EAPI=4
+
+MY_P="OpenGTL-${PV}"
+
+inherit cmake-utils
+
+DESCRIPTION="Collection of libraries for graphics transformation algorithms"
+HOMEPAGE="http://opengtl.org/"
+SRC_URI="http://download.opengtl.org/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug test"
+
+RDEPEND="
+	media-libs/libpng
+	>=sys-devel/llvm-3.0
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/lcov )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use debug OPENGTL_ENABLE_DEBUG_OUTPUT)
+		$(cmake-utils_use test OPENGTL_BUILD_TESTS)
+		$(cmake-utils_use test OPENGTL_CODE_COVERAGE)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	newdoc OpenShiva/doc/reference/region.pdf OpenShiva.pdf
+}
diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.23.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.23.ebuild
index debb1c1cf3d7..b755ac3e0f6b 100644
--- a/media-libs/sdl-gfx/sdl-gfx-2.0.23.ebuild
+++ b/media-libs/sdl-gfx/sdl-gfx-2.0.23.ebuild
@@ -1,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/sdl-gfx/sdl-gfx-2.0.23.ebuild,v 1.4 2012/01/10 20:14:36 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-gfx/sdl-gfx-2.0.23.ebuild,v 1.5 2012/01/17 16:38:06 jer Exp $
 
 EAPI=2
 inherit autotools multilib
@@ -12,7 +12,7 @@ SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc mmx static-libs"
 
 DEPEND="media-libs/libsdl[video]"
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index 2112512099d0..50e9b7e2398c 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -1 +1,2 @@
 DIST SDL_mixer-1.2.11.tar.gz 2690654 RMD160 559355116a1c380edf71879da0dbcf5359f05476 SHA1 ef5d45160babeb51eafa7e4019cec38324ee1a5d SHA256 86145ac39cac6d2c6169c226f937648dca5e89dcd828751763dd174fa9af9cf9
+DIST SDL_mixer-1.2.12.tar.gz 3707781 RMD160 99089725824095398bfb34fd9ccb7c16674192d8 SHA1 a20fa96470ad9e1052f1957b77ffa68fb090b384 SHA256 1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a
diff --git a/media-libs/sdl-mixer/metadata.xml b/media-libs/sdl-mixer/metadata.xml
index 333c32adaa5a..38f4fb4843ad 100644
--- a/media-libs/sdl-mixer/metadata.xml
+++ b/media-libs/sdl-mixer/metadata.xml
@@ -4,7 +4,8 @@
 <herd>games</herd>
 <use>
  <flag name='midi'>basic support for MIDI files</flag>
+ <flag name='fluidsynth'>Use <pkg>media-sound/fluidsynth</pkg> for MIDI support</flag>
  <flag name='wav'>support WAVE files</flag>
- <flag name='playtools'>Install playwave and playmus tools (usefull for testing)</flag>
+ <flag name='playtools'>Install playwave and playmus tools (useful for testing)</flag>
 </use>
 </pkgmetadata>
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild
new file mode 100644
index 000000000000..1a0fd9033f8a
--- /dev/null
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild,v 1.1 2012/01/17 01:08:19 mr_bones_ Exp $
+
+EAPI=4
+
+MY_P=${P/sdl-/SDL_}
+DESCRIPTION="Simple Direct Media Layer Mixer Library"
+HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/"
+SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="flac fluidsynth mad +midi mikmod modplug mp3 playtools static-libs timidity vorbis +wav"
+REQUIRED_USE="midi? ( || ( timidity fluidsynth ) )"
+
+DEPEND=">=media-libs/libsdl-1.2.10
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth )
+	timidity? ( media-sound/timidity++ )
+	mad? ( media-libs/libmad )
+	!mad? ( mp3? ( >=media-libs/smpeg-0.4.4-r1 ) )
+	modplug? ( media-libs/libmodplug )
+	mikmod? ( >=media-libs/libmikmod-3.1.10 )
+	vorbis? ( >=media-libs/libvorbis-1.0_beta4 media-libs/libogg )"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-music-flac-shared \
+		--disable-music-fluidsynth-shared \
+		--disable-music-mod-shared \
+		--disable-music-mp3-shared \
+		--disable-music-ogg-shared \
+		$(use_enable wav music-wave) \
+		$(use_enable timidity music-timidity-midi) \
+		$(use_enable fluidsynth music-fluidsynth-midi) \
+		$(use_enable vorbis music-ogg) \
+		$(use_enable mikmod music-mod) \
+		$(use_enable modplug music-modplug) \
+		$(use_enable flac music-flac) \
+		$(use_enable static-libs static) \
+		$(use mad && echo --disable-music-mp3 || use_enable mp3 music-mp3) \
+		$(use_enable mad music-mp3-mad-gpl)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	if use playtools; then
+		emake DESTDIR="${D}" install-bin
+	fi
+	dodoc CHANGES README
+	if ! use static-libs ; then
+		find "${D}" -type f -name '*.la' -exec rm {} + \
+			|| die "la removal failed"
+	fi
+}
diff --git a/media-libs/sdl-net/sdl-net-1.2.8.ebuild b/media-libs/sdl-net/sdl-net-1.2.8.ebuild
index 64c030b29ff1..0c6c602e79f0 100644
--- a/media-libs/sdl-net/sdl-net-1.2.8.ebuild
+++ b/media-libs/sdl-net/sdl-net-1.2.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/media-libs/sdl-net/sdl-net-1.2.8.ebuild,v 1.1 2012/01/16 22:57:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-net/sdl-net-1.2.8.ebuild,v 1.2 2012/01/17 17:28:04 mr_bones_ Exp $
 
 EAPI=2
 MY_P=${P/sdl-/SDL_}
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="static-libs"
 
-DEPEND=">=media-libs/libsdl-1.2.5"
+DEPEND=">=media-libs/libsdl-1.2.14"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3.ebuild b/media-libs/sdl-sound/sdl-sound-1.0.3.ebuild
index 0bfe6a588d3a..6d658527c57d 100644
--- a/media-libs/sdl-sound/sdl-sound-1.0.3.ebuild
+++ b/media-libs/sdl-sound/sdl-sound-1.0.3.ebuild
@@ -1,7 +1,8 @@
-# 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/media-libs/sdl-sound/sdl-sound-1.0.3.ebuild,v 1.6 2010/07/27 00:33:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-sound/sdl-sound-1.0.3.ebuild,v 1.7 2012/01/17 15:27:34 mr_bones_ Exp $
 
+EAPI=2
 MY_P="${P/sdl-/SDL_}"
 DESCRIPTION="A library that handles the decoding of sound file formats"
 HOMEPAGE="http://icculus.org/SDL_sound/"
@@ -10,11 +11,12 @@ SRC_URI="http://icculus.org/SDL_sound/downloads/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="flac mikmod mp3 mpeg physfs speex static-libs vorbis"
+IUSE="flac mikmod modplug mp3 mpeg physfs speex static-libs vorbis"
 
 RDEPEND=">=media-libs/libsdl-1.2
 	flac? ( media-libs/flac )
-	mikmod? ( >=media-libs/libmikmod-3.1.9 media-libs/libmodplug )
+	mikmod? ( >=media-libs/libmikmod-3.1.9 )
+	modplug? ( media-libs/libmodplug )
 	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )
 	speex? ( media-libs/speex media-libs/libogg )
 	physfs? ( dev-games/physfs )
@@ -24,7 +26,7 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
-src_compile() {
+src_configure() {
 	econf \
 		--disable-dependency-tracking \
 		--enable-midi \
@@ -34,15 +36,13 @@ src_compile() {
 		$(use_enable speex) \
 		$(use_enable static-libs static) \
 		$(use_enable mikmod) \
-		$(use_enable mikmod modplug) \
+		$(use_enable modplug) \
 		$(use_enable physfs) \
-		$(use_enable vorbis ogg) \
-		|| die
-	emake || die "emake failed"
+		$(use_enable vorbis ogg)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc CHANGELOG CREDITS README TODO
 	if ! use static-libs ; then
 		find "${D}" -type f -name '*.la' -exec rm {} + \
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.1.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.1.1.ebuild
index b674557f8a1c..5eae2a839aee 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.1.1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-3.1.1.ebuild,v 1.1 2011/12/05 22:47:41 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-3.1.1.ebuild,v 1.2 2012/01/17 13:18:35 klausman Exp $
 
 EAPI=4
 
@@ -65,7 +65,9 @@ mp3_warning() {
 
 src_configure() {
 	mp3_warning
-
+	# Turn "-z defs" into "-Wl,-z,defs" because some versions of gcc don't like
+	# it (bug 395213)
+	epatch "${FILESDIR}/audacious-plugins_ldflags.patch"
 	econf \
 		--enable-chardet \
 		--enable-modplug \
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.1.ebuild
index 3ec4d63a5d56..db09c46a3486 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.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/media-plugins/audacious-plugins/audacious-plugins-3.1.ebuild,v 1.6 2011/12/07 13:46:52 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-3.1.ebuild,v 1.8 2012/01/17 13:21:31 klausman Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="http://distfiles.atheme.org/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
 IUSE="aac adplug alsa aqua bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
 lame libnotify libsamplerate midi mms mp3 mtp nls oss pulseaudio scrobbler sid sndfile sse2 vorbis wavpack"
 
@@ -65,6 +65,9 @@ mp3_warning() {
 
 src_configure() {
 	mp3_warning
+	# Turn "-z defs" into "-Wl,-z,defs" because some versions of gcc don't like
+	# it (bug 395213)
+	epatch "${FILESDIR}/audacious-plugins_ldflags.patch"
 
 	econf \
 		--enable-chardet \
diff --git a/media-plugins/audacious-plugins/files/audacious-plugins_ldflags.patch b/media-plugins/audacious-plugins/files/audacious-plugins_ldflags.patch
new file mode 100644
index 000000000000..359964ecd943
--- /dev/null
+++ b/media-plugins/audacious-plugins/files/audacious-plugins_ldflags.patch
@@ -0,0 +1,11 @@
+--- configure.old	2012-01-17 13:00:17.000000000 +0000
++++ configure	2012-01-17 13:00:33.000000000 +0000
+@@ -5223,7 +5223,7 @@
+     *linux*)
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-        LDFLAGS="$LDFLAGS -z defs"
++        LDFLAGS="$LDFLAGS -Wl,-z,defs"
+         ;;
+     *)
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
diff --git a/media-radio/fldigi/fldigi-3.21.35_pre1.ebuild b/media-radio/fldigi/fldigi-3.21.35_pre1.ebuild
index f40209d4a139..baab6ae38065 100644
--- a/media-radio/fldigi/fldigi-3.21.35_pre1.ebuild
+++ b/media-radio/fldigi/fldigi-3.21.35_pre1.ebuild
@@ -1,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-radio/fldigi/fldigi-3.21.35_pre1.ebuild,v 1.1 2012/01/05 16:05:54 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/fldigi/fldigi-3.21.35_pre1.ebuild,v 1.2 2012/01/17 13:04:27 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.w1hkj.com/trials-1.3.0/src/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="hamlib nls portaudio pulseaudio sndfile xmlrpc"
 
 RDEPEND="x11-libs/fltk:1[threads,xft]
diff --git a/media-sound/abcm2ps/Manifest b/media-sound/abcm2ps/Manifest
index 172d3b40afbb..ad8017ae2137 100644
--- a/media-sound/abcm2ps/Manifest
+++ b/media-sound/abcm2ps/Manifest
@@ -1,6 +1,5 @@
 DIST abcm2ps-5.9.15.tar.gz 253032 RMD160 d5a6b2639c34d6c70f5412ffeb82db8369da312d SHA1 27e1fc6473a60daee7828dc02f60bbaf70361a7e SHA256 b54a045d7dab2c20e81fc64877a49809855dc8b249293a4e383e2ca2a0eae2d2
 DIST abcm2ps-5.9.24.tar.gz 254329 RMD160 26695fabb540b17bd2dee86ba18c7fa3baa11e8b SHA1 7261ea8d2442a63897f97882e788c2d2404cd8c9 SHA256 008f8cde72c09ddd1c6a61d0b1f86d0733f35b76c94b7ceaeff97d02e8bcc53f
 DIST abcm2ps-5.9.25.tar.gz 254499 RMD160 ed35ffb262118db45181923aad2cf50374faf7c3 SHA1 893886d5fc94f0c7483592871e39c5b24329ff73 SHA256 50efede424b4d60ec3653c1fee66d62ef8c082bbba5f2ac0ea6c80321a4973e3
-DIST abcm2ps-6.5.15.tar.gz 292884 RMD160 0e4cb46a3f2279b0d63b82e57ec1deaaa36a0b60 SHA1 6692dcc02a20cca7340c44f1dfae4eaec781b754 SHA256 de42e2851407a3a4a88870e835b6d9c9d6a2ca42343f463d9604f0da612f432a
-DIST abcm2ps-6.5.16.tar.gz 293474 RMD160 d0bed71202d4e2c179d32d39073246349756bed9 SHA1 48667629aa9688478791bd62aa88767549253aee SHA256 a6d6cbec1177e4f819638e8282979c2ca57fdba54481dcd446c6dc8c999464d6
+DIST abcm2ps-6.6.3.tar.gz 294909 RMD160 60044ed9cb8a13f2f4a1d81cd02f92039abb1163 SHA1 64b672d6967716839f2233208293fee5d7579ecf SHA256 32c3909bde02213b5ab8c3bdfd1d3b985cc833254a4c6dbfb156c7818834990e
 DIST transpose_abc.pl 21045 RMD160 3ea7c36f80249a2c6e6c03eca0d9d58c054e2cfc SHA1 82a852ae790d6f379d48e4f3acc5aeba0236e575 SHA256 bd6960872bfbc9f71f183f36d533ea33b8cf62a6027b447f0b0b8adfa25a2848
diff --git a/media-sound/abcm2ps/abcm2ps-6.5.16.ebuild b/media-sound/abcm2ps/abcm2ps-6.5.16.ebuild
deleted file mode 100644
index d73b8476f3c9..000000000000
--- a/media-sound/abcm2ps/abcm2ps-6.5.16.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcm2ps/abcm2ps-6.5.16.ebuild,v 1.1 2011/12/23 03:16:08 radhermit Exp $
-
-EAPI=4
-
-DESCRIPTION="A program to convert abc files to Postscript files"
-HOMEPAGE="http://moinejf.free.fr/"
-SRC_URI="http://moinejf.free.fr/${P}.tar.gz
-	http://moinejf.free.fr/transpose_abc.pl"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples pango"
-
-RDEPEND="pango? ( x11-libs/pango media-libs/freetype:2 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_configure() {
-	econf \
-		--enable-a4 \
-		--enable-deco-is-roll \
-		$(use_enable pango)
-}
-
-src_install() {
-	dobin abcm2ps
-
-	insinto /usr/share/${PN}
-	doins *.fmt
-
-	dodoc Changes README *.txt
-
-	if use examples ; then
-		docinto examples
-		dodoc *.{abc,eps}
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	docinto contrib
-	dodoc "${DISTDIR}"/transpose_abc.pl
-}
diff --git a/media-sound/abcm2ps/abcm2ps-6.5.15.ebuild b/media-sound/abcm2ps/abcm2ps-6.6.3.ebuild
similarity index 90%
rename from media-sound/abcm2ps/abcm2ps-6.5.15.ebuild
rename to media-sound/abcm2ps/abcm2ps-6.6.3.ebuild
index 0f4b9f0b2d20..c94fdadc39de 100644
--- a/media-sound/abcm2ps/abcm2ps-6.5.15.ebuild
+++ b/media-sound/abcm2ps/abcm2ps-6.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcm2ps/abcm2ps-6.5.15.ebuild,v 1.2 2011/12/18 17:49:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcm2ps/abcm2ps-6.6.3.ebuild,v 1.1 2012/01/17 23:40:22 radhermit Exp $
 
 EAPI=4
 
diff --git a/media-sound/audacious/audacious-3.1.1.ebuild b/media-sound/audacious/audacious-3.1.1.ebuild
index 8cc3c5033e03..6f1b4d234bc4 100644
--- a/media-sound/audacious/audacious-3.1.1.ebuild
+++ b/media-sound/audacious/audacious-3.1.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-3.1.1.ebuild,v 1.1 2011/12/05 22:46:56 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-3.1.1.ebuild,v 1.2 2012/01/17 12:55:52 klausman Exp $
 
 EAPI=4
+inherit eutils
 
 MY_P="${P/_/-}"
 S="${WORKDIR}/${MY_P}"
@@ -34,6 +35,10 @@ DEPEND="${RDEPEND}
 PDEPEND=">=media-plugins/audacious-plugins-3.1.1"
 
 src_configure() {
+	# Some gccs don't like "-z defs" on their command line. Explicitly make it a
+	# linker flag (bug 395213).
+	epatch "${FILESDIR}/audacious_ldflags.patch"
+
 	# D-Bus is a mandatory dependency, remote control,
 	# session management and some plugins depend on this.
 	# Building without D-Bus is *unsupported* and a USE-flag
diff --git a/media-sound/audacious/audacious-3.1.ebuild b/media-sound/audacious/audacious-3.1.ebuild
index 6f7278e8c88b..9b8f08b92572 100644
--- a/media-sound/audacious/audacious-3.1.ebuild
+++ b/media-sound/audacious/audacious-3.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-3.1.ebuild,v 1.4 2011/12/07 13:47:38 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-3.1.ebuild,v 1.6 2012/01/17 13:22:00 klausman Exp $
 
 EAPI=4
+inherit eutils
 
 MY_P="${P/_/-}"
 S="${WORKDIR}/${MY_P}"
@@ -13,7 +14,7 @@ SRC_URI="http://distfiles.atheme.org/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
 IUSE="altivec chardet nls session sse2"
 
 RDEPEND=">=dev-libs/dbus-glib-0.60
@@ -34,6 +35,10 @@ DEPEND="${RDEPEND}
 PDEPEND=">=media-plugins/audacious-plugins-3.1"
 
 src_configure() {
+	# Some gccs don't like "-z defs" on their command line. Explicitly make it a
+	# linker flag (bug 395213).
+	epatch "${FILESDIR}/audacious_ldflags.patch"
+
 	# D-Bus is a mandatory dependency, remote control,
 	# session management and some plugins depend on this.
 	# Building without D-Bus is *unsupported* and a USE-flag
diff --git a/media-sound/audacious/files/audacious_ldflags.patch b/media-sound/audacious/files/audacious_ldflags.patch
new file mode 100644
index 000000000000..e030b1af5dae
--- /dev/null
+++ b/media-sound/audacious/files/audacious_ldflags.patch
@@ -0,0 +1,11 @@
+--- configure.old	2012-01-17 12:41:09.000000000 +0000
++++ configure	2012-01-17 12:41:42.000000000 +0000
+@@ -4759,7 +4759,7 @@
+     *linux*)
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-        LDFLAGS="$LDFLAGS -z defs"
++        LDFLAGS="$LDFLAGS -Wl,-z,defs"
+         ;;
+     *)
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
diff --git a/media-sound/rhythmbox/rhythmbox-2.95.ebuild b/media-sound/rhythmbox/rhythmbox-2.95.ebuild
index 791413c05b43..8f937c5d784b 100644
--- a/media-sound/rhythmbox/rhythmbox-2.95.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-2.95.ebuild
@@ -1,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.95.ebuild,v 1.1 2012/01/16 03:47:24 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.95.ebuild,v 1.2 2012/01/17 17:05:37 pacho Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -32,7 +32,7 @@ REQUIRED_USE="
 # NOTE: gst-python is still needed because gstreamer introspection is incomplete
 COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
 	dev-libs/libxml2:2
-	>=x11-libs/gtk+-2.91.4:3[introspection]
+	>=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?]
diff --git a/media-tv/linuxtv-dvb-headers/linuxtv-dvb-headers-3.1.ebuild b/media-tv/linuxtv-dvb-headers/linuxtv-dvb-headers-3.1.ebuild
deleted file mode 100644
index 4211e29df0dd..000000000000
--- a/media-tv/linuxtv-dvb-headers/linuxtv-dvb-headers-3.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-headers/linuxtv-dvb-headers-3.1.ebuild,v 1.14 2011/03/20 11:24:31 armin76 Exp $
-
-inherit eutils
-
-DESCRIPTION="Virtual Package installing the Header files for DVB"
-HOMEPAGE="http://www.linuxtv.org"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc x86"
-IUSE=""
-RDEPEND="|| (
-		>=sys-kernel/linux-headers-2.6.11-r2
-		media-tv/linuxtv-dvb
-	)"
diff --git a/media-tv/linuxtv-dvb-headers/linuxtv-dvb-headers-5.ebuild b/media-tv/linuxtv-dvb-headers/linuxtv-dvb-headers-5.ebuild
index fe231da4c6df..5f84448dbb30 100644
--- a/media-tv/linuxtv-dvb-headers/linuxtv-dvb-headers-5.ebuild
+++ b/media-tv/linuxtv-dvb-headers/linuxtv-dvb-headers-5.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-headers/linuxtv-dvb-headers-5.ebuild,v 1.7 2011/10/22 17:47:51 hd_brummy Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-headers/linuxtv-dvb-headers-5.ebuild,v 1.8 2012/01/17 19:24:25 idl0r Exp $
 
 DESCRIPTION="Virtual Package installing the Header files for DVB"
 HOMEPAGE="http://www.linuxtv.org"
@@ -10,4 +8,5 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~arm amd64 ~hppa ~ppc ppc64 x86"
 IUSE=""
-RDEPEND=">=sys-kernel/linux-headers-2.6.29"
+RDEPEND=">=sys-kernel/linux-headers-2.6.28
+	<sys-kernel/linux-headers-3.0"
diff --git a/media-video/kplayer/files/kplayer-0.7.1-enablefinal.patch b/media-video/kplayer/files/kplayer-0.7.1-enablefinal.patch
deleted file mode 100644
index 9a0afb3fa010..000000000000
--- a/media-video/kplayer/files/kplayer-0.7.1-enablefinal.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN kplayer-0.7.1.orig/src/kplayerpropertiesdialog.cpp kplayer-0.7.1/src/kplayerpropertiesdialog.cpp
---- kplayer-0.7.1.orig/src/kplayerpropertiesdialog.cpp	2011-06-10 22:16:25.000000000 +0200
-+++ kplayer-0.7.1/src/kplayerpropertiesdialog.cpp	2011-11-12 23:02:00.529999063 +0100
-@@ -33,7 +33,7 @@
- #define DEBUG_KPLAYER_PROPERTIES_DIALOG
- #endif
- 
--QString listEntry (QComboBox* combo, bool hasDefault = false)
-+QString listEntry (QComboBox* combo, bool hasDefault)
- {
-   static QRegExp re_key_value ("^([^:]+): *(.*)$");
-   if ( hasDefault && combo -> currentIndex() == 0 )
diff --git a/media-video/kplayer/kplayer-0.7.1.ebuild b/media-video/kplayer/kplayer-0.7.1.ebuild
index 1ba474b5cba2..308c812ba6b6 100644
--- a/media-video/kplayer/kplayer-0.7.1.ebuild
+++ b/media-video/kplayer/kplayer-0.7.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/media-video/kplayer/kplayer-0.7.1.ebuild,v 1.6 2011/11/12 21:04:43 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/kplayer-0.7.1.ebuild,v 1.7 2012/01/17 12:14:46 johu Exp $
 
 EAPI=4
 
@@ -22,5 +22,3 @@ IUSE="debug"
 RDEPEND="${DEPEND}
 	|| ( >=media-video/mplayer-1.0_rc1 media-video/mplayer2 )
 "
-
-PATCHES=( "${FILESDIR}/${P}-enablefinal.patch" )
diff --git a/media-video/vdr/vdr-1.6.0_p2-r7.ebuild b/media-video/vdr/vdr-1.6.0_p2-r7.ebuild
index 197b4dcd5ac9..1eaf1d35cabc 100644
--- a/media-video/vdr/vdr-1.6.0_p2-r7.ebuild
+++ b/media-video/vdr/vdr-1.6.0_p2-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild,v 1.2 2011/10/24 17:45:10 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild,v 1.3 2012/01/17 19:08:17 idl0r Exp $
 
 EAPI="4"
 
@@ -52,7 +52,7 @@ COMMON_DEPEND="virtual/jpeg
 	dvdarchive? ( dvdchapjump? ( >=media-libs/libdvdread-4.1.3_p1168 ) )"
 
 DEPEND="${COMMON_DEPEND}
-	~media-tv/linuxtv-dvb-headers-5
+	=media-tv/linuxtv-dvb-headers-5*
 	dev-util/unifdef
 	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
 
diff --git a/metadata/cache/app-admin/sshguard-1.0 b/metadata/cache/app-admin/sshguard-1.0
deleted file mode 100644
index 16ad075814f6..000000000000
--- a/metadata/cache/app-admin/sshguard-1.0
+++ /dev/null
@@ -1,22 +0,0 @@
-kernel_linux? ( net-firewall/iptables ) kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) )
-kernel_linux? ( net-firewall/iptables ) kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) ) virtual/logger
-0
-mirror://sourceforge/sshguard/sshguard-1.0.tar.bz2
-
-http://sshguard.sourceforge.net/
-BSD
-protects hosts from brute force attacks against ssh
-amd64 x86 ~x86-fbsd
-
-ipfilter kernel_FreeBSD kernel_linux
-
-
-
-
-
-compile install
-
-
-
-
-
diff --git a/metadata/cache/app-admin/sshguard-1.1 b/metadata/cache/app-admin/sshguard-1.1
deleted file mode 100644
index 34dab607eb3c..000000000000
--- a/metadata/cache/app-admin/sshguard-1.1
+++ /dev/null
@@ -1,22 +0,0 @@
-kernel_linux? ( net-firewall/iptables ) kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) )
-kernel_linux? ( net-firewall/iptables ) kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) ) virtual/logger
-0
-mirror://sourceforge/sshguard/sshguard-1.1.tar.bz2
-
-http://sshguard.sourceforge.net/
-BSD
-protects hosts from brute force attacks against ssh
-~amd64 ~x86 ~x86-fbsd
-
-ipfilter kernel_FreeBSD kernel_linux
-
-
-
-
-
-compile install
-
-
-
-
-
diff --git a/metadata/cache/app-admin/sshguard-1.3 b/metadata/cache/app-admin/sshguard-1.3
deleted file mode 100644
index 25746ffd6526..000000000000
--- a/metadata/cache/app-admin/sshguard-1.3
+++ /dev/null
@@ -1,22 +0,0 @@
-kernel_linux? ( net-firewall/iptables ) kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) )
-kernel_linux? ( net-firewall/iptables ) kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) ) virtual/logger
-0
-mirror://sourceforge/sshguard/sshguard-1.3.tar.bz2
-
-http://sshguard.sourceforge.net/
-BSD
-protects hosts from brute force attacks against ssh
-~amd64 ~x86 ~x86-fbsd
-
-ipfilter kernel_FreeBSD kernel_linux
-
-
-
-
-
-compile install
-
-
-
-
-
diff --git a/metadata/cache/app-admin/sshguard-1.4 b/metadata/cache/app-admin/sshguard-1.4
deleted file mode 100644
index 00eff62c1f35..000000000000
--- a/metadata/cache/app-admin/sshguard-1.4
+++ /dev/null
@@ -1,22 +0,0 @@
-kernel_linux? ( net-firewall/iptables ) kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) ) sys-devel/flex
-kernel_linux? ( net-firewall/iptables ) kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) ) virtual/logger
-0
-mirror://sourceforge/sshguard/sshguard-1.4.tar.bz2
-
-http://sshguard.sourceforge.net/
-BSD
-protects hosts from brute force attacks against ssh
-~amd64 ~x86 ~x86-fbsd
-
-ipfilter kernel_FreeBSD kernel_linux
-
-
-
-2
-
-configure install
-
-
-
-
-
diff --git a/metadata/cache/app-admin/sudo-1.8.2-r1 b/metadata/cache/app-admin/sudo-1.8.2-r1
index 6816cd3f2bcb..d0532ee661f2 100644
--- a/metadata/cache/app-admin/sudo-1.8.2-r1
+++ b/metadata/cache/app-admin/sudo-1.8.2-r1
@@ -6,7 +6,7 @@ http://www.sudo.ws/sudo/dist/sudo-1.8.2.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1
 http://www.sudo.ws/
 as-is BSD
 Allows users or groups to run commands as other users
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
 eutils flag-o-matic libtool multilib pam portability toolchain-funcs user
 pam offensive ldap selinux skey
 pam? ( !skey ) skey? ( !pam )
diff --git a/metadata/cache/app-arch/libarchive-2.8.5 b/metadata/cache/app-arch/libarchive-2.8.5
index 084d3ebaa137..7584def84b27 100644
--- a/metadata/cache/app-arch/libarchive-2.8.5
+++ b/metadata/cache/app-arch/libarchive-2.8.5
@@ -6,7 +6,7 @@ http://libarchive.googlecode.com/files/libarchive-2.8.5.tar.gz http://people.fre
 http://code.google.com/p/libarchive/
 BSD
 BSD tar command
-alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
 eutils flag-o-matic multilib portability toolchain-funcs user
 static static-libs acl xattr kernel_linux +bzip2 +lzma +zlib expat
 
diff --git a/metadata/cache/app-backup/kbackup-0.7.1 b/metadata/cache/app-backup/kbackup-0.7.1
index f420a97517ec..2439ed0dbe66 100644
--- a/metadata/cache/app-backup/kbackup-0.7.1
+++ b/metadata/cache/app-backup/kbackup-0.7.1
@@ -8,7 +8,7 @@ GPL-2
 KBackup is a program that lets you back up any directories or files.
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_cs linguas_de linguas_es linguas_fr linguas_it linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sv +handbook aqua kdeenablefinal
+debug linguas_cs linguas_de linguas_es linguas_fr linguas_it linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sv +handbook aqua
 
 
 
diff --git a/metadata/cache/app-cdr/k3b-2.0.2-r1 b/metadata/cache/app-cdr/k3b-2.0.2-r1
index 1706e172eb25..92295aa510f7 100644
--- a/metadata/cache/app-cdr/k3b-2.0.2-r1
+++ b/metadata/cache/app-cdr/k3b-2.0.2-r1
@@ -8,7 +8,7 @@ GPL-2 FDL-1.2
 The CD/DVD Kreator for KDE
 amd64 ~ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug dvd emovix encode ffmpeg flac lame mad musepack musicbrainz sndfile sox taglib vcd vorbis +wav linguas_ast linguas_be linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_csb linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_ko linguas_ku linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_sk linguas_sl linguas_sv linguas_th linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua kdeenablefinal
+debug dvd emovix encode ffmpeg flac lame mad musepack musicbrainz sndfile sox taglib vcd vorbis +wav linguas_ast linguas_be linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_csb linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_ko linguas_ku linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_sk linguas_sl linguas_sv linguas_th linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/app-cdr/k9copy-2.3.7 b/metadata/cache/app-cdr/k9copy-2.3.7
index f8f84be53606..f77fa0f4c8ed 100644
--- a/metadata/cache/app-cdr/k9copy-2.3.7
+++ b/metadata/cache/app-cdr/k9copy-2.3.7
@@ -8,7 +8,7 @@ GPL-2
 k9copy is a DVD backup utility which allows the copy of one or more titles from a DVD9 to a DVD5.
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es_AR linguas_es linguas_fr linguas_it linguas_ja linguas_nl linguas_pl linguas_pt_BR linguas_ru linguas_sr@Latn linguas_sr linguas_tr linguas_zh_TW +handbook aqua kdeenablefinal
+debug linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es_AR linguas_es linguas_fr linguas_it linguas_ja linguas_nl linguas_pl linguas_pt_BR linguas_ru linguas_sr@Latn linguas_sr linguas_tr linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/app-cdr/k9copy-2.3.8 b/metadata/cache/app-cdr/k9copy-2.3.8
index 8f791b34e31b..87eb5398787b 100644
--- a/metadata/cache/app-cdr/k9copy-2.3.8
+++ b/metadata/cache/app-cdr/k9copy-2.3.8
@@ -8,7 +8,7 @@ GPL-2
 k9copy is a DVD backup utility which allows the copy of one or more titles from a DVD9 to a DVD5.
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_es_AR linguas_fr linguas_it linguas_ja linguas_nl linguas_pl linguas_pt_BR linguas_ru linguas_sr linguas_sr@Latn linguas_tr linguas_uk linguas_zh_TW +handbook aqua kdeenablefinal
+debug linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_es_AR linguas_fr linguas_it linguas_ja linguas_nl linguas_pl linguas_pt_BR linguas_ru linguas_sr linguas_sr@Latn linguas_tr linguas_uk linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/app-cdr/kcdemu-0.3 b/metadata/cache/app-cdr/kcdemu-0.3
index 5e7023b92e5f..91ea82f2b677 100644
--- a/metadata/cache/app-cdr/kcdemu-0.3
+++ b/metadata/cache/app-cdr/kcdemu-0.3
@@ -8,7 +8,7 @@ GPL-2
 A frontend to cdemu daemon for KDE4
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_de linguas_es aqua kdeenablefinal
+debug linguas_de linguas_es aqua
 
 
 
diff --git a/metadata/cache/app-cdr/kcdemu-0.3.1-r1 b/metadata/cache/app-cdr/kcdemu-0.3.1-r1
index 1da7afda0453..8a746b6df6db 100644
--- a/metadata/cache/app-cdr/kcdemu-0.3.1-r1
+++ b/metadata/cache/app-cdr/kcdemu-0.3.1-r1
@@ -8,7 +8,7 @@ GPL-2
 A frontend to cdemu daemon for KDE4
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_de linguas_es linguas_pl linguas_ro aqua kdeenablefinal
+debug linguas_de linguas_es linguas_pl linguas_ro aqua
 
 
 
diff --git a/metadata/cache/app-cdr/kcdemu-0.4 b/metadata/cache/app-cdr/kcdemu-0.4
index 07b815a4502b..d7ab73bc32b1 100644
--- a/metadata/cache/app-cdr/kcdemu-0.4
+++ b/metadata/cache/app-cdr/kcdemu-0.4
@@ -8,7 +8,7 @@ GPL-2
 A frontend to cdemu daemon for KDE4
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_de linguas_es linguas_pl linguas_ro linguas_sv aqua kdeenablefinal
+debug linguas_de linguas_es linguas_pl linguas_ro linguas_sv aqua
 
 
 
diff --git a/metadata/cache/app-crypt/heimdal-1.3.3-r1 b/metadata/cache/app-crypt/heimdal-1.3.3-r1
deleted file mode 100644
index 64a72f2a49f7..000000000000
--- a/metadata/cache/app-crypt/heimdal-1.3.3-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) !berkdb? ( sys-libs/gdbm ) >=dev-db/sqlite-3.5.7 >=sys-libs/e2fsprogs-libs-1.41.11 afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) !!app-crypt/mit-krb5 dev-util/pkgconfig >=sys-devel/autoconf-2.62 test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) )
-ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) !berkdb? ( sys-libs/gdbm ) >=dev-db/sqlite-3.5.7 >=sys-libs/e2fsprogs-libs-1.41.11 afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) !!app-crypt/mit-krb5
-0
-http://www.h5l.org/dist/src/heimdal-1.3.3.tar.gz
-
-http://www.h5l.org/
-BSD
-Kerberos 5 implementation from KTH
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-eutils libtool multilib portability toolchain-funcs user virtualx
-afs +berkdb hdb-ldap ipv6 otp pkinit ssl threads test X
-
-
-
-2
-
-compile configure install preinst prepare test
-
-
-
-
-
diff --git a/metadata/cache/app-crypt/heimdal-1.4.1_pre20110304 b/metadata/cache/app-crypt/heimdal-1.4.1_pre20110304
deleted file mode 100644
index 78543469f27a..000000000000
--- a/metadata/cache/app-crypt/heimdal-1.4.1_pre20110304
+++ /dev/null
@@ -1,22 +0,0 @@
-ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) !berkdb? ( sys-libs/gdbm ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.5.7 >=sys-libs/e2fsprogs-libs-1.41.11 afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) !!app-crypt/mit-krb5 =dev-lang/python-2* dev-util/pkgconfig >=sys-devel/autoconf-2.62 test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=app-admin/eselect-python-20091230
-ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) !berkdb? ( sys-libs/gdbm ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.5.7 >=sys-libs/e2fsprogs-libs-1.41.11 afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) !!app-crypt/mit-krb5 >=app-admin/eselect-python-20091230
-0
-http://www.h5l.org/dist/src/heimdal-1.4.1_pre20110304.tar.bz2
-
-http://www.h5l.org/
-BSD
-Kerberos 5 implementation from KTH
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-autotools db-use eutils libtool multilib portability python toolchain-funcs user versionator virtualx
-afs +berkdb caps hdb-ldap ipv6 otp +pkinit ssl threads test X
-
-
-
-2
-
-compile configure install preinst prepare setup test
-
-
-
-
-
diff --git a/metadata/cache/app-crypt/heimdal-1.5 b/metadata/cache/app-crypt/heimdal-1.5
deleted file mode 100644
index 67a8ac8bb493..000000000000
--- a/metadata/cache/app-crypt/heimdal-1.5
+++ /dev/null
@@ -1,22 +0,0 @@
-ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) !berkdb? ( sys-libs/gdbm ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.5.7 >=sys-libs/e2fsprogs-libs-1.41.11 afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) !!app-crypt/mit-krb5 =dev-lang/python-2* dev-util/pkgconfig >=sys-devel/autoconf-2.62 test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=app-admin/eselect-python-20091230
-ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) !berkdb? ( sys-libs/gdbm ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.5.7 >=sys-libs/e2fsprogs-libs-1.41.11 afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) !!app-crypt/mit-krb5 >=app-admin/eselect-python-20091230
-0
-http://www.h5l.org/dist/src/heimdal-1.5.tar.gz
-
-http://www.h5l.org/
-BSD
-Kerberos 5 implementation from KTH
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-autotools db-use eutils flag-o-matic libtool multilib portability python toolchain-funcs user versionator virtualx
-afs +berkdb caps hdb-ldap ipv6 otp +pkinit ssl threads test X
-
-
-
-2
-
-compile configure install prepare setup
-
-
-
-
-
diff --git a/metadata/cache/app-crypt/heimdal-1.5.1 b/metadata/cache/app-crypt/heimdal-1.5.1
deleted file mode 100644
index 9d49324d4525..000000000000
--- a/metadata/cache/app-crypt/heimdal-1.5.1
+++ /dev/null
@@ -1,22 +0,0 @@
-ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) !berkdb? ( sys-libs/gdbm ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.5.7 >=sys-libs/e2fsprogs-libs-1.41.11 afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) !!app-crypt/mit-krb5 =dev-lang/python-2* dev-util/pkgconfig >=sys-devel/autoconf-2.62 test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=app-admin/eselect-python-20091230
-ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) !berkdb? ( sys-libs/gdbm ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.5.7 >=sys-libs/e2fsprogs-libs-1.41.11 afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) !!app-crypt/mit-krb5 >=app-admin/eselect-python-20091230
-0
-http://www.h5l.org/dist/src/heimdal-1.5.1.tar.gz
-
-http://www.h5l.org/
-BSD
-Kerberos 5 implementation from KTH
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-autotools db-use eutils flag-o-matic libtool multilib portability python toolchain-funcs user versionator virtualx
-afs +berkdb caps hdb-ldap ipv6 otp +pkinit ssl static-libs threads test X
-
-
-
-2
-
-compile configure install postinst preinst prepare setup
-
-
-
-
-
diff --git a/metadata/cache/app-crypt/heimdal-1.5.1-r1 b/metadata/cache/app-crypt/heimdal-1.5.1-r1
index 9478afabfab8..4e9709833b26 100644
--- a/metadata/cache/app-crypt/heimdal-1.5.1-r1
+++ b/metadata/cache/app-crypt/heimdal-1.5.1-r1
@@ -6,7 +6,7 @@ http://www.h5l.org/dist/src/heimdal-1.5.1.tar.gz
 http://www.h5l.org/
 BSD
 Kerberos 5 implementation from KTH
-alpha amd64 arm ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 autotools db-use eutils flag-o-matic libtool multilib portability python toolchain-funcs user versionator virtualx
 afs +berkdb caps hdb-ldap ipv6 otp +pkinit ssl static-libs threads test X
 
diff --git a/metadata/cache/app-crypt/mit-krb5-appl-1.0.1 b/metadata/cache/app-crypt/mit-krb5-appl-1.0.1
deleted file mode 100644
index c510a7079036..000000000000
--- a/metadata/cache/app-crypt/mit-krb5-appl-1.0.1
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-crypt/mit-krb5-1.8.0
->=app-crypt/mit-krb5-1.8.0
-0
-http://web.mit.edu/kerberos/dist/krb5-appl/1.0/krb5-appl-1.0.1-signed.tar
-
-http://web.mit.edu/kerberos/www/
-as-is
-Kerberized applications split from the main MIT Kerberos V distribution
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-eutils flag-o-matic multilib portability toolchain-funcs user versionator
-
-
-
-
-2
-
-compile configure install unpack
-
-
-
-
-
diff --git a/metadata/cache/app-crypt/mit-krb5-appl-1.0.1-r1 b/metadata/cache/app-crypt/mit-krb5-appl-1.0.1-r1
deleted file mode 100644
index af7ed1e8fbd8..000000000000
--- a/metadata/cache/app-crypt/mit-krb5-appl-1.0.1-r1
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-crypt/mit-krb5-1.8.0 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
->=app-crypt/mit-krb5-1.8.0
-0
-http://web.mit.edu/kerberos/dist/krb5-appl/1.0/krb5-appl-1.0.1-signed.tar
-
-http://web.mit.edu/kerberos/www/
-as-is
-Kerberized applications split from the main MIT Kerberos V distribution
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-autotools eutils flag-o-matic libtool multilib portability toolchain-funcs user versionator
-
-
-
-
-4
-
-configure install prepare unpack
-
-
-
-
-
diff --git a/metadata/cache/app-crypt/mit-krb5-appl-1.0.2 b/metadata/cache/app-crypt/mit-krb5-appl-1.0.2
deleted file mode 100644
index 97dc7b448187..000000000000
--- a/metadata/cache/app-crypt/mit-krb5-appl-1.0.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-crypt/mit-krb5-1.8.0
->=app-crypt/mit-krb5-1.8.0
-0
-http://web.mit.edu/kerberos/dist/krb5-appl/1.0/krb5-appl-1.0.2-signed.tar
-
-http://web.mit.edu/kerberos/www/
-as-is
-Kerberized applications split from the main MIT Kerberos V distribution
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-eutils flag-o-matic multilib portability toolchain-funcs user versionator
-
-
-
-
-4
-
-configure install unpack
-
-
-
-
-
diff --git a/metadata/cache/app-dicts/dikt-2d b/metadata/cache/app-dicts/dikt-2d
index a72996763ad8..606b8fe3be08 100644
--- a/metadata/cache/app-dicts/dikt-2d
+++ b/metadata/cache/app-dicts/dikt-2d
@@ -8,7 +8,7 @@ BSD-2
 A dictionary for KDE
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/app-editors/gummi-0.6.1 b/metadata/cache/app-editors/gummi-0.6.1
index 6d2cb1cd58fc..0685c15e9213 100644
--- a/metadata/cache/app-editors/gummi-0.6.1
+++ b/metadata/cache/app-editors/gummi-0.6.1
@@ -6,7 +6,7 @@ http://dev.midnightcoding.org/redmine/attachments/download/217/gummi-0.6.1.tar.g
 http://gummi.midnightcoding.org
 MIT
 Simple LaTeX editor for GTK+
-~amd64 ~x86
+amd64 ~x86
 base eutils multilib portability toolchain-funcs user
 linguas_ar linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_fr linguas_it linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sv linguas_zh_TW
 
diff --git a/metadata/cache/app-editors/kile-2.1 b/metadata/cache/app-editors/kile-2.1
index 4f011b4513d1..ecb8d3707361 100644
--- a/metadata/cache/app-editors/kile-2.1
+++ b/metadata/cache/app-editors/kile-2.1
@@ -8,7 +8,7 @@ FDL-1.2 GPL-2
 A Latex Editor and TeX shell for KDE
 amd64 ~ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +pdf +png +handbook aqua kdeenablefinal
+debug +pdf +png +handbook aqua
 
 
 
diff --git a/metadata/cache/app-emulation/qemu-kvm-0.13.0-r2 b/metadata/cache/app-emulation/qemu-kvm-0.13.0-r2
deleted file mode 100644
index 2d72421b63ef..000000000000
--- a/metadata/cache/app-emulation/qemu-kvm-0.13.0-r2
+++ /dev/null
@@ -1,22 +0,0 @@
-!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-softmmu !app-emulation/qemu-user !app-emulation/qemu-kvm-spice sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( net-misc/curl ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) ssl? ( net-libs/gnutls ) vde? ( net-misc/vde ) app-text/texi2html >=sys-kernel/linux-headers-2.6.29 ssl? ( dev-util/pkgconfig )
-!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-softmmu !app-emulation/qemu-user !app-emulation/qemu-kvm-spice sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( net-misc/curl ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) ssl? ( net-libs/gnutls ) vde? ( net-misc/vde )
-0
-mirror://sourceforge/kvm/qemu-kvm/qemu-kvm-0.13.0.tar.gz
-test
-http://www.linux-kvm.org
-GPL-2
-QEMU + Kernel-based Virtual Machine userland tools
-amd64 ~ppc ~ppc64 x86
-eutils flag-o-matic linux-info multilib portability toolchain-funcs user versionator
-+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses png pulseaudio qemu-ifup sasl sdl ssl static vde +qemu_softmmu_targets_i386 +qemu_softmmu_targets_x86_64 +qemu_softmmu_targets_arm +qemu_softmmu_targets_cris +qemu_softmmu_targets_m68k +qemu_softmmu_targets_microblaze +qemu_softmmu_targets_mips +qemu_softmmu_targets_mipsel +qemu_softmmu_targets_ppc +qemu_softmmu_targets_ppc64 +qemu_softmmu_targets_sh4 +qemu_softmmu_targets_sh4eb +qemu_softmmu_targets_sparc +qemu_softmmu_targets_sparc64 +qemu_softmmu_targets_mips64 +qemu_softmmu_targets_mips64el +qemu_softmmu_targets_ppcemb +qemu_user_targets_i386 +qemu_user_targets_x86_64 +qemu_user_targets_arm +qemu_user_targets_cris +qemu_user_targets_m68k +qemu_user_targets_microblaze +qemu_user_targets_mips +qemu_user_targets_mipsel +qemu_user_targets_ppc +qemu_user_targets_ppc64 +qemu_user_targets_sh4 +qemu_user_targets_sh4eb +qemu_user_targets_sparc +qemu_user_targets_sparc64 +qemu_user_targets_alpha +qemu_user_targets_armeb +qemu_user_targets_ppc64abi32 +qemu_user_targets_sparc32plus
-
-
-
-2
-
-compile configure install postinst prepare setup
-
-
-
-
-
diff --git a/metadata/cache/app-emulation/qemu-kvm-0.15.0 b/metadata/cache/app-emulation/qemu-kvm-0.15.0
index 0290c2524391..f2d0f9bb2f31 100644
--- a/metadata/cache/app-emulation/qemu-kvm-0.15.0
+++ b/metadata/cache/app-emulation/qemu-kvm-0.15.0
@@ -1,4 +1,4 @@
-!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-softmmu !app-emulation/qemu-user !app-emulation/qemu-kvm-spice >=dev-libs/glib-2.0 sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( >=net-misc/curl-7.15.4 ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) nss? ( dev-libs/nss ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) spice? ( >=app-emulation/spice-0.6.0 ) ssl? ( net-libs/gnutls ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen ) app-text/texi2html >=sys-kernel/linux-headers-2.6.35 ssl? ( dev-util/pkgconfig )
+!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-softmmu !app-emulation/qemu-user !app-emulation/qemu-kvm-spice >=dev-libs/glib-2.0 sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( >=net-misc/curl-7.15.4 ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) nss? ( dev-libs/nss ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) spice? ( >=app-emulation/spice-0.6.0 ) ssl? ( net-libs/gnutls ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen ) app-text/texi2html dev-util/pkgconfig >=sys-kernel/linux-headers-2.6.35
 !app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-softmmu !app-emulation/qemu-user !app-emulation/qemu-kvm-spice >=dev-libs/glib-2.0 sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( >=net-misc/curl-7.15.4 ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) nss? ( dev-libs/nss ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) spice? ( >=app-emulation/spice-0.6.0 ) ssl? ( net-libs/gnutls ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen )
 0
 mirror://sourceforge/kvm/qemu-kvm/qemu-kvm-0.15.0.tar.gz http://dev.gentoo.org/~flameeyes/qemu-kvm/qemu-kvm-0.15.0-backports-1.tar.bz2 http://dev.gentoo.org/~cardoe/distfiles/qemu-kvm-0.15.0-backports-1.tar.bz2
diff --git a/metadata/cache/app-emulation/qemu-kvm-0.15.1-r1 b/metadata/cache/app-emulation/qemu-kvm-0.15.1-r1
index 60e09a075535..03801320fe31 100644
--- a/metadata/cache/app-emulation/qemu-kvm-0.15.1-r1
+++ b/metadata/cache/app-emulation/qemu-kvm-0.15.1-r1
@@ -1,4 +1,4 @@
-!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-user >=dev-libs/glib-2.0 sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib amd64? ( sys-apps/seabios ) x86? ( sys-apps/seabios ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( >=net-misc/curl-7.15.4 ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) nss? ( dev-libs/nss ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) spice? ( >=app-emulation/spice-0.6.0 ) ssl? ( net-libs/gnutls ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen ) app-text/texi2html >=sys-kernel/linux-headers-2.6.35 ssl? ( dev-util/pkgconfig ) >=app-admin/eselect-python-20091230
+!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-user >=dev-libs/glib-2.0 sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib amd64? ( sys-apps/seabios ) x86? ( sys-apps/seabios ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( >=net-misc/curl-7.15.4 ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) nss? ( dev-libs/nss ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) spice? ( >=app-emulation/spice-0.6.0 ) ssl? ( net-libs/gnutls ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen ) app-text/texi2html dev-util/pkgconfig >=sys-kernel/linux-headers-2.6.35 >=app-admin/eselect-python-20091230
 !app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-user >=dev-libs/glib-2.0 sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib amd64? ( sys-apps/seabios ) x86? ( sys-apps/seabios ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( >=net-misc/curl-7.15.4 ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) nss? ( dev-libs/nss ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) spice? ( >=app-emulation/spice-0.6.0 ) ssl? ( net-libs/gnutls ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen ) >=app-admin/eselect-python-20091230
 0
 mirror://sourceforge/kvm/qemu-kvm/qemu-kvm-0.15.1.tar.gz
diff --git a/metadata/cache/app-emulation/qemu-kvm-1.0 b/metadata/cache/app-emulation/qemu-kvm-1.0
new file mode 100644
index 000000000000..50d916afdad7
--- /dev/null
+++ b/metadata/cache/app-emulation/qemu-kvm-1.0
@@ -0,0 +1,22 @@
+!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-user >=dev-libs/glib-2.0 sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib amd64? ( sys-apps/seabios ) x86? ( sys-apps/seabios ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( >=net-misc/curl-7.15.4 ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) nss? ( dev-libs/nss ) opengl? ( virtual/opengl ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) spice? ( >=app-emulation/spice-0.9.0 >=app-emulation/spice-protocol-0.8.1 ) ssl? ( net-libs/gnutls ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen ) app-text/texi2html dev-util/pkgconfig >=sys-kernel/linux-headers-2.6.35 >=app-admin/eselect-python-20091230
+!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-user >=dev-libs/glib-2.0 sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib amd64? ( sys-apps/seabios ) x86? ( sys-apps/seabios ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( >=net-misc/curl-7.15.4 ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) nss? ( dev-libs/nss ) opengl? ( virtual/opengl ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) spice? ( >=app-emulation/spice-0.9.0 >=app-emulation/spice-protocol-0.8.1 ) ssl? ( net-libs/gnutls ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen ) >=app-admin/eselect-python-20091230
+0
+mirror://sourceforge/kvm/qemu-kvm/qemu-kvm-1.0.tar.gz
+test
+http://www.linux-kvm.org
+GPL-2
+QEMU + Kernel-based Virtual Machine userland tools
+~amd64 ~ppc ~ppc64 ~x86
+eutils flag-o-matic linux-info multilib portability python toolchain-funcs user versionator
++aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses nss opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads vde +vhost-net xattr xen +qemu_softmmu_targets_x86_64 qemu_softmmu_targets_i386 qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_ppcemb qemu_user_targets_i386 qemu_user_targets_x86_64 qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_mips qemu_user_targets_mipsel qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_alpha qemu_user_targets_armeb qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus
+
+
+
+3
+
+configure install postinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/app-emulation/qemu-kvm-9999 b/metadata/cache/app-emulation/qemu-kvm-9999
index 1efbdc78b28c..a2388478500e 100644
--- a/metadata/cache/app-emulation/qemu-kvm-9999
+++ b/metadata/cache/app-emulation/qemu-kvm-9999
@@ -1,5 +1,5 @@
-!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-user >=dev-libs/glib-2.0 sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib amd64? ( sys-apps/seabios ) x86? ( sys-apps/seabios ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( >=net-misc/curl-7.15.4 ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) nss? ( dev-libs/nss ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) spice? ( >=app-emulation/spice-0.6.0 ) ssl? ( net-libs/gnutls ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen ) app-text/texi2html >=sys-kernel/linux-headers-2.6.35 ssl? ( dev-util/pkgconfig ) dev-vcs/git >=app-admin/eselect-python-20091230
-!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-user >=dev-libs/glib-2.0 sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib amd64? ( sys-apps/seabios ) x86? ( sys-apps/seabios ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( >=net-misc/curl-7.15.4 ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) nss? ( dev-libs/nss ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) spice? ( >=app-emulation/spice-0.6.0 ) ssl? ( net-libs/gnutls ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen ) >=app-admin/eselect-python-20091230
+!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-user >=dev-libs/glib-2.0 sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib amd64? ( sys-apps/seabios ) x86? ( sys-apps/seabios ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( >=net-misc/curl-7.15.4 ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) nss? ( dev-libs/nss ) opengl? ( virtual/opengl ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) spice? ( >=app-emulation/spice-0.9.0 >=app-emulation/spice-protocol-0.8.1 ) ssl? ( net-libs/gnutls ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen ) app-text/texi2html dev-util/pkgconfig >=sys-kernel/linux-headers-2.6.35 dev-vcs/git >=app-admin/eselect-python-20091230
+!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-user >=dev-libs/glib-2.0 sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib amd64? ( sys-apps/seabios ) x86? ( sys-apps/seabios ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( >=net-misc/curl-7.15.4 ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) nss? ( dev-libs/nss ) opengl? ( virtual/opengl ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) spice? ( >=app-emulation/spice-0.9.0 >=app-emulation/spice-protocol-0.8.1 ) ssl? ( net-libs/gnutls ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen ) >=app-admin/eselect-python-20091230
 0
 
 test
@@ -8,7 +8,7 @@ GPL-2
 QEMU + Kernel-based Virtual Machine userland tools
 
 eutils flag-o-matic git-2 linux-info multilib portability python toolchain-funcs user versionator
-+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses nss png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads vde +vhost-net xattr xen +qemu_softmmu_targets_x86_64 qemu_softmmu_targets_i386 qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_ppcemb qemu_user_targets_i386 qemu_user_targets_x86_64 qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_mips qemu_user_targets_mipsel qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_alpha qemu_user_targets_armeb qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus
++aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses nss opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads vde +vhost-net xattr xen +qemu_softmmu_targets_x86_64 qemu_softmmu_targets_i386 qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_ppcemb qemu_user_targets_i386 qemu_user_targets_x86_64 qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_mips qemu_user_targets_mipsel qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_alpha qemu_user_targets_armeb qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus
 
 
 
diff --git a/metadata/cache/app-emulation/virt-manager-0.9.0-r2 b/metadata/cache/app-emulation/virt-manager-0.9.0-r2
index 968d5a40d82f..756c9557d0f9 100644
--- a/metadata/cache/app-emulation/virt-manager-0.9.0-r2
+++ b/metadata/cache/app-emulation/virt-manager-0.9.0-r2
@@ -1,7 +1,7 @@
->=dev-python/pygtk-1.99.12 >=app-emulation/libvirt-0.7.0[python,sasl?] >=dev-libs/libxml2-2.6.23[python] >=app-emulation/virtinst-0.600.0 >=gnome-base/librsvg-2 >=x11-libs/vte-0.12.2:0[python] >=net-libs/gtk-vnc-0.3.8[python,sasl?] >=dev-python/dbus-python-0.61 >=dev-python/gconf-python-1.99.11 dev-python/urlgrabber gnome-keyring? ( dev-python/gnome-keyring-python ) policykit? ( sys-auth/polkit ) spice? ( >=net-misc/spice-gtk-0.6[python,sasl?,-gtk3] ) app-text/rarian dev-util/intltool >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* =dev-lang/python-2.4* )
->=dev-python/pygtk-1.99.12 >=app-emulation/libvirt-0.7.0[python,sasl?] >=dev-libs/libxml2-2.6.23[python] >=app-emulation/virtinst-0.600.0 >=gnome-base/librsvg-2 >=x11-libs/vte-0.12.2:0[python] >=net-libs/gtk-vnc-0.3.8[python,sasl?] >=dev-python/dbus-python-0.61 >=dev-python/gconf-python-1.99.11 dev-python/urlgrabber gnome-keyring? ( dev-python/gnome-keyring-python ) policykit? ( sys-auth/polkit ) spice? ( >=net-misc/spice-gtk-0.6[python,sasl?,-gtk3] ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* =dev-lang/python-2.4* )
+>=dev-python/pygtk-1.99.12 >=app-emulation/libvirt-0.7.0[python,sasl?] >=dev-libs/libxml2-2.6.23[python] >app-emulation/virtinst-0.600.0 >=gnome-base/librsvg-2 >=x11-libs/vte-0.12.2:0[python] >=net-libs/gtk-vnc-0.3.8[python,sasl?] >=dev-python/dbus-python-0.61 >=dev-python/gconf-python-1.99.11 dev-python/urlgrabber gnome-keyring? ( dev-python/gnome-keyring-python ) policykit? ( sys-auth/polkit ) spice? ( >=net-misc/spice-gtk-0.6[python,sasl?,-gtk3] ) app-text/rarian dev-util/intltool >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* =dev-lang/python-2.4* )
+>=dev-python/pygtk-1.99.12 >=app-emulation/libvirt-0.7.0[python,sasl?] >=dev-libs/libxml2-2.6.23[python] >app-emulation/virtinst-0.600.0 >=gnome-base/librsvg-2 >=x11-libs/vte-0.12.2:0[python] >=net-libs/gtk-vnc-0.3.8[python,sasl?] >=dev-python/dbus-python-0.61 >=dev-python/gconf-python-1.99.11 dev-python/urlgrabber gnome-keyring? ( dev-python/gnome-keyring-python ) policykit? ( sys-auth/polkit ) spice? ( >=net-misc/spice-gtk-0.6[python,sasl?,-gtk3] ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* =dev-lang/python-2.4* )
 0
-http://virt-manager.org/download/sources/virt-manager/virt-manager-0.9.0.tar.gz mirror://gentoo/virt-manager-0.9.0-bp-2.tar.bz2 http://dev.gentoo.org/~cardoe/distfiles/virt-manager-0.9.0-bp-2.tar.bz2
+http://virt-manager.org/download/sources/virt-manager/virt-manager-0.9.0.tar.gz mirror://gentoo/virt-manager-0.9.0-bp-3.tar.bz2 http://dev.gentoo.org/~cardoe/distfiles/virt-manager-0.9.0-bp-3.tar.bz2
 
 http://virt-manager.org/
 GPL-2
diff --git a/metadata/cache/app-emulation/virtinst-0.600.0-r1 b/metadata/cache/app-emulation/virtinst-0.600.0-r1
new file mode 100644
index 000000000000..a82a7fc4e3cd
--- /dev/null
+++ b/metadata/cache/app-emulation/virtinst-0.600.0-r1
@@ -0,0 +1,22 @@
+>=app-emulation/libvirt-0.7.0[python] dev-python/urlgrabber dev-libs/libxml2[python] >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+>=app-emulation/libvirt-0.7.0[python] dev-python/urlgrabber dev-libs/libxml2[python] >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+0
+http://virt-manager.et.redhat.com/download/sources/virtinst/virtinst-0.600.0.tar.gz mirror://gentoo/virtinst-0.600.0-bp-1.tar.bz2 http://dev.gentoo.org/~cardoe/distfiles/virtinst-0.600.0-bp-1.tar.bz2
+
+http://virt-manager.et.redhat.com/
+GPL-2
+Python modules for starting virtualized guest installations
+~amd64 ~x86
+distutils eutils multilib portability python toolchain-funcs user
+
+
+
+
+3
+
+compile install postinst postrm prepare
+
+
+
+
+
diff --git a/metadata/cache/app-i18n/enca-1.13-r2 b/metadata/cache/app-i18n/enca-1.13-r2
index 64952f5b4312..6e7a6b02c025 100644
--- a/metadata/cache/app-i18n/enca-1.13-r2
+++ b/metadata/cache/app-i18n/enca-1.13-r2
@@ -6,7 +6,7 @@ http://dl.cihar.com/enca/enca-1.13.tar.bz2
 http://gitorious.org/enca
 GPL-2
 ENCA detects the character coding of a file and converts it if desired
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 autotools autotools-utils eutils libtool multilib portability toolchain-funcs user
 doc +recode
 
diff --git a/metadata/cache/app-laptop/laptop-mode-tools-1.60-r1 b/metadata/cache/app-laptop/laptop-mode-tools-1.60-r1
index 24fa1359602b..efeee82036bf 100644
--- a/metadata/cache/app-laptop/laptop-mode-tools-1.60-r1
+++ b/metadata/cache/app-laptop/laptop-mode-tools-1.60-r1
@@ -1,12 +1,12 @@
 
-sys-apps/ethtool sys-apps/hdparm acpi? ( sys-power/acpid ) apm? ( sys-apps/apmd ) bluetooth? ( net-wireless/bluez ) scsi? ( sys-apps/sdparm )
+net-wireless/wireless-tools sys-apps/ethtool sys-apps/hdparm acpi? ( sys-power/acpid ) apm? ( sys-apps/apmd ) bluetooth? ( net-wireless/bluez ) scsi? ( sys-apps/sdparm )
 0
 http://www.samwel.tk/laptop_mode/tools/downloads/laptop-mode-tools_1.60.tar.gz
 
 http://www.samwel.tk/laptop_mode/
 GPL-2
 Linux kernel laptop_mode user-space utilities
-~amd64 ~ppc ~x86
+amd64 ~ppc ~x86
 
 acpi apm bluetooth scsi
 
diff --git a/metadata/cache/app-misc/byobu-5.4 b/metadata/cache/app-misc/byobu-5.4
new file mode 100644
index 000000000000..258762771fd9
--- /dev/null
+++ b/metadata/cache/app-misc/byobu-5.4
@@ -0,0 +1,22 @@
+>=app-admin/eselect-python-20091230 =dev-lang/python-2*
+|| ( app-misc/screen app-misc/tmux ) dev-libs/newt >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+0
+http://launchpad.net/byobu/trunk/5.4/+download/byobu_5.4.orig.tar.gz
+
+https://launchpad.net/byobu
+GPL-3
+A set of profiles for the GNU Screen console window manager (app-misc/screen)
+~amd64 ~x86
+multilib python toolchain-funcs
+
+
+
+
+4
+
+install prepare setup
+
+
+
+
+
diff --git a/metadata/cache/app-misc/geoclue-0.12.0_p20110307 b/metadata/cache/app-misc/geoclue-0.12.0_p20110307
index 417c9b0d78ad..e15b2420ed78 100644
--- a/metadata/cache/app-misc/geoclue-0.12.0_p20110307
+++ b/metadata/cache/app-misc/geoclue-0.12.0_p20110307
@@ -6,7 +6,7 @@ http://dev.gentoo.org/~signals/geoclue-0.12.0_p20110307.tar.bz2
 http://freedesktop.org/wiki/Software/GeoClue
 LGPL-2
 A geoinformation D-Bus service
-~amd64 ~x86
+amd64 ~x86
 autotools eutils libtool multilib portability toolchain-funcs user
 geonames gps gsmloc gtk hostip manual networkmanager nominatim plazes skyhook yahoo-geo
 skyhook? ( networkmanager )
diff --git a/metadata/cache/app-office/calligra-2.3.85 b/metadata/cache/app-office/calligra-2.3.85
index fb930af00e54..00c3172c2b53 100644
--- a/metadata/cache/app-office/calligra-2.3.85
+++ b/metadata/cache/app-office/calligra-2.3.85
@@ -8,7 +8,7 @@ GPL-2
 KDE Office Suite
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-+crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype +wmf word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_tables calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua kdeenablefinal
++crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype +wmf word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_tables calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
 calligra_features_kexi? ( calligra_features_tables ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim ) calligra_features_tables? ( eigen ) test? ( calligra_features_karbon )
 
 
diff --git a/metadata/cache/app-office/calligra-2.3.86 b/metadata/cache/app-office/calligra-2.3.86
index 6c8c2bbc3c70..c1802bdf7120 100644
--- a/metadata/cache/app-office/calligra-2.3.86
+++ b/metadata/cache/app-office/calligra-2.3.86
@@ -8,7 +8,7 @@ GPL-2
 KDE Office Suite
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype +wmf word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_tables calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua kdeenablefinal
+attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype +wmf word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_tables calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
 calligra_features_kexi? ( calligra_features_tables ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim ) calligra_features_tables? ( eigen ) test? ( calligra_features_karbon )
 
 
diff --git a/metadata/cache/app-office/calligra-9999 b/metadata/cache/app-office/calligra-9999
index eafe77e3d8f2..ee8bf2aca809 100644
--- a/metadata/cache/app-office/calligra-9999
+++ b/metadata/cache/app-office/calligra-9999
@@ -8,7 +8,7 @@ GPL-2
 KDE Office Suite
 
 base cmake-utils eutils fdo-mime flag-o-matic git-2 gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype +wmf word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_tables calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua kdeenablefinal
+attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype +wmf word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_tables calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
 calligra_features_kexi? ( calligra_features_tables ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim ) calligra_features_tables? ( eigen ) test? ( calligra_features_karbon )
 
 
diff --git a/metadata/cache/app-office/calligra-l10n-2.3.85 b/metadata/cache/app-office/calligra-l10n-2.3.85
index 30f2012b9cae..5fb0183eb902 100644
--- a/metadata/cache/app-office/calligra-l10n-2.3.85
+++ b/metadata/cache/app-office/calligra-l10n-2.3.85
@@ -8,7 +8,7 @@ GPL-2
 Calligra localization package
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-doc linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_it linguas_kk linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
+doc linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_it linguas_kk linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/app-office/calligra-l10n-2.3.86 b/metadata/cache/app-office/calligra-l10n-2.3.86
index 76dda0c04926..f98c78a4c1af 100644
--- a/metadata/cache/app-office/calligra-l10n-2.3.86
+++ b/metadata/cache/app-office/calligra-l10n-2.3.86
@@ -8,7 +8,7 @@ GPL-2
 Calligra localization package
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-doc linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_it linguas_kk linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
+doc linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_it linguas_kk linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/app-office/karbon-2.3.3 b/metadata/cache/app-office/karbon-2.3.3
index b84fae490833..521e9fda38de 100644
--- a/metadata/cache/app-office/karbon-2.3.3
+++ b/metadata/cache/app-office/karbon-2.3.3
@@ -8,7 +8,7 @@ GPL-2
 KOffice vector drawing application.
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-+pstoedit wpg aqua kdeenablefinal debug
++pstoedit wpg aqua debug
 
 
 
diff --git a/metadata/cache/app-office/kexi-2.3.3 b/metadata/cache/app-office/kexi-2.3.3
index 03273eba30ac..a06bcb0ff70f 100644
--- a/metadata/cache/app-office/kexi-2.3.3
+++ b/metadata/cache/app-office/kexi-2.3.3
@@ -8,7 +8,7 @@ GPL-2
 KOffice integrated environment for database management
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-freetds mysql postgres reports xbase aqua kdeenablefinal debug
+freetds mysql postgres reports xbase aqua debug
 
 
 
diff --git a/metadata/cache/app-office/kmymoney-4.5.3 b/metadata/cache/app-office/kmymoney-4.5.3
index 2ebf8acf36ff..2f63daf4ede4 100644
--- a/metadata/cache/app-office/kmymoney-4.5.3
+++ b/metadata/cache/app-office/kmymoney-4.5.3
@@ -8,7 +8,7 @@ GPL-2
 A personal finance manager for KDE
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug calendar doc hbci ofx quotes test test linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_ja linguas_lt linguas_ms linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW test +handbook aqua kdeenablefinal
+debug calendar doc hbci ofx quotes test test linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_ja linguas_lt linguas_ms linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW test +handbook aqua
 
 
 
diff --git a/metadata/cache/app-office/kmymoney-4.6.0-r1 b/metadata/cache/app-office/kmymoney-4.6.0-r1
index c93afb1fa5c1..391f294275b6 100644
--- a/metadata/cache/app-office/kmymoney-4.6.0-r1
+++ b/metadata/cache/app-office/kmymoney-4.6.0-r1
@@ -8,7 +8,7 @@ GPL-2
 Personal finance manager for KDE
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug calendar doc hbci ofx quotes test linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_ja linguas_lt linguas_ms linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW test +handbook aqua kdeenablefinal
+debug calendar doc hbci ofx quotes test linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_ja linguas_lt linguas_ms linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW test +handbook aqua
 
 
 
diff --git a/metadata/cache/app-office/kmymoney-4.6.1 b/metadata/cache/app-office/kmymoney-4.6.1
index 2738c9a8003f..8e0e90ff8a2b 100644
--- a/metadata/cache/app-office/kmymoney-4.6.1
+++ b/metadata/cache/app-office/kmymoney-4.6.1
@@ -8,7 +8,7 @@ GPL-2
 Personal finance manager for KDE
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug calendar doc hbci ofx quotes test linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_ja linguas_lt linguas_ms linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW test +handbook aqua kdeenablefinal
+debug calendar doc hbci ofx quotes test linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_ja linguas_lt linguas_ms linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW test +handbook aqua
 
 
 
diff --git a/metadata/cache/app-office/koffice-data-2.3.3 b/metadata/cache/app-office/koffice-data-2.3.3
index 278e33253751..004bb1ef566d 100644
--- a/metadata/cache/app-office/koffice-data-2.3.3
+++ b/metadata/cache/app-office/koffice-data-2.3.3
@@ -8,7 +8,7 @@ GPL-2
 Shared KOffice data files
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/app-office/koffice-l10n-2.3.3 b/metadata/cache/app-office/koffice-l10n-2.3.3
index 5c8b6f4e1aa4..d197e8f8807b 100644
--- a/metadata/cache/app-office/koffice-l10n-2.3.3
+++ b/metadata/cache/app-office/koffice-l10n-2.3.3
@@ -8,7 +8,7 @@ GPL-2
 KOffice localization package
 amd64 ~ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-doc linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_gl linguas_hu linguas_it linguas_ja linguas_kk linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sv linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
+doc linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_gl linguas_hu linguas_it linguas_ja linguas_kk linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sv linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/app-office/koffice-libs-2.3.3 b/metadata/cache/app-office/koffice-libs-2.3.3
index b729ac8b0410..2ee20a6665a6 100644
--- a/metadata/cache/app-office/koffice-libs-2.3.3
+++ b/metadata/cache/app-office/koffice-libs-2.3.3
@@ -8,7 +8,7 @@ GPL-2
 Shared KOffice libraries.
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-crypt openexr reports opengl test aqua kdeenablefinal debug
+crypt openexr reports opengl test aqua debug
 
 
 
diff --git a/metadata/cache/app-office/koffice-libs-2.3.3-r1 b/metadata/cache/app-office/koffice-libs-2.3.3-r1
index 1061ede2a933..2680d058dfa9 100644
--- a/metadata/cache/app-office/koffice-libs-2.3.3-r1
+++ b/metadata/cache/app-office/koffice-libs-2.3.3-r1
@@ -8,7 +8,7 @@ GPL-2
 Shared KOffice libraries
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-crypt openexr reports opengl test aqua kdeenablefinal debug
+crypt openexr reports opengl test aqua debug
 
 
 
diff --git a/metadata/cache/app-office/kplato-2.3.3 b/metadata/cache/app-office/kplato-2.3.3
index db38d034e5a7..c4a732bd9b12 100644
--- a/metadata/cache/app-office/kplato-2.3.3
+++ b/metadata/cache/app-office/kplato-2.3.3
@@ -8,7 +8,7 @@ GPL-2
 KOffice project management application
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-python aqua kdeenablefinal debug
+python aqua debug
 
 
 
diff --git a/metadata/cache/app-office/kpresenter-2.3.3 b/metadata/cache/app-office/kpresenter-2.3.3
index 88cd1db18bc9..7aa1d4ea13d3 100644
--- a/metadata/cache/app-office/kpresenter-2.3.3
+++ b/metadata/cache/app-office/kpresenter-2.3.3
@@ -8,7 +8,7 @@ GPL-2
 KOffice presentation program
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal debug
+aqua debug
 
 
 
diff --git a/metadata/cache/app-office/krita-2.3.3 b/metadata/cache/app-office/krita-2.3.3
index b70170d18bea..b994ee3ed09b 100644
--- a/metadata/cache/app-office/krita-2.3.3
+++ b/metadata/cache/app-office/krita-2.3.3
@@ -8,7 +8,7 @@ GPL-2
 KOffice image manipulation program.
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-gmm +kdcraw openexr +pdf +tiff opengl aqua kdeenablefinal debug
+gmm +kdcraw openexr +pdf +tiff opengl aqua debug
 
 
 
diff --git a/metadata/cache/app-office/kspread-2.3.3 b/metadata/cache/app-office/kspread-2.3.3
index d023a8251ce3..e1607f11b6fb 100644
--- a/metadata/cache/app-office/kspread-2.3.3
+++ b/metadata/cache/app-office/kspread-2.3.3
@@ -8,7 +8,7 @@ GPL-2
 KOffice spreadsheet application
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-+solver aqua kdeenablefinal debug
++solver aqua debug
 
 
 
diff --git a/metadata/cache/app-office/kword-2.3.3 b/metadata/cache/app-office/kword-2.3.3
index 3adcad1a0c70..6cfa726488d9 100644
--- a/metadata/cache/app-office/kword-2.3.3
+++ b/metadata/cache/app-office/kword-2.3.3
@@ -8,7 +8,7 @@ GPL-2
 KOffice word processor
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-wpd aqua kdeenablefinal debug
+wpd aqua debug
 
 
 
diff --git a/metadata/cache/app-office/kword-2.3.3-r1 b/metadata/cache/app-office/kword-2.3.3-r1
index d4c54be7e09a..9414f81a4475 100644
--- a/metadata/cache/app-office/kword-2.3.3-r1
+++ b/metadata/cache/app-office/kword-2.3.3-r1
@@ -8,7 +8,7 @@ GPL-2
 KOffice word processor
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-wpd aqua kdeenablefinal debug
+wpd aqua debug
 
 
 
diff --git a/metadata/cache/app-office/libalkimia-4.3.1 b/metadata/cache/app-office/libalkimia-4.3.1
index b309cf5732bd..05b527175239 100644
--- a/metadata/cache/app-office/libalkimia-4.3.1
+++ b/metadata/cache/app-office/libalkimia-4.3.1
@@ -8,7 +8,7 @@ LGPL-2.1
 Library with common classes and functionality used by KDE finance applications
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-doc aqua kdeenablefinal
+doc aqua
 
 
 
diff --git a/metadata/cache/app-office/libreoffice-3.3.4 b/metadata/cache/app-office/libreoffice-3.3.4
index d09e3050e92a..ad0d95a62f68 100644
--- a/metadata/cache/app-office/libreoffice-3.3.4
+++ b/metadata/cache/app-office/libreoffice-3.3.4
@@ -8,7 +8,7 @@ LGPL-3
 LibreOffice, a full office productivity suite.
 amd64 ppc x86 ~amd64-linux ~x86-linux
 autotools base bash-completion check-reqs db-use eutils fdo-mime flag-o-matic gnome2-utils java-pkg-opt-2 java-utils-2 kde4-base kde4-functions libtool multilib pax-utils portability python toolchain-funcs user versionator virtualx
-binfilter cups -custom-cflags dbus debug eds gnome gstreamer gtk kde ldap nsplugin odk opengl templates linguas_af linguas_ar linguas_as linguas_ast linguas_be_BY linguas_bg linguas_bn linguas_bo linguas_br linguas_brx linguas_bs linguas_ca linguas_ca_XV linguas_cs linguas_cy linguas_da linguas_de linguas_dgo linguas_dz linguas_el linguas_en linguas_en_GB linguas_en_ZA linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gd linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_kn linguas_ko linguas_kok linguas_ks linguas_ku linguas_ky linguas_lo linguas_lt linguas_lv linguas_mai linguas_mk linguas_ml linguas_mn linguas_mni linguas_mr linguas_ms linguas_my linguas_nb linguas_ne linguas_nl linguas_nn linguas_nr linguas_ns linguas_oc linguas_om linguas_or linguas_pa_IN linguas_pap linguas_pl linguas_ps linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_sa_IN linguas_sat linguas_sd linguas_sh linguas_si linguas_sk linguas_sl linguas_sq linguas_sr linguas_ss linguas_st linguas_sv linguas_sw_TZ linguas_ta linguas_te linguas_tg linguas_th linguas_ti linguas_tn linguas_tr linguas_ts linguas_ug linguas_uk linguas_uz linguas_ve linguas_vi linguas_xh linguas_zh_CN linguas_zh_TW linguas_zu linguas_en linguas_en_US bash-completion elibc_FreeBSD java aqua kde kdeenablefinal
+binfilter cups -custom-cflags dbus debug eds gnome gstreamer gtk kde ldap nsplugin odk opengl templates linguas_af linguas_ar linguas_as linguas_ast linguas_be_BY linguas_bg linguas_bn linguas_bo linguas_br linguas_brx linguas_bs linguas_ca linguas_ca_XV linguas_cs linguas_cy linguas_da linguas_de linguas_dgo linguas_dz linguas_el linguas_en linguas_en_GB linguas_en_ZA linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gd linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_kn linguas_ko linguas_kok linguas_ks linguas_ku linguas_ky linguas_lo linguas_lt linguas_lv linguas_mai linguas_mk linguas_ml linguas_mn linguas_mni linguas_mr linguas_ms linguas_my linguas_nb linguas_ne linguas_nl linguas_nn linguas_nr linguas_ns linguas_oc linguas_om linguas_or linguas_pa_IN linguas_pap linguas_pl linguas_ps linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_sa_IN linguas_sat linguas_sd linguas_sh linguas_si linguas_sk linguas_sl linguas_sq linguas_sr linguas_ss linguas_st linguas_sv linguas_sw_TZ linguas_ta linguas_te linguas_tg linguas_th linguas_ti linguas_tn linguas_tr linguas_ts linguas_ug linguas_uk linguas_uz linguas_ve linguas_vi linguas_xh linguas_zh_CN linguas_zh_TW linguas_zu linguas_en linguas_en_US bash-completion elibc_FreeBSD java aqua kde
 
 bash-completion? ( app-shells/bash-completion )
 
diff --git a/metadata/cache/app-office/libreoffice-3.4.3.2-r1 b/metadata/cache/app-office/libreoffice-3.4.3.2-r1
index 095047575556..5c14371659fa 100644
--- a/metadata/cache/app-office/libreoffice-3.4.3.2-r1
+++ b/metadata/cache/app-office/libreoffice-3.4.3.2-r1
@@ -8,7 +8,7 @@ LGPL-3
 LibreOffice, a full office productivity suite.
 amd64 ppc x86 ~amd64-linux ~x86-linux
 autotools base bash-completion check-reqs eutils fdo-mime flag-o-matic gnome2-utils java-pkg-opt-2 java-utils-2 kde4-base kde4-functions libtool multilib nsplugins pax-utils portability prefix python toolchain-funcs user versionator virtualx
-binfilter +branding custom-cflags dbus debug eds gnome graphite gstreamer gtk kde ldap mysql nsplugin odk opengl python templates test +vba webdav pdfimport linguas_de linguas_en_GB linguas_en_ZA linguas_es linguas_fr linguas_hu linguas_it bash-completion elibc_FreeBSD java aqua kde kdeenablefinal
+binfilter +branding custom-cflags dbus debug eds gnome graphite gstreamer gtk kde ldap mysql nsplugin odk opengl python templates test +vba webdav pdfimport linguas_de linguas_en_GB linguas_en_ZA linguas_es linguas_fr linguas_hu linguas_it bash-completion elibc_FreeBSD java aqua kde
 
 =app-office/libreoffice-l10n-3.4.3* bash-completion? ( app-shells/bash-completion )
 
diff --git a/metadata/cache/app-office/libreoffice-3.4.5.2 b/metadata/cache/app-office/libreoffice-3.4.5.2
index 6d34e5255786..0dcd350a272c 100644
--- a/metadata/cache/app-office/libreoffice-3.4.5.2
+++ b/metadata/cache/app-office/libreoffice-3.4.5.2
@@ -8,7 +8,7 @@ LGPL-3
 LibreOffice, a full office productivity suite.
 amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 autotools base bash-completion-r1 check-reqs eutils fdo-mime flag-o-matic gnome2-utils java-pkg-opt-2 java-utils-2 kde4-base kde4-functions libtool multilib nsplugins pax-utils portability prefix python toolchain-funcs user versionator virtualx
-binfilter +branding custom-cflags dbus debug eds gnome graphite gstreamer gtk jemalloc kde mysql nsplugin odk opengl pdfimport python test +vba webdav elibc_FreeBSD java aqua kde kdeenablefinal
+binfilter +branding custom-cflags dbus debug eds gnome graphite gstreamer gtk jemalloc kde mysql nsplugin odk opengl pdfimport python test +vba webdav elibc_FreeBSD java aqua kde
 gnome? ( gtk ) nsplugin? ( gtk ) eds? ( gnome )
 =app-office/libreoffice-l10n-3.4*
 
diff --git a/metadata/cache/app-office/libreoffice-3.4.99.3 b/metadata/cache/app-office/libreoffice-3.4.99.3
index 63e1d2699ca3..84e814e2dbc2 100644
--- a/metadata/cache/app-office/libreoffice-3.4.99.3
+++ b/metadata/cache/app-office/libreoffice-3.4.99.3
@@ -8,7 +8,7 @@ LGPL-3
 LibreOffice, a full office productivity suite.
 ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 autotools base bash-completion-r1 check-reqs eutils fdo-mime flag-o-matic gnome2-utils java-pkg-opt-2 java-utils-2 kde4-base kde4-functions libtool multilib nsplugins pax-utils portability prefix python toolchain-funcs user versionator virtualx
-binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk gtk3 +jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba +webdav +xmlsec elibc_FreeBSD java aqua kde kdeenablefinal
+binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk gtk3 +jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba +webdav +xmlsec elibc_FreeBSD java aqua kde
 nsplugin? ( gtk ) gnome? ( gtk ) eds? ( gnome )
 >=app-office/libreoffice-l10n-3.5.0
 
diff --git a/metadata/cache/app-office/libreoffice-3.5.9999 b/metadata/cache/app-office/libreoffice-3.5.9999
index 8a63b5b7e1d2..8945a16a663b 100644
--- a/metadata/cache/app-office/libreoffice-3.5.9999
+++ b/metadata/cache/app-office/libreoffice-3.5.9999
@@ -8,7 +8,7 @@ LGPL-3
 LibreOffice, a full office productivity suite.
 
 autotools base bash-completion-r1 check-reqs eutils fdo-mime flag-o-matic git-2 gnome2-utils java-pkg-opt-2 java-utils-2 kde4-base kde4-functions libtool multilib nsplugins pax-utils portability prefix python toolchain-funcs user versionator virtualx
-binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk gtk3 +jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba +webdav +xmlsec elibc_FreeBSD java aqua kde kdeenablefinal
+binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk gtk3 +jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba +webdav +xmlsec elibc_FreeBSD java aqua kde
 nsplugin? ( gtk ) gnome? ( gtk ) eds? ( gnome )
 >=app-office/libreoffice-l10n-3.5.0
 
diff --git a/metadata/cache/app-office/libreoffice-9999-r2 b/metadata/cache/app-office/libreoffice-9999-r2
index 6e8a35a8eae6..190cab6f344f 100644
--- a/metadata/cache/app-office/libreoffice-9999-r2
+++ b/metadata/cache/app-office/libreoffice-9999-r2
@@ -8,7 +8,7 @@ LGPL-3
 LibreOffice, a full office productivity suite.
 
 autotools base bash-completion-r1 check-reqs eutils fdo-mime flag-o-matic git-2 gnome2-utils java-pkg-opt-2 java-utils-2 kde4-base kde4-functions libtool multilib nsplugins pax-utils portability prefix python toolchain-funcs user versionator virtualx
-binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk gtk3 +jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba +webdav +xmlsec elibc_FreeBSD java aqua kde kdeenablefinal
+binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk gtk3 +jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba +webdav +xmlsec elibc_FreeBSD java aqua kde
 nsplugin? ( gtk ) gnome? ( gtk ) eds? ( gnome )
 >=app-office/libreoffice-l10n-3.5
 
diff --git a/metadata/cache/app-office/libreoffice-bin-3.4.3.2-r1 b/metadata/cache/app-office/libreoffice-bin-3.4.3.2-r1
index f2791a565fbd..96515885e197 100644
--- a/metadata/cache/app-office/libreoffice-bin-3.4.3.2-r1
+++ b/metadata/cache/app-office/libreoffice-bin-3.4.3.2-r1
@@ -8,7 +8,7 @@ LGPL-3
 LibreOffice, a full office productivity suite. Binary package
 amd64 ~x86
 base eutils fdo-mime gnome2-utils java-pkg-opt-2 java-utils-2 kde4-base kde4-functions multilib pax-utils portability toolchain-funcs user versionator virtualx
-gnome java kde aqua kde kdeenablefinal elibc_FreeBSD java
+gnome java kde aqua kde elibc_FreeBSD java
 kde? ( !gnome ) gnome? ( !kde )
 =app-office/libreoffice-l10n-3.4.3*
 
diff --git a/metadata/cache/app-office/skrooge-0.8.0 b/metadata/cache/app-office/skrooge-0.8.0
index 272a4c1d0c97..d2687d0786d3 100644
--- a/metadata/cache/app-office/skrooge-0.8.0
+++ b/metadata/cache/app-office/skrooge-0.8.0
@@ -8,7 +8,7 @@ GPL-3
 personal finances manager for KDE4, aiming at being simple and intuitive
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook test linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ms linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_uk linguas_zh_TW test aqua kdeenablefinal
+debug +handbook test linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ms linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_uk linguas_zh_TW test aqua
 
 
 
diff --git a/metadata/cache/app-office/skrooge-1.0.0 b/metadata/cache/app-office/skrooge-1.0.0
index 74a8c8db1133..203659cb0bfc 100644
--- a/metadata/cache/app-office/skrooge-1.0.0
+++ b/metadata/cache/app-office/skrooge-1.0.0
@@ -8,7 +8,7 @@ GPL-3
 personal finances manager for KDE4, aiming at being simple and intuitive
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_ja linguas_lt linguas_nb linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_ug linguas_zh_CN aqua kdeenablefinal
+debug +handbook linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_ja linguas_lt linguas_nb linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_ug linguas_zh_CN aqua
 
 
 
diff --git a/metadata/cache/app-office/skrooge-1.1.1 b/metadata/cache/app-office/skrooge-1.1.1
index 550271369458..15d71cf977f2 100644
--- a/metadata/cache/app-office/skrooge-1.1.1
+++ b/metadata/cache/app-office/skrooge-1.1.1
@@ -8,7 +8,7 @@ GPL-3
 personal finances manager for KDE4, aiming at being simple and intuitive
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_ja linguas_lt linguas_nb linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_ug linguas_zh_CN +handbook aqua kdeenablefinal
+debug linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_ja linguas_lt linguas_nb linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_ug linguas_zh_CN +handbook aqua
 
 
 
diff --git a/metadata/cache/app-portage/kportagetray-0.2.4 b/metadata/cache/app-portage/kportagetray-0.2.4
index 7c492391baf9..c41ad61785be 100644
--- a/metadata/cache/app-portage/kportagetray-0.2.4
+++ b/metadata/cache/app-portage/kportagetray-0.2.4
@@ -8,7 +8,7 @@ GPL-3
 Graphical application for Portage's daily tasks
 ~amd64 ~ppc ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability python toolchain-funcs user versionator virtualx
-linguas_pt_BR aqua kdeenablefinal
+linguas_pt_BR aqua
 
 
 
diff --git a/metadata/cache/app-text/dvipsk-5.991_p20110705-r1 b/metadata/cache/app-text/dvipsk-5.991_p20110705-r1
index b445072547f4..21f1ab9675d5 100644
--- a/metadata/cache/app-text/dvipsk-5.991_p20110705-r1
+++ b/metadata/cache/app-text/dvipsk-5.991_p20110705-r1
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-20110705-source.tar.xz mirror://gentoo/texlive-core-upst
 http://tug.org/texlive/
 GPL-2
 DVI-to-PostScript translator
-~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 eutils multilib portability texlive-common toolchain-funcs user
 doc source
 
diff --git a/metadata/cache/app-text/kbibtex-0.3 b/metadata/cache/app-text/kbibtex-0.3
index 08b883f994ef..c95e0838f7c6 100644
--- a/metadata/cache/app-text/kbibtex-0.3
+++ b/metadata/cache/app-text/kbibtex-0.3
@@ -8,7 +8,7 @@ GPL-2
 BibTeX editor for KDE to edit bibliographies used with LaTeX
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/app-text/kbibtex-0.4 b/metadata/cache/app-text/kbibtex-0.4
index 72fea092306f..9ca8e1053268 100644
--- a/metadata/cache/app-text/kbibtex-0.4
+++ b/metadata/cache/app-text/kbibtex-0.4
@@ -8,7 +8,7 @@ GPL-2
 BibTeX editor for KDE to edit bibliographies used with LaTeX
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/app-text/kchmviewer-5.2-r1 b/metadata/cache/app-text/kchmviewer-5.2-r1
index 40d2e2b96b80..92a5985dd15f 100644
--- a/metadata/cache/app-text/kchmviewer-5.2-r1
+++ b/metadata/cache/app-text/kchmviewer-5.2-r1
@@ -8,7 +8,7 @@ GPL-3
 KchmViewer is a feature rich chm file viewer, based on Qt.
 amd64 ppc x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability qt4-r2 toolchain-funcs user versionator virtualx
-kde kdeenablefinal
+kde
 
 
 
diff --git a/metadata/cache/app-text/kchmviewer-5.3 b/metadata/cache/app-text/kchmviewer-5.3
index e94f5f9c96c5..5033498933d1 100644
--- a/metadata/cache/app-text/kchmviewer-5.3
+++ b/metadata/cache/app-text/kchmviewer-5.3
@@ -8,7 +8,7 @@ GPL-3
 KchmViewer is a feature rich chm file viewer, based on Qt.
 ~amd64 ~ppc ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability qt4-r2 toolchain-funcs user versionator virtualx
-kde kdeenablefinal
+kde
 
 
 
diff --git a/metadata/cache/app-text/kchmviewer-6.0 b/metadata/cache/app-text/kchmviewer-6.0
index abd2393b23db..a8e7ec35d89a 100644
--- a/metadata/cache/app-text/kchmviewer-6.0
+++ b/metadata/cache/app-text/kchmviewer-6.0
@@ -8,7 +8,7 @@ GPL-3
 KchmViewer is a feature rich chm file viewer, based on Qt.
 ~amd64 ~ppc ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability qt4-r2 toolchain-funcs user versionator virtualx
-kde kdeenablefinal
+kde
 
 
 
diff --git a/metadata/cache/app-text/kding-0.6 b/metadata/cache/app-text/kding-0.6
index b829e5fa8f12..5f484fffc750 100644
--- a/metadata/cache/app-text/kding-0.6
+++ b/metadata/cache/app-text/kding-0.6
@@ -8,7 +8,7 @@ GPL-2
 KDing is a KDE port of Ding, a dictionary lookup program.
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook linguas_de aqua kdeenablefinal
+debug +handbook linguas_de aqua
 
 
 
diff --git a/metadata/cache/app-text/ps2pkm-1.5_p20110705 b/metadata/cache/app-text/ps2pkm-1.5_p20110705
index 3a97184dca5b..22ccf3821765 100644
--- a/metadata/cache/app-text/ps2pkm-1.5_p20110705
+++ b/metadata/cache/app-text/ps2pkm-1.5_p20110705
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-20110705-source.tar.xz
 http://tug.org/texlive/
 MIT
 Tool that converts a PostScript type1 font into a corresponding TeX PK font
-~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 
 
 
diff --git a/metadata/cache/app-text/ronn-0.7.3 b/metadata/cache/app-text/ronn-0.7.3
index 9959e242098a..219de7f9d88b 100644
--- a/metadata/cache/app-text/ronn-0.7.3
+++ b/metadata/cache/app-text/ronn-0.7.3
@@ -6,7 +6,7 @@ mirror://rubygems/ronn-0.7.3.gem
 http://github.com/rtomayko/ronn/
 MIT
 Ronn converts simple, human readable textfiles to roff for terminal display, and also to HTML.
-~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
 test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
 
diff --git a/metadata/cache/app-text/texlive-2011 b/metadata/cache/app-text/texlive-2011
index b7c724ac62f0..a8a24cfef416 100644
--- a/metadata/cache/app-text/texlive-2011
+++ b/metadata/cache/app-text/texlive-2011
@@ -6,7 +6,7 @@
 http://tug.org/texlive/
 GPL-2
 A complete TeX distribution
-~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 
 cjk context detex doc dvi2tty dvipdfm extra games graphics humanities jadetex luatex music omega pdfannotextractor png pstricks publishers science tex4ht truetype xetex xindy xml X linguas_af linguas_ar linguas_as linguas_bg linguas_bn linguas_bo linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hsb linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_ko linguas_kn linguas_la linguas_lo linguas_lt linguas_lv linguas_ml linguas_mn linguas_mr linguas_nb linguas_nl linguas_nn linguas_no linguas_or linguas_pa linguas_pl linguas_pt linguas_ro linguas_ru linguas_sa_IN linguas_sk linguas_sl linguas_sr linguas_sv linguas_ta linguas_te linguas_th linguas_tk linguas_tr linguas_uk linguas_vi linguas_zh
 
diff --git a/metadata/cache/app-text/texlive-core-2011-r5 b/metadata/cache/app-text/texlive-core-2011-r5
index bef594399e2c..a4288faaedea 100644
--- a/metadata/cache/app-text/texlive-core-2011-r5
+++ b/metadata/cache/app-text/texlive-core-2011-r5
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-20110705-source.tar.xz mirror://gentoo/texlive-core-patc
 http://tug.org/texlive/
 GPL-2 LPPL-1.3c TeX
 A complete TeX distribution
-~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 eutils flag-o-matic libtool multilib portability texlive-common toolchain-funcs user
 cjk X doc source tk xetex
 
diff --git a/metadata/cache/dev-lang/php-5.3.9 b/metadata/cache/dev-lang/php-5.3.9
index 09cd7a969caa..eb013b1bea0e 100644
--- a/metadata/cache/dev-lang/php-5.3.9
+++ b/metadata/cache/dev-lang/php-5.3.9
@@ -6,7 +6,7 @@ http://www.php.net/distributions/php-5.3.9.tar.bz2 http://olemarkus.org/~olemark
 http://php.net/
 PHP-3
 The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs.
-alpha amd64 arm ~hppa ia64 ppc ppc64 s390 sh sparc x86
+alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86
 apache-module autotools db-use depend.apache eutils flag-o-matic libtool multilib portability toolchain-funcs user versionator
 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 +session sharedmem +simplexml snmp soap sockets spell sqlite sqlite3 ssl sybase-ct sysvipc tidy +tokenizer truetype unicode wddx +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib suhosin apache2
 truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xsl? ( xml ) ldap-sasl? ( ldap ) kolab? ( imap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
diff --git a/metadata/cache/dev-libs/libnl-3.2.6 b/metadata/cache/dev-libs/libnl-3.2.6
new file mode 100644
index 000000000000..e0ac54042218
--- /dev/null
+++ b/metadata/cache/dev-libs/libnl-3.2.6
@@ -0,0 +1,22 @@
+
+
+3
+http://www.infradead.org/~tgr/libnl/files/libnl-3.2.6.tar.gz
+
+http://www.infradead.org/~tgr/libnl/
+LGPL-2.1
+A library for applications dealing with netlink socket
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux
+eutils multilib portability toolchain-funcs user
+static-libs utils
+
+
+
+4
+
+configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-libs/libofx-0.9.4 b/metadata/cache/dev-libs/libofx-0.9.4
index 685db42b2df0..b8c86c3bc272 100644
--- a/metadata/cache/dev-libs/libofx-0.9.4
+++ b/metadata/cache/dev-libs/libofx-0.9.4
@@ -6,7 +6,7 @@ mirror://sourceforge/libofx/libofx-0.9.4.tar.gz
 http://libofx.sourceforge.net/
 GPL-2
 A library to support the Open Financial eXchange XML format
-alpha amd64 ~hppa ia64 ~ppc ~ppc64 sparc x86
+alpha amd64 hppa ia64 ~ppc ~ppc64 sparc x86
 
 static-libs test
 
diff --git a/metadata/cache/dev-libs/libp11-0.2.8 b/metadata/cache/dev-libs/libp11-0.2.8
index 2ba69e1f5232..7e284ab70795 100644
--- a/metadata/cache/dev-libs/libp11-0.2.8
+++ b/metadata/cache/dev-libs/libp11-0.2.8
@@ -6,7 +6,7 @@ http://www.opensc-project.org/files/libp11/libp11-0.2.8.tar.gz
 http://www.opensc-project.org/libp11/
 LGPL-2.1
 A library implementing a layer on top of PKCS#11 API to make using PKCS#11 implementations easier.
-alpha amd64 hppa ia64 ~ppc ~ppc64 sparc x86
+alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86
 libtool multilib toolchain-funcs
 doc
 
diff --git a/metadata/cache/dev-libs/libp11-0.2.8-r1 b/metadata/cache/dev-libs/libp11-0.2.8-r1
index 12107d8d8edb..8bef70d6ccbf 100644
--- a/metadata/cache/dev-libs/libp11-0.2.8-r1
+++ b/metadata/cache/dev-libs/libp11-0.2.8-r1
@@ -6,7 +6,7 @@ http://www.opensc-project.org/files/libp11/libp11-0.2.8.tar.gz
 http://www.opensc-project.org/libp11/
 LGPL-2.1
 A library implementing a layer on top of PKCS#11 API to make using PKCS#11 implementations easier.
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 autotools eutils libtool multilib portability toolchain-funcs user
 doc
 
diff --git a/metadata/cache/dev-libs/libqzeitgeist-0.8.0 b/metadata/cache/dev-libs/libqzeitgeist-0.8.0
index 93f8cdf1e46b..4f364e2ac563 100644
--- a/metadata/cache/dev-libs/libqzeitgeist-0.8.0
+++ b/metadata/cache/dev-libs/libqzeitgeist-0.8.0
@@ -8,7 +8,7 @@ GPL-2
 Qt interface to the Zeitgeist event tracking system
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/dev-libs/libzip-0.10-r1 b/metadata/cache/dev-libs/libzip-0.10-r1
index a53c454bc776..144b943a8244 100644
--- a/metadata/cache/dev-libs/libzip-0.10-r1
+++ b/metadata/cache/dev-libs/libzip-0.10-r1
@@ -6,7 +6,7 @@ http://www.nih.at/libzip/libzip-0.10.tar.gz
 http://www.nih.at/libzip/
 BSD
 Library for manipulating zip archives
-~alpha amd64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+~alpha amd64 hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 autotools autotools-utils eutils libtool multilib portability toolchain-funcs user
 static-libs
 
diff --git a/metadata/cache/dev-libs/ptexenc-1.2.0_p20110705 b/metadata/cache/dev-libs/ptexenc-1.2.0_p20110705
index 70fbb05c394e..4a41faf535d0 100644
--- a/metadata/cache/dev-libs/ptexenc-1.2.0_p20110705
+++ b/metadata/cache/dev-libs/ptexenc-1.2.0_p20110705
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-20110705-source.tar.xz
 http://tutimura.ath.cx/ptexlive/?ptexenc
 BSD
 Library for Japanese pTeX providing a better way of handling character encodings
-~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos
 
 iconv static-libs
 
diff --git a/metadata/cache/dev-php/PEAR-HTML_Template_Sigma-1.2.0-r1 b/metadata/cache/dev-php/PEAR-HTML_Template_Sigma-1.2.0-r1
index 3c5f0c802604..f2e319a5de95 100644
--- a/metadata/cache/dev-php/PEAR-HTML_Template_Sigma-1.2.0-r1
+++ b/metadata/cache/dev-php/PEAR-HTML_Template_Sigma-1.2.0-r1
@@ -6,7 +6,7 @@ http://pear.php.net/get/HTML_Template_Sigma-1.2.0.tgz
 http://pear.php.net/HTML_Template_Sigma
 PHP-3.01
 An implementation of Integrated Templates API with template 'compilation' added
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 multilib php-pear-r1 toolchain-funcs
 
 
diff --git a/metadata/cache/dev-python/apptools-4.0.0 b/metadata/cache/dev-python/apptools-4.0.0
index 0af2229b3ca6..0daa2cfb9b53 100644
--- a/metadata/cache/dev-python/apptools-4.0.0
+++ b/metadata/cache/dev-python/apptools-4.0.0
@@ -1,5 +1,5 @@
-dev-python/setuptools doc? ( dev-python/sphinx ) test? ( dev-python/configobj dev-python/numpy >=dev-python/traits-4.0.0 dev-python/pyface media-fonts/font-cursor-misc media-fonts/font-misc-misc ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* test? ( dev-python/nose ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-dev-python/configobj dev-python/numpy >=dev-python/traits-4.0.0 >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+dev-python/setuptools doc? ( dev-python/sphinx ) test? ( dev-python/configobj dev-python/numpy >=dev-python/traits-4.1.0 dev-python/pyface media-fonts/font-cursor-misc media-fonts/font-misc-misc ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* test? ( dev-python/nose ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+dev-python/configobj dev-python/numpy >=dev-python/traits-4.1.0 >=app-admin/eselect-python-20091230 =dev-lang/python-2*
 0
 http://www.enthought.com/repo/ets/apptools-4.0.0.tar.gz
 
@@ -12,9 +12,9 @@ doc examples test test test
 
 
 
-3
+4
 
-compile install postinst postrm prepare test
+compile install postinst postrm prepare setup test
 
 
 
diff --git a/metadata/cache/dev-python/apptools-4.0.1 b/metadata/cache/dev-python/apptools-4.0.1
new file mode 100644
index 000000000000..52caaadba137
--- /dev/null
+++ b/metadata/cache/dev-python/apptools-4.0.1
@@ -0,0 +1,22 @@
+dev-python/setuptools doc? ( dev-python/sphinx ) test? ( dev-python/configobj dev-python/numpy >=dev-python/traits-4 >=dev-python/pyface-4 media-fonts/font-cursor-misc media-fonts/font-misc-misc ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* test? ( dev-python/nose ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+dev-python/configobj dev-python/numpy >=dev-python/traits-4 >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+0
+http://www.enthought.com/repo/ets/apptools-4.0.1.tar.gz
+
+http://code.enthought.com/projects/app_tools/ http://pypi.python.org/pypi/apptools
+BSD
+Enthought Tool Suite: Application tools
+~amd64 ~x86
+distutils multilib python toolchain-funcs virtualx
+doc examples test test test
+
+
+
+4
+
+compile install postinst postrm prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-python/blockcanvas-4.0.1 b/metadata/cache/dev-python/blockcanvas-4.0.1
new file mode 100644
index 000000000000..3e711b83a693
--- /dev/null
+++ b/metadata/cache/dev-python/blockcanvas-4.0.1
@@ -0,0 +1,22 @@
+dev-python/setuptools doc? ( dev-python/sphinx ) test? ( >=dev-python/apptools-4 >=dev-python/chaco-4 >=dev-python/codetools-4 >=dev-python/etsdevtools-4 >=dev-python/pyface-4 >=dev-python/scimath-4 >=dev-python/traitsui-4 dev-python/configobj dev-python/docutils dev-python/greenlet dev-python/imaging dev-python/numpy media-fonts/font-cursor-misc media-fonts/font-misc-misc ) >=app-admin/eselect-python-20091230 dev-lang/python test? ( dev-python/nose ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-python/apptools-4 >=dev-python/chaco-4 >=dev-python/codetools-4 >=dev-python/etsdevtools-4 >=dev-python/pyface-4 >=dev-python/scimath-4 >=dev-python/traitsui-4 dev-python/configobj dev-python/docutils dev-python/greenlet dev-python/imaging dev-python/numpy >=app-admin/eselect-python-20091230 dev-lang/python
+0
+http://www.enthought.com/repo/ets/blockcanvas-4.0.1.tar.gz
+
+http://code.enthought.com/projects/block_canvas/ http://pypi.python.org/pypi/blockcanvas
+BSD
+Enthought Tool Suite: Numerical modeling
+~amd64 ~x86
+distutils multilib python toolchain-funcs virtualx
+doc test test test
+
+
+
+4
+
+compile install postinst postrm prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-python/chaco-4.1.0 b/metadata/cache/dev-python/chaco-4.1.0
new file mode 100644
index 000000000000..fe6afc7e0c0f
--- /dev/null
+++ b/metadata/cache/dev-python/chaco-4.1.0
@@ -0,0 +1,22 @@
+dev-python/setuptools dev-python/numpy doc? ( >=dev-python/enable-4 media-fonts/font-cursor-misc media-fonts/font-misc-misc !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) test? ( >=dev-python/enable-4 media-fonts/font-cursor-misc media-fonts/font-misc-misc ) >=app-admin/eselect-python-20091230 dev-lang/python test? ( dev-python/nose ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-python/enable-4 dev-python/numpy >=app-admin/eselect-python-20091230 dev-lang/python
+0
+http://www.enthought.com/repo/ets/chaco-4.1.0.tar.gz
+
+http://code.enthought.com/projects/chaco/ http://pypi.python.org/pypi/chaco
+BSD
+Enthought Tool Suite: Interactive plotting toolkit
+~amd64 ~x86
+distutils multilib python toolchain-funcs virtualx
+doc examples test test test
+
+
+
+4
+
+compile install postinst postrm prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-python/codetools-4.0.0 b/metadata/cache/dev-python/codetools-4.0.0
index aeba70aa9650..88788c0b94b9 100644
--- a/metadata/cache/dev-python/codetools-4.0.0
+++ b/metadata/cache/dev-python/codetools-4.0.0
@@ -1,5 +1,5 @@
-dev-python/numpy >=dev-python/scimath-4.0 >=dev-python/traits-4.0 dev-python/setuptools doc? ( dev-python/sphinx ) test? ( dev-python/numpy >=dev-python/scimath-4.0 >=dev-python/traits-4.0 media-fonts/font-cursor-misc media-fonts/font-misc-misc ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* test? ( dev-python/nose ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-dev-python/numpy >=dev-python/scimath-4.0 >=dev-python/traits-4.0 >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+dev-python/numpy >=dev-python/scimath-4 >=dev-python/traits-4 dev-python/setuptools doc? ( dev-python/sphinx ) test? ( dev-python/numpy >=dev-python/scimath-4 >=dev-python/traits-4 media-fonts/font-cursor-misc media-fonts/font-misc-misc ) >=app-admin/eselect-python-20091230 dev-lang/python test? ( dev-python/nose ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+dev-python/numpy >=dev-python/scimath-4 >=dev-python/traits-4 >=app-admin/eselect-python-20091230 dev-lang/python
 0
 http://www.enthought.com/repo/ets/codetools-4.0.0.tar.gz
 
@@ -12,9 +12,9 @@ doc examples test test test
 
 
 
-3
+4
 
-compile install postinst postrm prepare test
+compile install postinst postrm prepare setup test
 
 
 
diff --git a/metadata/cache/dev-python/cvxopt-1.1.4 b/metadata/cache/dev-python/cvxopt-1.1.4-r1
similarity index 100%
rename from metadata/cache/dev-python/cvxopt-1.1.4
rename to metadata/cache/dev-python/cvxopt-1.1.4-r1
diff --git a/metadata/cache/dev-python/enable-4.1.0 b/metadata/cache/dev-python/enable-4.1.0
new file mode 100644
index 000000000000..920970854828
--- /dev/null
+++ b/metadata/cache/dev-python/enable-4.1.0
@@ -0,0 +1,22 @@
+dev-python/setuptools dev-lang/swig dev-python/cython doc? ( dev-python/sphinx ) test? ( dev-python/numpy dev-python/reportlab >=dev-python/traitsui-4 >=media-libs/freetype-2 virtual/opengl x11-libs/libX11 media-fonts/font-cursor-misc media-fonts/font-misc-misc ) >=app-admin/eselect-python-20091230 dev-lang/python test? ( dev-python/nose ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+dev-python/numpy dev-python/reportlab >=dev-python/traitsui-4 >=media-libs/freetype-2 virtual/opengl x11-libs/libX11 >=app-admin/eselect-python-20091230 dev-lang/python
+0
+http://www.enthought.com/repo/ets/enable-4.1.0.tar.gz
+
+http://code.enthought.com/projects/enable/ http://pypi.python.org/pypi/enable
+BSD
+Enthought Tool Suite: Drawing and interaction packages
+~amd64 ~x86
+distutils eutils multilib portability python toolchain-funcs user virtualx
+doc examples test test test
+
+
+
+4
+
+compile install postinst postrm prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-python/envisage-4.1.0 b/metadata/cache/dev-python/envisage-4.1.0
new file mode 100644
index 000000000000..3c52589909ce
--- /dev/null
+++ b/metadata/cache/dev-python/envisage-4.1.0
@@ -0,0 +1,22 @@
+dev-python/setuptools doc? ( dev-python/sphinx ) test? ( >=dev-python/traits-4 media-fonts/font-cursor-misc media-fonts/font-misc-misc ) >=app-admin/eselect-python-20091230 dev-lang/python test? ( dev-python/nose ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-python/traits-4 >=app-admin/eselect-python-20091230 dev-lang/python
+0
+http://www.enthought.com/repo/ets/envisage-4.1.0.tar.gz
+
+http://code.enthought.com/projects/envisage/ http://pypi.python.org/pypi/envisage
+BSD
+Enthought Tool Suite: Extensible application framework
+~amd64 ~x86
+distutils multilib python toolchain-funcs virtualx
+doc examples test test test
+
+
+
+4
+
+compile install postinst postrm prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-python/ets-4.1.0 b/metadata/cache/dev-python/ets-4.1.0
new file mode 100644
index 000000000000..abdf45bbbe88
--- /dev/null
+++ b/metadata/cache/dev-python/ets-4.1.0
@@ -0,0 +1,22 @@
+>=app-admin/eselect-python-20091230 dev-lang/python
+>=dev-python/apptools-4.0.1[doc?,examples?] >=dev-python/blockcanvas-4.0.1[doc?] >=dev-python/chaco-4.1.0[doc?,examples?] >=dev-python/codetools-4.0.0[doc?,examples?] >=dev-python/enable-4.1.0[doc?,examples?] >=dev-python/envisage-4.1.0[doc?,examples?] >=dev-python/etsdevtools-4.0.0[doc?,examples?] >=dev-python/graphcanvas-4.0.0[examples?] >=sci-visualization/mayavi-4.1.0[doc?,examples?] >=dev-python/pyface-4.1.0[doc?,examples?] >=dev-python/scimath-4.0.1[doc?] >=dev-python/traits-4.1.0[doc?,examples?] >=dev-python/traitsui-4.1.0[doc?,examples?] >=app-admin/eselect-python-20091230 dev-lang/python
+0
+http://www.enthought.com/repo/ets/ets-4.1.0.tar.gz
+
+http://code.enthought.com/projects/ http://pypi.python.org/pypi/ets
+BSD
+Meta package for the Enthought Tool Suite
+~amd64 ~x86
+distutils multilib python toolchain-funcs
+doc examples
+
+
+
+4
+
+compile install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/dev-python/etsdevtools-4.0.0 b/metadata/cache/dev-python/etsdevtools-4.0.0
index 7298615da3b2..bdd06cee8a6b 100644
--- a/metadata/cache/dev-python/etsdevtools-4.0.0
+++ b/metadata/cache/dev-python/etsdevtools-4.0.0
@@ -1,20 +1,20 @@
-dev-python/setuptools doc? ( dev-python/sphinx ) test? ( dev-python/numpy >=dev-python/traits-4.0 >=dev-python/traitsui-4.0 media-fonts/font-cursor-misc media-fonts/font-misc-misc x11-apps/xhost ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* test? ( dev-python/nose ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-dev-python/numpy >=dev-python/traits-4.0 >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+dev-python/setuptools doc? ( dev-python/sphinx ) test? ( dev-python/numpy >=dev-python/traits-4 >=dev-python/traitsui-4 media-fonts/font-cursor-misc media-fonts/font-misc-misc x11-apps/xhost ) >=app-admin/eselect-python-20091230 dev-lang/python test? ( dev-python/nose ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+dev-python/numpy >=dev-python/traits-4 >=app-admin/eselect-python-20091230 dev-lang/python
 0
 http://www.enthought.com/repo/ets/etsdevtools-4.0.0.tar.gz
 
 http://code.enthought.com/projects/dev_tools.php http://pypi.python.org/pypi/etsdevtools
 BSD
-Enthought Tool Suite: tools to support Python development
+Enthought Tool Suite: Tools to support Python development
 ~amd64 ~ppc ~ppc64 ~x86
 distutils multilib python toolchain-funcs virtualx
 doc examples test test test
 
 
 
-3
+4
 
-compile install postinst postrm prepare test
+compile install postinst postrm prepare setup test
 
 
 
diff --git a/metadata/cache/dev-python/etsproxy-0.1.1 b/metadata/cache/dev-python/etsproxy-0.1.1
new file mode 100644
index 000000000000..c5ad61737f54
--- /dev/null
+++ b/metadata/cache/dev-python/etsproxy-0.1.1
@@ -0,0 +1,22 @@
+!<dev-python/apptools-4 !<dev-python/blockcanvas-4 !<dev-python/chaco-4 !<dev-python/codetools-4 !<dev-python/enable-4 !<dev-python/enthoughtbase-4 !<dev-python/envisagecore-4 !<dev-python/envisageplugins-4 !<dev-python/etsdevtools-4 !<dev-python/etsprojecttools-4 !<dev-python/graphcanvas-4 !<sci-visualization/mayavi-4 !<dev-python/scimath-4 !<dev-python/traits-4 !<dev-python/traitsbackendwx-4 !<dev-python/traitsbackendqt-4 !<dev-python/traitsgui-4 dev-python/setuptools >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+!<dev-python/apptools-4 !<dev-python/blockcanvas-4 !<dev-python/chaco-4 !<dev-python/codetools-4 !<dev-python/enable-4 !<dev-python/enthoughtbase-4 !<dev-python/envisagecore-4 !<dev-python/envisageplugins-4 !<dev-python/etsdevtools-4 !<dev-python/etsprojecttools-4 !<dev-python/graphcanvas-4 !<sci-visualization/mayavi-4 !<dev-python/scimath-4 !<dev-python/traits-4 !<dev-python/traitsbackendwx-4 !<dev-python/traitsbackendqt-4 !<dev-python/traitsgui-4 >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+0
+http://www.enthought.com/repo/ets/etsproxy-0.1.1.tar.gz
+
+http://pypi.python.org/pypi/etsproxy
+BSD
+Enthought Tool Suite: Proxy modules for backwards compatibility
+~amd64 ~x86
+distutils multilib python toolchain-funcs
+
+
+
+
+4
+
+compile install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/dev-python/graphcanvas-4.0.0 b/metadata/cache/dev-python/graphcanvas-4.0.0
index 95addcc08a09..f7d42875fd13 100644
--- a/metadata/cache/dev-python/graphcanvas-4.0.0
+++ b/metadata/cache/dev-python/graphcanvas-4.0.0
@@ -1,5 +1,5 @@
-dev-python/setuptools test? ( dev-python/networkx dev-python/enable media-fonts/font-cursor-misc media-fonts/font-misc-misc x11-apps/xhost ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* test? ( dev-python/nose ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-dev-python/networkx dev-python/enable >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+dev-python/setuptools test? ( dev-python/networkx dev-python/enable media-fonts/font-cursor-misc media-fonts/font-misc-misc x11-apps/xhost ) >=app-admin/eselect-python-20091230 dev-lang/python test? ( dev-python/nose ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+dev-python/networkx dev-python/enable >=app-admin/eselect-python-20091230 dev-lang/python
 0
 http://www.enthought.com/repo/ets/graphcanvas-4.0.0.tar.gz
 
@@ -12,9 +12,9 @@ examples test test test
 
 
 
-3
+4
 
-compile install postinst postrm prepare test
+compile install postinst postrm prepare setup test
 
 
 
diff --git a/metadata/cache/dev-python/h5py-2.0.1 b/metadata/cache/dev-python/h5py-2.0.1
index 9351e55b3351..1a22cb39c5d2 100644
--- a/metadata/cache/dev-python/h5py-2.0.1
+++ b/metadata/cache/dev-python/h5py-2.0.1
@@ -6,7 +6,7 @@ http://h5py.googlecode.com/files/h5py-2.0.1.tar.gz
 http://h5py.alfven.org/ http://code.google.com/p/h5py/ http://pypi.python.org/pypi/h5py
 BSD
 A simple Python interface to HDF5 files.
-~amd64 ~x86
+~amd64 ~x86 ~amd64-linux ~x86-linux
 distutils multilib python toolchain-funcs
 test
 
diff --git a/metadata/cache/dev-python/matplotlib-1.1.0 b/metadata/cache/dev-python/matplotlib-1.1.0
index 95cedacdad24..4171c783304b 100644
--- a/metadata/cache/dev-python/matplotlib-1.1.0
+++ b/metadata/cache/dev-python/matplotlib-1.1.0
@@ -1,14 +1,14 @@
 dev-python/numpy dev-python/python-dateutil dev-python/pytz media-libs/freetype:2 media-libs/libpng gtk? ( dev-python/pygtk ) wxwidgets? ( dev-python/wxpython:2.8 ) dev-python/pycxx dev-util/pkgconfig doc? ( app-text/dvipng dev-python/imaging dev-python/ipython dev-python/xlwt dev-python/sphinx media-gfx/graphviz[cairo] dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* tk? ( =dev-lang/python-2*[tk] )
-dev-python/numpy dev-python/python-dateutil dev-python/pytz media-libs/freetype:2 media-libs/libpng gtk? ( dev-python/pygtk ) wxwidgets? ( dev-python/wxpython:2.8 ) virtual/ttf-fonts media-fonts/stix-fonts media-fonts/texcm-ttf dev-python/pyparsing cairo? ( dev-python/pycairo ) excel? ( dev-python/xlwt ) fltk? ( dev-python/pyfltk ) qt4? ( dev-python/PyQt4[X] ) traits? ( dev-python/traits dev-python/configobj ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/dvipng app-text/poppler[utils] dev-texlive/texlive-fontsrecommended ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* tk? ( =dev-lang/python-2*[tk] )
+dev-python/numpy dev-python/python-dateutil dev-python/pytz media-libs/freetype:2 media-libs/libpng gtk? ( dev-python/pygtk ) wxwidgets? ( dev-python/wxpython:2.8 ) virtual/ttf-fonts media-fonts/stix-fonts media-fonts/texcm-ttf dev-python/pyparsing cairo? ( dev-python/pycairo ) excel? ( dev-python/xlwt ) fltk? ( dev-python/pyfltk ) qt4? ( || ( dev-python/PyQt4[X] dev-python/pyside[X] ) ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/dvipng app-text/poppler[utils] dev-texlive/texlive-fontsrecommended ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* tk? ( =dev-lang/python-2*[tk] )
 0
-mirror://sourceforge/matplotlib/matplotlib-1.1.0.tar.gz doc? ( mirror://gentoo/matplotlib-sampledata.tar.bz2 ) examples? ( mirror://gentoo/matplotlib-sampledata.tar.bz2 )
+mirror://sourceforge/matplotlib/matplotlib-1.1.0.tar.gz doc? ( mirror://sourceforge/matplotlib/mpl_sampledata-1.1.0.tar.gz ) examples? ( mirror://sourceforge/matplotlib/mpl_sampledata-1.1.0.tar.gz )
 
 http://matplotlib.sourceforge.net/ http://pypi.python.org/pypi/matplotlib
 BitstreamVera BSD matplotlib MIT OFL-1.1
 Pure python plotting library with matlab like syntax
 ~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-distutils eutils multilib portability python toolchain-funcs user
-cairo doc excel examples fltk gtk latex qt4 traits tk wxwidgets
+distutils multilib python toolchain-funcs
+cairo doc excel examples fltk gtk latex qt4 tk wxwidgets
 
 
 
diff --git a/metadata/cache/dev-python/pyface-4.1.0 b/metadata/cache/dev-python/pyface-4.1.0
new file mode 100644
index 000000000000..a7bb1f7738ae
--- /dev/null
+++ b/metadata/cache/dev-python/pyface-4.1.0
@@ -0,0 +1,22 @@
+dev-python/setuptools doc? ( dev-python/sphinx ) test? ( >=dev-python/traits-4.1 || ( dev-python/wxpython dev-python/PyQt4 dev-python/pyside ) dev-python/traitsui media-fonts/font-cursor-misc media-fonts/font-misc-misc ) >=app-admin/eselect-python-20091230 dev-lang/python test? ( dev-python/nose ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-python/traits-4.1 || ( dev-python/wxpython dev-python/PyQt4 dev-python/pyside ) >=app-admin/eselect-python-20091230 dev-lang/python
+0
+http://www.enthought.com/repo/ets/pyface-4.1.0.tar.gz
+
+https://github.com/enthought/pyface http://pypi.python.org/pypi/pyface
+BSD
+Enthought Tool Suite: Traits-capable windowing framework
+~amd64 ~ppc ~ppc64 ~x86
+distutils multilib python toolchain-funcs virtualx
+doc examples test test test
+
+
+
+4
+
+compile install postinst postrm prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-python/pyside-1.1.0 b/metadata/cache/dev-python/pyside-1.1.0
index 662c4d19bfe7..5a6b6264b940 100644
--- a/metadata/cache/dev-python/pyside-1.1.0
+++ b/metadata/cache/dev-python/pyside-1.1.0
@@ -8,7 +8,7 @@ LGPL-2.1
 Python bindings for the Qt framework
 ~amd64 ~x86
 base cmake-utils eutils flag-o-matic multilib portability python toolchain-funcs user virtualx
-assistant debug declarative help multimedia kde opengl phonon script sql svg test webkit X xmlpatterns test
+assistant debug declarative multimedia kde opengl phonon script sql svg test webkit X xmlpatterns test
 opengl? ( X ) svg? ( X ) script? ( X ) X? ( script )
 
 
diff --git a/metadata/cache/dev-python/scimath-4.0.1 b/metadata/cache/dev-python/scimath-4.0.1
new file mode 100644
index 000000000000..296987429ef1
--- /dev/null
+++ b/metadata/cache/dev-python/scimath-4.0.1
@@ -0,0 +1,22 @@
+dev-python/setuptools doc? ( dev-python/sphinx ) test? ( >=dev-python/traits-4.1 >=dev-python/traitsui-4.1 sci-libs/scipy media-fonts/font-cursor-misc media-fonts/font-misc-misc x11-apps/xhost ) >=app-admin/eselect-python-20091230 dev-lang/python test? ( dev-python/nose ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-python/traits-4.1 >=dev-python/traitsui-4.1 sci-libs/scipy >=app-admin/eselect-python-20091230 dev-lang/python
+0
+http://www.enthought.com/repo/ets/scimath-4.0.1.tar.gz
+
+http://code.enthought.com/projects/sci_math/ http://pypi.python.org/pypi/scimath
+BSD
+Enthought Tool Suite: Scientific and mathematical tools
+~amd64 ~x86
+distutils multilib python toolchain-funcs virtualx
+doc test test test
+
+
+
+4
+
+compile install postinst postrm prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-python/traits-4.1.0 b/metadata/cache/dev-python/traits-4.1.0
new file mode 100644
index 000000000000..412dfe5a662f
--- /dev/null
+++ b/metadata/cache/dev-python/traits-4.1.0
@@ -0,0 +1,22 @@
+dev-python/setuptools doc? ( dev-python/sphinx ) test? ( dev-python/numpy ) >=app-admin/eselect-python-20091230 dev-lang/python test? ( dev-python/nose ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+dev-python/numpy >=app-admin/eselect-python-20091230 dev-lang/python
+0
+http://www.enthought.com/repo/ETS/traits-4.1.0.tar.gz
+
+http://code.enthought.com/projects/traits/ http://pypi.python.org/pypi/traits
+BSD
+Enthought Tool Suite: Explicitly typed attributes for Python
+~amd64 ~ppc ~ppc64 ~x86
+distutils multilib python toolchain-funcs virtualx
+doc examples test test test
+
+
+
+4
+
+compile install postinst postrm prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-python/traitsui-4.1.0 b/metadata/cache/dev-python/traitsui-4.1.0
new file mode 100644
index 000000000000..36e51dd98d2d
--- /dev/null
+++ b/metadata/cache/dev-python/traitsui-4.1.0
@@ -0,0 +1,22 @@
+dev-python/setuptools doc? ( dev-python/sphinx ) test? ( dev-python/pyface dev-python/traits media-fonts/font-cursor-misc media-fonts/font-misc-misc ) >=app-admin/eselect-python-20091230 dev-lang/python test? ( dev-python/nose ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+dev-python/pyface dev-python/traits >=app-admin/eselect-python-20091230 dev-lang/python
+0
+http://www.enthought.com/repo/ets/traitsui-4.1.0.tar.gz
+
+https://github.com/enthought/traitsui http://pypi.python.org/pypi/traitsui
+BSD
+Enthought Tool Suite: Traits-capable user interfaces
+~amd64 ~ppc ~ppc64 ~x86
+distutils multilib python toolchain-funcs virtualx
+doc examples test test test
+
+
+
+4
+
+compile install postinst postrm prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/best_in_place-1.0.4 b/metadata/cache/dev-ruby/best_in_place-1.0.4
new file mode 100644
index 000000000000..0f8c13bebf8c
--- /dev/null
+++ b/metadata/cache/dev-ruby/best_in_place-1.0.4
@@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby18? ( dev-ruby/rails:3.1[ruby_targets_ruby18] dev-ruby/jquery-rails[ruby_targets_ruby18] ) ruby_targets_ree18? ( dev-ruby/rails:3.1[ruby_targets_ree18] dev-ruby/jquery-rails[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec-rails[ruby_targets_ruby18] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby18] >=dev-ruby/capybara-1.0.1[ruby_targets_ruby18] >=dev-ruby/sqlite3-ruby-1.3.4-r1[ruby_targets_ruby18] dev-ruby/rdiscount[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rspec-rails[ruby_targets_ree18] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ree18] >=dev-ruby/capybara-1.0.1[ruby_targets_ree18] >=dev-ruby/sqlite3-ruby-1.3.4-r1[ruby_targets_ree18] dev-ruby/rdiscount[ruby_targets_ree18] ) ) test? ( www-client/firefox ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+ruby_targets_ruby18? ( dev-ruby/rails:3.1[ruby_targets_ruby18] dev-ruby/jquery-rails[ruby_targets_ruby18] ) ruby_targets_ree18? ( dev-ruby/rails:3.1[ruby_targets_ree18] dev-ruby/jquery-rails[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+3
+mirror://rubygems/best_in_place-1.0.4.gem
+
+http://github.com/bernat/best_in_place
+MIT
+In-place editor helper for Rails 3o
+~amd64
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator virtualx
+test test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
+|| ( ruby_targets_ruby18 ruby_targets_ree18 )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/bundler-1.0.18 b/metadata/cache/dev-ruby/bundler-1.0.18
index 878dc72e57d2..c9da37ecab77 100644
--- a/metadata/cache/dev-ruby/bundler-1.0.18
+++ b/metadata/cache/dev-ruby/bundler-1.0.18
@@ -6,7 +6,7 @@ mirror://rubygems/bundler-1.0.18.gem
 http://github.com/carlhuda/bundler
 MIT
 An easy way to vendor gem dependencies
-~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~sparc-solaris ~x86-solaris
+amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~sparc-solaris ~x86-solaris
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
 test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
 
diff --git a/metadata/cache/dev-ruby/mongoid-2.4.1 b/metadata/cache/dev-ruby/mongoid-2.4.1
index eec13eadf0ec..d8bdf977babe 100644
--- a/metadata/cache/dev-ruby/mongoid-2.4.1
+++ b/metadata/cache/dev-ruby/mongoid-2.4.1
@@ -3,9 +3,9 @@ ruby_targets_ruby18? ( >=dev-ruby/activemodel-3.1[ruby_targets_ruby18] >=dev-rub
 0
 https://github.com/mongoid/mongoid/tarball/v2.4.1 -> mongoid-2.4.1.tar.gz
 test
-ODM (Object Document Mapper) Framework for MongoDB
-MIT
 http://mongoid.org/
+MIT
+ODM (Object Document Mapper) Framework for MongoDB
 ~amd64
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
 test elibc_FreeBSD ruby_targets_ruby18 doc test test
diff --git a/metadata/cache/dev-ruby/mustache-0.99.4 b/metadata/cache/dev-ruby/mustache-0.99.4
index ff97afa1e993..d06fb7f8fd07 100644
--- a/metadata/cache/dev-ruby/mustache-0.99.4
+++ b/metadata/cache/dev-ruby/mustache-0.99.4
@@ -6,7 +6,7 @@ mirror://rubygems/mustache-0.99.4.gem
 http://mustache.github.com/
 MIT
 Mustache is a framework-agnostic way to render logic-free views.
-~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
 elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 doc test
 
diff --git a/metadata/cache/dev-ruby/pdf-reader-0.8.6 b/metadata/cache/dev-ruby/pdf-reader-0.8.6
deleted file mode 100644
index 25fa6c087270..000000000000
--- a/metadata/cache/dev-ruby/pdf-reader-0.8.6
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( dev-ruby/ascii85[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/ascii85[ruby_targets_ruby19] ) ruby_targets_ree18? ( dev-ruby/ascii85[ruby_targets_ree18] ) ruby_targets_jruby? ( dev-ruby/ascii85[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-ruby/rake[ruby_targets_ruby18] dev-ruby/rspec:0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/rake[ruby_targets_ruby19] dev-ruby/rspec:0[ruby_targets_ruby19] ) ruby_targets_ree18? ( dev-ruby/rake[ruby_targets_ree18] dev-ruby/rspec:0[ruby_targets_ree18] ) ruby_targets_jruby? ( dev-ruby/rake[ruby_targets_jruby] dev-ruby/rspec:0[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-ruby_targets_ruby18? ( dev-ruby/ascii85[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/ascii85[ruby_targets_ruby19] ) ruby_targets_ree18? ( dev-ruby/ascii85[ruby_targets_ree18] ) ruby_targets_jruby? ( dev-ruby/ascii85[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-0
-http://github.com/yob/pdf-reader/tarball/v0.8.6 -> pdf-reader-git-0.8.6.tgz
-
-http://github.com/yob/pdf-reader/
-MIT
-PDF parser conforming as much as possible to the PDF specification from Adobe
-~amd64
-eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc doc test test
-
-
-
-2
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/pdf-reader-0.9.2 b/metadata/cache/dev-ruby/pdf-reader-0.9.2
deleted file mode 100644
index 909447ddf5eb..000000000000
--- a/metadata/cache/dev-ruby/pdf-reader-0.9.2
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( dev-ruby/ascii85[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/ascii85[ruby_targets_ruby19] ) ruby_targets_ree18? ( dev-ruby/ascii85[ruby_targets_ree18] ) ruby_targets_jruby? ( dev-ruby/ascii85[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( >=dev-ruby/rspec-2.1:2[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/rspec-2.1:2[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/rspec-2.1:2[ruby_targets_ree18] ) ruby_targets_jruby? ( >=dev-ruby/rspec-2.1:2[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-ruby_targets_ruby18? ( dev-ruby/ascii85[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/ascii85[ruby_targets_ruby19] ) ruby_targets_ree18? ( dev-ruby/ascii85[ruby_targets_ree18] ) ruby_targets_jruby? ( dev-ruby/ascii85[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-0
-http://github.com/yob/pdf-reader/tarball/v0.9.2 -> pdf-reader-git-0.9.2.tgz
-
-http://github.com/yob/pdf-reader/
-MIT
-PDF parser conforming as much as possible to the PDF specification from Adobe
-~amd64
-eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc doc test test
-
-
-
-2
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/pdf-reader-0.9.3 b/metadata/cache/dev-ruby/pdf-reader-0.9.3
deleted file mode 100644
index d82ae24253b7..000000000000
--- a/metadata/cache/dev-ruby/pdf-reader-0.9.3
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( dev-ruby/ascii85[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/ascii85[ruby_targets_ruby19] ) ruby_targets_ree18? ( dev-ruby/ascii85[ruby_targets_ree18] ) ruby_targets_jruby? ( dev-ruby/ascii85[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( >=dev-ruby/rspec-2.1:2[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/rspec-2.1:2[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/rspec-2.1:2[ruby_targets_ree18] ) ruby_targets_jruby? ( >=dev-ruby/rspec-2.1:2[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-ruby_targets_ruby18? ( dev-ruby/ascii85[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/ascii85[ruby_targets_ruby19] ) ruby_targets_ree18? ( dev-ruby/ascii85[ruby_targets_ree18] ) ruby_targets_jruby? ( dev-ruby/ascii85[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-0
-http://github.com/yob/pdf-reader/tarball/v0.9.3 -> pdf-reader-git-0.9.3.tgz
-
-http://github.com/yob/pdf-reader/
-MIT
-PDF parser conforming as much as possible to the PDF specification from Adobe
-~amd64
-eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc doc test test
-
-
-
-2
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/rdiscount-1.6.8 b/metadata/cache/dev-ruby/rdiscount-1.6.8
index c3fdd8682283..a7f82eea22f8 100644
--- a/metadata/cache/dev-ruby/rdiscount-1.6.8
+++ b/metadata/cache/dev-ruby/rdiscount-1.6.8
@@ -6,7 +6,7 @@ mirror://rubygems/rdiscount-1.6.8.gem
 http://github.com/rtomayko/rdiscount
 MIT
 Implementation of John Gruber's Markdown
-~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
 elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 doc test test
 
diff --git a/metadata/cache/dev-ruby/ruby-rc4-0.1.3 b/metadata/cache/dev-ruby/ruby-rc4-0.1.3
new file mode 100644
index 000000000000..08ed7a360d91
--- /dev/null
+++ b/metadata/cache/dev-ruby/ruby-rc4-0.1.3
@@ -0,0 +1,22 @@
+ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rspec:2[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[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? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( 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] ) )
+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] )
+0
+https://github.com/caiges/Ruby-RC4/tarball/9e70c22a5f05deb0d19b9f91bac4cf2332acaf28 -> ruby-rc4-0.1.3-git.tgz
+
+https://github.com/caiges/Ruby-RC4
+MIT
+A pure Ruby implementation of the Rc4 algorithm.
+~amd64
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc doc test test
+|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-tex/bibtexu-3.71_p20110705 b/metadata/cache/dev-tex/bibtexu-3.71_p20110705
index 16f447e5bfaa..7d9a1d73520c 100644
--- a/metadata/cache/dev-tex/bibtexu-3.71_p20110705
+++ b/metadata/cache/dev-tex/bibtexu-3.71_p20110705
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-20110705-source.tar.xz
 http://tug.org/texlive/
 GPL-2
 8-bit Implementation of BibTeX 0.99 with a Very Large Capacity
-~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 
 
 
diff --git a/metadata/cache/dev-tex/mh-20111011 b/metadata/cache/dev-tex/mh-20111011
index 79deef37e5d7..01ff291aed8b 100644
--- a/metadata/cache/dev-tex/mh-20111011
+++ b/metadata/cache/dev-tex/mh-20111011
@@ -6,7 +6,7 @@ mirror://gentoo/mh-20111011.zip
 http://www.ctan.org/tex-archive/macros/latex/contrib/mh/
 LPPL-1.3
 Additional LaTeX math tools.
-~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 base eutils latex-package multilib portability toolchain-funcs user
 doc
 
diff --git a/metadata/cache/dev-texlive/texlive-basic-2011-r1 b/metadata/cache/dev-texlive/texlive-basic-2011-r1
index 71cb61185e8b..4e0a8f73bb28 100644
--- a/metadata/cache/dev-texlive/texlive-basic-2011-r1
+++ b/metadata/cache/dev-texlive/texlive-basic-2011-r1
@@ -1,12 +1,12 @@
->=dev-texlive/texlive-documentation-base-2011 >=dev-tex/luatex-0.70 !<app-text/texlive-core-2009 !<dev-texlive/texlive-latex-2009 !<dev-texlive/texlive-latexrecommended-2009 !<dev-texlive/texlive-langcjk-2011 >=app-text/texlive-core-2011 app-arch/xz-utils
->=dev-texlive/texlive-documentation-base-2011 >=dev-tex/luatex-0.70 !<app-text/texlive-core-2009 !<dev-texlive/texlive-latex-2009 !<dev-texlive/texlive-latexrecommended-2009 !<dev-texlive/texlive-langcjk-2011 >=app-text/texlive-core-2011
+>=dev-texlive/texlive-documentation-base-2011 >=dev-tex/luatex-0.70 !<app-text/texlive-core-2009 !<dev-texlive/texlive-latex-2009 !<dev-texlive/texlive-latexrecommended-2009 !!<dev-texlive/texlive-langcjk-2011 >=app-text/texlive-core-2011 app-arch/xz-utils
+>=dev-texlive/texlive-documentation-base-2011 >=dev-tex/luatex-0.70 !<app-text/texlive-core-2009 !<dev-texlive/texlive-latex-2009 !<dev-texlive/texlive-latexrecommended-2009 !!<dev-texlive/texlive-langcjk-2011 >=app-text/texlive-core-2011
 0
 mirror://gentoo/texlive-module-amsfonts-2011.tar.xz mirror://gentoo/texlive-module-bibtex-2011.tar.xz mirror://gentoo/texlive-module-cm-2011.tar.xz mirror://gentoo/texlive-module-dvipdfmx-def-2011.tar.xz mirror://gentoo/texlive-module-enctex-2011.tar.xz mirror://gentoo/texlive-module-etex-2011.tar.xz mirror://gentoo/texlive-module-etex-pkg-2011.tar.xz mirror://gentoo/texlive-module-glyphlist-2011.tar.xz mirror://gentoo/texlive-module-hyph-utf8-2011.tar.xz mirror://gentoo/texlive-module-ifluatex-2011.tar.xz mirror://gentoo/texlive-module-ifxetex-2011.tar.xz mirror://gentoo/texlive-module-lua-alt-getopt-2011.tar.xz mirror://gentoo/texlive-module-luatex-2011.tar.xz mirror://gentoo/texlive-module-makeindex-2011.tar.xz mirror://gentoo/texlive-module-metafont-2011.tar.xz mirror://gentoo/texlive-module-mflogo-2011.tar.xz mirror://gentoo/texlive-module-mfware-2011.tar.xz mirror://gentoo/texlive-module-misc-2011.tar.xz mirror://gentoo/texlive-module-pdftex-2011.tar.xz mirror://gentoo/texlive-module-plain-2011.tar.xz mirror://gentoo/texlive-module-tcdialog-2011.tar.xz mirror://gentoo/texlive-module-tex-2011.tar.xz mirror://gentoo/texlive-module-texlive-msg-translations-2011.tar.xz mirror://gentoo/texlive-module-texlive-scripts-2011.tar.xz mirror://gentoo/texlive-module-collection-basic-2011.tar.xz doc? ( mirror://gentoo/texlive-module-amsfonts.doc-2011.tar.xz mirror://gentoo/texlive-module-bibtex.doc-2011.tar.xz mirror://gentoo/texlive-module-cm.doc-2011.tar.xz mirror://gentoo/texlive-module-enctex.doc-2011.tar.xz mirror://gentoo/texlive-module-etex.doc-2011.tar.xz mirror://gentoo/texlive-module-etex-pkg.doc-2011.tar.xz mirror://gentoo/texlive-module-hyph-utf8.doc-2011.tar.xz mirror://gentoo/texlive-module-ifluatex.doc-2011.tar.xz mirror://gentoo/texlive-module-ifxetex.doc-2011.tar.xz mirror://gentoo/texlive-module-lua-alt-getopt.doc-2011.tar.xz mirror://gentoo/texlive-module-luatex.doc-2011.tar.xz mirror://gentoo/texlive-module-makeindex.doc-2011.tar.xz mirror://gentoo/texlive-module-metafont.doc-2011.tar.xz mirror://gentoo/texlive-module-mflogo.doc-2011.tar.xz mirror://gentoo/texlive-module-mfware.doc-2011.tar.xz mirror://gentoo/texlive-module-pdftex.doc-2011.tar.xz mirror://gentoo/texlive-module-tcdialog.doc-2011.tar.xz mirror://gentoo/texlive-module-tex.doc-2011.tar.xz mirror://gentoo/texlive-module-texlive-scripts.doc-2011.tar.xz ) source? ( mirror://gentoo/texlive-module-amsfonts.source-2011.tar.xz mirror://gentoo/texlive-module-hyph-utf8.source-2011.tar.xz mirror://gentoo/texlive-module-ifluatex.source-2011.tar.xz mirror://gentoo/texlive-module-ifxetex.source-2011.tar.xz mirror://gentoo/texlive-module-mflogo.source-2011.tar.xz )
 
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 GPL-2 LPPL-1.3 OFL TeX
 TeXLive Essential programs and files
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-bibtexextra-2011 b/metadata/cache/dev-texlive/texlive-bibtexextra-2011
index f09c3d1956fe..84ac6a340e76 100644
--- a/metadata/cache/dev-texlive/texlive-bibtexextra-2011
+++ b/metadata/cache/dev-texlive/texlive-bibtexextra-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-aichej-2011.tar.xz mirror://gentoo/texlive-module
 http://www.tug.org/texlive/
 GPL-2 Artistic as-is GPL-1 LPPL-1.3 public-domain
 TeXLive Extra BibTeX styles
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-context-2011 b/metadata/cache/dev-texlive/texlive-context-2011
index 055d918cb564..69e4bb697415 100644
--- a/metadata/cache/dev-texlive/texlive-context-2011
+++ b/metadata/cache/dev-texlive/texlive-context-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-context-2011.tar.xz mirror://gentoo/texlive-modul
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 GPL-2 public-domain
 TeXLive ConTeXt format
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-arabic-2011 b/metadata/cache/dev-texlive/texlive-documentation-arabic-2011
index 1714dd0c4e60..0a6bcd59deb5 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-arabic-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-arabic-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-persian-2011.tar.xz mirror://gentoo/texliv
 http://www.tug.org/texlive/
 GPL-2 public-domain
 TeXLive Arabic documentation
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-base-2011 b/metadata/cache/dev-texlive/texlive-documentation-base-2011
index e249ba679218..0c222bececb5 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-base-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-base-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-texlive-common-2011.tar.xz mirror://gentoo/texliv
 http://www.tug.org/texlive/
 GPL-2
 TeXLive TeX Live documentation
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-bulgarian-2011 b/metadata/cache/dev-texlive/texlive-documentation-bulgarian-2011
index d7766d74e339..0da165bb35c6 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-bulgarian-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-bulgarian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-bulgarian-2011.tar.xz mirror://gentoo/texl
 http://www.tug.org/texlive/
 GPL-2 FDL-1.1 public-domain
 TeXLive Bulgarian documentation
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-chinese-2011 b/metadata/cache/dev-texlive/texlive-documentation-chinese-2011
index df8834539f1e..52665f15f3ad 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-chinese-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-chinese-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-asymptote-faq-zh-cn-2011.tar.xz mirror://gentoo/t
 http://www.tug.org/texlive/
 GPL-2 FDL-1.1 GPL-1 LGPL-2 LPPL-1.3
 TeXLive Chinese documentation
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-czechslovak-2011 b/metadata/cache/dev-texlive/texlive-documentation-czechslovak-2011
index 7534aa06bf06..2699ed9ba53a 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-czechslovak-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-czechslovak-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-czech-2011.tar.xz mirror://gentoo/texlive-
 http://www.tug.org/texlive/
 GPL-2 GPL-1 LPPL-1.3
 TeXLive Czech/Slovak documentation
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-dutch-2011 b/metadata/cache/dev-texlive/texlive-documentation-dutch-2011
index ad188be82e5a..ebadec0c7565 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-dutch-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-dutch-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-dutch-2011.tar.xz mirror://gentoo/texlive-
 http://www.tug.org/texlive/
 GPL-2 GPL-1
 TeXLive Dutch documentation
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-english-2011 b/metadata/cache/dev-texlive/texlive-documentation-english-2011
index 5d84dcba8b68..02e37164b254 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-english-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-english-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-FAQ-en-2011.tar.xz mirror://gentoo/texlive-module
 http://www.tug.org/texlive/
 GPL-2 as-is FDL-1.1 GPL-1 GPL-2 LPPL-1.3 public-domain TeX
 TeXLive English documentation
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-finnish-2011 b/metadata/cache/dev-texlive/texlive-documentation-finnish-2011
index cb45ab88e3dc..33c3b89dae0e 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-finnish-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-finnish-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-finnish-2011.tar.xz mirror://gentoo/texliv
 http://www.tug.org/texlive/
 GPL-2 public-domain
 TeXLive Finnish documentation
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-french-2011 b/metadata/cache/dev-texlive/texlive-documentation-french-2011
index f6504144675e..178aeee81be3 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-french-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-french-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-apprends-latex-2011.tar.xz mirror://gentoo/texliv
 http://www.tug.org/texlive/
 GPL-2 FDL-1.1 GPL-1 LPPL-1.3
 TeXLive French documentation
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-german-2011 b/metadata/cache/dev-texlive/texlive-documentation-german-2011
index d6a03c61460c..eff072161fa9 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-german-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-german-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-kopka-2011.tar.xz mirror://gentoo/texlive-module-
 http://www.tug.org/texlive/
 GPL-2 as-is FDL-1.1 GPL-1 LPPL-1.3
 TeXLive German documentation
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-italian-2011 b/metadata/cache/dev-texlive/texlive-documentation-italian-2011
index a06377bce6dd..af9c87ac1c6e 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-italian-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-italian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-amsldoc-it-2011.tar.xz mirror://gentoo/texlive-mo
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 LPPL-1.3
 TeXLive Italian documentation
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-japanese-2011 b/metadata/cache/dev-texlive/texlive-documentation-japanese-2011
index b03f4252326b..ece45ff27b1d 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-japanese-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-japanese-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-japanese-2011.tar.xz mirror://gentoo/texli
 http://www.tug.org/texlive/
 GPL-2 GPL-1
 TeXLive Japanese documentation
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-korean-2011 b/metadata/cache/dev-texlive/texlive-documentation-korean-2011
index 59b837930a2a..5d0443176418 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-korean-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-korean-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-korean-2011.tar.xz mirror://gentoo/texlive
 http://www.tug.org/texlive/
 GPL-2 FDL-1.1
 TeXLive Korean documentation
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-mongolian-2011 b/metadata/cache/dev-texlive/texlive-documentation-mongolian-2011
index 69eaef2e5520..504fa01b69e1 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-mongolian-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-mongolian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-mongol-2011.tar.xz mirror://gentoo/texlive
 http://www.tug.org/texlive/
 GPL-2 LPPL-1.3
 TeXLive Mongolian documentation
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-polish-2011 b/metadata/cache/dev-texlive/texlive-documentation-polish-2011
index 7d737f60b49c..0d8826c2d94a 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-polish-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-polish-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-polish-2011.tar.xz mirror://gentoo/texlive
 http://www.tug.org/texlive/
 GPL-2 public-domain
 TeXLive Polish documentation
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-portuguese-2011 b/metadata/cache/dev-texlive/texlive-documentation-portuguese-2011
index bc63b9a7a974..d9da8b336ee6 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-portuguese-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-portuguese-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-beamer-tut-pt-2011.tar.xz mirror://gentoo/texlive
 http://www.tug.org/texlive/
 GPL-2 GPL-1 LPPL-1.3 public-domain
 TeXLive Portuguese documentation
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-russian-2011 b/metadata/cache/dev-texlive/texlive-documentation-russian-2011
index a5ef6434e033..80469199515f 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-russian-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-russian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-russian-2011.tar.xz mirror://gentoo/texliv
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1
 TeXLive Russian documentation
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-serbian-2011 b/metadata/cache/dev-texlive/texlive-documentation-serbian-2011
index 3a82c0b21396..b6ab5c778925 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-serbian-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-serbian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-texlive-sr-2011.tar.xz mirror://gentoo/texlive-mo
 http://www.tug.org/texlive/
 GPL-2
 TeXLive Serbian documentation
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-slovenian-2011 b/metadata/cache/dev-texlive/texlive-documentation-slovenian-2011
index 0bbf5389e91a..5dca4d72026d 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-slovenian-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-slovenian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-slovenian-2011.tar.xz mirror://gentoo/texl
 http://www.tug.org/texlive/
 GPL-2 GPL-1
 TeXLive Slovenian documentation
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-spanish-2011 b/metadata/cache/dev-texlive/texlive-documentation-spanish-2011
index d1db2420952b..57d95ef1d1f9 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-spanish-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-spanish-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-es-tex-faq-2011.tar.xz mirror://gentoo/texlive-mo
 http://www.tug.org/texlive/
 GPL-2 as-is LPPL-1.3 public-domain
 TeXLive Spanish documentation
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-thai-2011 b/metadata/cache/dev-texlive/texlive-documentation-thai-2011
index 89668604b178..4cfe333c71af 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-thai-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-thai-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-thai-2011.tar.xz mirror://gentoo/texlive-m
 http://www.tug.org/texlive/
 GPL-2 public-domain
 TeXLive Thai documentation
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-turkish-2011 b/metadata/cache/dev-texlive/texlive-documentation-turkish-2011
index 651816e33a53..e9e5eba44212 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-turkish-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-turkish-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-turkish-2011.tar.xz mirror://gentoo/texliv
 http://www.tug.org/texlive/
 GPL-2 public-domain
 TeXLive Turkish documentation
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-ukrainian-2011 b/metadata/cache/dev-texlive/texlive-documentation-ukrainian-2011
index 33f3c1714362..bd35a4f80bbe 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-ukrainian-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-ukrainian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-ukr-2011.tar.xz mirror://gentoo/texlive-mo
 http://www.tug.org/texlive/
 GPL-2 as-is
 TeXLive Ukrainian documentation
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-vietnamese-2011 b/metadata/cache/dev-texlive/texlive-documentation-vietnamese-2011
index 855a7e2f315c..d93c9d905da3 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-vietnamese-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-vietnamese-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-amsldoc-vn-2011.tar.xz mirror://gentoo/texlive-mo
 http://www.tug.org/texlive/
 GPL-2 LGPL-2 LPPL-1.3
 TeXLive Vietnamese documentation
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-fontsextra-2011 b/metadata/cache/dev-texlive/texlive-fontsextra-2011
index c4b6fc4b9248..3cd20b5c5287 100644
--- a/metadata/cache/dev-texlive/texlive-fontsextra-2011
+++ b/metadata/cache/dev-texlive/texlive-fontsextra-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-Asana-Math-2011.tar.xz mirror://gentoo/texlive-mo
 http://www.tug.org/texlive/
 GPL-2 as-is BSD GPL-1 GPL-2 GPL-3 LPPL-1.3 OFL public-domain TeX
 TeXLive Extra fonts
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-fontsrecommended-2011 b/metadata/cache/dev-texlive/texlive-fontsrecommended-2011
index f636b3dfae00..b2f4f01359c7 100644
--- a/metadata/cache/dev-texlive/texlive-fontsrecommended-2011
+++ b/metadata/cache/dev-texlive/texlive-fontsrecommended-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-avantgar-2011.tar.xz mirror://gentoo/texlive-modu
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 LPPL-1.3 public-domain
 TeXLive Recommended fonts
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-fontutils-2011 b/metadata/cache/dev-texlive/texlive-fontutils-2011
index 27339fe27cd8..232be89ecd9c 100644
--- a/metadata/cache/dev-texlive/texlive-fontutils-2011
+++ b/metadata/cache/dev-texlive/texlive-fontutils-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-accfonts-2011.tar.xz mirror://gentoo/texlive-modu
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 LPPL-1.3 public-domain
 TeXLive TeX and Outline font utilities
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-formatsextra-2011 b/metadata/cache/dev-texlive/texlive-formatsextra-2011
index e31ddf1f5da6..35c4b4445ed8 100644
--- a/metadata/cache/dev-texlive/texlive-formatsextra-2011
+++ b/metadata/cache/dev-texlive/texlive-formatsextra-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-edmac-2011.tar.xz mirror://gentoo/texlive-module-
 http://www.tug.org/texlive/
 GPL-2 GPL-2 LPPL-1.3 public-domain TeX
 TeXLive Extra formats
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-games-2011 b/metadata/cache/dev-texlive/texlive-games-2011
index 94441929c4b0..f802b7134e12 100644
--- a/metadata/cache/dev-texlive/texlive-games-2011
+++ b/metadata/cache/dev-texlive/texlive-games-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-bartel-chess-fonts-2011.tar.xz mirror://gentoo/te
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 LPPL-1.3 public-domain
 TeXLive Games typesetting
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-genericextra-2011 b/metadata/cache/dev-texlive/texlive-genericextra-2011
index e17c679a8a83..115147dc6bd1 100644
--- a/metadata/cache/dev-texlive/texlive-genericextra-2011
+++ b/metadata/cache/dev-texlive/texlive-genericextra-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-abbr-2011.tar.xz mirror://gentoo/texlive-module-a
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 GPL-2 LPPL-1.3 public-domain TeX
 TeXLive Extra generic packages
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-genericrecommended-2011 b/metadata/cache/dev-texlive/texlive-genericrecommended-2011
index 2429af7bbba2..4e1de3a57bb0 100644
--- a/metadata/cache/dev-texlive/texlive-genericrecommended-2011
+++ b/metadata/cache/dev-texlive/texlive-genericrecommended-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-epsf-2011.tar.xz mirror://gentoo/texlive-module-f
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 LPPL-1.3 public-domain
 TeXLive Recommended generic packages
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-htmlxml-2011 b/metadata/cache/dev-texlive/texlive-htmlxml-2011
index 8b911f293de0..bdfc437102cf 100644
--- a/metadata/cache/dev-texlive/texlive-htmlxml-2011
+++ b/metadata/cache/dev-texlive/texlive-htmlxml-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-xmlplay-2011.tar.xz mirror://gentoo/texlive-modul
 http://www.tug.org/texlive/
 GPL-2 public-domain
 TeXLive HTML/SGML/XML support
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-humanities-2011 b/metadata/cache/dev-texlive/texlive-humanities-2011
index 366f2b49ab0c..63b3e3689ff0 100644
--- a/metadata/cache/dev-texlive/texlive-humanities-2011
+++ b/metadata/cache/dev-texlive/texlive-humanities-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-alnumsec-2011.tar.xz mirror://gentoo/texlive-modu
 http://www.tug.org/texlive/
 GPL-2 GPL-1 LPPL-1.2 LPPL-1.3 public-domain
 TeXLive Humanities packages
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langafrican-2011 b/metadata/cache/dev-texlive/texlive-langafrican-2011
index 671d31dab593..7b482ede0281 100644
--- a/metadata/cache/dev-texlive/texlive-langafrican-2011
+++ b/metadata/cache/dev-texlive/texlive-langafrican-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-ethiop-2011.tar.xz mirror://gentoo/texlive-module
 http://www.tug.org/texlive/
 GPL-2 GPL-1 GPL-2
 TeXLive African scripts
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langarabic-2011 b/metadata/cache/dev-texlive/texlive-langarabic-2011
index 46859302819c..dfa97fde9d74 100644
--- a/metadata/cache/dev-texlive/texlive-langarabic-2011
+++ b/metadata/cache/dev-texlive/texlive-langarabic-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-arabi-2011.tar.xz mirror://gentoo/texlive-module-
 http://www.tug.org/texlive/
 GPL-2 LPPL-1.3
 TeXLive Arabic
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langarmenian-2011 b/metadata/cache/dev-texlive/texlive-langarmenian-2011
index 761ad092ddd0..f1818d210b2e 100644
--- a/metadata/cache/dev-texlive/texlive-langarmenian-2011
+++ b/metadata/cache/dev-texlive/texlive-langarmenian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-collection-langarmenian-2011.tar.xz
 http://www.tug.org/texlive/
 GPL-2
 TeXLive Armenian
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langcjk-2011 b/metadata/cache/dev-texlive/texlive-langcjk-2011
index 8ecc47086aa8..4cafc5746855 100644
--- a/metadata/cache/dev-texlive/texlive-langcjk-2011
+++ b/metadata/cache/dev-texlive/texlive-langcjk-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-adobemapping-2011.tar.xz mirror://gentoo/texlive-
 http://www.tug.org/texlive/
 GPL-2 as-is BSD LPPL-1.3
 TeXLive Chinese, Japanese, Korean
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langcroatian-2011 b/metadata/cache/dev-texlive/texlive-langcroatian-2011
index 664c2cafeb1f..4c1a6ab442f6 100644
--- a/metadata/cache/dev-texlive/texlive-langcroatian-2011
+++ b/metadata/cache/dev-texlive/texlive-langcroatian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-hrlatex-2011.tar.xz mirror://gentoo/texlive-modul
 http://www.tug.org/texlive/
 GPL-2 LPPL-1.3
 TeXLive Croatian
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langcyrillic-2011 b/metadata/cache/dev-texlive/texlive-langcyrillic-2011
index a593f948ce24..f04f61cf0fe3 100644
--- a/metadata/cache/dev-texlive/texlive-langcyrillic-2011
+++ b/metadata/cache/dev-texlive/texlive-langcyrillic-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-cmcyr-2011.tar.xz mirror://gentoo/texlive-module-
 http://www.tug.org/texlive/
 GPL-2 as-is LPPL-1.3 public-domain
 TeXLive Cyrillic
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langczechslovak-2011 b/metadata/cache/dev-texlive/texlive-langczechslovak-2011
index f62aac87ed90..277b272fb683 100644
--- a/metadata/cache/dev-texlive/texlive-langczechslovak-2011
+++ b/metadata/cache/dev-texlive/texlive-langczechslovak-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-cs-2011.tar.xz mirror://gentoo/texlive-module-csb
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 LPPL-1.3
 TeXLive Czech/Slovak
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langdanish-2011 b/metadata/cache/dev-texlive/texlive-langdanish-2011
index b774274b88b6..e0ff8c432a6b 100644
--- a/metadata/cache/dev-texlive/texlive-langdanish-2011
+++ b/metadata/cache/dev-texlive/texlive-langdanish-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-hyphen-danish-2011.tar.xz mirror://gentoo/texlive
 http://www.tug.org/texlive/
 GPL-2 LPPL-1.3
 TeXLive Danish
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langdutch-2011 b/metadata/cache/dev-texlive/texlive-langdutch-2011
index 9da344e21ea4..73842e444fd5 100644
--- a/metadata/cache/dev-texlive/texlive-langdutch-2011
+++ b/metadata/cache/dev-texlive/texlive-langdutch-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-hyphen-dutch-2011.tar.xz mirror://gentoo/texlive-
 http://www.tug.org/texlive/
 GPL-2
 TeXLive Dutch
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langenglish-2011 b/metadata/cache/dev-texlive/texlive-langenglish-2011
index 86184c64f957..5f3752f22765 100644
--- a/metadata/cache/dev-texlive/texlive-langenglish-2011
+++ b/metadata/cache/dev-texlive/texlive-langenglish-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-hyphen-english-2011.tar.xz mirror://gentoo/texliv
 http://www.tug.org/texlive/
 GPL-2
 TeXLive US and UK English
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langfinnish-2011 b/metadata/cache/dev-texlive/texlive-langfinnish-2011
index a07e3196dbbb..8a7307ee5e9e 100644
--- a/metadata/cache/dev-texlive/texlive-langfinnish-2011
+++ b/metadata/cache/dev-texlive/texlive-langfinnish-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-finbib-2011.tar.xz mirror://gentoo/texlive-module
 http://www.tug.org/texlive/
 GPL-2 as-is public-domain
 TeXLive Finnish
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langfrench-2011 b/metadata/cache/dev-texlive/texlive-langfrench-2011
index 92ce9f9e3521..059656a09760 100644
--- a/metadata/cache/dev-texlive/texlive-langfrench-2011
+++ b/metadata/cache/dev-texlive/texlive-langfrench-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-aeguill-2011.tar.xz mirror://gentoo/texlive-modul
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 LPPL-1.3 public-domain
 TeXLive French
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langgerman-2011 b/metadata/cache/dev-texlive/texlive-langgerman-2011
index 7929f51b0d5e..d60c2f854f5d 100644
--- a/metadata/cache/dev-texlive/texlive-langgerman-2011
+++ b/metadata/cache/dev-texlive/texlive-langgerman-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-bibleref-german-2011.tar.xz mirror://gentoo/texli
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 LPPL-1.3
 TeXLive German
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langgreek-2011 b/metadata/cache/dev-texlive/texlive-langgreek-2011
index 4d8d4aeccbc0..4e8e83a5bb59 100644
--- a/metadata/cache/dev-texlive/texlive-langgreek-2011
+++ b/metadata/cache/dev-texlive/texlive-langgreek-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-betababel-2011.tar.xz mirror://gentoo/texlive-mod
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 GPL-2 LPPL-1.3 public-domain
 TeXLive Greek
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langhebrew-2011 b/metadata/cache/dev-texlive/texlive-langhebrew-2011
index 3327beccf0ab..4891de923b7e 100644
--- a/metadata/cache/dev-texlive/texlive-langhebrew-2011
+++ b/metadata/cache/dev-texlive/texlive-langhebrew-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-cjhebrew-2011.tar.xz mirror://gentoo/texlive-modu
 http://www.tug.org/texlive/
 GPL-2 LPPL-1.3
 TeXLive Hebrew
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langhungarian-2011 b/metadata/cache/dev-texlive/texlive-langhungarian-2011
index e55f889bc4fb..662407b4b90e 100644
--- a/metadata/cache/dev-texlive/texlive-langhungarian-2011
+++ b/metadata/cache/dev-texlive/texlive-langhungarian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-magyar-2011.tar.xz mirror://gentoo/texlive-module
 http://www.tug.org/texlive/
 GPL-2 GPL-1 LPPL-1.3
 TeXLive Hungarian
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langindic-2011 b/metadata/cache/dev-texlive/texlive-langindic-2011
index 58ccaa57519b..2701a5c0aca7 100644
--- a/metadata/cache/dev-texlive/texlive-langindic-2011
+++ b/metadata/cache/dev-texlive/texlive-langindic-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-bangtex-2011.tar.xz mirror://gentoo/texlive-modul
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 GPL-2 LPPL-1.3 public-domain
 TeXLive Indic scripts
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langitalian-2011 b/metadata/cache/dev-texlive/texlive-langitalian-2011
index 5a9b145ef78b..b3e4e76c04d5 100644
--- a/metadata/cache/dev-texlive/texlive-langitalian-2011
+++ b/metadata/cache/dev-texlive/texlive-langitalian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-hyphen-italian-2011.tar.xz mirror://gentoo/texliv
 http://www.tug.org/texlive/
 GPL-2 LGPL-2 LPPL-1.3
 TeXLive Italian
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langlatin-2011 b/metadata/cache/dev-texlive/texlive-langlatin-2011
index 67545513810b..330be6becf69 100644
--- a/metadata/cache/dev-texlive/texlive-langlatin-2011
+++ b/metadata/cache/dev-texlive/texlive-langlatin-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-hyphen-latin-2011.tar.xz mirror://gentoo/texlive-
 http://www.tug.org/texlive/
 GPL-2 LPPL-1.3
 TeXLive Latin
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langlatvian-2011 b/metadata/cache/dev-texlive/texlive-langlatvian-2011
index 1b34892532ee..cbe1461a33a8 100644
--- a/metadata/cache/dev-texlive/texlive-langlatvian-2011
+++ b/metadata/cache/dev-texlive/texlive-langlatvian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-hyphen-latvian-2011.tar.xz mirror://gentoo/texliv
 http://www.tug.org/texlive/
 GPL-2
 TeXLive Latvian
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langlithuanian-2011 b/metadata/cache/dev-texlive/texlive-langlithuanian-2011
index 13031f1e7f73..d8be8f526559 100644
--- a/metadata/cache/dev-texlive/texlive-langlithuanian-2011
+++ b/metadata/cache/dev-texlive/texlive-langlithuanian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lithuanian-2011.tar.xz mirror://gentoo/texlive-mo
 http://www.tug.org/texlive/
 GPL-2 LPPL-1.3
 TeXLive Lithuanian
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langmongolian-2011 b/metadata/cache/dev-texlive/texlive-langmongolian-2011
index 33c45ac93f11..f85cce7ee4a7 100644
--- a/metadata/cache/dev-texlive/texlive-langmongolian-2011
+++ b/metadata/cache/dev-texlive/texlive-langmongolian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-hyphen-mongolian-2011.tar.xz mirror://gentoo/texl
 http://www.tug.org/texlive/
 GPL-2 GPL-1 LPPL-1.3
 TeXLive Mongolian
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langnorwegian-2011 b/metadata/cache/dev-texlive/texlive-langnorwegian-2011
index 1dc01d636f81..7f64a737ac1e 100644
--- a/metadata/cache/dev-texlive/texlive-langnorwegian-2011
+++ b/metadata/cache/dev-texlive/texlive-langnorwegian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-hyphen-norwegian-2011.tar.xz mirror://gentoo/texl
 http://www.tug.org/texlive/
 GPL-2
 TeXLive Norwegian
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langother-2011 b/metadata/cache/dev-texlive/texlive-langother-2011
index 9cd5a8433e30..0175839a99ad 100644
--- a/metadata/cache/dev-texlive/texlive-langother-2011
+++ b/metadata/cache/dev-texlive/texlive-langother-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-hyphen-afrikaans-2011.tar.xz mirror://gentoo/texl
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 LPPL-1.3
 TeXLive Other hyphenation patterns
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langpolish-2011 b/metadata/cache/dev-texlive/texlive-langpolish-2011
index ecdab0fa3e96..4e7377770443 100644
--- a/metadata/cache/dev-texlive/texlive-langpolish-2011
+++ b/metadata/cache/dev-texlive/texlive-langpolish-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-cc-pl-2011.tar.xz mirror://gentoo/texlive-module-
 http://www.tug.org/texlive/
 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX
 TeXLive Polish
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langportuguese-2011 b/metadata/cache/dev-texlive/texlive-langportuguese-2011
index 79acc2561d5e..481e5345485e 100644
--- a/metadata/cache/dev-texlive/texlive-langportuguese-2011
+++ b/metadata/cache/dev-texlive/texlive-langportuguese-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-ordinalpt-2011.tar.xz mirror://gentoo/texlive-mod
 http://www.tug.org/texlive/
 GPL-2 LPPL-1.3
 TeXLive Portuguese
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langspanish-2011 b/metadata/cache/dev-texlive/texlive-langspanish-2011
index 044d0c77ed91..17fb619506e0 100644
--- a/metadata/cache/dev-texlive/texlive-langspanish-2011
+++ b/metadata/cache/dev-texlive/texlive-langspanish-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-hyphen-spanish-2011.tar.xz mirror://gentoo/texliv
 http://www.tug.org/texlive/
 GPL-2 LPPL-1.3
 TeXLive Spanish
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langswedish-2011 b/metadata/cache/dev-texlive/texlive-langswedish-2011
index 74c181422301..22cb18ef6d0c 100644
--- a/metadata/cache/dev-texlive/texlive-langswedish-2011
+++ b/metadata/cache/dev-texlive/texlive-langswedish-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-swebib-2011.tar.xz mirror://gentoo/texlive-module
 http://www.tug.org/texlive/
 GPL-2 LPPL-1.2
 TeXLive Swedish
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langtibetan-2011 b/metadata/cache/dev-texlive/texlive-langtibetan-2011
index cbb06521c856..6878fe3a3228 100644
--- a/metadata/cache/dev-texlive/texlive-langtibetan-2011
+++ b/metadata/cache/dev-texlive/texlive-langtibetan-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-ctib-2011.tar.xz mirror://gentoo/texlive-module-o
 http://www.tug.org/texlive/
 GPL-2 GPL-1
 TeXLive Tibetan
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langturkmen-2011 b/metadata/cache/dev-texlive/texlive-langturkmen-2011
index 88c57f2cc65e..76ef462768e3 100644
--- a/metadata/cache/dev-texlive/texlive-langturkmen-2011
+++ b/metadata/cache/dev-texlive/texlive-langturkmen-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-turkmen-2011.tar.xz mirror://gentoo/texlive-modul
 http://www.tug.org/texlive/
 GPL-2 LPPL-1.3
 TeXLive Turkmen
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langvietnamese-2011 b/metadata/cache/dev-texlive/texlive-langvietnamese-2011
index d78b62d6872f..554aea4be9c5 100644
--- a/metadata/cache/dev-texlive/texlive-langvietnamese-2011
+++ b/metadata/cache/dev-texlive/texlive-langvietnamese-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-vntex-2011.tar.xz mirror://gentoo/texlive-module-
 http://www.tug.org/texlive/
 GPL-2 as-is
 TeXLive Vietnamese
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-latex-2011 b/metadata/cache/dev-texlive/texlive-latex-2011
index 3455c138c78f..52c56253b751 100644
--- a/metadata/cache/dev-texlive/texlive-latex-2011
+++ b/metadata/cache/dev-texlive/texlive-latex-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-ae-2011.tar.xz mirror://gentoo/texlive-module-ams
 http://www.tug.org/texlive/
 GPL-2 GPL-2 LPPL-1.3
 TeXLive Basic LaTeX packages
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-latexextra-2011-r2 b/metadata/cache/dev-texlive/texlive-latexextra-2011-r2
index 0dfe1c283398..392097be867a 100644
--- a/metadata/cache/dev-texlive/texlive-latexextra-2011-r2
+++ b/metadata/cache/dev-texlive/texlive-latexextra-2011-r2
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-2up-2011.tar.xz mirror://gentoo/texlive-module-Ak
 http://www.tug.org/texlive/
 GPL-2 Apache-2.0 as-is GPL-1 GPL-2 GPL-3 LGPL-2 LPPL-1.2 LPPL-1.3 public-domain
 TeXLive LaTeX supplementary packages
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-latexrecommended-2011 b/metadata/cache/dev-texlive/texlive-latexrecommended-2011
index ad45350a13ed..fd72596e8281 100644
--- a/metadata/cache/dev-texlive/texlive-latexrecommended-2011
+++ b/metadata/cache/dev-texlive/texlive-latexrecommended-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-anysize-2011.tar.xz mirror://gentoo/texlive-modul
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 LPPL-1.2 LPPL-1.3 public-domain
 TeXLive LaTeX recommended packages
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-luatex-2011 b/metadata/cache/dev-texlive/texlive-luatex-2011
index a6a453368bb5..2d51b7f78031 100644
--- a/metadata/cache/dev-texlive/texlive-luatex-2011
+++ b/metadata/cache/dev-texlive/texlive-luatex-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-luacode-2011.tar.xz mirror://gentoo/texlive-modul
 http://www.tug.org/texlive/
 GPL-2 FDL-1.1 GPL-2 LPPL-1.3 public-domain
 TeXLive LuaTeX packages
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-mathextra-2011 b/metadata/cache/dev-texlive/texlive-mathextra-2011
index b842452750ff..e81d11016b07 100644
--- a/metadata/cache/dev-texlive/texlive-mathextra-2011
+++ b/metadata/cache/dev-texlive/texlive-mathextra-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-12many-2011.tar.xz mirror://gentoo/texlive-module
 http://www.tug.org/texlive/
 GPL-2 as-is BSD GPL-1 GPL-3 LGPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX
 TeXLive Advanced math typesetting
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-metapost-2011 b/metadata/cache/dev-texlive/texlive-metapost-2011
index 06c8b49cc90b..d9be5c29dcf6 100644
--- a/metadata/cache/dev-texlive/texlive-metapost-2011
+++ b/metadata/cache/dev-texlive/texlive-metapost-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-automata-2011.tar.xz mirror://gentoo/texlive-modu
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 LGPL-2 LPPL-1.3 public-domain
 TeXLive MetaPost (and Metafont) drawing packages
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-music-2011 b/metadata/cache/dev-texlive/texlive-music-2011
index 60e2994b1499..d628cbd11d6b 100644
--- a/metadata/cache/dev-texlive/texlive-music-2011
+++ b/metadata/cache/dev-texlive/texlive-music-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-abc-2011.tar.xz mirror://gentoo/texlive-module-fi
 http://www.tug.org/texlive/
 GPL-2 GPL-1 LGPL-2.1 LPPL-1.3
 TeXLive Music typesetting
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-omega-2011 b/metadata/cache/dev-texlive/texlive-omega-2011
index 59ce85ee7fe1..f9c62330aa7c 100644
--- a/metadata/cache/dev-texlive/texlive-omega-2011
+++ b/metadata/cache/dev-texlive/texlive-omega-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-antomega-2011.tar.xz mirror://gentoo/texlive-modu
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 LPPL-1.3
 TeXLive Omega
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-pictures-2011 b/metadata/cache/dev-texlive/texlive-pictures-2011
index 7e14cc702ec9..394d5c89e31f 100644
--- a/metadata/cache/dev-texlive/texlive-pictures-2011
+++ b/metadata/cache/dev-texlive/texlive-pictures-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-adjustbox-2011.tar.xz mirror://gentoo/texlive-mod
 http://www.tug.org/texlive/
 GPL-2 Apache-2.0 as-is GPL-1 GPL-3 LPPL-1.3 public-domain
 TeXLive Graphics packages and programs
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-plainextra-2011 b/metadata/cache/dev-texlive/texlive-plainextra-2011
index 1ca889f97a31..89eda26aab53 100644
--- a/metadata/cache/dev-texlive/texlive-plainextra-2011
+++ b/metadata/cache/dev-texlive/texlive-plainextra-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-figflow-2011.tar.xz mirror://gentoo/texlive-modul
 http://www.tug.org/texlive/
 GPL-2 as-is LPPL-1.3 public-domain
 TeXLive Plain TeX supplementary packages
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-pstricks-2011 b/metadata/cache/dev-texlive/texlive-pstricks-2011
index 53f7b54f1486..2ad48f864135 100644
--- a/metadata/cache/dev-texlive/texlive-pstricks-2011
+++ b/metadata/cache/dev-texlive/texlive-pstricks-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-auto-pst-pdf-2011.tar.xz mirror://gentoo/texlive-
 http://www.tug.org/texlive/
 GPL-2 GPL-1 LGPL-2 LPPL-1.3
 TeXLive PSTricks packages
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-publishers-2011 b/metadata/cache/dev-texlive/texlive-publishers-2011
index e0a641bf7bf5..63e5dbc774f5 100644
--- a/metadata/cache/dev-texlive/texlive-publishers-2011
+++ b/metadata/cache/dev-texlive/texlive-publishers-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-ANUfinalexam-2011.tar.xz mirror://gentoo/texlive-
 http://www.tug.org/texlive/
 GPL-2 Apache-2.0 as-is GPL-1 GPL-3 LPPL-1.2 LPPL-1.3 public-domain
 TeXLive Support for publishers, theses, standards, conferences, etc.
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-science-2011 b/metadata/cache/dev-texlive/texlive-science-2011
index 9b869606d380..409a1acb89b0 100644
--- a/metadata/cache/dev-texlive/texlive-science-2011
+++ b/metadata/cache/dev-texlive/texlive-science-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-SIstyle-2011.tar.xz mirror://gentoo/texlive-modul
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 LGPL-2 LPPL-1.2 LPPL-1.3 public-domain
 TeXLive Typesetting for natural and computer sciences
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-texinfo-2011 b/metadata/cache/dev-texlive/texlive-texinfo-2011
index 2117e29718e1..b95b94128884 100644
--- a/metadata/cache/dev-texlive/texlive-texinfo-2011
+++ b/metadata/cache/dev-texlive/texlive-texinfo-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-texinfo-2011.tar.xz mirror://gentoo/texlive-modul
 http://www.tug.org/texlive/
 GPL-2 GPL-1
 TeXLive GNU Texinfo
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-xetex-2011 b/metadata/cache/dev-texlive/texlive-xetex-2011
index 6deeea0f4dd7..16b4547f43d3 100644
--- a/metadata/cache/dev-texlive/texlive-xetex-2011
+++ b/metadata/cache/dev-texlive/texlive-xetex-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-arabxetex-2011.tar.xz mirror://gentoo/texlive-mod
 http://www.tug.org/texlive/
 GPL-2 Apache-2.0 GPL-1 LPPL-1.3 OFL public-domain
 TeXLive XeTeX packages
-~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 ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils font multilib portability texlive-common texlive-module toolchain-funcs user
 X source doc
 
diff --git a/metadata/cache/dev-util/gdbus-codegen-2.30.1 b/metadata/cache/dev-util/gdbus-codegen-2.30.1
deleted file mode 100644
index 98c28fb8ad41..000000000000
--- a/metadata/cache/dev-util/gdbus-codegen-2.30.1
+++ /dev/null
@@ -1,22 +0,0 @@
-app-arch/xz-utils >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] )
->=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] )
-0
-mirror://gnome/sources/glib/2.30/glib-2.30.1.tar.xz
-
-http://www.gtk.org/
-LGPL-2
-GDBus code and documentation generator
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux
-eutils gnome.org multilib portability python toolchain-funcs user versionator
-
-
->=dev-libs/glib-2.30.1:2
-
-4
-
-install postinst postrm prepare setup test
-
-
-
-
-
diff --git a/metadata/cache/dev-util/intltool-0.50.0 b/metadata/cache/dev-util/intltool-0.50.0
index e53a41ade045..66af23965c68 100644
--- a/metadata/cache/dev-util/intltool-0.50.0
+++ b/metadata/cache/dev-util/intltool-0.50.0
@@ -6,7 +6,7 @@ http://edge.launchpad.net/intltool/trunk/0.50.0/+download/intltool-0.50.0.tar.gz
 http://edge.launchpad.net/intltool/
 GPL-2
 Internationalization Tool Collection
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 
 
 
diff --git a/metadata/cache/dev-util/kdbg-2.5.1 b/metadata/cache/dev-util/kdbg-2.5.1
index 137286e5db99..281729a4bc94 100644
--- a/metadata/cache/dev-util/kdbg-2.5.1
+++ b/metadata/cache/dev-util/kdbg-2.5.1
@@ -8,7 +8,7 @@ GPL-2
 A graphical debugger interface
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-linguas_cs linguas_da linguas_de linguas_es linguas_fr linguas_hr linguas_hu linguas_it linguas_ja linguas_nb linguas_nn linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_tr linguas_zh_CN +handbook aqua kdeenablefinal
+linguas_cs linguas_da linguas_de linguas_es linguas_fr linguas_hr linguas_hu linguas_it linguas_ja linguas_nb linguas_nn linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_tr linguas_zh_CN +handbook aqua
 
 
 
diff --git a/metadata/cache/dev-util/kdevelop-4.2.2 b/metadata/cache/dev-util/kdevelop-4.2.2
index ec47a2107334..58de23dde86c 100644
--- a/metadata/cache/dev-util/kdevelop-4.2.2
+++ b/metadata/cache/dev-util/kdevelop-4.2.2
@@ -8,7 +8,7 @@ GPL-2 LGPL-2
 Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages.
 amd64 ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-+cmake +cxx debug okteta +qmake qthelp linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_fr linguas_it linguas_nb linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_sv linguas_th linguas_uk linguas_zh_CN linguas_zh_TW test aqua kdeenablefinal
++cmake +cxx debug okteta +qmake qthelp linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_fr linguas_it linguas_nb linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_sv linguas_th linguas_uk linguas_zh_CN linguas_zh_TW test aqua
 
 
 
diff --git a/metadata/cache/dev-util/kdevelop-4.2.3 b/metadata/cache/dev-util/kdevelop-4.2.3
index 81bfdf634f44..f0cd7f01750b 100644
--- a/metadata/cache/dev-util/kdevelop-4.2.3
+++ b/metadata/cache/dev-util/kdevelop-4.2.3
@@ -8,7 +8,7 @@ GPL-2 LGPL-2
 Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages.
 ~amd64 ~ppc ~ppc64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-+cmake +cxx debug okteta +qmake qthelp linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_fr linguas_it linguas_nb linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_sv linguas_th linguas_uk linguas_zh_CN linguas_zh_TW test aqua kdeenablefinal
++cmake +cxx debug okteta +qmake qthelp linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_fr linguas_it linguas_nb linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_sv linguas_th linguas_uk linguas_zh_CN linguas_zh_TW test aqua
 
 
 
diff --git a/metadata/cache/dev-util/kdevelop-pg-qt-0.9.5 b/metadata/cache/dev-util/kdevelop-pg-qt-0.9.5
index e4e234492802..36c593f021ca 100644
--- a/metadata/cache/dev-util/kdevelop-pg-qt-0.9.5
+++ b/metadata/cache/dev-util/kdevelop-pg-qt-0.9.5
@@ -8,7 +8,7 @@ LGPL-2
 A LL(1) parser generator used mainly by KDevelop language plugins
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/dev-util/kdevelop-php-1.0.2 b/metadata/cache/dev-util/kdevelop-php-1.0.2
index cd3ea5d14de2..50645de624a8 100644
--- a/metadata/cache/dev-util/kdevelop-php-1.0.2
+++ b/metadata/cache/dev-util/kdevelop-php-1.0.2
@@ -8,7 +8,7 @@ GPL-2 LGPL-2
 PHP plugin for KDevelop 4
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug doc linguas_ca linguas_ca@valencia linguas_da linguas_en_GB linguas_es linguas_et linguas_fr linguas_gl linguas_it linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_sv linguas_th linguas_uk linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
+debug doc linguas_ca linguas_ca@valencia linguas_da linguas_en_GB linguas_es linguas_et linguas_fr linguas_gl linguas_it linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_sv linguas_th linguas_uk linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/dev-util/kdevelop-php-1.2.0 b/metadata/cache/dev-util/kdevelop-php-1.2.0
index 5098e7873d41..c6d02cdfc1da 100644
--- a/metadata/cache/dev-util/kdevelop-php-1.2.0
+++ b/metadata/cache/dev-util/kdevelop-php-1.2.0
@@ -8,7 +8,7 @@ GPL-2 LGPL-2
 PHP plugin for KDevelop 4
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug doc linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_fr linguas_it linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_sv linguas_th linguas_uk linguas_zh_CN linguas_zh_TW test aqua kdeenablefinal
+debug doc linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_fr linguas_it linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_sv linguas_th linguas_uk linguas_zh_CN linguas_zh_TW test aqua
 
 
 
diff --git a/metadata/cache/dev-util/kdevelop-php-1.2.3 b/metadata/cache/dev-util/kdevelop-php-1.2.3
index e88847f0c02e..3eb5fa76d4ec 100644
--- a/metadata/cache/dev-util/kdevelop-php-1.2.3
+++ b/metadata/cache/dev-util/kdevelop-php-1.2.3
@@ -8,7 +8,7 @@ GPL-2 LGPL-2
 PHP plugin for KDevelop 4
 amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug doc linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_fr linguas_it linguas_nb linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_sv linguas_th linguas_uk linguas_zh_CN linguas_zh_TW test aqua kdeenablefinal
+debug doc linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_fr linguas_it linguas_nb linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_sv linguas_th linguas_uk linguas_zh_CN linguas_zh_TW test aqua
 
 
 
diff --git a/metadata/cache/dev-util/kdevelop-php-docs-1.0.2 b/metadata/cache/dev-util/kdevelop-php-docs-1.0.2
index 78051882cc6f..36bcafc57911 100644
--- a/metadata/cache/dev-util/kdevelop-php-docs-1.0.2
+++ b/metadata/cache/dev-util/kdevelop-php-docs-1.0.2
@@ -8,7 +8,7 @@ GPL-2 LGPL-2
 PHP documentation plugin for KDevelop 4
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_ca linguas_ca@valencia linguas_da linguas_en_GB linguas_es linguas_et linguas_fr linguas_gl linguas_it linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_sv linguas_uk linguas_zh_TW aqua kdeenablefinal
+debug linguas_ca linguas_ca@valencia linguas_da linguas_en_GB linguas_es linguas_et linguas_fr linguas_gl linguas_it linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_sv linguas_uk linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/dev-util/kdevelop-php-docs-1.2.0 b/metadata/cache/dev-util/kdevelop-php-docs-1.2.0
index e1aae3fd051e..21ca36b2543c 100644
--- a/metadata/cache/dev-util/kdevelop-php-docs-1.2.0
+++ b/metadata/cache/dev-util/kdevelop-php-docs-1.2.0
@@ -8,7 +8,7 @@ GPL-2 LGPL-2
 PHP documentation plugin for KDevelop 4
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_fr linguas_gl linguas_it linguas_nb linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_ru linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
+debug linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_fr linguas_gl linguas_it linguas_nb linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_ru linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/dev-util/kdevelop-php-docs-1.2.3 b/metadata/cache/dev-util/kdevelop-php-docs-1.2.3
index 2cb6f154182d..cbff4010b357 100644
--- a/metadata/cache/dev-util/kdevelop-php-docs-1.2.3
+++ b/metadata/cache/dev-util/kdevelop-php-docs-1.2.3
@@ -8,7 +8,7 @@ GPL-2 LGPL-2
 PHP documentation plugin for KDevelop 4
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_fr linguas_gl linguas_it linguas_nb linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_ru linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
+debug linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_fr linguas_gl linguas_it linguas_nb linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_ru linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/dev-util/kdevplatform-1.2.2 b/metadata/cache/dev-util/kdevplatform-1.2.2
index c048decfbc30..11da7781da62 100644
--- a/metadata/cache/dev-util/kdevplatform-1.2.2
+++ b/metadata/cache/dev-util/kdevplatform-1.2.2
@@ -8,7 +8,7 @@ GPL-2 LGPL-2
 KDE development support libraries and apps
 amd64 ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-cvs debug git reviewboard subversion linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_fr linguas_it linguas_nb linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_sv linguas_th linguas_uk linguas_zh_CN linguas_zh_TW test aqua kdeenablefinal
+cvs debug git reviewboard subversion linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_fr linguas_it linguas_nb linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_sv linguas_th linguas_uk linguas_zh_CN linguas_zh_TW test aqua
 
 
 
diff --git a/metadata/cache/dev-util/kdevplatform-1.2.3 b/metadata/cache/dev-util/kdevplatform-1.2.3
index 515cbb61d899..3f72fea3b18f 100644
--- a/metadata/cache/dev-util/kdevplatform-1.2.3
+++ b/metadata/cache/dev-util/kdevplatform-1.2.3
@@ -8,7 +8,7 @@ GPL-2 LGPL-2
 KDE development support libraries and apps
 ~amd64 ~ppc ~ppc64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-cvs debug git reviewboard subversion linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_fr linguas_it linguas_nb linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_sv linguas_th linguas_uk linguas_zh_CN linguas_zh_TW test aqua kdeenablefinal
+cvs debug git reviewboard subversion linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_fr linguas_it linguas_nb linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_sv linguas_th linguas_uk linguas_zh_CN linguas_zh_TW test aqua
 
 
 
diff --git a/metadata/cache/dev-util/kdevplatform-1.2.3-r1 b/metadata/cache/dev-util/kdevplatform-1.2.3-r1
index 646e5d3404a9..5f54edfdce46 100644
--- a/metadata/cache/dev-util/kdevplatform-1.2.3-r1
+++ b/metadata/cache/dev-util/kdevplatform-1.2.3-r1
@@ -8,7 +8,7 @@ GPL-2 LGPL-2
 KDE development support libraries and apps
 ~amd64 ~ppc ~ppc64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-cvs debug git reviewboard subversion linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_fr linguas_it linguas_nb linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_sv linguas_th linguas_uk linguas_zh_CN linguas_zh_TW test aqua kdeenablefinal
+cvs debug git reviewboard subversion linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_fr linguas_it linguas_nb linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_sv linguas_th linguas_uk linguas_zh_CN linguas_zh_TW test aqua
 
 
 
diff --git a/metadata/cache/dev-vcs/kdesvn-1.5.5 b/metadata/cache/dev-vcs/kdesvn-1.5.5
index 38597bb9fe31..7f493eced936 100644
--- a/metadata/cache/dev-vcs/kdesvn-1.5.5
+++ b/metadata/cache/dev-vcs/kdesvn-1.5.5
@@ -8,7 +8,7 @@ GPL-2
 KDESvn is a frontend to the subversion vcs.
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook linguas_de linguas_es linguas_fr linguas_ja linguas_lt linguas_pt_BR linguas_ro aqua kdeenablefinal
+debug +handbook linguas_de linguas_es linguas_fr linguas_ja linguas_lt linguas_pt_BR linguas_ro aqua
 
 
 
diff --git a/metadata/cache/games-arcade/fishsupper-0.1.6 b/metadata/cache/games-arcade/fishsupper-0.1.6
new file mode 100644
index 000000000000..f5d07d140ec4
--- /dev/null
+++ b/metadata/cache/games-arcade/fishsupper-0.1.6
@@ -0,0 +1,22 @@
+media-libs/libsdl[audio,video,opengl,X] media-libs/sdl-image[png] media-libs/sdl-mixer[wav] virtual/opengl dev-libs/boost
+media-libs/libsdl[audio,video,opengl,X] media-libs/sdl-image[png] media-libs/sdl-mixer[wav] virtual/opengl
+0
+mirror://sourceforge/fishsupper/fishsupper-0.1.6.tar.gz
+
+http://sourceforge.net/projects/fishsupper/
+CCPL-Attribution-ShareAlike-2.5 GPL-3
+A simple arcade/puzzle game, loosely based on the retro classic Frogger
+~amd64 ~x86
+base eutils games multilib portability toolchain-funcs user
+
+
+
+
+2
+
+compile configure install postinst preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/games-board/kaya-0.4 b/metadata/cache/games-board/kaya-0.4
index c3e4eabf947e..b5efa2f13d53 100644
--- a/metadata/cache/games-board/kaya-0.4
+++ b/metadata/cache/games-board/kaya-0.4
@@ -8,7 +8,7 @@ GPL-2
 Board game suite for KDE
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils java-utils-2 kde4-base kde4-functions multilib portability ruby-ng toolchain-funcs user versionator virtualx
-test test aqua kdeenablefinal elibc_FreeBSD ruby_targets_ruby18
+test test aqua elibc_FreeBSD ruby_targets_ruby18
 || ( ruby_targets_ruby18 )
 
 
diff --git a/metadata/cache/games-board/knights-2.3.2 b/metadata/cache/games-board/knights-2.3.2
index 8ae6f54df48a..921d7ae51ed6 100644
--- a/metadata/cache/games-board/knights-2.3.2
+++ b/metadata/cache/games-board/knights-2.3.2
@@ -8,7 +8,7 @@ GPL-3
 A simple chess board for KDE
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_hu linguas_it linguas_ja linguas_lt linguas_ml linguas_ms linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_uk linguas_zh_TW +handbook aqua kdeenablefinal
+debug linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_hu linguas_it linguas_ja linguas_lt linguas_ml linguas_ms linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_uk linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/games-board/knights-2.4.0 b/metadata/cache/games-board/knights-2.4.0
index 928d6e64bfad..2d0601d5bd0f 100644
--- a/metadata/cache/games-board/knights-2.4.0
+++ b/metadata/cache/games-board/knights-2.4.0
@@ -8,7 +8,7 @@ GPL-3
 A simple chess board for KDE
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_hu linguas_it linguas_ja linguas_lt linguas_ml linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sr@latin linguas_sv linguas_uk linguas_zh_TW +handbook aqua kdeenablefinal
+debug linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_hu linguas_it linguas_ja linguas_lt linguas_ml linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sr@latin linguas_sv linguas_uk linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/games-mud/crystal-0.2.4 b/metadata/cache/games-mud/crystal-0.2.4
index f8feb9b0f368..f4cad00658a3 100644
--- a/metadata/cache/games-mud/crystal-0.2.4
+++ b/metadata/cache/games-mud/crystal-0.2.4
@@ -6,7 +6,7 @@ http://www.evilmagic.org/dist/crystal-0.2.4.tar.gz
 http://www.evilmagic.org/crystal/
 GPL-2
 The crystal MUD client
-~amd64 ~ppc ~x86
+amd64 ~ppc ~x86
 base eutils games multilib portability toolchain-funcs user
 
 
diff --git a/metadata/cache/games-mud/kmuddy-1.0.1-r1 b/metadata/cache/games-mud/kmuddy-1.0.1-r1
index e5ca73fa3419..698f8c861980 100644
--- a/metadata/cache/games-mud/kmuddy-1.0.1-r1
+++ b/metadata/cache/games-mud/kmuddy-1.0.1-r1
@@ -8,7 +8,7 @@ GPL-2
 MUD client for KDE
 ~amd64 ~ppc ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_es +handbook aqua kdeenablefinal
+debug linguas_es +handbook aqua
 
 
 
diff --git a/metadata/cache/games-mud/trebuchet-1.075 b/metadata/cache/games-mud/trebuchet-1.075
index 21d666d53f2e..5f08824ee590 100644
--- a/metadata/cache/games-mud/trebuchet-1.075
+++ b/metadata/cache/games-mud/trebuchet-1.075
@@ -6,7 +6,7 @@ test
 http://belfry.com/fuzzball/trebuchet/
 GPL-2
 A crossplatform TCL/TK based MUD client
-~amd64 ~ppc ~x86
+amd64 ~ppc ~x86
 base eutils games multilib portability toolchain-funcs user
 
 
diff --git a/metadata/cache/games-puzzle/kmagnet-0.10 b/metadata/cache/games-puzzle/kmagnet-0.10
index 44f274caaa6f..7bb25d3ca605 100644
--- a/metadata/cache/games-puzzle/kmagnet-0.10
+++ b/metadata/cache/games-puzzle/kmagnet-0.10
@@ -8,7 +8,7 @@ GPL-3
 A simple puzzle game
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook linguas_ca linguas_cs aqua kdeenablefinal
+debug +handbook linguas_ca linguas_cs aqua
 
 
 
diff --git a/metadata/cache/games-puzzle/krosswordpuzzle-0.15.6.2.1259326 b/metadata/cache/games-puzzle/krosswordpuzzle-0.15.6.2.1259326
index c5ae32f80673..ec42c9957aaf 100644
--- a/metadata/cache/games-puzzle/krosswordpuzzle-0.15.6.2.1259326
+++ b/metadata/cache/games-puzzle/krosswordpuzzle-0.15.6.2.1259326
@@ -8,7 +8,7 @@ GPL-2
 Crossword playing game and editor for KDE 4
 ~amd64
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/games-strategy/lightyears-1.4 b/metadata/cache/games-strategy/lightyears-1.4
index 98fa3f7e4c22..c472a5e42f17 100644
--- a/metadata/cache/games-strategy/lightyears-1.4
+++ b/metadata/cache/games-strategy/lightyears-1.4
@@ -6,7 +6,7 @@ http://www.jwhitham.org.uk/20kly/lightyears-1.4.tar.bz2
 http://www.jwhitham.org.uk/20kly/
 GPL-2
 a single-player game with a science-fiction theme
-~amd64 ~x86
+amd64 ~x86
 base eutils games multilib portability python toolchain-funcs user
 
 
diff --git a/metadata/cache/kde-base/activitymanager-4.6.3 b/metadata/cache/kde-base/activitymanager-4.6.3
index 63436fab880b..52758177922b 100644
--- a/metadata/cache/kde-base/activitymanager-4.6.3
+++ b/metadata/cache/kde-base/activitymanager-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Activity manager
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug semantic-desktop kdeprefix aqua kdeenablefinal
+debug semantic-desktop kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/activitymanager-4.7.3 b/metadata/cache/kde-base/activitymanager-4.7.3
deleted file mode 100644
index b1a55bb4c36f..000000000000
--- a/metadata/cache/kde-base/activitymanager-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdelibs-4.7.3:4[aqua=,semantic-desktop=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/kdelibs-4.7.3:4[aqua=,semantic-desktop=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Activity manager
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug semantic-desktop aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/activitymanager-4.7.4 b/metadata/cache/kde-base/activitymanager-4.7.4
index 314be9991a57..2e6e3f7b8924 100644
--- a/metadata/cache/kde-base/activitymanager-4.7.4
+++ b/metadata/cache/kde-base/activitymanager-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Activity manager
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug semantic-desktop aqua kdeenablefinal
+debug semantic-desktop aqua
 
 
 
diff --git a/metadata/cache/kde-base/akonadi-4.4.11.1 b/metadata/cache/kde-base/akonadi-4.4.11.1
index 39bd43ebe8df..1d67ab25bc93 100644
--- a/metadata/cache/kde-base/akonadi-4.4.11.1
+++ b/metadata/cache/kde-base/akonadi-4.4.11.1
@@ -8,7 +8,7 @@ GPL-2
 An extensible cross-desktop storage service for PIM data and meta data
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/akonadiconsole-4.7.3 b/metadata/cache/kde-base/akonadiconsole-4.7.3
deleted file mode 100644
index 773fad4cfe6e..000000000000
--- a/metadata/cache/kde-base/akonadiconsole-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdepim-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Akonadi developer console
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/akonadiconsole-4.7.4 b/metadata/cache/kde-base/akonadiconsole-4.7.4
index f2737ea6a0b5..efa0f4727206 100644
--- a/metadata/cache/kde-base/akonadiconsole-4.7.4
+++ b/metadata/cache/kde-base/akonadiconsole-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Akonadi developer console
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/akregator-4.4.11.1 b/metadata/cache/kde-base/akregator-4.4.11.1
index 2ac8c58eec2b..4cc946b2a462 100644
--- a/metadata/cache/kde-base/akregator-4.4.11.1
+++ b/metadata/cache/kde-base/akregator-4.4.11.1
@@ -8,7 +8,7 @@ GPL-2
 KDE news feed aggregator.
 ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook kdeprefix aqua kdeenablefinal +kontact
+debug +handbook kdeprefix aqua +kontact
 
 
 
diff --git a/metadata/cache/kde-base/akregator-4.4.11.1-r1 b/metadata/cache/kde-base/akregator-4.4.11.1-r1
index a921ffb74bff..8dc3a6e4e0f1 100644
--- a/metadata/cache/kde-base/akregator-4.4.11.1-r1
+++ b/metadata/cache/kde-base/akregator-4.4.11.1-r1
@@ -8,7 +8,7 @@ GPL-2
 KDE news feed aggregator.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook kdeprefix aqua kdeenablefinal +kontact
+debug +handbook kdeprefix aqua +kontact
 
 
 
diff --git a/metadata/cache/kde-base/akregator-4.7.3 b/metadata/cache/kde-base/akregator-4.7.3
deleted file mode 100644
index b6791177908a..000000000000
--- a/metadata/cache/kde-base/akregator-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.3:4[aqua=] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/kdepimlibs-4.7.3:4[aqua=] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] kontact? ( >=kde-base/kontact-4.7.3:4[aqua=] )
-4
-mirror://kde/stable/4.7.3/src/kdepim-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE news feed aggregator.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal +kontact
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/akregator-4.7.4 b/metadata/cache/kde-base/akregator-4.7.4
index 831c765019e1..cf476928a555 100644
--- a/metadata/cache/kde-base/akregator-4.7.4
+++ b/metadata/cache/kde-base/akregator-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE news feed aggregator.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal +kontact
+debug +handbook aqua +kontact
 
 
 
diff --git a/metadata/cache/kde-base/amor-4.6.3 b/metadata/cache/kde-base/amor-4.6.3
index 18c75b36c4d7..2cd49072ae02 100644
--- a/metadata/cache/kde-base/amor-4.6.3
+++ b/metadata/cache/kde-base/amor-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: Amusing Misuse Of Resources - desktop-dwelling creature
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/amor-4.7.3 b/metadata/cache/kde-base/amor-4.7.3
deleted file mode 100644
index 27923c0657e4..000000000000
--- a/metadata/cache/kde-base/amor-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdetoys-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: Amusing Misuse Of Resources - desktop-dwelling creature
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/amor-4.7.4 b/metadata/cache/kde-base/amor-4.7.4
index de43f1788d3d..2bdbe4febf72 100644
--- a/metadata/cache/kde-base/amor-4.7.4
+++ b/metadata/cache/kde-base/amor-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: Amusing Misuse Of Resources - desktop-dwelling creature
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/ark-4.6.3-r1 b/metadata/cache/kde-base/ark-4.6.3-r1
index 2136a94d3d02..9daeebf9b900 100644
--- a/metadata/cache/kde-base/ark-4.6.3-r1
+++ b/metadata/cache/kde-base/ark-4.6.3-r1
@@ -8,7 +8,7 @@ GPL-2
 KDE Archiving tool
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-+archive +bzip2 debug lzma kdeprefix +handbook aqua kdeenablefinal
++archive +bzip2 debug lzma kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/ark-4.7.3 b/metadata/cache/kde-base/ark-4.7.3
deleted file mode 100644
index 9ff4c715ff44..000000000000
--- a/metadata/cache/kde-base/ark-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkonq-4.7.3:4[aqua=] sys-libs/zlib archive? ( >=app-arch/libarchive-2.6.1[bzip2?,lzma?,zlib] ) lzma? ( app-arch/xz-utils ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/libkonq-4.7.3:4[aqua=] sys-libs/zlib archive? ( >=app-arch/libarchive-2.6.1[bzip2?,lzma?,zlib] ) lzma? ( app-arch/xz-utils ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeutils-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Archiving tool
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-+archive +bzip2 debug lzma +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/ark-4.7.4 b/metadata/cache/kde-base/ark-4.7.4
index 8fcb3f22fc70..07825277ede7 100644
--- a/metadata/cache/kde-base/ark-4.7.4
+++ b/metadata/cache/kde-base/ark-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Archiving tool
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-+archive +bzip2 debug lzma +handbook aqua kdeenablefinal
++archive +bzip2 debug lzma +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/attica-4.6.3 b/metadata/cache/kde-base/attica-4.6.3
index fa393fd87d5f..c6136c8d3948 100644
--- a/metadata/cache/kde-base/attica-4.6.3
+++ b/metadata/cache/kde-base/attica-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Open Collaboration Services provider management
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/attica-4.7.3 b/metadata/cache/kde-base/attica-4.7.3
deleted file mode 100644
index 3e31b302f6c8..000000000000
--- a/metadata/cache/kde-base/attica-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/libattica-0.1.4 >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=dev-libs/libattica-0.1.4 >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Open Collaboration Services provider management
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/attica-4.7.4 b/metadata/cache/kde-base/attica-4.7.4
index 5d4b27a270e0..cf1295f76206 100644
--- a/metadata/cache/kde-base/attica-4.7.4
+++ b/metadata/cache/kde-base/attica-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Open Collaboration Services provider management
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/blinken-4.6.3 b/metadata/cache/kde-base/blinken-4.6.3
index e28aee4ff6c7..5090b7f78a83 100644
--- a/metadata/cache/kde-base/blinken-4.6.3
+++ b/metadata/cache/kde-base/blinken-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE version of the Simon Says game.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/blinken-4.7.3 b/metadata/cache/kde-base/blinken-4.7.3
deleted file mode 100644
index a717266ca51e..000000000000
--- a/metadata/cache/kde-base/blinken-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkdeedu-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/libkdeedu-4.7.3:4[aqua=] >=kde-base/knotify-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/blinken-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE version of the Simon Says game.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/blinken-4.7.4 b/metadata/cache/kde-base/blinken-4.7.4
index d8d9258f96bb..7268648e70a9 100644
--- a/metadata/cache/kde-base/blinken-4.7.4
+++ b/metadata/cache/kde-base/blinken-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE version of the Simon Says game.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/blogilo-4.4.11.1 b/metadata/cache/kde-base/blogilo-4.4.11.1
index 872c75a0f237..2ccc5e403067 100644
--- a/metadata/cache/kde-base/blogilo-4.4.11.1
+++ b/metadata/cache/kde-base/blogilo-4.4.11.1
@@ -8,7 +8,7 @@ GPL-2
 KDE Blogging Client
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook kdeprefix aqua kdeenablefinal
+debug +handbook kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/blogilo-4.7.3 b/metadata/cache/kde-base/blogilo-4.7.3
deleted file mode 100644
index 68d0ed2c63b1..000000000000
--- a/metadata/cache/kde-base/blogilo-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/kdepimlibs-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdepim-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Blogging Client
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/blogilo-4.7.4 b/metadata/cache/kde-base/blogilo-4.7.4
index bbdac24b695d..fe2bac8f33c6 100644
--- a/metadata/cache/kde-base/blogilo-4.7.4
+++ b/metadata/cache/kde-base/blogilo-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Blogging Client
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/bomber-4.6.3 b/metadata/cache/kde-base/bomber-4.6.3
index 533d4b9a06e8..5a8df66e55d0 100644
--- a/metadata/cache/kde-base/bomber-4.6.3
+++ b/metadata/cache/kde-base/bomber-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE arcade bombing game
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/bomber-4.7.3 b/metadata/cache/kde-base/bomber-4.7.3
deleted file mode 100644
index 09b9effa57e5..000000000000
--- a/metadata/cache/kde-base/bomber-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE arcade bombing game
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/bomber-4.7.4 b/metadata/cache/kde-base/bomber-4.7.4
index 07c1c2791865..c97089d9f938 100644
--- a/metadata/cache/kde-base/bomber-4.7.4
+++ b/metadata/cache/kde-base/bomber-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE arcade bombing game
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/bovo-4.6.3 b/metadata/cache/kde-base/bovo-4.6.3
index 96d8d1c770ec..804d7b38de59 100644
--- a/metadata/cache/kde-base/bovo-4.6.3
+++ b/metadata/cache/kde-base/bovo-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Five-in-a-row Board Game
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/bovo-4.7.3 b/metadata/cache/kde-base/bovo-4.7.3
deleted file mode 100644
index cd62c69218a1..000000000000
--- a/metadata/cache/kde-base/bovo-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Five-in-a-row Board Game
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/bovo-4.7.4 b/metadata/cache/kde-base/bovo-4.7.4
index a7f4b4d33ecb..63440f5a9d9b 100644
--- a/metadata/cache/kde-base/bovo-4.7.4
+++ b/metadata/cache/kde-base/bovo-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Five-in-a-row Board Game
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/cantor-4.6.3 b/metadata/cache/kde-base/cantor-4.6.3
index f1a43faa5217..99bec8fcedbc 100644
--- a/metadata/cache/kde-base/cantor-4.6.3
+++ b/metadata/cache/kde-base/cantor-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE4 interface for doing mathematics and scientific computing
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug ps +R kdeprefix +handbook aqua kdeenablefinal
+debug ps +R kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/cantor-4.7.3 b/metadata/cache/kde-base/cantor-4.7.3
deleted file mode 100644
index ba56d8b98e7b..000000000000
--- a/metadata/cache/kde-base/cantor-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-ps? ( app-text/libspectre ) R? ( dev-lang/R ) >=dev-cpp/eigen-2.0.3:2 >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-ps? ( app-text/libspectre ) R? ( dev-lang/R ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/cantor-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-KDE4 interface for doing mathematics and scientific computing
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug ps +R +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/cantor-4.7.4 b/metadata/cache/kde-base/cantor-4.7.4
index e7d73ba2c204..0cbb079f0d8d 100644
--- a/metadata/cache/kde-base/cantor-4.7.4
+++ b/metadata/cache/kde-base/cantor-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE4 interface for doing mathematics and scientific computing
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug ps +R +handbook aqua kdeenablefinal
+debug ps +R +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/cervisia-4.6.3 b/metadata/cache/kde-base/cervisia-4.6.3
index 3f23920a8b8d..5c8519496d34 100644
--- a/metadata/cache/kde-base/cervisia-4.6.3
+++ b/metadata/cache/kde-base/cervisia-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Cervisia - A KDE CVS frontend
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/cervisia-4.7.3 b/metadata/cache/kde-base/cervisia-4.7.3
deleted file mode 100644
index b3ed342a1f84..000000000000
--- a/metadata/cache/kde-base/cervisia-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-dev-vcs/cvs >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdesdk-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Cervisia - A KDE CVS frontend
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/cervisia-4.7.4 b/metadata/cache/kde-base/cervisia-4.7.4
index e93232acad41..4f213ab4fd9b 100644
--- a/metadata/cache/kde-base/cervisia-4.7.4
+++ b/metadata/cache/kde-base/cervisia-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Cervisia - A KDE CVS frontend
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/dolphin-4.6.3 b/metadata/cache/kde-base/dolphin-4.6.3
index 0a355b2838be..02bebc95b907 100644
--- a/metadata/cache/kde-base/dolphin-4.6.3
+++ b/metadata/cache/kde-base/dolphin-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 A KDE filemanager focusing on usability
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug semantic-desktop thumbnail kdeprefix +handbook aqua kdeenablefinal
+debug semantic-desktop thumbnail kdeprefix +handbook aqua
 
 thumbnail? ( >=kde-base/thumbnailers-4.6.3:4[aqua=] || ( >=kde-base/ffmpegthumbs-4.6.3:4[aqua=] >=kde-base/mplayerthumbs-4.6.3:4[aqua=] ) )
 
diff --git a/metadata/cache/kde-base/dolphin-4.7.3 b/metadata/cache/kde-base/dolphin-4.7.3
deleted file mode 100644
index 433e9d593405..000000000000
--- a/metadata/cache/kde-base/dolphin-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdelibs-4.7.3:4[aqua=,semantic-desktop=] >=kde-base/libkonq-4.7.3:4[aqua=] semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.2 ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/kdelibs-4.7.3:4[aqua=,semantic-desktop=] >=kde-base/libkonq-4.7.3:4[aqua=] semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.2 ) >=kde-base/kfind-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-baseapps-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-A KDE filemanager focusing on usability
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug semantic-desktop thumbnail +handbook aqua kdeenablefinal
-
-thumbnail? ( >=kde-base/thumbnailers-4.7.3:4[aqua=] || ( >=kde-base/ffmpegthumbs-4.7.3:4[aqua=] >=kde-base/mplayerthumbs-4.7.3:4[aqua=] ) )
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/dolphin-4.7.4 b/metadata/cache/kde-base/dolphin-4.7.4
index d8541464a3f1..c1442284820f 100644
--- a/metadata/cache/kde-base/dolphin-4.7.4
+++ b/metadata/cache/kde-base/dolphin-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 A KDE filemanager focusing on usability
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug semantic-desktop thumbnail +handbook aqua kdeenablefinal
+debug semantic-desktop thumbnail +handbook aqua
 
 thumbnail? ( >=kde-base/thumbnailers-4.7.4:4[aqua=] || ( >=kde-base/ffmpegthumbs-4.7.4:4[aqua=] >=kde-base/mplayerthumbs-4.7.4:4[aqua=] ) )
 
diff --git a/metadata/cache/kde-base/dolphin-plugins-4.6.3 b/metadata/cache/kde-base/dolphin-plugins-4.6.3
index 2375d797b21d..b22018bcca27 100644
--- a/metadata/cache/kde-base/dolphin-plugins-4.6.3
+++ b/metadata/cache/kde-base/dolphin-plugins-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Extra Dolphin plugins
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +git +subversion kdeprefix aqua kdeenablefinal
+debug +git +subversion kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/dolphin-plugins-4.7.3 b/metadata/cache/kde-base/dolphin-plugins-4.7.3
deleted file mode 100644
index 43515233589d..000000000000
--- a/metadata/cache/kde-base/dolphin-plugins-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkonq-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/libkonq-4.7.3:4[aqua=] >=kde-base/kompare-4.7.3:4[aqua=] git? ( dev-vcs/git ) subversion? ( dev-vcs/subversion ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdesdk-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Extra Dolphin plugins
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +git +subversion aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/dolphin-plugins-4.7.4 b/metadata/cache/kde-base/dolphin-plugins-4.7.4
index ced6e7ba9160..0c482028d097 100644
--- a/metadata/cache/kde-base/dolphin-plugins-4.7.4
+++ b/metadata/cache/kde-base/dolphin-plugins-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Extra Dolphin plugins
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +git +subversion aqua kdeenablefinal
+debug +git +subversion aqua
 
 
 
diff --git a/metadata/cache/kde-base/dragonplayer-4.6.3 b/metadata/cache/kde-base/dragonplayer-4.6.3
index ab2a9972f026..dfbdd722d0e6 100644
--- a/metadata/cache/kde-base/dragonplayer-4.6.3
+++ b/metadata/cache/kde-base/dragonplayer-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Dragon Player is a simple video player for KDE 4
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug xine kdeprefix +handbook aqua kdeenablefinal
+debug xine kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/dragonplayer-4.7.3 b/metadata/cache/kde-base/dragonplayer-4.7.3
deleted file mode 100644
index 53fe59ed56ef..000000000000
--- a/metadata/cache/kde-base/dragonplayer-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=media-libs/phonon-4.4.3 xine? ( media-libs/xine-lib[xcb] ) sys-devel/gettext >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=media-libs/phonon-4.4.3 xine? ( media-libs/xine-lib[xcb] ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdemultimedia-4.7.3.tar.bz2
-
-http://www.dragonplayer.net/
-GPL-2
-Dragon Player is a simple video player for KDE 4
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug xine +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/dragonplayer-4.7.4 b/metadata/cache/kde-base/dragonplayer-4.7.4
index 872d8fa32aa0..d102cf0b7776 100644
--- a/metadata/cache/kde-base/dragonplayer-4.7.4
+++ b/metadata/cache/kde-base/dragonplayer-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Dragon Player is a simple video player for KDE 4
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug xine +handbook aqua kdeenablefinal
+debug xine +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/drkonqi-4.6.3 b/metadata/cache/kde-base/drkonqi-4.6.3
index a17736e262a8..bf35c30cf29c 100644
--- a/metadata/cache/kde-base/drkonqi-4.6.3
+++ b/metadata/cache/kde-base/drkonqi-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE crash handler, gives the user feedback if a program crashed
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/drkonqi-4.7.3 b/metadata/cache/kde-base/drkonqi-4.7.3
deleted file mode 100644
index 808f997bb85d..000000000000
--- a/metadata/cache/kde-base/drkonqi-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE crash handler, gives the user feedback if a program crashed
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/drkonqi-4.7.4 b/metadata/cache/kde-base/drkonqi-4.7.4
index 1f0ec1cc1067..bc670f1c6685 100644
--- a/metadata/cache/kde-base/drkonqi-4.7.4
+++ b/metadata/cache/kde-base/drkonqi-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE crash handler, gives the user feedback if a program crashed
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/ffmpegthumbs-4.6.3 b/metadata/cache/kde-base/ffmpegthumbs-4.6.3
index 4e0add95469d..6f1c29f28d90 100644
--- a/metadata/cache/kde-base/ffmpegthumbs-4.6.3
+++ b/metadata/cache/kde-base/ffmpegthumbs-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 A FFmpeg based thumbnail Generator for Video Files.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/ffmpegthumbs-4.7.3 b/metadata/cache/kde-base/ffmpegthumbs-4.7.3
deleted file mode 100644
index 7c28a7c8259c..000000000000
--- a/metadata/cache/kde-base/ffmpegthumbs-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-virtual/ffmpeg >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-virtual/ffmpeg >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdemultimedia-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-A FFmpeg based thumbnail Generator for Video Files.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/ffmpegthumbs-4.7.4 b/metadata/cache/kde-base/ffmpegthumbs-4.7.4
index c4789b23b47b..db06ec35e543 100644
--- a/metadata/cache/kde-base/ffmpegthumbs-4.7.4
+++ b/metadata/cache/kde-base/ffmpegthumbs-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 A FFmpeg based thumbnail Generator for Video Files.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/filelight-4.6.3 b/metadata/cache/kde-base/filelight-4.6.3
index 1dd0b659cc61..9859558bdff1 100644
--- a/metadata/cache/kde-base/filelight-4.6.3
+++ b/metadata/cache/kde-base/filelight-4.6.3
@@ -8,7 +8,7 @@ GPL-3
 Filelight creates an interactive map of concentric, segmented rings that help visualise disk usage.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/filelight-4.7.3 b/metadata/cache/kde-base/filelight-4.7.3
deleted file mode 100644
index d0102b967538..000000000000
--- a/metadata/cache/kde-base/filelight-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-x11-apps/xdpyinfo >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeutils-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-3
-Filelight creates an interactive map of concentric, segmented rings that help visualise disk usage.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/filelight-4.7.4 b/metadata/cache/kde-base/filelight-4.7.4
index d4ab2f94f960..89827f1019e5 100644
--- a/metadata/cache/kde-base/filelight-4.7.4
+++ b/metadata/cache/kde-base/filelight-4.7.4
@@ -8,7 +8,7 @@ GPL-3
 Filelight creates an interactive map of concentric, segmented rings that help visualise disk usage.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/freespacenotifier-4.6.3 b/metadata/cache/kde-base/freespacenotifier-4.6.3
index 66667f1ac3bd..17be94cad0b9 100644
--- a/metadata/cache/kde-base/freespacenotifier-4.6.3
+++ b/metadata/cache/kde-base/freespacenotifier-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 A module that monitors free disk space on the home dir
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/freespacenotifier-4.7.3 b/metadata/cache/kde-base/freespacenotifier-4.7.3
deleted file mode 100644
index 587a4d9fdb89..000000000000
--- a/metadata/cache/kde-base/freespacenotifier-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-A module that monitors free disk space on the home dir
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/freespacenotifier-4.7.4 b/metadata/cache/kde-base/freespacenotifier-4.7.4
index 04e0e1365280..05e15ff31b90 100644
--- a/metadata/cache/kde-base/freespacenotifier-4.7.4
+++ b/metadata/cache/kde-base/freespacenotifier-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 A module that monitors free disk space on the home dir
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/granatier-4.6.3 b/metadata/cache/kde-base/granatier-4.6.3
index 43c1fde84139..290cfd4371b8 100644
--- a/metadata/cache/kde-base/granatier-4.6.3
+++ b/metadata/cache/kde-base/granatier-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Bomberman game
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug openal kdeprefix +handbook aqua kdeenablefinal
+debug openal kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/granatier-4.7.3 b/metadata/cache/kde-base/granatier-4.7.3
deleted file mode 100644
index 1972d58b852e..000000000000
--- a/metadata/cache/kde-base/granatier-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/libsndfile media-libs/openal >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-media-libs/libsndfile media-libs/openal >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Bomberman game
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/granatier-4.7.4 b/metadata/cache/kde-base/granatier-4.7.4
index 393dd39f4b8d..28f36f04961f 100644
--- a/metadata/cache/kde-base/granatier-4.7.4
+++ b/metadata/cache/kde-base/granatier-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Bomberman game
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/gwenview-4.6.3 b/metadata/cache/kde-base/gwenview-4.6.3
index 863cdfb26044..e6ef0c081299 100644
--- a/metadata/cache/kde-base/gwenview-4.6.3
+++ b/metadata/cache/kde-base/gwenview-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE image viewer
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kipi semantic-desktop kdeprefix +handbook aqua kdeenablefinal
+debug kipi semantic-desktop kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/gwenview-4.7.3 b/metadata/cache/kde-base/gwenview-4.7.3
deleted file mode 100644
index fe8f2ce79bff..000000000000
--- a/metadata/cache/kde-base/gwenview-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdelibs-4.7.3:4[aqua=,semantic-desktop=] >=kde-base/libkonq-4.7.3:4[aqua=] >=media-gfx/exiv2-0.19 virtual/jpeg kipi? ( >=kde-base/libkipi-4.7.3:4[aqua=] ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/kdelibs-4.7.3:4[aqua=,semantic-desktop=] >=kde-base/libkonq-4.7.3:4[aqua=] >=media-gfx/exiv2-0.19 virtual/jpeg kipi? ( >=kde-base/libkipi-4.7.3:4[aqua=] ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/gwenview-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-KDE image viewer
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug kipi semantic-desktop +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/gwenview-4.7.4 b/metadata/cache/kde-base/gwenview-4.7.4
index ed5f1b70917e..a23bb4422a82 100644
--- a/metadata/cache/kde-base/gwenview-4.7.4
+++ b/metadata/cache/kde-base/gwenview-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE image viewer
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug kipi semantic-desktop +handbook aqua kdeenablefinal
+debug kipi semantic-desktop +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/jovie-4.6.3 b/metadata/cache/kde-base/jovie-4.6.3
index bb7553932509..35ab4bbf225e 100644
--- a/metadata/cache/kde-base/jovie-4.6.3
+++ b/metadata/cache/kde-base/jovie-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Jovie is a text to speech application
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/jovie-4.7.3 b/metadata/cache/kde-base/jovie-4.7.3
deleted file mode 100644
index f0c45b37abc1..000000000000
--- a/metadata/cache/kde-base/jovie-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-app-accessibility/speech-dispatcher >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-app-accessibility/speech-dispatcher >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeaccessibility-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Jovie is a text to speech application
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/jovie-4.7.4 b/metadata/cache/kde-base/jovie-4.7.4
index 236bb46414b0..5d64e838c3af 100644
--- a/metadata/cache/kde-base/jovie-4.7.4
+++ b/metadata/cache/kde-base/jovie-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Jovie is a text to speech application
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/juk-4.6.3 b/metadata/cache/kde-base/juk-4.6.3
index b3c91d98c560..491a3a0b50b3 100644
--- a/metadata/cache/kde-base/juk-4.6.3
+++ b/metadata/cache/kde-base/juk-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Jukebox and music manager for KDE.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug musicbrainz kdeprefix +handbook aqua kdeenablefinal
+debug musicbrainz kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/juk-4.7.3 b/metadata/cache/kde-base/juk-4.7.3
deleted file mode 100644
index 634365d8c86f..000000000000
--- a/metadata/cache/kde-base/juk-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=media-libs/taglib-1.6 musicbrainz? ( media-libs/tunepimp ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=media-libs/taglib-1.6 musicbrainz? ( media-libs/tunepimp ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdemultimedia-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Jukebox and music manager for KDE.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug musicbrainz +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/juk-4.7.4 b/metadata/cache/kde-base/juk-4.7.4
index dad0a445c497..16e43a8de7c0 100644
--- a/metadata/cache/kde-base/juk-4.7.4
+++ b/metadata/cache/kde-base/juk-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Jukebox and music manager for KDE.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug musicbrainz +handbook aqua kdeenablefinal
+debug musicbrainz +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kabcclient-4.4.11.1 b/metadata/cache/kde-base/kabcclient-4.4.11.1
index 2023b0e934fb..f86fc03818f4 100644
--- a/metadata/cache/kde-base/kabcclient-4.4.11.1
+++ b/metadata/cache/kde-base/kabcclient-4.4.11.1
@@ -8,7 +8,7 @@ GPL-2
 A command line client for accessing the KDE addressbook
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook kdeprefix aqua kdeenablefinal
+debug +handbook kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kabcclient-4.7.3 b/metadata/cache/kde-base/kabcclient-4.7.3
deleted file mode 100644
index 6c549ca38cc7..000000000000
--- a/metadata/cache/kde-base/kabcclient-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/kdepimlibs-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdepim-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-A command line client for accessing the KDE addressbook
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kabcclient-4.7.4 b/metadata/cache/kde-base/kabcclient-4.7.4
index 13565283bfbc..fe5166e40e48 100644
--- a/metadata/cache/kde-base/kabcclient-4.7.4
+++ b/metadata/cache/kde-base/kabcclient-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 A command line client for accessing the KDE addressbook
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kaccessible-4.6.3 b/metadata/cache/kde-base/kaccessible-4.6.3
index 1bfe64abd7f1..0c955f4231fb 100644
--- a/metadata/cache/kde-base/kaccessible-4.6.3
+++ b/metadata/cache/kde-base/kaccessible-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Provides accessibility services like focus tracking
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +speechd kdeprefix aqua kdeenablefinal
+debug +speechd kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kaccessible-4.7.3 b/metadata/cache/kde-base/kaccessible-4.7.3
deleted file mode 100644
index 060aafd2fb43..000000000000
--- a/metadata/cache/kde-base/kaccessible-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-app-accessibility/speech-dispatcher >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-app-accessibility/speech-dispatcher >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeaccessibility-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Provides accessibility services like focus tracking
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +speechd aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kaccessible-4.7.4 b/metadata/cache/kde-base/kaccessible-4.7.4
index 16df80670f63..6cbe9acf4eab 100644
--- a/metadata/cache/kde-base/kaccessible-4.7.4
+++ b/metadata/cache/kde-base/kaccessible-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Provides accessibility services like focus tracking
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +speechd aqua kdeenablefinal
+debug +speechd aqua
 
 
 
diff --git a/metadata/cache/kde-base/kactivities-4.7.3 b/metadata/cache/kde-base/kactivities-4.7.3
deleted file mode 100644
index af77ee8284fc..000000000000
--- a/metadata/cache/kde-base/kactivities-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-!<=kde-base/kdelibs-4.7.1-r1:4 >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdelibs-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-KDE Activity Manager
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kactivities-4.7.4 b/metadata/cache/kde-base/kactivities-4.7.4
index 9a2e6ea31f92..0b29a335a49e 100644
--- a/metadata/cache/kde-base/kactivities-4.7.4
+++ b/metadata/cache/kde-base/kactivities-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Activity Manager
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-base/kaddressbook-4.4.11.1 b/metadata/cache/kde-base/kaddressbook-4.4.11.1
index bb5efa3a30a7..76038a8559c2 100644
--- a/metadata/cache/kde-base/kaddressbook-4.4.11.1
+++ b/metadata/cache/kde-base/kaddressbook-4.4.11.1
@@ -8,7 +8,7 @@ GPL-2
 The KDE Address Book
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook kdeprefix aqua kdeenablefinal +kontact
+debug +handbook kdeprefix aqua +kontact
 
 
 
diff --git a/metadata/cache/kde-base/kaddressbook-4.7.3 b/metadata/cache/kde-base/kaddressbook-4.7.3
deleted file mode 100644
index 221cc24ab703..000000000000
--- a/metadata/cache/kde-base/kaddressbook-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/grantlee-0.1.4 >=kde-base/kdelibs-4.7.3:4[aqua=,semantic-desktop] >=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=dev-libs/grantlee-0.1.4 >=kde-base/kdelibs-4.7.3:4[aqua=,semantic-desktop] >=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] kontact? ( >=kde-base/kontact-4.7.3:4[aqua=] )
-4
-mirror://kde/stable/4.7.3/src/kdepim-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-The KDE Address Book
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal +kontact
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kaddressbook-4.7.4 b/metadata/cache/kde-base/kaddressbook-4.7.4
index 614f24910955..f997f84911a6 100644
--- a/metadata/cache/kde-base/kaddressbook-4.7.4
+++ b/metadata/cache/kde-base/kaddressbook-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 The KDE Address Book
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal +kontact
+debug +handbook aqua +kontact
 
 
 
diff --git a/metadata/cache/kde-base/kajongg-4.6.3 b/metadata/cache/kde-base/kajongg-4.6.3
index 2438e4577e1f..efc753d21a8c 100644
--- a/metadata/cache/kde-base/kajongg-4.6.3
+++ b/metadata/cache/kde-base/kajongg-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 The classical Mah Jongg for four players
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability python toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kajongg-4.7.3 b/metadata/cache/kde-base/kajongg-4.7.3
deleted file mode 100644
index e9f44a97cecb..000000000000
--- a/metadata/cache/kde-base/kajongg-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-db/sqlite:3 >=kde-base/libkdegames-4.7.3:4[aqua=] >=kde-base/pykde4-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=] >=app-admin/eselect-python-20091230
-dev-db/sqlite:3 >=kde-base/libkdegames-4.7.3:4[aqua=] >=kde-base/pykde4-4.7.3:4[aqua=] >=kde-base/libkmahjongg-4.7.3:4[aqua=] >=dev-python/twisted-8.2.0 >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=] >=app-admin/eselect-python-20091230
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-The classical Mah Jongg for four players
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability python toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kajongg-4.7.4 b/metadata/cache/kde-base/kajongg-4.7.4
index 77df38435e99..e1f64a4cdd84 100644
--- a/metadata/cache/kde-base/kajongg-4.7.4
+++ b/metadata/cache/kde-base/kajongg-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 The classical Mah Jongg for four players
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability python toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kalarm-4.4.11.1-r1 b/metadata/cache/kde-base/kalarm-4.4.11.1-r1
index edcdcb25398a..c5477ee56a63 100644
--- a/metadata/cache/kde-base/kalarm-4.4.11.1-r1
+++ b/metadata/cache/kde-base/kalarm-4.4.11.1-r1
@@ -8,7 +8,7 @@ GPL-2
 Personal alarm message, command and email scheduler for KDE
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook kdeprefix aqua kdeenablefinal
+debug +handbook kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kalarm-4.7.3 b/metadata/cache/kde-base/kalarm-4.7.3
deleted file mode 100644
index 34aff44b5459..000000000000
--- a/metadata/cache/kde-base/kalarm-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] media-libs/phonon >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] media-libs/phonon >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdepim-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Personal alarm message, command and email scheduler for KDE
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kalarm-4.7.4 b/metadata/cache/kde-base/kalarm-4.7.4
index 571a9fca0690..7e1c95d19d7f 100644
--- a/metadata/cache/kde-base/kalarm-4.7.4
+++ b/metadata/cache/kde-base/kalarm-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Personal alarm message, command and email scheduler for KDE
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kalgebra-4.6.3 b/metadata/cache/kde-base/kalgebra-4.6.3
index ca6656ba6959..81d11001496a 100644
--- a/metadata/cache/kde-base/kalgebra-4.6.3
+++ b/metadata/cache/kde-base/kalgebra-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 MathML-based graph calculator for KDE.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +plasma readline kdeprefix opengl +handbook aqua kdeenablefinal
+debug +plasma readline kdeprefix opengl +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kalgebra-4.7.3 b/metadata/cache/kde-base/kalgebra-4.7.3
deleted file mode 100644
index fe5afc74a6fb..000000000000
--- a/metadata/cache/kde-base/kalgebra-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkdeedu-4.7.3:4[aqua=] readline? ( sys-libs/readline ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/libkdeedu-4.7.3:4[aqua=] readline? ( sys-libs/readline ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kalgebra-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-MathML-based graph calculator for KDE.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +plasma readline opengl +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kalgebra-4.7.4 b/metadata/cache/kde-base/kalgebra-4.7.4
index 2d47b4bf400a..73a98278876a 100644
--- a/metadata/cache/kde-base/kalgebra-4.7.4
+++ b/metadata/cache/kde-base/kalgebra-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 MathML-based graph calculator for KDE.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +plasma readline opengl +handbook aqua kdeenablefinal
+debug +plasma readline opengl +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kalzium-4.6.3 b/metadata/cache/kde-base/kalzium-4.6.3
index 7bb276089623..1366fa92a2db 100644
--- a/metadata/cache/kde-base/kalzium-4.6.3
+++ b/metadata/cache/kde-base/kalzium-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: periodic table of the elements.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-editor debug +plasma solver kdeprefix test +handbook aqua kdeenablefinal
+editor debug +plasma solver kdeprefix test +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kalzium-4.7.3 b/metadata/cache/kde-base/kalzium-4.7.3
deleted file mode 100644
index 58e6ad10224c..000000000000
--- a/metadata/cache/kde-base/kalzium-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkdeedu-4.7.3:4[aqua=] editor? ( >=sci-chemistry/openbabel-2.2 ) editor? ( >=dev-cpp/eigen-2.0.3:2 ) solver? ( dev-ml/facile[ocamlopt] ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) test? ( dev-util/cppunit ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=x11-libs/qt-opengl-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/libkdeedu-4.7.3:4[aqua=] editor? ( >=sci-chemistry/openbabel-2.2 ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) >=x11-libs/qt-opengl-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kalzium-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: periodic table of the elements.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-editor debug +plasma solver test +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kalzium-4.7.4 b/metadata/cache/kde-base/kalzium-4.7.4
index 074de5c690f0..e172921ad4b0 100644
--- a/metadata/cache/kde-base/kalzium-4.7.4
+++ b/metadata/cache/kde-base/kalzium-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: periodic table of the elements.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-editor debug +plasma solver test +handbook aqua kdeenablefinal
+editor debug +plasma solver test +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kamera-4.6.3 b/metadata/cache/kde-base/kamera-4.6.3
index 4027b4ced71b..d7d1e3a467ff 100644
--- a/metadata/cache/kde-base/kamera-4.6.3
+++ b/metadata/cache/kde-base/kamera-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE digital camera manager
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kamera-4.7.3 b/metadata/cache/kde-base/kamera-4.7.3
deleted file mode 100644
index 0c27eda3288f..000000000000
--- a/metadata/cache/kde-base/kamera-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/libgphoto2 >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-media-libs/libgphoto2 >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kamera-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE digital camera manager
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kamera-4.7.4 b/metadata/cache/kde-base/kamera-4.7.4
index c3eae37e2b76..b254498e8d2c 100644
--- a/metadata/cache/kde-base/kamera-4.7.4
+++ b/metadata/cache/kde-base/kamera-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE digital camera manager
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kanagram-4.6.3 b/metadata/cache/kde-base/kanagram-4.6.3
index b56ad661ff51..d201f10dd236 100644
--- a/metadata/cache/kde-base/kanagram-4.6.3
+++ b/metadata/cache/kde-base/kanagram-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: letter order game.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kanagram-4.7.3 b/metadata/cache/kde-base/kanagram-4.7.3
deleted file mode 100644
index 00217dd30858..000000000000
--- a/metadata/cache/kde-base/kanagram-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkdeedu-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kanagram-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: letter order game.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kanagram-4.7.4 b/metadata/cache/kde-base/kanagram-4.7.4
index 818442fbfbd0..6bcbf56876a2 100644
--- a/metadata/cache/kde-base/kanagram-4.7.4
+++ b/metadata/cache/kde-base/kanagram-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: letter order game.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kapman-4.6.3 b/metadata/cache/kde-base/kapman-4.6.3
index 8729142b3cca..c433f4be8baf 100644
--- a/metadata/cache/kde-base/kapman-4.6.3
+++ b/metadata/cache/kde-base/kapman-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Pac-Man clone for KDE
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kapman-4.7.3 b/metadata/cache/kde-base/kapman-4.7.3
deleted file mode 100644
index 053eac0cef6e..000000000000
--- a/metadata/cache/kde-base/kapman-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Pac-Man clone for KDE
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kapman-4.7.4 b/metadata/cache/kde-base/kapman-4.7.4
index 085751389141..7bb66ce855d7 100644
--- a/metadata/cache/kde-base/kapman-4.7.4
+++ b/metadata/cache/kde-base/kapman-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Pac-Man clone for KDE
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kapptemplate-4.6.3 b/metadata/cache/kde-base/kapptemplate-4.6.3
index 3f0a289ff71b..42f371db216e 100644
--- a/metadata/cache/kde-base/kapptemplate-4.6.3
+++ b/metadata/cache/kde-base/kapptemplate-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KAppTemplate - A shell script to create the necessary framework to develop KDE applications.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kapptemplate-4.7.3 b/metadata/cache/kde-base/kapptemplate-4.7.3
deleted file mode 100644
index 14a6bb99a988..000000000000
--- a/metadata/cache/kde-base/kapptemplate-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdesdk-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KAppTemplate - A shell script to create the necessary framework to develop KDE applications.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kapptemplate-4.7.4 b/metadata/cache/kde-base/kapptemplate-4.7.4
index a3f80dbbcf93..ae9c54b5eca6 100644
--- a/metadata/cache/kde-base/kapptemplate-4.7.4
+++ b/metadata/cache/kde-base/kapptemplate-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KAppTemplate - A shell script to create the necessary framework to develop KDE applications.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kate-4.6.3 b/metadata/cache/kde-base/kate-4.6.3
index d05e205963a9..db73f78a5c31 100644
--- a/metadata/cache/kde-base/kate-4.6.3
+++ b/metadata/cache/kde-base/kate-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Kate is an MDI texteditor.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +plasma kdeprefix +handbook aqua kdeenablefinal
+debug +plasma kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kate-4.7.3 b/metadata/cache/kde-base/kate-4.7.3
deleted file mode 100644
index 87307d974b0e..000000000000
--- a/metadata/cache/kde-base/kate-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/libxml2 dev-libs/libxslt >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-dev-libs/libxml2 dev-libs/libxslt >=kde-base/katepart-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kate-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Kate is an MDI texteditor.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +plasma +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kate-4.7.4 b/metadata/cache/kde-base/kate-4.7.4
index a6797086a239..fe5c861c093a 100644
--- a/metadata/cache/kde-base/kate-4.7.4
+++ b/metadata/cache/kde-base/kate-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Kate is an MDI texteditor.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +plasma +handbook aqua kdeenablefinal
+debug +plasma +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/katepart-4.7.3 b/metadata/cache/kde-base/katepart-4.7.3
deleted file mode 100644
index 667da5d5de77..000000000000
--- a/metadata/cache/kde-base/katepart-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-!<=kde-base/kdelibs-4.6.50:4 >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kate-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-KDE Editor KPart
-amd64 ~arm ~ppc ~ppc64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/katepart-4.7.4 b/metadata/cache/kde-base/katepart-4.7.4
index 7064bf14003d..85cd7cb7abfb 100644
--- a/metadata/cache/kde-base/katepart-4.7.4
+++ b/metadata/cache/kde-base/katepart-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Editor KPart
 amd64 ~arm ~ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/katomic-4.6.3 b/metadata/cache/kde-base/katomic-4.6.3
index 054dbfefb649..9b6fd54d62c8 100644
--- a/metadata/cache/kde-base/katomic-4.6.3
+++ b/metadata/cache/kde-base/katomic-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Atomic Entertainment Game
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/katomic-4.7.3 b/metadata/cache/kde-base/katomic-4.7.3
deleted file mode 100644
index 3d7d1b651fcc..000000000000
--- a/metadata/cache/kde-base/katomic-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Atomic Entertainment Game
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/katomic-4.7.4 b/metadata/cache/kde-base/katomic-4.7.4
index 46ef3000d6b2..0f0cf4e62bb1 100644
--- a/metadata/cache/kde-base/katomic-4.7.4
+++ b/metadata/cache/kde-base/katomic-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Atomic Entertainment Game
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook selinux aqua kdeenablefinal
+debug +handbook selinux aqua
 
 
 
diff --git a/metadata/cache/kde-base/kbattleship-4.6.3 b/metadata/cache/kde-base/kbattleship-4.6.3
index 08a6d291d75c..5b05eb91306a 100644
--- a/metadata/cache/kde-base/kbattleship-4.6.3
+++ b/metadata/cache/kde-base/kbattleship-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 The KDE Battleship clone
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic games-ggz gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kbattleship-4.7.3 b/metadata/cache/kde-base/kbattleship-4.7.3
deleted file mode 100644
index ccd8d14d8de6..000000000000
--- a/metadata/cache/kde-base/kbattleship-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-The KDE Battleship clone
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic games-ggz gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kbattleship-4.7.4 b/metadata/cache/kde-base/kbattleship-4.7.4
index 41cc1233c73f..f3640161f3f3 100644
--- a/metadata/cache/kde-base/kbattleship-4.7.4
+++ b/metadata/cache/kde-base/kbattleship-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 The KDE Battleship clone
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic games-ggz gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook selinux aqua kdeenablefinal
+debug +handbook selinux aqua
 
 
 
diff --git a/metadata/cache/kde-base/kblackbox-4.6.3 b/metadata/cache/kde-base/kblackbox-4.6.3
index 3c152aa2beb4..e0fe8645337d 100644
--- a/metadata/cache/kde-base/kblackbox-4.6.3
+++ b/metadata/cache/kde-base/kblackbox-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Blackbox Game
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kblackbox-4.7.3 b/metadata/cache/kde-base/kblackbox-4.7.3
deleted file mode 100644
index ca1388c77deb..000000000000
--- a/metadata/cache/kde-base/kblackbox-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Blackbox Game
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kblackbox-4.7.4 b/metadata/cache/kde-base/kblackbox-4.7.4
index 870b9467decf..b77acc283ea6 100644
--- a/metadata/cache/kde-base/kblackbox-4.7.4
+++ b/metadata/cache/kde-base/kblackbox-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Blackbox Game
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook selinux aqua kdeenablefinal
+debug +handbook selinux aqua
 
 
 
diff --git a/metadata/cache/kde-base/kblocks-4.6.3 b/metadata/cache/kde-base/kblocks-4.6.3
index be15947cde1c..7b887dee0a30 100644
--- a/metadata/cache/kde-base/kblocks-4.6.3
+++ b/metadata/cache/kde-base/kblocks-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: Kblocks is a single-player Tetris-like game.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kblocks-4.7.3 b/metadata/cache/kde-base/kblocks-4.7.3
deleted file mode 100644
index d1d5f8d4f848..000000000000
--- a/metadata/cache/kde-base/kblocks-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: Kblocks is a single-player Tetris-like game.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kblocks-4.7.4 b/metadata/cache/kde-base/kblocks-4.7.4
index e2c2868cb5c2..86394fa5f579 100644
--- a/metadata/cache/kde-base/kblocks-4.7.4
+++ b/metadata/cache/kde-base/kblocks-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: Kblocks is a single-player Tetris-like game.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kbounce-4.6.3 b/metadata/cache/kde-base/kbounce-4.6.3
index 0491871362a6..0a330df788d5 100644
--- a/metadata/cache/kde-base/kbounce-4.6.3
+++ b/metadata/cache/kde-base/kbounce-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Bounce Ball Game
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kbounce-4.7.3 b/metadata/cache/kde-base/kbounce-4.7.3
deleted file mode 100644
index f0a20b5138e9..000000000000
--- a/metadata/cache/kde-base/kbounce-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Bounce Ball Game
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kbounce-4.7.4 b/metadata/cache/kde-base/kbounce-4.7.4
index 9c9550c49835..d5e3fbbb4530 100644
--- a/metadata/cache/kde-base/kbounce-4.7.4
+++ b/metadata/cache/kde-base/kbounce-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Bounce Ball Game
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kbreakout-4.6.3 b/metadata/cache/kde-base/kbreakout-4.6.3
index e9bc7a89fc42..d0e7b0af6514 100644
--- a/metadata/cache/kde-base/kbreakout-4.6.3
+++ b/metadata/cache/kde-base/kbreakout-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: A Breakout-like game for KDE.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kbreakout-4.7.3 b/metadata/cache/kde-base/kbreakout-4.7.3
deleted file mode 100644
index cbe0c18844a5..000000000000
--- a/metadata/cache/kde-base/kbreakout-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: A Breakout-like game for KDE.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kbreakout-4.7.4 b/metadata/cache/kde-base/kbreakout-4.7.4
index 03f8472cf252..985fd9bea24d 100644
--- a/metadata/cache/kde-base/kbreakout-4.7.4
+++ b/metadata/cache/kde-base/kbreakout-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: A Breakout-like game for KDE.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kbruch-4.6.3 b/metadata/cache/kde-base/kbruch-4.6.3
index cb78e7dc8c69..470a6a834833 100644
--- a/metadata/cache/kde-base/kbruch-4.6.3
+++ b/metadata/cache/kde-base/kbruch-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Educational: Learn calculating with fractions
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kbruch-4.7.3 b/metadata/cache/kde-base/kbruch-4.7.3
deleted file mode 100644
index fca85a9f3291..000000000000
--- a/metadata/cache/kde-base/kbruch-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kbruch-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Educational: Learn calculating with fractions
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kbruch-4.7.4 b/metadata/cache/kde-base/kbruch-4.7.4
index bbc3fd320baa..951806394c88 100644
--- a/metadata/cache/kde-base/kbruch-4.7.4
+++ b/metadata/cache/kde-base/kbruch-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Educational: Learn calculating with fractions
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kcachegrind-4.6.3 b/metadata/cache/kde-base/kcachegrind-4.6.3
index f73014ee9e50..9e6f7915b94f 100644
--- a/metadata/cache/kde-base/kcachegrind-4.6.3
+++ b/metadata/cache/kde-base/kcachegrind-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Frontend for Cachegrind
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kcachegrind-4.7.3 b/metadata/cache/kde-base/kcachegrind-4.7.3
deleted file mode 100644
index dc125c620a97..000000000000
--- a/metadata/cache/kde-base/kcachegrind-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-media-gfx/graphviz >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdesdk-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Frontend for Cachegrind
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kcachegrind-4.7.4 b/metadata/cache/kde-base/kcachegrind-4.7.4
index dff15005deed..e2a2ba171abf 100644
--- a/metadata/cache/kde-base/kcachegrind-4.7.4
+++ b/metadata/cache/kde-base/kcachegrind-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Frontend for Cachegrind
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kcalc-4.6.3 b/metadata/cache/kde-base/kcalc-4.6.3
index 6f986dff0ea3..d393b0e3838e 100644
--- a/metadata/cache/kde-base/kcalc-4.6.3
+++ b/metadata/cache/kde-base/kcalc-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE calculator
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix test +handbook aqua kdeenablefinal
+debug kdeprefix test +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kcalc-4.7.3 b/metadata/cache/kde-base/kcalc-4.7.3
deleted file mode 100644
index 6a778af898c8..000000000000
--- a/metadata/cache/kde-base/kcalc-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/gmp >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) test? ( dev-util/cppunit ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-dev-libs/gmp >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeutils-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-KDE calculator
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug test +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kcalc-4.7.4 b/metadata/cache/kde-base/kcalc-4.7.4
index 38b7e4a06b5a..1fd6d51974f4 100644
--- a/metadata/cache/kde-base/kcalc-4.7.4
+++ b/metadata/cache/kde-base/kcalc-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE calculator
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug test +handbook aqua kdeenablefinal
+debug test +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kcharselect-4.6.3 b/metadata/cache/kde-base/kcharselect-4.6.3
index 171745072fc8..32d370601074 100644
--- a/metadata/cache/kde-base/kcharselect-4.6.3
+++ b/metadata/cache/kde-base/kcharselect-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE character selection utility
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kcharselect-4.7.3 b/metadata/cache/kde-base/kcharselect-4.7.3
deleted file mode 100644
index ce5680c66f83..000000000000
--- a/metadata/cache/kde-base/kcharselect-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeutils-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE character selection utility
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kcharselect-4.7.4 b/metadata/cache/kde-base/kcharselect-4.7.4
index 5d64c4981b8a..33ad42d6bf58 100644
--- a/metadata/cache/kde-base/kcharselect-4.7.4
+++ b/metadata/cache/kde-base/kcharselect-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE character selection utility
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kcheckpass-4.6.3 b/metadata/cache/kde-base/kcheckpass-4.6.3
index cf17d602df7b..73e0e220d6f9 100644
--- a/metadata/cache/kde-base/kcheckpass-4.6.3
+++ b/metadata/cache/kde-base/kcheckpass-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 A simple password checker, used by any software in need of user authentication.
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug pam kdeprefix aqua kdeenablefinal
+debug pam kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kcheckpass-4.7.3 b/metadata/cache/kde-base/kcheckpass-4.7.3
deleted file mode 100644
index 4c145cbfe5ce..000000000000
--- a/metadata/cache/kde-base/kcheckpass-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-pam? ( >=kde-base/kdebase-pam-7 virtual/pam ) x11-libs/libxkbfile >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-pam? ( >=kde-base/kdebase-pam-7 virtual/pam ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-A simple password checker, used by any software in need of user authentication.
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug pam aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kcheckpass-4.7.4 b/metadata/cache/kde-base/kcheckpass-4.7.4
index 2ddee3b54fa7..b9e51bf88aee 100644
--- a/metadata/cache/kde-base/kcheckpass-4.7.4
+++ b/metadata/cache/kde-base/kcheckpass-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 A simple password checker, used by any software in need of user authentication.
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug pam aqua kdeenablefinal
+debug pam aqua
 
 
 
diff --git a/metadata/cache/kde-base/kcminit-4.6.3 b/metadata/cache/kde-base/kcminit-4.6.3
index 90a23a40e2db..1f0c7617c948 100644
--- a/metadata/cache/kde-base/kcminit-4.6.3
+++ b/metadata/cache/kde-base/kcminit-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KCMInit - runs startups initialization for Control Modules.
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kcminit-4.7.3 b/metadata/cache/kde-base/kcminit-4.7.3
deleted file mode 100644
index 0536826b9bd4..000000000000
--- a/metadata/cache/kde-base/kcminit-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/ksplash-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/ksplash-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KCMInit - runs startups initialization for Control Modules.
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kcminit-4.7.4 b/metadata/cache/kde-base/kcminit-4.7.4
index 156d37de919e..588259370b87 100644
--- a/metadata/cache/kde-base/kcminit-4.7.4
+++ b/metadata/cache/kde-base/kcminit-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KCMInit - runs startups initialization for Control Modules.
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kcmshell-4.6.3 b/metadata/cache/kde-base/kcmshell-4.6.3
index c880598477e8..0a4bd1a56eac 100644
--- a/metadata/cache/kde-base/kcmshell-4.6.3
+++ b/metadata/cache/kde-base/kcmshell-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KCMShell is a utility to host KDE control modules independently of SystemSettings.
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kcmshell-4.7.3 b/metadata/cache/kde-base/kcmshell-4.7.3
deleted file mode 100644
index 4d940e110952..000000000000
--- a/metadata/cache/kde-base/kcmshell-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KCMShell is a utility to host KDE control modules independently of SystemSettings.
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kcmshell-4.7.4 b/metadata/cache/kde-base/kcmshell-4.7.4
index be7b59128a6b..091f5ef146d3 100644
--- a/metadata/cache/kde-base/kcmshell-4.7.4
+++ b/metadata/cache/kde-base/kcmshell-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KCMShell is a utility to host KDE control modules independently of SystemSettings.
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kcolorchooser-4.6.3 b/metadata/cache/kde-base/kcolorchooser-4.6.3
index 25b3ad8193bb..2fc9e53aeece 100644
--- a/metadata/cache/kde-base/kcolorchooser-4.6.3
+++ b/metadata/cache/kde-base/kcolorchooser-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE color selector/editor
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kcolorchooser-4.7.3 b/metadata/cache/kde-base/kcolorchooser-4.7.3
deleted file mode 100644
index 00ee0440b38e..000000000000
--- a/metadata/cache/kde-base/kcolorchooser-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kcolorchooser-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE color selector/editor
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kcolorchooser-4.7.4 b/metadata/cache/kde-base/kcolorchooser-4.7.4
index a5f0577e3e67..f9cc0e788a3c 100644
--- a/metadata/cache/kde-base/kcolorchooser-4.7.4
+++ b/metadata/cache/kde-base/kcolorchooser-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE color selector/editor
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kcontrol-4.6.3 b/metadata/cache/kde-base/kcontrol-4.6.3
index 5daf86a534eb..857f62dd51a7 100644
--- a/metadata/cache/kde-base/kcontrol-4.6.3
+++ b/metadata/cache/kde-base/kcontrol-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 The KDE Control Center
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kcontrol-4.7.3 b/metadata/cache/kde-base/kcontrol-4.7.3
deleted file mode 100644
index bad2f39bb97f..000000000000
--- a/metadata/cache/kde-base/kcontrol-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/kdnssd-4.7.3:4[aqua=] >=kde-base/khotkeys-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-The KDE Control Center
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kcontrol-4.7.4 b/metadata/cache/kde-base/kcontrol-4.7.4
index 3efe99ed0a9d..0295c9b72fc0 100644
--- a/metadata/cache/kde-base/kcontrol-4.7.4
+++ b/metadata/cache/kde-base/kcontrol-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 The KDE Control Center
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kcron-4.6.3 b/metadata/cache/kde-base/kcron-4.6.3
index e927bd877008..de61833e7a8b 100644
--- a/metadata/cache/kde-base/kcron-4.6.3
+++ b/metadata/cache/kde-base/kcron-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Task Scheduler
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kcron-4.7.3 b/metadata/cache/kde-base/kcron-4.7.3
deleted file mode 100644
index a07a36aee619..000000000000
--- a/metadata/cache/kde-base/kcron-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-!prefix? ( virtual/cron ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeadmin-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Task Scheduler
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kcron-4.7.4 b/metadata/cache/kde-base/kcron-4.7.4
index 1ff97dbc4fe4..7bacce895c38 100644
--- a/metadata/cache/kde-base/kcron-4.7.4
+++ b/metadata/cache/kde-base/kcron-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Task Scheduler
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kde-env-4.6.3 b/metadata/cache/kde-base/kde-env-4.6.3
index 77089b0381f3..ace70b200cc0 100644
--- a/metadata/cache/kde-base/kde-env-4.6.3
+++ b/metadata/cache/kde-base/kde-env-4.6.3
@@ -8,7 +8,7 @@ as-is
 Environment setting required for all KDE4 apps to run.
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base eutils fdo-mime gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeprefix kdeenablefinal
+aqua kdeprefix
 
 
 
diff --git a/metadata/cache/kde-base/kde-env-4.7.3 b/metadata/cache/kde-base/kde-env-4.7.3
deleted file mode 100644
index 7dd7519ffd65..000000000000
--- a/metadata/cache/kde-base/kde-env-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4
-!<=kde-base/kdelibs-4.6.80:4
-4
-
-
-http://www.kde.org/
-as-is
-Environment setting required for all KDE4 apps to run.
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base eutils fdo-mime gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kde-env-4.7.4 b/metadata/cache/kde-base/kde-env-4.7.4
index 7dd7519ffd65..cc120c16c57c 100644
--- a/metadata/cache/kde-base/kde-env-4.7.4
+++ b/metadata/cache/kde-base/kde-env-4.7.4
@@ -8,7 +8,7 @@ as-is
 Environment setting required for all KDE4 apps to run.
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base eutils fdo-mime gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-base/kde-l10n-4.6.3-r1 b/metadata/cache/kde-base/kde-l10n-4.6.3-r1
index 97855c3ce18e..b619c9a85f22 100644
--- a/metadata/cache/kde-base/kde-l10n-4.6.3-r1
+++ b/metadata/cache/kde-base/kde-l10n-4.6.3-r1
@@ -8,7 +8,7 @@ GPL-2
 KDE internationalization package
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-linguas_ar linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_km linguas_kn linguas_ko linguas_lt linguas_lv linguas_mai linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW kdeprefix +handbook aqua kdeenablefinal
+linguas_ar linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_km linguas_kn linguas_ko linguas_lt linguas_lv linguas_mai linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kde-l10n-4.6.3-r2 b/metadata/cache/kde-base/kde-l10n-4.6.3-r2
index a81319ff815e..a0403b248f1e 100644
--- a/metadata/cache/kde-base/kde-l10n-4.6.3-r2
+++ b/metadata/cache/kde-base/kde-l10n-4.6.3-r2
@@ -8,7 +8,7 @@ GPL-2
 KDE internationalization package
 ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-linguas_ar linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_km linguas_kn linguas_ko linguas_lt linguas_lv linguas_mai linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW kdeprefix +handbook aqua kdeenablefinal
+linguas_ar linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_km linguas_kn linguas_ko linguas_lt linguas_lv linguas_mai linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kde-l10n-4.7.3 b/metadata/cache/kde-base/kde-l10n-4.7.3
deleted file mode 100644
index b1d0ca90f4ab..000000000000
--- a/metadata/cache/kde-base/kde-l10n-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-devel/gettext >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-!<kde-misc/konq-plugins-4.6 >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-linguas_ar? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-ar-4.7.3.tar.bz2 ) linguas_bg? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-bg-4.7.3.tar.bz2 ) linguas_bs? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-bs-4.7.3.tar.bz2 ) linguas_ca? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-ca-4.7.3.tar.bz2 ) linguas_ca@valencia? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-ca@valencia-4.7.3.tar.bz2 ) linguas_cs? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-cs-4.7.3.tar.bz2 ) linguas_da? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-da-4.7.3.tar.bz2 ) linguas_de? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-de-4.7.3.tar.bz2 ) linguas_el? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-el-4.7.3.tar.bz2 ) linguas_en_GB? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-en_GB-4.7.3.tar.bz2 ) linguas_es? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-es-4.7.3.tar.bz2 ) linguas_et? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-et-4.7.3.tar.bz2 ) linguas_eu? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-eu-4.7.3.tar.bz2 ) linguas_fi? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-fi-4.7.3.tar.bz2 ) linguas_fr? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-fr-4.7.3.tar.bz2 ) linguas_ga? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-ga-4.7.3.tar.bz2 ) linguas_gl? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-gl-4.7.3.tar.bz2 ) linguas_he? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-he-4.7.3.tar.bz2 ) linguas_hr? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-hr-4.7.3.tar.bz2 ) linguas_hu? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-hu-4.7.3.tar.bz2 ) linguas_ia? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-ia-4.7.3.tar.bz2 ) linguas_id? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-id-4.7.3.tar.bz2 ) linguas_is? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-is-4.7.3.tar.bz2 ) linguas_it? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-it-4.7.3.tar.bz2 ) linguas_ja? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-ja-4.7.3.tar.bz2 ) linguas_kk? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-kk-4.7.3.tar.bz2 ) linguas_km? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-km-4.7.3.tar.bz2 ) linguas_kn? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-kn-4.7.3.tar.bz2 ) linguas_ko? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-ko-4.7.3.tar.bz2 ) linguas_lt? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-lt-4.7.3.tar.bz2 ) linguas_lv? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-lv-4.7.3.tar.bz2 ) linguas_nb? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-nb-4.7.3.tar.bz2 ) linguas_nds? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-nds-4.7.3.tar.bz2 ) linguas_nl? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-nl-4.7.3.tar.bz2 ) linguas_nn? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-nn-4.7.3.tar.bz2 ) linguas_pa? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-pa-4.7.3.tar.bz2 ) linguas_pl? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-pl-4.7.3.tar.bz2 ) linguas_pt? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-pt-4.7.3.tar.bz2 ) linguas_pt_BR? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-pt_BR-4.7.3.tar.bz2 ) linguas_ro? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-ro-4.7.3.tar.bz2 ) linguas_ru? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-ru-4.7.3.tar.bz2 ) linguas_sk? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-sk-4.7.3.tar.bz2 ) linguas_sl? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-sl-4.7.3.tar.bz2 ) linguas_sr? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-sr-4.7.3.tar.bz2 ) linguas_sv? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-sv-4.7.3.tar.bz2 ) linguas_th? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-th-4.7.3.tar.bz2 ) linguas_tr? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-tr-4.7.3.tar.bz2 ) linguas_ug? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-ug-4.7.3.tar.bz2 ) linguas_uk? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-uk-4.7.3.tar.bz2 ) linguas_wa? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-wa-4.7.3.tar.bz2 ) linguas_zh_CN? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-zh_CN-4.7.3.tar.bz2 ) linguas_zh_TW? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-zh_TW-4.7.3.tar.bz2 )
-
-http://www.kde.org/
-GPL-2
-KDE internationalization package
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-+handbook linguas_ar linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hr linguas_hu linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_km linguas_kn linguas_ko linguas_lt linguas_lv linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tr linguas_ug linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kde-l10n-4.7.4 b/metadata/cache/kde-base/kde-l10n-4.7.4
index 4272eb569ab7..efdc3bfe1083 100644
--- a/metadata/cache/kde-base/kde-l10n-4.7.4
+++ b/metadata/cache/kde-base/kde-l10n-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE internationalization package
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-+handbook linguas_ar linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hr linguas_hu linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_km linguas_kn linguas_ko linguas_lt linguas_lv linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tr linguas_ug linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
++handbook linguas_ar linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hr linguas_hu linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_km linguas_kn linguas_ko linguas_lt linguas_lv linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tr linguas_ug linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/kde-base/kde-meta-4.7.3 b/metadata/cache/kde-base/kde-meta-4.7.3
deleted file mode 100644
index 16d927678170..000000000000
--- a/metadata/cache/kde-base/kde-meta-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/kate-4.7.3:4[aqua=] >=kde-base/kdeadmin-meta-4.7.3:4[aqua=] >=kde-base/kdeartwork-meta-4.7.3:4[aqua=] >=kde-base/kdebase-meta-4.7.3:4[aqua=] >=kde-base/kdeedu-meta-4.7.3:4[aqua=] >=kde-base/kdegames-meta-4.7.3:4[aqua=] >=kde-base/kdegraphics-meta-4.7.3:4[aqua=] >=kde-base/kdemultimedia-meta-4.7.3:4[aqua=] >=kde-base/kdenetwork-meta-4.7.3:4[aqua=] >=kde-base/kdeplasma-addons-4.7.3:4[aqua=] >=kde-base/kdetoys-meta-4.7.3:4[aqua=] >=kde-base/kdeutils-meta-4.7.3:4[aqua=] accessibility? ( >=kde-base/kdeaccessibility-meta-4.7.3:4[aqua=] ) nls? ( >=kde-base/kde-l10n-4.7.3:4[aqua=] ) sdk? ( >=kde-base/kdebindings-meta-4.7.3:4[aqua=] >=kde-base/kdesdk-meta-4.7.3:4[aqua=] >=kde-base/kdewebdev-meta-4.7.3:4[aqua=] ) semantic-desktop? ( >=kde-base/kdepim-meta-4.4.11.1:4[aqua=] )
-4
-
-
-http://www.kde.org/
-GPL-2
-KDE - merge this to pull in all split kde-base/* packages
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
-accessibility nls sdk semantic-desktop aqua
-
-
-
-4
-
--
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kde-wallpapers-4.7.3 b/metadata/cache/kde-base/kde-wallpapers-4.7.3
deleted file mode 100644
index fb97cff505a5..000000000000
--- a/metadata/cache/kde-base/kde-wallpapers-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-!kde-base/kdebase-wallpapers:4 >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kde-wallpapers-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE wallpapers
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kde-wallpapers-4.7.4 b/metadata/cache/kde-base/kde-wallpapers-4.7.4
index 05106b276cab..6219fd351a63 100644
--- a/metadata/cache/kde-base/kde-wallpapers-4.7.4
+++ b/metadata/cache/kde-base/kde-wallpapers-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE wallpapers
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdeaccessibility-colorschemes-4.6.3 b/metadata/cache/kde-base/kdeaccessibility-colorschemes-4.6.3
index d146f51a4af7..e86701dd0c31 100644
--- a/metadata/cache/kde-base/kdeaccessibility-colorschemes-4.6.3
+++ b/metadata/cache/kde-base/kdeaccessibility-colorschemes-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE high contrast color schemes
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-kdeprefix aqua kdeenablefinal
+kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdeaccessibility-iconthemes-4.6.3 b/metadata/cache/kde-base/kdeaccessibility-iconthemes-4.6.3
index 19ddd202cfa3..1943bec9cf40 100644
--- a/metadata/cache/kde-base/kdeaccessibility-iconthemes-4.6.3
+++ b/metadata/cache/kde-base/kdeaccessibility-iconthemes-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Icon Themes designed with accessibility in mind
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-kdeprefix aqua kdeenablefinal
+kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdeaccessibility-meta-4.7.3 b/metadata/cache/kde-base/kdeaccessibility-meta-4.7.3
deleted file mode 100644
index 25f61522205e..000000000000
--- a/metadata/cache/kde-base/kdeaccessibility-meta-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/jovie-4.7.3:4[aqua=] >=kde-base/kaccessible-4.7.3:4[aqua=] >=kde-base/kmag-4.7.3:4[aqua=] >=kde-base/kmousetool-4.7.3:4[aqua=] >=kde-base/kmouth-4.7.3:4[aqua=]
-4
-
-
-http://www.kde.org/
-GPL-2
-kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
-aqua
-
-
-
-4
-
--
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdeaccounts-plugin-4.6.3 b/metadata/cache/kde-base/kdeaccounts-plugin-4.6.3
index b03799dafb27..bdabd8f7a74f 100644
--- a/metadata/cache/kde-base/kdeaccounts-plugin-4.6.3
+++ b/metadata/cache/kde-base/kdeaccounts-plugin-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Addressbook Plugin that puts names/email addresses of all KDE SVN accounts into an addressbook
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdeaccounts-plugin-4.7.3 b/metadata/cache/kde-base/kdeaccounts-plugin-4.7.3
deleted file mode 100644
index d94b64187ff3..000000000000
--- a/metadata/cache/kde-base/kdeaccounts-plugin-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/kdepimlibs-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdesdk-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Addressbook Plugin that puts names/email addresses of all KDE SVN accounts into an addressbook
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdeaccounts-plugin-4.7.4 b/metadata/cache/kde-base/kdeaccounts-plugin-4.7.4
index c7b70486d518..d912add112d7 100644
--- a/metadata/cache/kde-base/kdeaccounts-plugin-4.7.4
+++ b/metadata/cache/kde-base/kdeaccounts-plugin-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Addressbook Plugin that puts names/email addresses of all KDE SVN accounts into an addressbook
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdeadmin-meta-4.7.3 b/metadata/cache/kde-base/kdeadmin-meta-4.7.3
deleted file mode 100644
index 39d76648b7b0..000000000000
--- a/metadata/cache/kde-base/kdeadmin-meta-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/kcron-4.7.3:4[aqua=] >=kde-base/ksystemlog-4.7.3:4[aqua=] >=kde-base/kuser-4.7.3:4[aqua=] cups? ( >=kde-base/system-config-printer-kde-4.7.3:4[aqua=] )
-4
-
-
-http://www.kde.org/
-GPL-2
-KDE administration tools - merge this to pull in all kdeadmin-derived packages
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
-cups aqua
-
-
-
-4
-
--
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdeartwork-colorschemes-4.6.3 b/metadata/cache/kde-base/kdeartwork-colorschemes-4.6.3
index becfd0dd9cc6..a9bc70d51c4e 100644
--- a/metadata/cache/kde-base/kdeartwork-colorschemes-4.6.3
+++ b/metadata/cache/kde-base/kdeartwork-colorschemes-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE extra colorschemes
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-kdeprefix aqua kdeenablefinal
+kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdeartwork-colorschemes-4.7.3 b/metadata/cache/kde-base/kdeartwork-colorschemes-4.7.3
deleted file mode 100644
index 86e393cce326..000000000000
--- a/metadata/cache/kde-base/kdeartwork-colorschemes-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-!kde-base/kdeaccessibility-colorschemes:4 >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeartwork-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE extra colorschemes
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdeartwork-colorschemes-4.7.4 b/metadata/cache/kde-base/kdeartwork-colorschemes-4.7.4
index 59ed9116451d..0b21d4fc1f88 100644
--- a/metadata/cache/kde-base/kdeartwork-colorschemes-4.7.4
+++ b/metadata/cache/kde-base/kdeartwork-colorschemes-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE extra colorschemes
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdeartwork-desktopthemes-4.6.3 b/metadata/cache/kde-base/kdeartwork-desktopthemes-4.6.3
index a2dfaec295f0..b78f79a4022f 100644
--- a/metadata/cache/kde-base/kdeartwork-desktopthemes-4.6.3
+++ b/metadata/cache/kde-base/kdeartwork-desktopthemes-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Additional KDE4 Plasma themes
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-kdeprefix aqua kdeenablefinal
+kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdeartwork-desktopthemes-4.7.3 b/metadata/cache/kde-base/kdeartwork-desktopthemes-4.7.3
deleted file mode 100644
index b980cd54edf3..000000000000
--- a/metadata/cache/kde-base/kdeartwork-desktopthemes-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeartwork-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Additional KDE4 Plasma themes
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdeartwork-desktopthemes-4.7.4 b/metadata/cache/kde-base/kdeartwork-desktopthemes-4.7.4
index f76a55b5ba4c..8dadbfec5775 100644
--- a/metadata/cache/kde-base/kdeartwork-desktopthemes-4.7.4
+++ b/metadata/cache/kde-base/kdeartwork-desktopthemes-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Additional KDE4 Plasma themes
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdeartwork-emoticons-4.6.3 b/metadata/cache/kde-base/kdeartwork-emoticons-4.6.3
index f0a7d4830729..8dca6246cd20 100644
--- a/metadata/cache/kde-base/kdeartwork-emoticons-4.6.3
+++ b/metadata/cache/kde-base/kdeartwork-emoticons-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 EmotIcons (icons for things like smilies :-) for kde
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-kdeprefix aqua kdeenablefinal
+kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdeartwork-emoticons-4.7.3 b/metadata/cache/kde-base/kdeartwork-emoticons-4.7.3
deleted file mode 100644
index bd1f299ec903..000000000000
--- a/metadata/cache/kde-base/kdeartwork-emoticons-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeartwork-4.7.3.tar.bz2
-binchecks strip
-http://www.kde.org/
-GPL-2
-EmotIcons (icons for things like smilies :-) for kde
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdeartwork-emoticons-4.7.4 b/metadata/cache/kde-base/kdeartwork-emoticons-4.7.4
index c933d0f73759..7abd4a1349c0 100644
--- a/metadata/cache/kde-base/kdeartwork-emoticons-4.7.4
+++ b/metadata/cache/kde-base/kdeartwork-emoticons-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 EmotIcons (icons for things like smilies :-) for kde
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdeartwork-iconthemes-4.6.3 b/metadata/cache/kde-base/kdeartwork-iconthemes-4.6.3
index 74b5eff6aedb..e465e0551a66 100644
--- a/metadata/cache/kde-base/kdeartwork-iconthemes-4.6.3
+++ b/metadata/cache/kde-base/kdeartwork-iconthemes-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Icon themes for kde
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-kdeprefix aqua kdeenablefinal
+kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdeartwork-iconthemes-4.7.3 b/metadata/cache/kde-base/kdeartwork-iconthemes-4.7.3
deleted file mode 100644
index 8617563987cb..000000000000
--- a/metadata/cache/kde-base/kdeartwork-iconthemes-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-!x11-themes/nuvola !kde-base/kdeaccessibility-iconthemes:4 >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeartwork-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Icon themes for kde
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdeartwork-iconthemes-4.7.4 b/metadata/cache/kde-base/kdeartwork-iconthemes-4.7.4
index b9853f313ca9..b394ed1bf294 100644
--- a/metadata/cache/kde-base/kdeartwork-iconthemes-4.7.4
+++ b/metadata/cache/kde-base/kdeartwork-iconthemes-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Icon themes for kde
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdeartwork-kscreensaver-4.6.3 b/metadata/cache/kde-base/kdeartwork-kscreensaver-4.6.3
index e05337a331ea..339a7be1ce79 100644
--- a/metadata/cache/kde-base/kdeartwork-kscreensaver-4.6.3
+++ b/metadata/cache/kde-base/kdeartwork-kscreensaver-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Extra screensavers for kde
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +eigen +kexiv2 opengl xscreensaver kdeprefix opengl aqua kdeenablefinal
+debug +eigen +kexiv2 opengl xscreensaver kdeprefix opengl aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdeartwork-kscreensaver-4.7.3 b/metadata/cache/kde-base/kdeartwork-kscreensaver-4.7.3
deleted file mode 100644
index 235641b470c4..000000000000
--- a/metadata/cache/kde-base/kdeartwork-kscreensaver-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kscreensaver-4.7.3:4[aqua=,opengl?] >=kde-base/libkworkspace-4.7.3:4[aqua=] media-libs/libart_lgpl opengl? ( virtual/opengl ) xscreensaver? ( x11-misc/xscreensaver ) eigen? ( dev-cpp/eigen:2 ) kexiv2? ( >=kde-base/libkexiv2-4.7.3:4[aqua=] ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/kscreensaver-4.7.3:4[aqua=,opengl?] >=kde-base/libkworkspace-4.7.3:4[aqua=] media-libs/libart_lgpl opengl? ( virtual/opengl ) xscreensaver? ( x11-misc/xscreensaver ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeartwork-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Extra screensavers for kde
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +eigen +kexiv2 opengl xscreensaver opengl aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdeartwork-kscreensaver-4.7.4 b/metadata/cache/kde-base/kdeartwork-kscreensaver-4.7.4
index f7e1c6610503..bebbb8e0a6e0 100644
--- a/metadata/cache/kde-base/kdeartwork-kscreensaver-4.7.4
+++ b/metadata/cache/kde-base/kdeartwork-kscreensaver-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Extra screensavers for kde
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +eigen +kexiv2 opengl xscreensaver opengl aqua kdeenablefinal
+debug +eigen +kexiv2 opengl xscreensaver opengl aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdeartwork-meta-4.7.3 b/metadata/cache/kde-base/kdeartwork-meta-4.7.3
deleted file mode 100644
index 45cd3932aac9..000000000000
--- a/metadata/cache/kde-base/kdeartwork-meta-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/kdeartwork-colorschemes-4.7.3:4[aqua=] >=kde-base/kdeartwork-desktopthemes-4.7.3:4[aqua=] >=kde-base/kdeartwork-emoticons-4.7.3:4[aqua=] >=kde-base/kdeartwork-iconthemes-4.7.3:4[aqua=] >=kde-base/kdeartwork-kscreensaver-4.7.3:4[aqua=] >=kde-base/kdeartwork-sounds-4.7.3:4[aqua=] >=kde-base/kdeartwork-styles-4.7.3:4[aqua=] >=kde-base/kdeartwork-wallpapers-4.7.3:4[aqua=] >=kde-base/kdeartwork-weatherwallpapers-4.7.3:4[aqua=]
-4
-
-
-http://www.kde.org/
-GPL-2
-kdeartwork - merge this to pull in all kdeartwork-derived packages
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
-aqua
-
-
-
-4
-
--
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdeartwork-sounds-4.6.3 b/metadata/cache/kde-base/kdeartwork-sounds-4.6.3
index 141f4cf9c708..bbb78709c3c3 100644
--- a/metadata/cache/kde-base/kdeartwork-sounds-4.6.3
+++ b/metadata/cache/kde-base/kdeartwork-sounds-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Extra sound themes for kde
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-kdeprefix aqua kdeenablefinal
+kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdeartwork-sounds-4.7.3 b/metadata/cache/kde-base/kdeartwork-sounds-4.7.3
deleted file mode 100644
index e68941c96285..000000000000
--- a/metadata/cache/kde-base/kdeartwork-sounds-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeartwork-4.7.3.tar.bz2
-binchecks strip
-http://www.kde.org/
-GPL-2
-Extra sound themes for kde
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdeartwork-sounds-4.7.4 b/metadata/cache/kde-base/kdeartwork-sounds-4.7.4
index 2aa44075449d..1488617bebbd 100644
--- a/metadata/cache/kde-base/kdeartwork-sounds-4.7.4
+++ b/metadata/cache/kde-base/kdeartwork-sounds-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Extra sound themes for kde
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdeartwork-styles-4.6.3 b/metadata/cache/kde-base/kdeartwork-styles-4.6.3
index 8e00d48800b2..2b0d86061886 100644
--- a/metadata/cache/kde-base/kdeartwork-styles-4.6.3
+++ b/metadata/cache/kde-base/kdeartwork-styles-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Extra KWin styles and window decorations
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdeartwork-styles-4.7.3 b/metadata/cache/kde-base/kdeartwork-styles-4.7.3
deleted file mode 100644
index 6b4535d3e993..000000000000
--- a/metadata/cache/kde-base/kdeartwork-styles-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kwin-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/kwin-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeartwork-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Extra KWin styles and window decorations
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdeartwork-styles-4.7.4 b/metadata/cache/kde-base/kdeartwork-styles-4.7.4
index 34fd0a2b068c..7e19a273fd11 100644
--- a/metadata/cache/kde-base/kdeartwork-styles-4.7.4
+++ b/metadata/cache/kde-base/kdeartwork-styles-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Extra KWin styles and window decorations
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdeartwork-wallpapers-4.6.3 b/metadata/cache/kde-base/kdeartwork-wallpapers-4.6.3
index 18276d4f003d..655f51eac14f 100644
--- a/metadata/cache/kde-base/kdeartwork-wallpapers-4.6.3
+++ b/metadata/cache/kde-base/kdeartwork-wallpapers-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Wallpapers from kde
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-kdeprefix aqua kdeenablefinal
+kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdeartwork-wallpapers-4.7.3 b/metadata/cache/kde-base/kdeartwork-wallpapers-4.7.3
deleted file mode 100644
index 7d93cf1a90d5..000000000000
--- a/metadata/cache/kde-base/kdeartwork-wallpapers-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeartwork-4.7.3.tar.bz2
-binchecks strip
-http://www.kde.org/
-GPL-2
-Wallpapers from kde
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdeartwork-wallpapers-4.7.4 b/metadata/cache/kde-base/kdeartwork-wallpapers-4.7.4
index bf889c3fdd2a..ec3f9d5061cf 100644
--- a/metadata/cache/kde-base/kdeartwork-wallpapers-4.7.4
+++ b/metadata/cache/kde-base/kdeartwork-wallpapers-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Wallpapers from kde
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdeartwork-weatherwallpapers-4.6.3 b/metadata/cache/kde-base/kdeartwork-weatherwallpapers-4.6.3
index 92d7257806c6..abc82b083102 100644
--- a/metadata/cache/kde-base/kdeartwork-weatherwallpapers-4.6.3
+++ b/metadata/cache/kde-base/kdeartwork-weatherwallpapers-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Weather aware wallpapers. Changes with weather outside.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-kdeprefix aqua kdeenablefinal
+kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdeartwork-weatherwallpapers-4.7.3 b/metadata/cache/kde-base/kdeartwork-weatherwallpapers-4.7.3
deleted file mode 100644
index 549ae79e57f0..000000000000
--- a/metadata/cache/kde-base/kdeartwork-weatherwallpapers-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/kdeartwork-wallpapers-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeartwork-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Weather aware wallpapers. Changes with weather outside.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdeartwork-weatherwallpapers-4.7.4 b/metadata/cache/kde-base/kdeartwork-weatherwallpapers-4.7.4
index 691eae5f6507..85eb6bdc206a 100644
--- a/metadata/cache/kde-base/kdeartwork-weatherwallpapers-4.7.4
+++ b/metadata/cache/kde-base/kdeartwork-weatherwallpapers-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Weather aware wallpapers. Changes with weather outside.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdebase-cursors-4.6.3 b/metadata/cache/kde-base/kdebase-cursors-4.6.3
index e5eb89dc9973..2bfa9f95046b 100644
--- a/metadata/cache/kde-base/kdebase-cursors-4.6.3
+++ b/metadata/cache/kde-base/kdebase-cursors-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 oxygen cursors from kdebase
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-kdeprefix aqua kdeenablefinal
+kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdebase-cursors-4.7.3 b/metadata/cache/kde-base/kdebase-cursors-4.7.3
deleted file mode 100644
index 1545103d5eb2..000000000000
--- a/metadata/cache/kde-base/kdebase-cursors-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-oxygen cursors from kdebase
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdebase-cursors-4.7.4 b/metadata/cache/kde-base/kdebase-cursors-4.7.4
index c53f37eb3353..2271a9d38c24 100644
--- a/metadata/cache/kde-base/kdebase-cursors-4.7.4
+++ b/metadata/cache/kde-base/kdebase-cursors-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 oxygen cursors from kdebase
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdebase-data-4.6.3 b/metadata/cache/kde-base/kdebase-data-4.6.3
index 864cba5522b5..963bfd9228c5 100644
--- a/metadata/cache/kde-base/kdebase-data-4.6.3
+++ b/metadata/cache/kde-base/kdebase-data-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Icons, localization data and various .desktop files from kdebase.
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-kdeprefix aqua kdeenablefinal
+kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdebase-data-4.7.3 b/metadata/cache/kde-base/kdebase-data-4.7.3
deleted file mode 100644
index 8593a084f2dc..000000000000
--- a/metadata/cache/kde-base/kdebase-data-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-wallpapers? ( >=kde-base/kde-wallpapers-4.7.3:4[aqua=] ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] x11-themes/hicolor-icon-theme >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Icons, localization data and various .desktop files from kdebase.
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-+wallpapers aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdebase-data-4.7.4 b/metadata/cache/kde-base/kdebase-data-4.7.4
index 0fbed2fb11ed..d9af03d803d8 100644
--- a/metadata/cache/kde-base/kdebase-data-4.7.4
+++ b/metadata/cache/kde-base/kdebase-data-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Icons, localization data and various .desktop files from kdebase.
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-+wallpapers aqua kdeenablefinal
++wallpapers aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdebase-desktoptheme-4.6.3 b/metadata/cache/kde-base/kdebase-desktoptheme-4.6.3
index e0cd187ed309..719821e47ed2 100644
--- a/metadata/cache/kde-base/kdebase-desktoptheme-4.6.3
+++ b/metadata/cache/kde-base/kdebase-desktoptheme-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Oxygen KDE4 desktop theme.
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-kdeprefix aqua kdeenablefinal
+kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdebase-desktoptheme-4.7.3 b/metadata/cache/kde-base/kdebase-desktoptheme-4.7.3
deleted file mode 100644
index 0825a14c88b4..000000000000
--- a/metadata/cache/kde-base/kdebase-desktoptheme-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Oxygen KDE4 desktop theme.
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdebase-desktoptheme-4.7.4 b/metadata/cache/kde-base/kdebase-desktoptheme-4.7.4
index 2411878611dc..39d125b9824a 100644
--- a/metadata/cache/kde-base/kdebase-desktoptheme-4.7.4
+++ b/metadata/cache/kde-base/kdebase-desktoptheme-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Oxygen KDE4 desktop theme.
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdebase-kioslaves-4.6.3 b/metadata/cache/kde-base/kdebase-kioslaves-4.6.3
index 2a299966a42c..6f0dd61c3932 100644
--- a/metadata/cache/kde-base/kdebase-kioslaves-4.6.3
+++ b/metadata/cache/kde-base/kdebase-kioslaves-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-+bzip2 exif debug lzma openexr samba +sftp kdeprefix +handbook aqua kdeenablefinal
++bzip2 exif debug lzma openexr samba +sftp kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdebase-kioslaves-4.7.3 b/metadata/cache/kde-base/kdebase-kioslaves-4.7.3
deleted file mode 100644
index 91a0824d20d9..000000000000
--- a/metadata/cache/kde-base/kdebase-kioslaves-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-!aqua? ( x11-libs/libXcursor ) bzip2? ( app-arch/bzip2 ) exif? ( media-gfx/exiv2 ) lzma? ( app-arch/xz-utils ) openexr? ( media-libs/openexr ) samba? ( net-fs/samba[smbclient] ) sftp? ( >=net-libs/libssh-0.4.0[sftp] ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-!aqua? ( x11-libs/libXcursor ) bzip2? ( app-arch/bzip2 ) exif? ( media-gfx/exiv2 ) lzma? ( app-arch/xz-utils ) openexr? ( media-libs/openexr ) samba? ( net-fs/samba[smbclient] ) sftp? ( >=net-libs/libssh-0.4.0[sftp] ) >=kde-base/kdelibs-4.7.3:4[aqua=,bzip2?,lzma?] >=kde-base/kdialog-4.7.3:4[aqua=] virtual/ssh !aqua? ( !kernel_SunOS? ( virtual/eject ) ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-+bzip2 exif debug lzma openexr samba +sftp +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdebase-kioslaves-4.7.4 b/metadata/cache/kde-base/kdebase-kioslaves-4.7.4
index bedc3807b665..903dc6b825ec 100644
--- a/metadata/cache/kde-base/kdebase-kioslaves-4.7.4
+++ b/metadata/cache/kde-base/kdebase-kioslaves-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-+bzip2 exif debug lzma openexr samba +sftp +handbook aqua kdeenablefinal
++bzip2 exif debug lzma openexr samba +sftp +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdebase-menu-4.6.3 b/metadata/cache/kde-base/kdebase-menu-4.6.3
index 81163851d38e..f1ca897f1719 100644
--- a/metadata/cache/kde-base/kdebase-menu-4.6.3
+++ b/metadata/cache/kde-base/kdebase-menu-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Menu query tool.
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdebase-menu-4.7.3 b/metadata/cache/kde-base/kdebase-menu-4.7.3
deleted file mode 100644
index 4b9d2654690d..000000000000
--- a/metadata/cache/kde-base/kdebase-menu-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Menu query tool.
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdebase-menu-4.7.4 b/metadata/cache/kde-base/kdebase-menu-4.7.4
index a9c647059667..873072e3a6c6 100644
--- a/metadata/cache/kde-base/kdebase-menu-4.7.4
+++ b/metadata/cache/kde-base/kdebase-menu-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Menu query tool.
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdebase-menu-icons-4.6.3 b/metadata/cache/kde-base/kdebase-menu-icons-4.6.3
index c6ecb3e91413..bff12e1eb246 100644
--- a/metadata/cache/kde-base/kdebase-menu-icons-4.6.3
+++ b/metadata/cache/kde-base/kdebase-menu-icons-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE menu icons
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-kdeprefix aqua kdeenablefinal
+kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdebase-menu-icons-4.7.3 b/metadata/cache/kde-base/kdebase-menu-icons-4.7.3
deleted file mode 100644
index 8d16ba362f53..000000000000
--- a/metadata/cache/kde-base/kdebase-menu-icons-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE menu icons
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdebase-menu-icons-4.7.4 b/metadata/cache/kde-base/kdebase-menu-icons-4.7.4
index 669aeae8602b..f8eb6b609537 100644
--- a/metadata/cache/kde-base/kdebase-menu-icons-4.7.4
+++ b/metadata/cache/kde-base/kdebase-menu-icons-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE menu icons
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdebase-meta-4.7.3 b/metadata/cache/kde-base/kdebase-meta-4.7.3
deleted file mode 100644
index 90664812414f..000000000000
--- a/metadata/cache/kde-base/kdebase-meta-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/dolphin-4.7.3:4[aqua=] >=kde-base/freespacenotifier-4.7.3:4[aqua=] >=kde-base/kcheckpass-4.7.3:4[aqua=] >=kde-base/kcminit-4.7.3:4[aqua=] wallpapers? ( >=kde-base/kde-wallpapers-4.7.3:4[aqua=] ) >=kde-base/kdebase-cursors-4.7.3:4[aqua=] >=kde-base/kdebase-runtime-meta-4.7.3:4[aqua=] >=kde-base/kdebase-startkde-4.7.3:4[aqua=] >=kde-base/kdepasswd-4.7.3:4[aqua=] >=kde-base/kdialog-4.7.3:4[aqua=] >=kde-base/keditbookmarks-4.7.3:4[aqua=] >=kde-base/kephal-4.7.3:4[aqua=] >=kde-base/kfind-4.7.3:4[aqua=] >=kde-base/kfmclient-4.7.3:4[aqua=] >=kde-base/khotkeys-4.7.3:4[aqua=] >=kde-base/kinfocenter-4.7.3:4[aqua=] >=kde-base/klipper-4.7.3:4[aqua=] >=kde-base/kmenuedit-4.7.3:4[aqua=] >=kde-base/konq-plugins-4.7.3:4[aqua=] >=kde-base/konqueror-4.7.3:4[aqua=] >=kde-base/konsole-4.7.3:4[aqua=] >=kde-base/kscreensaver-4.7.3:4[aqua=] >=kde-base/ksmserver-4.7.3:4[aqua=] >=kde-base/ksplash-4.7.3:4[aqua=] >=kde-base/kstartupconfig-4.7.3:4[aqua=] >=kde-base/kstyles-4.7.3:4[aqua=] >=kde-base/ksysguard-4.7.3:4[aqua=] >=kde-base/ksystraycmd-4.7.3:4[aqua=] >=kde-base/kwin-4.7.3:4[aqua=] >=kde-base/kwrite-4.7.3:4[aqua=] >=kde-base/kwrited-4.7.3:4[aqua=] >=kde-base/libkonq-4.7.3:4[aqua=] >=kde-base/libkworkspace-4.7.3:4[aqua=] >=kde-base/liboxygenstyle-4.7.3:4[aqua=] >=kde-base/libplasmaclock-4.7.3:4[aqua=] >=kde-base/libplasmagenericshell-4.7.3:4[aqua=] >=kde-base/libtaskmanager-4.7.3:4[aqua=] >=kde-base/nsplugins-4.7.3:4[aqua=] >=kde-base/phonon-kde-4.7.3:4[aqua=] >=kde-base/plasma-apps-4.7.3:4[aqua=] >=kde-base/plasma-workspace-4.7.3:4[aqua=] >=kde-base/powerdevil-4.7.3:4[aqua=] >=kde-base/qguiplatformplugin_kde-4.7.3:4[aqua=] >=kde-base/solid-4.7.3:4[aqua=] >=kde-base/systemsettings-4.7.3:4[aqua=] !prefix? ( >=kde-base/kdm-4.7.3:4[aqua=] )
-4
-
-
-http://www.kde.org/
-GPL-2
-Merge this to pull in all kdebase-derived packages
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
-+wallpapers aqua
-
-
-
-4
-
--
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdebase-runtime-meta-4.7.3 b/metadata/cache/kde-base/kdebase-runtime-meta-4.7.3
deleted file mode 100644
index b96400784886..000000000000
--- a/metadata/cache/kde-base/kdebase-runtime-meta-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/activitymanager-4.7.3:4[aqua=] >=kde-base/attica-4.7.3:4[aqua=] >=kde-base/drkonqi-4.7.3:4[aqua=] >=kde-base/kcmshell-4.7.3:4[aqua=] >=kde-base/kcontrol-4.7.3:4[aqua=] >=kde-base/kdebase-data-4.7.3:4[aqua=] >=kde-base/kdebase-desktoptheme-4.7.3:4[aqua=] >=kde-base/kdebase-kioslaves-4.7.3:4[aqua=] >=kde-base/kdebase-menu-4.7.3:4[aqua=] >=kde-base/kdebase-menu-icons-4.7.3:4[aqua=] >=kde-base/kdebugdialog-4.7.3:4[aqua=] >=kde-base/kdesu-4.7.3:4[aqua=] >=kde-base/kdontchangethehostname-4.7.3:4[aqua=] >=kde-base/keditfiletype-4.7.3:4[aqua=] >=kde-base/kfile-4.7.3:4[aqua=] >=kde-base/kglobalaccel-4.7.3:4[aqua=] >=kde-base/kiconfinder-4.7.3:4[aqua=] >=kde-base/kioclient-4.7.3:4[aqua=] >=kde-base/kmimetypefinder-4.7.3:4[aqua=] >=kde-base/knetattach-4.7.3:4[aqua=] >=kde-base/knewstuff-4.7.3:4[aqua=] >=kde-base/kpasswdserver-4.7.3:4[aqua=] >=kde-base/kquitapp-4.7.3:4[aqua=] >=kde-base/kstart-4.7.3:4[aqua=] >=kde-base/ktimezoned-4.7.3:4[aqua=] >=kde-base/ktraderclient-4.7.3:4[aqua=] >=kde-base/kuiserver-4.7.3:4[aqua=] >=kde-base/kurifilter-plugins-4.7.3:4[aqua=] >=kde-base/kwallet-4.7.3:4[aqua=] >=kde-base/kwalletd-4.7.3:4[aqua=] >=kde-base/plasma-runtime-4.7.3:4[aqua=] >=kde-base/renamedlg-plugins-4.7.3:4[aqua=] >=kde-base/solid-runtime-4.7.3:4[aqua=] handbook? ( >=kde-base/khelpcenter-4.7.3:4[aqua=] ) semantic-desktop? ( >=kde-base/nepomuk-4.7.3:4[aqua=] )
-4
-
-
-http://www.kde.org/
-GPL-2
-Merge this to pull in all kdebase-runtime-derived packages
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
-+handbook semantic-desktop aqua
-
-
-
-4
-
--
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdebase-startkde-4.6.3 b/metadata/cache/kde-base/kdebase-startkde-4.6.3
index 397b20d61c09..63b412e737a1 100644
--- a/metadata/cache/kde-base/kdebase-startkde-4.6.3
+++ b/metadata/cache/kde-base/kdebase-startkde-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Startkde script, which starts a complete KDE session, and associated scripts
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability prefix toolchain-funcs user versionator virtualx
-kdeprefix aqua kdeenablefinal
+kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdebase-startkde-4.7.3 b/metadata/cache/kde-base/kdebase-startkde-4.7.3
deleted file mode 100644
index 86c4e9c64e82..000000000000
--- a/metadata/cache/kde-base/kdebase-startkde-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/kcminit-4.7.3:4[aqua=] >=kde-base/kdebase-runtime-meta-4.7.3:4[aqua=] wallpapers? ( >=kde-base/kde-wallpapers-4.7.3:4[aqua=] ) >=kde-base/kfmclient-4.7.3:4[aqua=] >=kde-base/knotify-4.7.3:4[aqua=] >=kde-base/kreadconfig-4.7.3:4[aqua=] >=kde-base/krunner-4.7.3:4[aqua=] >=kde-base/ksmserver-4.7.3:4[aqua=] >=kde-base/ksplash-4.7.3:4[aqua=] >=kde-base/kstartupconfig-4.7.3:4[aqua=] >=kde-base/kwin-4.7.3:4[aqua=] >=kde-base/phonon-kde-4.7.3:4[aqua=] >=kde-base/plasma-apps-4.7.3:4[aqua=] >=kde-base/plasma-workspace-4.7.3:4[aqua=] >=kde-base/systemsettings-4.7.3:4[aqua=] x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrandr x11-apps/xrdb x11-apps/xsetroot x11-apps/xset >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Startkde script, which starts a complete KDE session, and associated scripts
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability prefix toolchain-funcs user versionator virtualx
-+wallpapers aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdebase-startkde-4.7.4 b/metadata/cache/kde-base/kdebase-startkde-4.7.4
index b02be7ebb30f..4dbbc70595fd 100644
--- a/metadata/cache/kde-base/kdebase-startkde-4.7.4
+++ b/metadata/cache/kde-base/kdebase-startkde-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Startkde script, which starts a complete KDE session, and associated scripts
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability prefix toolchain-funcs user versionator virtualx
-+wallpapers aqua kdeenablefinal
++wallpapers aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdebase-wallpapers-4.6.3 b/metadata/cache/kde-base/kdebase-wallpapers-4.6.3
index 51ba959f136b..2420ea10925c 100644
--- a/metadata/cache/kde-base/kdebase-wallpapers-4.6.3
+++ b/metadata/cache/kde-base/kdebase-wallpapers-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE wallpapers
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-kdeprefix aqua kdeenablefinal
+kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdebindings-csharp-4.6.3 b/metadata/cache/kde-base/kdebindings-csharp-4.6.3
index 4407d02ced35..cca1bcf3ee0c 100644
--- a/metadata/cache/kde-base/kdebindings-csharp-4.6.3
+++ b/metadata/cache/kde-base/kdebindings-csharp-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 C# bindings for KDE and Qt
 amd64 ppc x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta mono multilib portability toolchain-funcs user versionator virtualx
-akonadi debug +phonon plasma qimageblitz qscintilla semantic-desktop webkit kdeprefix aqua kdeenablefinal
+akonadi debug +phonon plasma qimageblitz qscintilla semantic-desktop webkit kdeprefix aqua
 plasma? ( webkit )
 
 
diff --git a/metadata/cache/kde-base/kdebindings-meta-4.7.3 b/metadata/cache/kde-base/kdebindings-meta-4.7.3
deleted file mode 100644
index 9f9e1fef81be..000000000000
--- a/metadata/cache/kde-base/kdebindings-meta-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/smokegen-4.7.3:4[aqua=] >=kde-base/smokekde-4.7.3:4[aqua=] >=kde-base/smokeqt-4.7.3:4[aqua=] csharp? ( >=kde-base/kimono-4.7.3:4[aqua=] >=kde-base/qyoto-4.7.3:4[aqua=] ) java? ( >=kde-base/krossjava-4.7.3:4[aqua=] ) perl? ( >=kde-base/perlkde-4.7.3:4[aqua=] >=kde-base/perlqt-4.7.3:4[aqua=] ) python? ( >=kde-base/krosspython-4.7.3:4[aqua=] >=kde-base/pykde4-4.7.3:4[aqua=] ) ruby? ( >=kde-base/korundum-4.7.3:4[aqua=] >=kde-base/krossruby-4.7.3:4[aqua=] >=kde-base/qtruby-4.7.3:4[aqua=] )
-4
-
-
-http://www.kde.org/
-GPL-2
-KDE bindings - merge this to pull in all kdebindings-derived packages
-amd64 ~ppc x86
-eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
-csharp java perl python ruby aqua
-
-
-
-4
-
--
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdebindings-perl-4.6.3 b/metadata/cache/kde-base/kdebindings-perl-4.6.3
index c0b832e666ae..911a3172bca1 100644
--- a/metadata/cache/kde-base/kdebindings-perl-4.6.3
+++ b/metadata/cache/kde-base/kdebindings-perl-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Perl bindings
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-akonadi attica debug kate okular phonon plasma qimageblitz qscintilla qwt semantic-desktop webkit kdeprefix declarative qthelp multimedia aqua kdeenablefinal
+akonadi attica debug kate okular phonon plasma qimageblitz qscintilla qwt semantic-desktop webkit kdeprefix declarative qthelp multimedia aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdebindings-ruby-4.6.3 b/metadata/cache/kde-base/kdebindings-ruby-4.6.3
index db7f7aee2432..8234328a4c1d 100644
--- a/metadata/cache/kde-base/kdebindings-ruby-4.6.3
+++ b/metadata/cache/kde-base/kdebindings-ruby-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Ruby bindings
 amd64 ppc x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils java-utils-2 kde4-base kde4-functions kde4-meta multilib portability ruby-ng toolchain-funcs user versionator virtualx
-akonadi debug kate okular phonon plasma qscintilla qwt semantic-desktop webkit kdeprefix declarative aqua kdeenablefinal elibc_FreeBSD ruby_targets_ruby18
+akonadi debug kate okular phonon plasma qscintilla qwt semantic-desktop webkit kdeprefix declarative aqua elibc_FreeBSD ruby_targets_ruby18
 || ( ruby_targets_ruby18 )
 
 
diff --git a/metadata/cache/kde-base/kdebugdialog-4.6.3 b/metadata/cache/kde-base/kdebugdialog-4.6.3
index 065c1902d06f..2872cbd56b1b 100644
--- a/metadata/cache/kde-base/kdebugdialog-4.6.3
+++ b/metadata/cache/kde-base/kdebugdialog-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: A dialog box for setting preferences for debug output
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdebugdialog-4.7.3 b/metadata/cache/kde-base/kdebugdialog-4.7.3
deleted file mode 100644
index d0ba2ac09f17..000000000000
--- a/metadata/cache/kde-base/kdebugdialog-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: A dialog box for setting preferences for debug output
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdebugdialog-4.7.4 b/metadata/cache/kde-base/kdebugdialog-4.7.4
index dc3c0f140208..24e1fda852a6 100644
--- a/metadata/cache/kde-base/kdebugdialog-4.7.4
+++ b/metadata/cache/kde-base/kdebugdialog-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: A dialog box for setting preferences for debug output
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdeedu-meta-4.7.3 b/metadata/cache/kde-base/kdeedu-meta-4.7.3
deleted file mode 100644
index 381ab44fdb5a..000000000000
--- a/metadata/cache/kde-base/kdeedu-meta-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/blinken-4.7.3:4[aqua=] >=kde-base/cantor-4.7.3:4[aqua=] >=kde-base/kalgebra-4.7.3:4[aqua=] >=kde-base/kalzium-4.7.3:4[aqua=] >=kde-base/kanagram-4.7.3:4[aqua=] >=kde-base/kbruch-4.7.3:4[aqua=] >=kde-base/kgeography-4.7.3:4[aqua=] >=kde-base/khangman-4.7.3:4[aqua=] >=kde-base/kig-4.7.3:4[aqua=] >=kde-base/kiten-4.7.3:4[aqua=] >=kde-base/klettres-4.7.3:4[aqua=] >=kde-base/kmplot-4.7.3:4[aqua=] >=kde-base/kstars-4.7.3:4[aqua=] >=kde-base/ktouch-4.7.3:4[aqua=] >=kde-base/kturtle-4.7.3:4[aqua=] >=kde-base/kwordquiz-4.7.3:4[aqua=] >=kde-base/libkdeedu-4.7.3:4[aqua=] >=kde-base/marble-4.7.3:4[aqua=] >=kde-base/parley-4.7.3:4[aqua=] >=kde-base/rocs-4.7.3:4[aqua=] >=kde-base/step-4.7.3:4[aqua=]
-4
-
-
-http://www.kde.org/
-GPL-2
-KDE educational apps - merge this to pull in all kdeedu-derived packages
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
-aqua
-
-
-
-4
-
--
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdegames-meta-4.7.3 b/metadata/cache/kde-base/kdegames-meta-4.7.3
deleted file mode 100644
index 67209b760025..000000000000
--- a/metadata/cache/kde-base/kdegames-meta-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/bomber-4.7.3:4[aqua=] >=kde-base/bovo-4.7.3:4[aqua=] >=kde-base/granatier-4.7.3:4[aqua=] >=kde-base/kapman-4.7.3:4[aqua=] >=kde-base/katomic-4.7.3:4[aqua=] >=kde-base/kbattleship-4.7.3:4[aqua=] >=kde-base/kblackbox-4.7.3:4[aqua=] >=kde-base/kblocks-4.7.3:4[aqua=] >=kde-base/kbounce-4.7.3:4[aqua=] >=kde-base/kbreakout-4.7.3:4[aqua=] >=kde-base/kdiamond-4.7.3:4[aqua=] >=kde-base/kfourinline-4.7.3:4[aqua=] >=kde-base/kgoldrunner-4.7.3:4[aqua=] >=kde-base/killbots-4.7.3:4[aqua=] >=kde-base/kigo-4.7.3:4[aqua=] >=kde-base/kiriki-4.7.3:4[aqua=] >=kde-base/kjumpingcube-4.7.3:4[aqua=] >=kde-base/klickety-4.7.3:4[aqua=] >=kde-base/klines-4.7.3:4[aqua=] >=kde-base/kmahjongg-4.7.3:4[aqua=] >=kde-base/kmines-4.7.3:4[aqua=] >=kde-base/knetwalk-4.7.3:4[aqua=] >=kde-base/kolf-4.7.3:4[aqua=] >=kde-base/kollision-4.7.3:4[aqua=] >=kde-base/konquest-4.7.3:4[aqua=] >=kde-base/kpat-4.7.3:4[aqua=] >=kde-base/kreversi-4.7.3:4[aqua=] >=kde-base/kshisen-4.7.3:4[aqua=] >=kde-base/ksirk-4.7.3:4[aqua=] >=kde-base/kspaceduel-4.7.3:4[aqua=] >=kde-base/ksquares-4.7.3:4[aqua=] >=kde-base/ktron-4.7.3:4[aqua=] >=kde-base/ktuberling-4.7.3:4[aqua=] >=kde-base/kubrick-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=] >=kde-base/libkmahjongg-4.7.3:4[aqua=] >=kde-base/lskat-4.7.3:4[aqua=] >=kde-base/palapeli-4.7.3:4[aqua=] opengl? ( >=kde-base/ksudoku-4.7.3:4[aqua=] ) python? ( >=kde-base/kajongg-4.7.3:4[aqua=] )
-4
-
-
-http://www.kde.org/
-GPL-2
-kdegames - merge this to pull in all kdegames-derived packages
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
-opengl python aqua
-
-
-
-4
-
--
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdegraphics-meta-4.7.3 b/metadata/cache/kde-base/kdegraphics-meta-4.7.3
deleted file mode 100644
index 6198fb64a489..000000000000
--- a/metadata/cache/kde-base/kdegraphics-meta-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/gwenview-4.7.3:4[aqua=] >=kde-base/kamera-4.7.3:4[aqua=] >=kde-base/kcolorchooser-4.7.3:4[aqua=] >=kde-base/kdegraphics-strigi-analyzer-4.7.3:4[aqua=] >=kde-base/kgamma-4.7.3:4[aqua=] >=kde-base/kolourpaint-4.7.3:4[aqua=] >=kde-base/kruler-4.7.3:4[aqua=] >=kde-base/ksnapshot-4.7.3:4[aqua=] >=kde-base/libkdcraw-4.7.3:4[aqua=] >=kde-base/libkexiv2-4.7.3:4[aqua=] >=kde-base/libkipi-4.7.3:4[aqua=] >=kde-base/okular-4.7.3:4[aqua=] >=kde-base/svgpart-4.7.3:4[aqua=] >=kde-base/thumbnailers-4.7.3:4[aqua=] scanner? ( >=kde-base/ksaneplugin-4.7.3:4[aqua=] >=kde-base/libksane-4.7.3:4[aqua=] )
-4
-
-
-http://www.kde.org/
-GPL-2
-kdegraphics - merge this to pull in all kdegraphics-derived packages
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
-scanner aqua
-
-
-
-4
-
--
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdegraphics-strigi-analyzer-4.6.3 b/metadata/cache/kde-base/kdegraphics-strigi-analyzer-4.6.3
index a1be1576e035..956a5e5eda4f 100644
--- a/metadata/cache/kde-base/kdegraphics-strigi-analyzer-4.6.3
+++ b/metadata/cache/kde-base/kdegraphics-strigi-analyzer-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 kdegraphics: strigi plugins
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdegraphics-strigi-analyzer-4.7.3 b/metadata/cache/kde-base/kdegraphics-strigi-analyzer-4.7.3
deleted file mode 100644
index bcfed5032ae5..000000000000
--- a/metadata/cache/kde-base/kdegraphics-strigi-analyzer-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-app-misc/strigi >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-app-misc/strigi >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegraphics-strigi-analyzer-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-kdegraphics: strigi plugins
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdegraphics-strigi-analyzer-4.7.4 b/metadata/cache/kde-base/kdegraphics-strigi-analyzer-4.7.4
index 7c12b59730a2..2bf5b5cc44c9 100644
--- a/metadata/cache/kde-base/kdegraphics-strigi-analyzer-4.7.4
+++ b/metadata/cache/kde-base/kdegraphics-strigi-analyzer-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 kdegraphics: strigi plugins
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdelibs-4.6.3-r3 b/metadata/cache/kde-base/kdelibs-4.6.3-r3
index 7e10cfda7666..262a3e39440d 100644
--- a/metadata/cache/kde-base/kdelibs-4.6.3-r3
+++ b/metadata/cache/kde-base/kdelibs-4.6.3-r3
@@ -8,7 +8,7 @@ LGPL-2.1
 KDE libraries needed by all KDE programs.
 ppc ~ppc64
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev zeroconf kdeprefix opengl test aqua kdeenablefinal
+3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev zeroconf kdeprefix opengl test aqua
 
 || ( ( >=kde-base/kfmclient-4.6.3:4[aqua=] ) x11-misc/xdg-utils ) handbook? ( >=kde-base/khelpcenter-4.6.3:4[aqua=] ) policykit? ( >=kde-misc/polkit-kde-kcmodules-0.98_pre20101127 >=sys-auth/polkit-kde-agent-0.99 ) semantic-desktop? ( >=kde-base/nepomuk-4.6.3:4[aqua=] )
 
diff --git a/metadata/cache/kde-base/kdelibs-4.7.3-r1 b/metadata/cache/kde-base/kdelibs-4.7.3-r1
deleted file mode 100644
index e391f5bc6113..000000000000
--- a/metadata/cache/kde-base/kdelibs-4.7.3-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-app-crypt/qca:2 >=app-misc/strigi-0.7.6 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.1.90 >=dev-libs/libdbusmenu-qt-0.3.2 dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib >=media-libs/libpng-1.4 >=media-libs/phonon-4.4.3 sys-libs/zlib virtual/jpeg >=x11-misc/shared-mime-info-0.60 acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst !kernel_SunOS? ( sys-libs/libutempter ) ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper ) kerberos? ( virtual/krb5 ) lzma? ( app-arch/xz-utils ) openexr? ( media-libs/openexr media-libs/ilmbase ) policykit? ( >=sys-auth/polkit-qt-0.99 ) semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.6.50 >=dev-libs/soprano-2.6.51[dbus,raptor,redland] ) spell? ( app-text/enchant ) ssl? ( dev-libs/openssl ) udev? ( sys-fs/udev ) zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] !bindist? ( net-misc/mDNSResponder ) ) ) doc? ( app-doc/doxygen ) nls? ( virtual/libintl ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) test? ( dev-util/cppunit ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) >=x11-libs/qt-declarative-4.7.0:4 opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile )
-app-crypt/qca:2 >=app-misc/strigi-0.7.6 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.1.90 >=dev-libs/libdbusmenu-qt-0.3.2 dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib >=media-libs/libpng-1.4 >=media-libs/phonon-4.4.3 sys-libs/zlib virtual/jpeg >=x11-misc/shared-mime-info-0.60 acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst !kernel_SunOS? ( sys-libs/libutempter ) ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper ) kerberos? ( virtual/krb5 ) lzma? ( app-arch/xz-utils ) openexr? ( media-libs/openexr media-libs/ilmbase ) policykit? ( >=sys-auth/polkit-qt-0.99 ) semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.6.50 >=dev-libs/soprano-2.6.51[dbus,raptor,redland] ) spell? ( app-text/enchant ) ssl? ( dev-libs/openssl ) udev? ( sys-fs/udev ) zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] !bindist? ( net-misc/mDNSResponder ) ) ) !x11-libs/qt-phonon >=app-crypt/gnupg-2.0.11 app-misc/ca-certificates >=kde-base/kde-env-4.7.3:4[aqua=] !aqua? ( x11-apps/iceauth x11-apps/rgb >=x11-misc/xdg-utils-1.0.2-r3 udisks? ( sys-fs/udisks ) upower? ( sys-power/upower ) ) !<=kde-base/plasma-workspace-4.7.1:4 !<=kde-base/kcontrol-4.4.50:4 >=kde-base/oxygen-icons-4.7.3:4[aqua=] >=x11-libs/qt-declarative-4.7.0:4 opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile )
-4
-mirror://kde/stable/4.7.3/src/kdelibs-4.7.3.tar.bz2
-test
-http://www.kde.org/
-LGPL-2.1
-KDE libraries needed by all KDE programs.
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks +upower zeroconf opengl test aqua kdeenablefinal
-udisks? ( udev ) upower? ( udev )
->=kde-base/katepart-4.7.3:4[aqua=] || ( ( >=kde-base/kfmclient-4.7.3:4[aqua=] ) x11-misc/xdg-utils ) handbook? ( >=kde-base/khelpcenter-4.7.3:4[aqua=] ) policykit? ( >=kde-misc/polkit-kde-kcmodules-0.98_pre20101127 >=sys-auth/polkit-kde-agent-0.99 ) semantic-desktop? ( >=kde-base/nepomuk-4.7.3:4[aqua=] )
-
-4
-
-compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdelibs-4.7.3-r11 b/metadata/cache/kde-base/kdelibs-4.7.3-r11
deleted file mode 100644
index b57b6030988d..000000000000
--- a/metadata/cache/kde-base/kdelibs-4.7.3-r11
+++ /dev/null
@@ -1,22 +0,0 @@
-app-crypt/qca:2 >=app-misc/strigi-0.7.6 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.1.90 >=dev-libs/libdbusmenu-qt-0.3.2 dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib >=media-libs/libpng-1.4 >=media-libs/phonon-4.4.3 sys-libs/zlib virtual/jpeg >=x11-misc/shared-mime-info-0.60 acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst !kernel_SunOS? ( sys-libs/libutempter ) ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper ) kerberos? ( virtual/krb5 ) lzma? ( app-arch/xz-utils ) openexr? ( media-libs/openexr media-libs/ilmbase ) policykit? ( >=sys-auth/polkit-qt-0.99 ) semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.6.50 >=dev-libs/soprano-2.6.51[dbus,raptor,redland] ) spell? ( app-text/enchant ) ssl? ( dev-libs/openssl ) udev? ( sys-fs/udev ) upnp? ( media-libs/herqq ) zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] !bindist? ( net-misc/mDNSResponder ) ) ) doc? ( app-doc/doxygen ) nls? ( virtual/libintl ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) test? ( dev-util/cppunit ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) >=x11-libs/qt-declarative-4.7.0:4 opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile )
-app-crypt/qca:2 >=app-misc/strigi-0.7.6 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.1.90 >=dev-libs/libdbusmenu-qt-0.3.2 dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib >=media-libs/libpng-1.4 >=media-libs/phonon-4.4.3 sys-libs/zlib virtual/jpeg >=x11-misc/shared-mime-info-0.60 acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst !kernel_SunOS? ( sys-libs/libutempter ) ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper ) kerberos? ( virtual/krb5 ) lzma? ( app-arch/xz-utils ) openexr? ( media-libs/openexr media-libs/ilmbase ) policykit? ( >=sys-auth/polkit-qt-0.99 ) semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.6.50 >=dev-libs/soprano-2.6.51[dbus,raptor,redland] ) spell? ( app-text/enchant ) ssl? ( dev-libs/openssl ) udev? ( sys-fs/udev ) upnp? ( media-libs/herqq ) zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] !bindist? ( net-misc/mDNSResponder ) ) ) !x11-libs/qt-phonon >=app-crypt/gnupg-2.0.11 app-misc/ca-certificates >=kde-base/kde-env-4.7.3:4[aqua=] !aqua? ( x11-apps/iceauth x11-apps/rgb >=x11-misc/xdg-utils-1.0.2-r3 udisks? ( sys-fs/udisks ) upower? ( sys-power/upower ) ) !<=kde-base/plasma-workspace-4.7.1:4 !<=kde-base/kcontrol-4.4.50:4 >=kde-base/oxygen-icons-4.7.3:4[aqua=] >=x11-libs/qt-declarative-4.7.0:4 opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile )
-4
-mirror://kde/stable/4.7.3/src/kdelibs-4.7.3.tar.bz2
-test
-http://www.kde.org/
-LGPL-2.1
-KDE libraries needed by all KDE programs.
-~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks +upower upnp zeroconf opengl test aqua kdeenablefinal
-udisks? ( udev ) upower? ( udev )
->=kde-base/katepart-4.7.3:4[aqua=] || ( ( >=kde-base/kfmclient-4.7.3:4[aqua=] ) x11-misc/xdg-utils ) handbook? ( >=kde-base/khelpcenter-4.7.3:4[aqua=] ) policykit? ( >=kde-misc/polkit-kde-kcmodules-0.98_pre20101127 >=sys-auth/polkit-kde-agent-0.99 ) semantic-desktop? ( >=kde-base/nepomuk-4.7.3:4[aqua=] )
-
-4
-
-compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdelibs-4.7.4 b/metadata/cache/kde-base/kdelibs-4.7.4
index 7c07f40073b1..a7e162e3a309 100644
--- a/metadata/cache/kde-base/kdelibs-4.7.4
+++ b/metadata/cache/kde-base/kdelibs-4.7.4
@@ -8,7 +8,7 @@ LGPL-2.1
 KDE libraries needed by all KDE programs.
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks +upower zeroconf opengl test aqua kdeenablefinal
+3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks +upower zeroconf opengl test aqua
 udisks? ( udev ) upower? ( udev )
 >=kde-base/katepart-4.7.4:4[aqua=] || ( ( >=kde-base/kfmclient-4.7.4:4[aqua=] ) x11-misc/xdg-utils ) handbook? ( >=kde-base/khelpcenter-4.7.4:4[aqua=] ) policykit? ( >=kde-misc/polkit-kde-kcmodules-0.98_pre20101127 >=sys-auth/polkit-kde-agent-0.99 ) semantic-desktop? ( >=kde-base/nepomuk-4.7.4:4[aqua=] )
 
diff --git a/metadata/cache/kde-base/kdelibs-4.7.4-r10 b/metadata/cache/kde-base/kdelibs-4.7.4-r10
index 9cea7ba0fdba..9e263e4ca797 100644
--- a/metadata/cache/kde-base/kdelibs-4.7.4-r10
+++ b/metadata/cache/kde-base/kdelibs-4.7.4-r10
@@ -8,7 +8,7 @@ LGPL-2.1
 KDE libraries needed by all KDE programs.
 ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks +upower upnp zeroconf opengl test aqua kdeenablefinal
+3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks +upower upnp zeroconf opengl test aqua
 udisks? ( udev ) upower? ( udev )
 >=kde-base/katepart-4.7.4:4[aqua=] || ( ( >=kde-base/kfmclient-4.7.4:4[aqua=] ) x11-misc/xdg-utils ) handbook? ( >=kde-base/khelpcenter-4.7.4:4[aqua=] ) policykit? ( >=kde-misc/polkit-kde-kcmodules-0.98_pre20101127 >=sys-auth/polkit-kde-agent-0.99 ) semantic-desktop? ( >=kde-base/nepomuk-4.7.4:4[aqua=] )
 
diff --git a/metadata/cache/kde-base/kdelibs-4.7.4-r11 b/metadata/cache/kde-base/kdelibs-4.7.4-r11
index 9cea7ba0fdba..9e263e4ca797 100644
--- a/metadata/cache/kde-base/kdelibs-4.7.4-r11
+++ b/metadata/cache/kde-base/kdelibs-4.7.4-r11
@@ -8,7 +8,7 @@ LGPL-2.1
 KDE libraries needed by all KDE programs.
 ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks +upower upnp zeroconf opengl test aqua kdeenablefinal
+3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks +upower upnp zeroconf opengl test aqua
 udisks? ( udev ) upower? ( udev )
 >=kde-base/katepart-4.7.4:4[aqua=] || ( ( >=kde-base/kfmclient-4.7.4:4[aqua=] ) x11-misc/xdg-utils ) handbook? ( >=kde-base/khelpcenter-4.7.4:4[aqua=] ) policykit? ( >=kde-misc/polkit-kde-kcmodules-0.98_pre20101127 >=sys-auth/polkit-kde-agent-0.99 ) semantic-desktop? ( >=kde-base/nepomuk-4.7.4:4[aqua=] )
 
diff --git a/metadata/cache/kde-base/kdemultimedia-kioslaves-4.6.3 b/metadata/cache/kde-base/kdemultimedia-kioslaves-4.6.3
index 14c4c55d3078..d2983960b0c5 100644
--- a/metadata/cache/kde-base/kdemultimedia-kioslaves-4.6.3
+++ b/metadata/cache/kde-base/kdemultimedia-kioslaves-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE kioslaves from the kdemultimedia package
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug encode flac vorbis kdeprefix +handbook aqua kdeenablefinal
+debug encode flac vorbis kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdemultimedia-kioslaves-4.7.3 b/metadata/cache/kde-base/kdemultimedia-kioslaves-4.7.3
deleted file mode 100644
index 4928ebab7cec..000000000000
--- a/metadata/cache/kde-base/kdemultimedia-kioslaves-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkcddb-4.7.3:4[aqua=] >=kde-base/libkcompactdisc-4.7.3:4[aqua=] media-sound/cdparanoia encode? ( flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libvorbis ) ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/libkcddb-4.7.3:4[aqua=] >=kde-base/libkcompactdisc-4.7.3:4[aqua=] media-sound/cdparanoia encode? ( flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libvorbis ) ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdemultimedia-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-KDE kioslaves from the kdemultimedia package
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug encode flac vorbis +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdemultimedia-kioslaves-4.7.4 b/metadata/cache/kde-base/kdemultimedia-kioslaves-4.7.4
index f376ede927f5..c272dfda4569 100644
--- a/metadata/cache/kde-base/kdemultimedia-kioslaves-4.7.4
+++ b/metadata/cache/kde-base/kdemultimedia-kioslaves-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE kioslaves from the kdemultimedia package
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug encode flac vorbis +handbook aqua kdeenablefinal
+debug encode flac vorbis +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdemultimedia-meta-4.7.3 b/metadata/cache/kde-base/kdemultimedia-meta-4.7.3
deleted file mode 100644
index c86f3ead7352..000000000000
--- a/metadata/cache/kde-base/kdemultimedia-meta-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/dragonplayer-4.7.3:4[aqua=] >=kde-base/juk-4.7.3:4[aqua=] >=kde-base/kdemultimedia-kioslaves-4.7.3:4[aqua=] >=kde-base/kmix-4.7.3:4[aqua=] >=kde-base/kscd-4.7.3:4[aqua=] >=kde-base/libkcddb-4.7.3:4[aqua=] >=kde-base/libkcompactdisc-4.7.3:4[aqua=] mplayer? ( >=kde-base/mplayerthumbs-4.7.3:4[aqua=] ) ffmpeg? ( >=kde-base/ffmpegthumbs-4.7.3:4[aqua=] )
-4
-
-
-http://www.kde.org/
-GPL-2
-kdemultimedia - merge this to pull in all kdemultimedia-derived packages
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
-ffmpeg +mplayer aqua
-
-
-
-4
-
--
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdenetwork-filesharing-4.6.3 b/metadata/cache/kde-base/kdenetwork-filesharing-4.6.3
index 9cd797b6f7a4..bb98ecc53cc2 100644
--- a/metadata/cache/kde-base/kdenetwork-filesharing-4.6.3
+++ b/metadata/cache/kde-base/kdenetwork-filesharing-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 kcontrol filesharing config module for NFS, SMB etc
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdenetwork-filesharing-4.7.3 b/metadata/cache/kde-base/kdenetwork-filesharing-4.7.3
deleted file mode 100644
index e7a9b4c71e27..000000000000
--- a/metadata/cache/kde-base/kdenetwork-filesharing-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdenetwork-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-kcontrol filesharing config module for NFS, SMB etc
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdenetwork-filesharing-4.7.4 b/metadata/cache/kde-base/kdenetwork-filesharing-4.7.4
index af61da5f31bc..041368f8f4d0 100644
--- a/metadata/cache/kde-base/kdenetwork-filesharing-4.7.4
+++ b/metadata/cache/kde-base/kdenetwork-filesharing-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 kcontrol filesharing config module for NFS, SMB etc
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdenetwork-meta-4.7.3 b/metadata/cache/kde-base/kdenetwork-meta-4.7.3
deleted file mode 100644
index 7f3f3ad27662..000000000000
--- a/metadata/cache/kde-base/kdenetwork-meta-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/kdenetwork-filesharing-4.7.3:4[aqua=] >=kde-base/kdnssd-4.7.3:4[aqua=] >=kde-base/kget-4.7.3:4[aqua=] >=kde-base/kopete-4.7.3:4[aqua=] >=kde-base/krdc-4.7.3:4[aqua=] >=kde-base/krfb-4.7.3:4[aqua=] ppp? ( >=kde-base/kppp-4.7.3:4[aqua=] )
-4
-
-
-http://www.kde.org/
-GPL-2
-kdenetwork - merge this to pull in all kdenetwork-derived packages
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
-ppp aqua
-
-
-
-4
-
--
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdepasswd-4.6.3 b/metadata/cache/kde-base/kdepasswd-4.6.3
index b9dd03cf9ec3..d718796ee6e1 100644
--- a/metadata/cache/kde-base/kdepasswd-4.6.3
+++ b/metadata/cache/kde-base/kdepasswd-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE GUI for passwd
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdepasswd-4.7.3 b/metadata/cache/kde-base/kdepasswd-4.7.3
deleted file mode 100644
index 1307d6d5f9bb..000000000000
--- a/metadata/cache/kde-base/kdepasswd-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkonq-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/libkonq-4.7.3:4[aqua=] >=kde-base/kdesu-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-baseapps-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE GUI for passwd
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdepasswd-4.7.4 b/metadata/cache/kde-base/kdepasswd-4.7.4
index 8ec83a3a736a..2a9a7dc6c4af 100644
--- a/metadata/cache/kde-base/kdepasswd-4.7.4
+++ b/metadata/cache/kde-base/kdepasswd-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE GUI for passwd
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdepim-common-libs-4.7.3 b/metadata/cache/kde-base/kdepim-common-libs-4.7.3
deleted file mode 100644
index ba108d5b0514..000000000000
--- a/metadata/cache/kde-base/kdepim-common-libs-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-app-crypt/gpgme >=app-office/akonadi-server-1.3.60 >=dev-libs/shared-desktop-ontologies-0.6.50 >=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-app-crypt/gpgme >=app-office/akonadi-server-1.3.60 >=dev-libs/shared-desktop-ontologies-0.6.50 >=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] app-crypt/gnupg >=kde-base/kdepim-runtime-4.7.3:4[aqua=] !kde-base/akonadi:4 !kde-base/libkdepim:4 !kde-base/libkleo:4 !kde-base/libkpgp:4 !<kde-base/kaddressbook-4.4.90:4 !<kde-base/kmail-4.4.80:4 !<kde-base/korganizer-4.5.67:4 >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdepim-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-Common libraries for KDE PIM apps
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdepim-common-libs-4.7.4 b/metadata/cache/kde-base/kdepim-common-libs-4.7.4
index 82a7b680afcf..335c739a467b 100644
--- a/metadata/cache/kde-base/kdepim-common-libs-4.7.4
+++ b/metadata/cache/kde-base/kdepim-common-libs-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Common libraries for KDE PIM apps
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdepim-icons-4.4.11.1 b/metadata/cache/kde-base/kdepim-icons-4.4.11.1
index 80dc593a2812..4a76bc92ff4b 100644
--- a/metadata/cache/kde-base/kdepim-icons-4.4.11.1
+++ b/metadata/cache/kde-base/kdepim-icons-4.4.11.1
@@ -8,7 +8,7 @@ GPL-2
 KDE PIM icons
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-kdeprefix aqua kdeenablefinal
+kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdepim-icons-4.7.3 b/metadata/cache/kde-base/kdepim-icons-4.7.3
deleted file mode 100644
index c5e9589a556a..000000000000
--- a/metadata/cache/kde-base/kdepim-icons-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdepim-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE PIM icons
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdepim-icons-4.7.4 b/metadata/cache/kde-base/kdepim-icons-4.7.4
index d2d4dfd80a69..1326c0d97ac6 100644
--- a/metadata/cache/kde-base/kdepim-icons-4.7.4
+++ b/metadata/cache/kde-base/kdepim-icons-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE PIM icons
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdepim-kresources-4.4.11.1 b/metadata/cache/kde-base/kdepim-kresources-4.4.11.1
index 58478ecf34a8..95e7bd427ce6 100644
--- a/metadata/cache/kde-base/kdepim-kresources-4.4.11.1
+++ b/metadata/cache/kde-base/kdepim-kresources-4.4.11.1
@@ -8,7 +8,7 @@ GPL-2
 KDE PIM groupware plugin collection
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdepim-kresources-4.7.3 b/metadata/cache/kde-base/kdepim-kresources-4.7.3
deleted file mode 100644
index 845ce6117cf1..000000000000
--- a/metadata/cache/kde-base/kdepim-kresources-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.3:4[aqua=] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/kdepimlibs-4.7.3:4[aqua=] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdepim-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE PIM groupware plugin collection
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdepim-kresources-4.7.4 b/metadata/cache/kde-base/kdepim-kresources-4.7.4
index 0f076870742d..2c6db24fe65c 100644
--- a/metadata/cache/kde-base/kdepim-kresources-4.7.4
+++ b/metadata/cache/kde-base/kdepim-kresources-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE PIM groupware plugin collection
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdepim-l10n-4.4.11.1-r1 b/metadata/cache/kde-base/kdepim-l10n-4.4.11.1-r1
index 4849b3357640..81e820e5ae26 100644
--- a/metadata/cache/kde-base/kdepim-l10n-4.4.11.1-r1
+++ b/metadata/cache/kde-base/kdepim-l10n-4.4.11.1-r1
@@ -8,7 +8,7 @@ GPL-2
 KDE PIM internationalization package
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-linguas_ar linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_csb linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_fy linguas_ga linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_km linguas_kn linguas_ko linguas_lt linguas_lv linguas_mai linguas_mk linguas_ml linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_sr linguas_sv linguas_tg linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW kdeprefix aqua kdeenablefinal
+linguas_ar linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_csb linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_fy linguas_ga linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_km linguas_kn linguas_ko linguas_lt linguas_lv linguas_mai linguas_mk linguas_ml linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_sr linguas_sv linguas_tg linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdepim-l10n-4.7.3 b/metadata/cache/kde-base/kdepim-l10n-4.7.3
deleted file mode 100644
index aa3d015db06d..000000000000
--- a/metadata/cache/kde-base/kdepim-l10n-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-devel/gettext >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-linguas_ar? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-ar-4.7.3.tar.bz2 ) linguas_bg? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-bg-4.7.3.tar.bz2 ) linguas_bs? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-bs-4.7.3.tar.bz2 ) linguas_ca? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-ca-4.7.3.tar.bz2 ) linguas_ca@valencia? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-ca@valencia-4.7.3.tar.bz2 ) linguas_cs? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-cs-4.7.3.tar.bz2 ) linguas_da? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-da-4.7.3.tar.bz2 ) linguas_de? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-de-4.7.3.tar.bz2 ) linguas_el? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-el-4.7.3.tar.bz2 ) linguas_en_GB? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-en_GB-4.7.3.tar.bz2 ) linguas_es? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-es-4.7.3.tar.bz2 ) linguas_et? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-et-4.7.3.tar.bz2 ) linguas_eu? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-eu-4.7.3.tar.bz2 ) linguas_fi? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-fi-4.7.3.tar.bz2 ) linguas_fr? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-fr-4.7.3.tar.bz2 ) linguas_ga? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-ga-4.7.3.tar.bz2 ) linguas_gl? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-gl-4.7.3.tar.bz2 ) linguas_he? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-he-4.7.3.tar.bz2 ) linguas_hr? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-hr-4.7.3.tar.bz2 ) linguas_hu? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-hu-4.7.3.tar.bz2 ) linguas_ia? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-ia-4.7.3.tar.bz2 ) linguas_id? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-id-4.7.3.tar.bz2 ) linguas_is? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-is-4.7.3.tar.bz2 ) linguas_it? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-it-4.7.3.tar.bz2 ) linguas_ja? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-ja-4.7.3.tar.bz2 ) linguas_kk? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-kk-4.7.3.tar.bz2 ) linguas_km? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-km-4.7.3.tar.bz2 ) linguas_kn? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-kn-4.7.3.tar.bz2 ) linguas_ko? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-ko-4.7.3.tar.bz2 ) linguas_lt? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-lt-4.7.3.tar.bz2 ) linguas_lv? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-lv-4.7.3.tar.bz2 ) linguas_nb? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-nb-4.7.3.tar.bz2 ) linguas_nds? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-nds-4.7.3.tar.bz2 ) linguas_nl? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-nl-4.7.3.tar.bz2 ) linguas_nn? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-nn-4.7.3.tar.bz2 ) linguas_pa? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-pa-4.7.3.tar.bz2 ) linguas_pl? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-pl-4.7.3.tar.bz2 ) linguas_pt? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-pt-4.7.3.tar.bz2 ) linguas_pt_BR? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-pt_BR-4.7.3.tar.bz2 ) linguas_ro? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-ro-4.7.3.tar.bz2 ) linguas_ru? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-ru-4.7.3.tar.bz2 ) linguas_sk? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-sk-4.7.3.tar.bz2 ) linguas_sl? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-sl-4.7.3.tar.bz2 ) linguas_sr? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-sr-4.7.3.tar.bz2 ) linguas_sv? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-sv-4.7.3.tar.bz2 ) linguas_th? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-th-4.7.3.tar.bz2 ) linguas_tr? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-tr-4.7.3.tar.bz2 ) linguas_ug? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-ug-4.7.3.tar.bz2 ) linguas_uk? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-uk-4.7.3.tar.bz2 ) linguas_wa? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-wa-4.7.3.tar.bz2 ) linguas_zh_CN? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-zh_CN-4.7.3.tar.bz2 ) linguas_zh_TW? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-zh_TW-4.7.3.tar.bz2 )
-
-http://www.kde.org/
-GPL-2
-KDE PIM internationalization package
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-+handbook linguas_ar linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hr linguas_hu linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_km linguas_kn linguas_ko linguas_lt linguas_lv linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tr linguas_ug linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdepim-l10n-4.7.4 b/metadata/cache/kde-base/kdepim-l10n-4.7.4
index 0edd14371c61..1de31880506e 100644
--- a/metadata/cache/kde-base/kdepim-l10n-4.7.4
+++ b/metadata/cache/kde-base/kdepim-l10n-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE PIM internationalization package
 ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-+handbook linguas_ar linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hr linguas_hu linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_km linguas_kn linguas_ko linguas_lt linguas_lv linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tr linguas_ug linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
++handbook linguas_ar linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hr linguas_hu linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_km linguas_kn linguas_ko linguas_lt linguas_lv linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tr linguas_ug linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdepim-l10n-4.7.4-r1 b/metadata/cache/kde-base/kdepim-l10n-4.7.4-r1
index 824e81b20bda..fbd5766d3ce3 100644
--- a/metadata/cache/kde-base/kdepim-l10n-4.7.4-r1
+++ b/metadata/cache/kde-base/kdepim-l10n-4.7.4-r1
@@ -8,7 +8,7 @@ GPL-2
 KDE PIM internationalization package
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-linguas_ar linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hr linguas_hu linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_km linguas_kn linguas_ko linguas_lt linguas_lv linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tr linguas_ug linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW +handbook aqua kdeenablefinal
+linguas_ar linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hr linguas_hu linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_km linguas_kn linguas_ko linguas_lt linguas_lv linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tr linguas_ug linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdepim-meta-4.7.3 b/metadata/cache/kde-base/kdepim-meta-4.7.3
deleted file mode 100644
index 712af8d0a336..000000000000
--- a/metadata/cache/kde-base/kdepim-meta-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/akonadiconsole-4.7.3:4[aqua=] >=kde-base/akregator-4.7.3:4[aqua=] >=kde-base/blogilo-4.7.3:4[aqua=] >=kde-base/kabcclient-4.7.3:4[aqua=] >=kde-base/kaddressbook-4.7.3:4[aqua=] >=kde-base/kalarm-4.7.3:4[aqua=] >=kde-base/kdepim-icons-4.7.3:4[aqua=] >=kde-base/kdepim-kresources-4.7.3:4[aqua=] >=kde-base/kdepim-runtime-4.7.3:4[aqua=] >=kde-base/kdepim-strigi-analyzer-4.7.3:4[aqua=] >=kde-base/kdepim-wizards-4.7.3:4[aqua=] >=kde-base/kjots-4.7.3:4[aqua=] >=kde-base/kleopatra-4.7.3:4[aqua=] >=kde-base/kmail-4.7.3:4[aqua=] >=kde-base/knode-4.7.3:4[aqua=] >=kde-base/knotes-4.7.3:4[aqua=] >=kde-base/konsolekalendar-4.7.3:4[aqua=] >=kde-base/kontact-4.7.3:4[aqua=] >=kde-base/korganizer-4.7.3:4[aqua=] >=kde-base/ktimetracker-4.7.3:4[aqua=]
-4
-
-
-http://www.kde.org/
-GPL-2
-kdepim - merge this to pull in all kdepim-derived packages
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
-aqua
-
-
-
-4
-
--
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdepim-runtime-4.4.11.1 b/metadata/cache/kde-base/kdepim-runtime-4.4.11.1
index 3350372c0755..d938ff42d1da 100644
--- a/metadata/cache/kde-base/kdepim-runtime-4.4.11.1
+++ b/metadata/cache/kde-base/kdepim-runtime-4.4.11.1
@@ -8,7 +8,7 @@ GPL-2
 KDE PIM runtime plugin collection
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdepim-runtime-4.7.3 b/metadata/cache/kde-base/kdepim-runtime-4.7.3
deleted file mode 100644
index fbfc95b91230..000000000000
--- a/metadata/cache/kde-base/kdepim-runtime-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-app-misc/strigi >=app-office/akonadi-server-1.3.60 dev-libs/boost dev-libs/libxml2:2 dev-libs/libxslt >=dev-libs/shared-desktop-ontologies-0.6.51 >=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] x11-misc/shared-mime-info >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-app-misc/strigi >=app-office/akonadi-server-1.3.60 dev-libs/boost dev-libs/libxml2:2 dev-libs/libxslt >=dev-libs/shared-desktop-ontologies-0.6.51 >=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] x11-misc/shared-mime-info >=kde-base/kdepim-icons-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdepim-runtime-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-KDE PIM runtime plugin collection
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdepim-runtime-4.7.4 b/metadata/cache/kde-base/kdepim-runtime-4.7.4
index 0ebca244b888..55f5e855c00d 100644
--- a/metadata/cache/kde-base/kdepim-runtime-4.7.4
+++ b/metadata/cache/kde-base/kdepim-runtime-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE PIM runtime plugin collection
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdepim-strigi-analyzer-4.4.11.1 b/metadata/cache/kde-base/kdepim-strigi-analyzer-4.4.11.1
index e952cb484c36..d0c0961c1193 100644
--- a/metadata/cache/kde-base/kdepim-strigi-analyzer-4.4.11.1
+++ b/metadata/cache/kde-base/kdepim-strigi-analyzer-4.4.11.1
@@ -8,7 +8,7 @@ GPL-2
 kdepim: strigi plugins
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdepim-strigi-analyzer-4.7.3 b/metadata/cache/kde-base/kdepim-strigi-analyzer-4.7.3
deleted file mode 100644
index d4d0d5907541..000000000000
--- a/metadata/cache/kde-base/kdepim-strigi-analyzer-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-app-misc/strigi >=kde-base/kdepimlibs-4.7.3:4[aqua=] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-app-misc/strigi >=kde-base/kdepimlibs-4.7.3:4[aqua=] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdepim-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-kdepim: strigi plugins
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdepim-strigi-analyzer-4.7.4 b/metadata/cache/kde-base/kdepim-strigi-analyzer-4.7.4
index 27516823b7c1..91e6bcd0dd36 100644
--- a/metadata/cache/kde-base/kdepim-strigi-analyzer-4.7.4
+++ b/metadata/cache/kde-base/kdepim-strigi-analyzer-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 kdepim: strigi plugins
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdepim-wizards-4.4.11.1 b/metadata/cache/kde-base/kdepim-wizards-4.4.11.1
index d2cd2def097b..85daed96a061 100644
--- a/metadata/cache/kde-base/kdepim-wizards-4.4.11.1
+++ b/metadata/cache/kde-base/kdepim-wizards-4.4.11.1
@@ -8,7 +8,7 @@ GPL-2
 KDE PIM wizards
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdepim-wizards-4.7.3 b/metadata/cache/kde-base/kdepim-wizards-4.7.3
deleted file mode 100644
index a3120248cca8..000000000000
--- a/metadata/cache/kde-base/kdepim-wizards-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.3:4[aqua=] >=kde-base/kdepim-kresources-4.7.3:4[aqua=] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/kdepimlibs-4.7.3:4[aqua=] >=kde-base/kdepim-kresources-4.7.3:4[aqua=] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdepim-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE PIM wizards
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdepim-wizards-4.7.4 b/metadata/cache/kde-base/kdepim-wizards-4.7.4
index 4b7f8bd174b9..f279b6713761 100644
--- a/metadata/cache/kde-base/kdepim-wizards-4.7.4
+++ b/metadata/cache/kde-base/kdepim-wizards-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE PIM wizards
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdepimlibs-4.6.3 b/metadata/cache/kde-base/kdepimlibs-4.6.3
index 8ba797a84586..f0ede573d3d7 100644
--- a/metadata/cache/kde-base/kdepimlibs-4.6.3
+++ b/metadata/cache/kde-base/kdepimlibs-4.6.3
@@ -8,7 +8,7 @@ LGPL-2.1
 Common library for KDE PIM apps.
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug ldap semantic-desktop kdeprefix test +handbook aqua kdeenablefinal
+debug ldap semantic-desktop kdeprefix test +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdepimlibs-4.7.3-r1 b/metadata/cache/kde-base/kdepimlibs-4.7.3-r1
deleted file mode 100644
index b4f7adf8220a..000000000000
--- a/metadata/cache/kde-base/kdepimlibs-4.7.3-r1
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-crypt/gpgme-1.1.6 dev-libs/libgpg-error >=dev-libs/libical-0.43 dev-libs/cyrus-sasl >=kde-base/kdelibs-4.7.3:4[aqua=,semantic-desktop=] semantic-desktop? ( >=app-office/akonadi-server-1.5.80 media-libs/phonon x11-misc/shared-mime-info ) ldap? ( net-nds/openldap ) >=dev-libs/boost-1.35.0-r5 >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) test? ( dev-util/cppunit ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=app-crypt/gpgme-1.1.6 dev-libs/libgpg-error >=dev-libs/libical-0.43 dev-libs/cyrus-sasl >=kde-base/kdelibs-4.7.3:4[aqua=,semantic-desktop=] semantic-desktop? ( >=app-office/akonadi-server-1.5.80 media-libs/phonon x11-misc/shared-mime-info ) ldap? ( net-nds/openldap ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdepimlibs-4.7.3.tar.bz2
-test
-http://www.kde.org/
-LGPL-2.1
-Common library for KDE PIM apps.
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug ldap semantic-desktop test +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdepimlibs-4.7.4-r1 b/metadata/cache/kde-base/kdepimlibs-4.7.4-r1
index 7ef8667bc541..ab565fbd7d4d 100644
--- a/metadata/cache/kde-base/kdepimlibs-4.7.4-r1
+++ b/metadata/cache/kde-base/kdepimlibs-4.7.4-r1
@@ -8,7 +8,7 @@ LGPL-2.1
 Common library for KDE PIM apps.
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug ldap semantic-desktop test +handbook aqua kdeenablefinal
+debug ldap semantic-desktop test +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdeplasma-addons-4.6.3 b/metadata/cache/kde-base/kdeplasma-addons-4.6.3
index e0855fbe5c89..7f3f0a922706 100644
--- a/metadata/cache/kde-base/kdeplasma-addons-4.6.3
+++ b/metadata/cache/kde-base/kdeplasma-addons-4.6.3
@@ -8,7 +8,7 @@ GPL-2 LGPL-2
 Extra Plasma applets and engines.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-attica debug desktopglobe exif qalculate qwt scim semantic-desktop kdeprefix aqua kdeenablefinal
+attica debug desktopglobe exif qalculate qwt scim semantic-desktop kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdeplasma-addons-4.7.3 b/metadata/cache/kde-base/kdeplasma-addons-4.7.3
deleted file mode 100644
index 5e4b165fd9cb..000000000000
--- a/metadata/cache/kde-base/kdeplasma-addons-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-app-crypt/qca:2 app-crypt/qca-ossl:2 >=kde-base/kdelibs-4.7.3:4[aqua=,semantic-desktop=] >=kde-base/krunner-4.7.3:4[aqua=] >=kde-base/plasma-workspace-4.7.3:4[aqua=,semantic-desktop=] x11-misc/shared-mime-info attica? ( dev-libs/libattica ) desktopglobe? ( >=kde-base/marble-4.7.3:4[aqua=] ) exif? ( >=kde-base/libkexiv2-4.7.3:4[aqua=] ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] >=kde-base/plasma-workspace-4.7.3:4[aqua=,rss] ) dev-cpp/eigen:2 >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-app-crypt/qca:2 app-crypt/qca-ossl:2 >=kde-base/kdelibs-4.7.3:4[aqua=,semantic-desktop=] >=kde-base/krunner-4.7.3:4[aqua=] >=kde-base/plasma-workspace-4.7.3:4[aqua=,semantic-desktop=] x11-misc/shared-mime-info attica? ( dev-libs/libattica ) desktopglobe? ( >=kde-base/marble-4.7.3:4[aqua=] ) exif? ( >=kde-base/libkexiv2-4.7.3:4[aqua=] ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] >=kde-base/plasma-workspace-4.7.3:4[aqua=,rss] ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeplasma-addons-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2 LGPL-2
-Extra Plasma applets and engines.
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-attica debug desktopglobe exif qalculate qwt scim semantic-desktop aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdeplasma-addons-4.7.3-r1 b/metadata/cache/kde-base/kdeplasma-addons-4.7.3-r1
deleted file mode 100644
index 747dbd4174fe..000000000000
--- a/metadata/cache/kde-base/kdeplasma-addons-4.7.3-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-app-crypt/qca:2 app-crypt/qca-ossl:2 >=kde-base/kdelibs-4.7.3:4[aqua=,semantic-desktop=] >=kde-base/krunner-4.7.3:4[aqua=] >=kde-base/plasma-workspace-4.7.3:4[aqua=,semantic-desktop=] x11-misc/shared-mime-info attica? ( dev-libs/libattica ) desktopglobe? ( >=kde-base/marble-4.7.3:4[aqua=] ) exif? ( >=kde-base/libkexiv2-4.7.3:4[aqua=] ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] >=kde-base/plasma-workspace-4.7.3:4[aqua=,rss] ) dev-cpp/eigen:2 >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-app-crypt/qca:2 app-crypt/qca-ossl:2 >=kde-base/kdelibs-4.7.3:4[aqua=,semantic-desktop=] >=kde-base/krunner-4.7.3:4[aqua=] >=kde-base/plasma-workspace-4.7.3:4[aqua=,semantic-desktop=] x11-misc/shared-mime-info attica? ( dev-libs/libattica ) desktopglobe? ( >=kde-base/marble-4.7.3:4[aqua=] ) exif? ( >=kde-base/libkexiv2-4.7.3:4[aqua=] ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] >=kde-base/plasma-workspace-4.7.3:4[aqua=,rss] ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeplasma-addons-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2 LGPL-2
-Extra Plasma applets and engines.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-attica debug desktopglobe exif qalculate qwt scim semantic-desktop aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdeplasma-addons-4.7.4 b/metadata/cache/kde-base/kdeplasma-addons-4.7.4
index 6cec67f1cb98..3a3647da8ba8 100644
--- a/metadata/cache/kde-base/kdeplasma-addons-4.7.4
+++ b/metadata/cache/kde-base/kdeplasma-addons-4.7.4
@@ -8,7 +8,7 @@ GPL-2 LGPL-2
 Extra Plasma applets and engines.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-attica debug desktopglobe exif qalculate qwt scim semantic-desktop aqua kdeenablefinal
+attica debug desktopglobe exif qalculate qwt scim semantic-desktop aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdesdk-kioslaves-4.6.3 b/metadata/cache/kde-base/kdesdk-kioslaves-4.6.3
index ceccef0f2535..b04482c6b6a0 100644
--- a/metadata/cache/kde-base/kdesdk-kioslaves-4.6.3
+++ b/metadata/cache/kde-base/kdesdk-kioslaves-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 kioslaves from kdesdk package
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug subversion kdeprefix aqua kdeenablefinal
+debug subversion kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdesdk-kioslaves-4.7.3 b/metadata/cache/kde-base/kdesdk-kioslaves-4.7.3
deleted file mode 100644
index bd32c44e43e3..000000000000
--- a/metadata/cache/kde-base/kdesdk-kioslaves-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-subversion? ( dev-libs/apr dev-vcs/subversion ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-subversion? ( dev-libs/apr dev-vcs/subversion ) subversion? ( !>=dev-vcs/kdesvn-1.5.2:4 ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdesdk-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-kioslaves from kdesdk package
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug subversion aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdesdk-kioslaves-4.7.4 b/metadata/cache/kde-base/kdesdk-kioslaves-4.7.4
index 2ec8773b9c4f..d75492a0f08c 100644
--- a/metadata/cache/kde-base/kdesdk-kioslaves-4.7.4
+++ b/metadata/cache/kde-base/kdesdk-kioslaves-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 kioslaves from kdesdk package
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug subversion aqua kdeenablefinal
+debug subversion aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdesdk-meta-4.7.3 b/metadata/cache/kde-base/kdesdk-meta-4.7.3
deleted file mode 100644
index c2f17ed0332e..000000000000
--- a/metadata/cache/kde-base/kdesdk-meta-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-
-cvs? ( >=kde-base/cervisia-4.7.3:4[aqua=] ) >=kde-base/dolphin-plugins-4.7.3:4[aqua=] >=kde-base/kapptemplate-4.7.3:4[aqua=] >=kde-base/kate-4.7.3:4[aqua=] >=kde-base/kcachegrind-4.7.3:4[aqua=] >=kde-base/kdeaccounts-plugin-4.7.3:4[aqua=] >=kde-base/kdesdk-kioslaves-4.7.3:4[aqua=] >=kde-base/kdesdk-misc-4.7.3:4[aqua=] >=kde-base/kdesdk-scripts-4.7.3:4[aqua=] >=kde-base/kdesdk-strigi-analyzer-4.7.3:4[aqua=] >=kde-base/kompare-4.7.3:4[aqua=] >=kde-base/kstartperf-4.7.3:4[aqua=] >=kde-base/kuiviewer-4.7.3:4[aqua=] >=kde-base/lokalize-4.7.3:4[aqua=] >=kde-base/okteta-4.7.3:4[aqua=] >=kde-base/umbrello-4.7.3:4[aqua=]
-4
-
-
-http://www.kde.org/
-GPL-2
-KDE SDK - merge this to pull in all kdesdk-derived packages
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
-cvs aqua
-
-
-
-4
-
--
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdesdk-misc-4.6.3 b/metadata/cache/kde-base/kdesdk-misc-4.6.3
index e6594ecb6b18..bbfe059600c4 100644
--- a/metadata/cache/kde-base/kdesdk-misc-4.6.3
+++ b/metadata/cache/kde-base/kdesdk-misc-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE miscellaneous SDK tools
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug extras kdeprefix aqua kdeenablefinal
+debug extras kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdesdk-misc-4.7.3 b/metadata/cache/kde-base/kdesdk-misc-4.7.3
deleted file mode 100644
index 31d2b5af7883..000000000000
--- a/metadata/cache/kde-base/kdesdk-misc-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-extras? ( >=dev-java/antlr-2.7.7:0[cxx,script] ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-extras? ( >=dev-java/antlr-2.7.7:0[cxx,script] ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdesdk-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE miscellaneous SDK tools
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug extras aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdesdk-misc-4.7.4 b/metadata/cache/kde-base/kdesdk-misc-4.7.4
index 3f8e793d0b4d..6cabe2d328c6 100644
--- a/metadata/cache/kde-base/kdesdk-misc-4.7.4
+++ b/metadata/cache/kde-base/kdesdk-misc-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE miscellaneous SDK tools
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug extras aqua kdeenablefinal
+debug extras aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdesdk-scripts-4.6.3 b/metadata/cache/kde-base/kdesdk-scripts-4.6.3
index 7899d22d588a..a36d657969fb 100644
--- a/metadata/cache/kde-base/kdesdk-scripts-4.6.3
+++ b/metadata/cache/kde-base/kdesdk-scripts-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE SDK Scripts
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-+handbook debug kdeprefix +handbook aqua kdeenablefinal
++handbook debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdesdk-scripts-4.7.3 b/metadata/cache/kde-base/kdesdk-scripts-4.7.3
deleted file mode 100644
index f9dde894ef7a..000000000000
--- a/metadata/cache/kde-base/kdesdk-scripts-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-app-arch/advancecomp >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdesdk-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE SDK Scripts
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdesdk-scripts-4.7.4 b/metadata/cache/kde-base/kdesdk-scripts-4.7.4
index 4d18ca2fc554..c452d1a67626 100644
--- a/metadata/cache/kde-base/kdesdk-scripts-4.7.4
+++ b/metadata/cache/kde-base/kdesdk-scripts-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE SDK Scripts
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdesdk-strigi-analyzer-4.6.3 b/metadata/cache/kde-base/kdesdk-strigi-analyzer-4.6.3
index 1bd680d85483..c26688a3d8ad 100644
--- a/metadata/cache/kde-base/kdesdk-strigi-analyzer-4.6.3
+++ b/metadata/cache/kde-base/kdesdk-strigi-analyzer-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 kdesdk: strigi plugins
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdesdk-strigi-analyzer-4.7.3 b/metadata/cache/kde-base/kdesdk-strigi-analyzer-4.7.3
deleted file mode 100644
index 7b273bb67afa..000000000000
--- a/metadata/cache/kde-base/kdesdk-strigi-analyzer-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-app-misc/strigi >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-app-misc/strigi >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdesdk-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-kdesdk: strigi plugins
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdesdk-strigi-analyzer-4.7.4 b/metadata/cache/kde-base/kdesdk-strigi-analyzer-4.7.4
index ee84f384b0cf..f07ebf131b60 100644
--- a/metadata/cache/kde-base/kdesdk-strigi-analyzer-4.7.4
+++ b/metadata/cache/kde-base/kdesdk-strigi-analyzer-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 kdesdk: strigi plugins
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdesu-4.6.3 b/metadata/cache/kde-base/kdesu-4.6.3
index 9bd0b0b7575c..896e185fa864 100644
--- a/metadata/cache/kde-base/kdesu-4.6.3
+++ b/metadata/cache/kde-base/kdesu-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: gui for su(1)
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdesu-4.7.3 b/metadata/cache/kde-base/kdesu-4.7.3
deleted file mode 100644
index e995ce31bb54..000000000000
--- a/metadata/cache/kde-base/kdesu-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: gui for su(1)
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdesu-4.7.4 b/metadata/cache/kde-base/kdesu-4.7.4
index 9cf4e8b7142d..bd364fe16685 100644
--- a/metadata/cache/kde-base/kdesu-4.7.4
+++ b/metadata/cache/kde-base/kdesu-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: gui for su(1)
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdetoys-meta-4.7.3 b/metadata/cache/kde-base/kdetoys-meta-4.7.3
deleted file mode 100644
index 01d296fb36bf..000000000000
--- a/metadata/cache/kde-base/kdetoys-meta-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/amor-4.7.3:4[aqua=] >=kde-base/kteatime-4.7.3:4[aqua=] >=kde-base/ktux-4.7.3:4[aqua=]
-4
-
-
-http://www.kde.org/
-GPL-2
-KDE toys - merge this to pull in all kdetoys-derived packages
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
-aqua
-
-
-
-4
-
--
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdeutils-meta-4.7.3 b/metadata/cache/kde-base/kdeutils-meta-4.7.3
deleted file mode 100644
index bb9d4df97114..000000000000
--- a/metadata/cache/kde-base/kdeutils-meta-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/ark-4.7.3:4[aqua=] >=kde-base/filelight-4.7.3:4[aqua=] >=kde-base/kcalc-4.7.3:4[aqua=] >=kde-base/kcharselect-4.7.3:4[aqua=] >=kde-base/kdf-4.7.3:4[aqua=] >=kde-base/kgpg-4.7.3:4[aqua=] >=kde-base/kremotecontrol-4.7.3:4[aqua=] >=kde-base/ktimer-4.7.3:4[aqua=] >=kde-base/kwallet-4.7.3:4[aqua=] >=kde-base/superkaramba-4.7.3:4[aqua=] >=kde-base/sweeper-4.7.3:4[aqua=] cups? ( >=kde-base/printer-applet-4.7.3:4[aqua=] ) floppy? ( >=kde-base/kfloppy-4.7.3:4[aqua=] )
-4
-
-
-http://www.kde.org/
-GPL-2
-kdeutils - merge this to pull in all kdeutils-derived packages
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
-cups floppy aqua
-
-
-
-4
-
--
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdewebdev-meta-4.7.3 b/metadata/cache/kde-base/kdewebdev-meta-4.7.3
deleted file mode 100644
index a9a4486aefe7..000000000000
--- a/metadata/cache/kde-base/kdewebdev-meta-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/kfilereplace-4.7.3:4[aqua=] >=kde-base/kimagemapeditor-4.7.3:4[aqua=] >=kde-base/klinkstatus-4.7.3:4[aqua=] >=kde-base/kommander-4.7.3:4[aqua=]
-4
-
-
-http://www.kde.org/
-GPL-2
-KDE WebDev - merge this to pull in all kdewebdev-derived packages
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
-aqua
-
-
-
-4
-
--
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdf-4.6.3 b/metadata/cache/kde-base/kdf-4.6.3
index c3e3739fb527..21130c36084d 100644
--- a/metadata/cache/kde-base/kdf-4.6.3
+++ b/metadata/cache/kde-base/kdf-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE free disk space utility
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdf-4.7.3 b/metadata/cache/kde-base/kdf-4.7.3
deleted file mode 100644
index 2e31ef09d1f6..000000000000
--- a/metadata/cache/kde-base/kdf-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeutils-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE free disk space utility
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdf-4.7.4 b/metadata/cache/kde-base/kdf-4.7.4
index 39554d4b3d00..e1f967b748dc 100644
--- a/metadata/cache/kde-base/kdf-4.7.4
+++ b/metadata/cache/kde-base/kdf-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE free disk space utility
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdialog-4.6.3 b/metadata/cache/kde-base/kdialog-4.6.3
index 74720f1cd353..937e5f032919 100644
--- a/metadata/cache/kde-base/kdialog-4.6.3
+++ b/metadata/cache/kde-base/kdialog-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDialog can be used to show nice dialog boxes from shell scripts
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdialog-4.7.3 b/metadata/cache/kde-base/kdialog-4.7.3
deleted file mode 100644
index cae2d45afc92..000000000000
--- a/metadata/cache/kde-base/kdialog-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-baseapps-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDialog can be used to show nice dialog boxes from shell scripts
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdialog-4.7.4 b/metadata/cache/kde-base/kdialog-4.7.4
index 552a287f2b96..19ec2cf71657 100644
--- a/metadata/cache/kde-base/kdialog-4.7.4
+++ b/metadata/cache/kde-base/kdialog-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDialog can be used to show nice dialog boxes from shell scripts
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdiamond-4.6.3 b/metadata/cache/kde-base/kdiamond-4.6.3
index 4b38ddca82ac..9216e000a5a4 100644
--- a/metadata/cache/kde-base/kdiamond-4.6.3
+++ b/metadata/cache/kde-base/kdiamond-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: KDiamond is a three-in-a-row game.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdiamond-4.7.3 b/metadata/cache/kde-base/kdiamond-4.7.3
deleted file mode 100644
index e71309161518..000000000000
--- a/metadata/cache/kde-base/kdiamond-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: KDiamond is a three-in-a-row game.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdiamond-4.7.4 b/metadata/cache/kde-base/kdiamond-4.7.4
index c3424bc9e7d9..a4bc6820bb84 100644
--- a/metadata/cache/kde-base/kdiamond-4.7.4
+++ b/metadata/cache/kde-base/kdiamond-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: KDiamond is a three-in-a-row game.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdm-4.6.3-r1 b/metadata/cache/kde-base/kdm-4.6.3-r1
index 3b820579d5cd..c85e32f746d3 100644
--- a/metadata/cache/kde-base/kdm-4.6.3-r1
+++ b/metadata/cache/kde-base/kdm-4.6.3-r1
@@ -8,7 +8,7 @@ GPL-2
 KDE login manager, similar to xdm and gdm
 amd64 ~arm ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-+consolekit debug kerberos pam kdeprefix +handbook aqua kdeenablefinal
++consolekit debug kerberos pam kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdm-4.7.3-r1 b/metadata/cache/kde-base/kdm-4.7.3-r1
deleted file mode 100644
index d1f475300dbd..000000000000
--- a/metadata/cache/kde-base/kdm-4.7.3-r1
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkworkspace-4.7.3:4[aqua=] x11-libs/libXau x11-libs/libXdmcp x11-libs/libXtst consolekit? ( >=sys-apps/dbus-1.0.2 sys-auth/consolekit ) kerberos? ( virtual/krb5 ) pam? ( >=kde-base/kcheckpass-4.7.3:4[aqua=] virtual/pam ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/libkworkspace-4.7.3:4[aqua=] x11-libs/libXau x11-libs/libXdmcp x11-libs/libXtst consolekit? ( >=sys-apps/dbus-1.0.2 sys-auth/consolekit ) kerberos? ( virtual/krb5 ) pam? ( >=kde-base/kcheckpass-4.7.3:4[aqua=] virtual/pam ) >=kde-base/kdepasswd-4.7.3:4[aqua=] >=x11-apps/xinit-1.0.5-r2 x11-apps/xmessage >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE login manager, similar to xdm and gdm
-amd64 ~arm ~ppc ~ppc64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-+consolekit debug kerberos pam +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdm-4.7.4 b/metadata/cache/kde-base/kdm-4.7.4
index 6d0a748543ac..8e2e9cd27f35 100644
--- a/metadata/cache/kde-base/kdm-4.7.4
+++ b/metadata/cache/kde-base/kdm-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE login manager, similar to xdm and gdm
 amd64 ~arm ~ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-+consolekit debug kerberos pam +handbook aqua kdeenablefinal
++consolekit debug kerberos pam +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdnssd-4.6.3 b/metadata/cache/kde-base/kdnssd-4.6.3
index 39164003e634..84f463179a39 100644
--- a/metadata/cache/kde-base/kdnssd-4.6.3
+++ b/metadata/cache/kde-base/kdnssd-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 A DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug zeroconf kdeprefix aqua kdeenablefinal
+debug zeroconf kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdnssd-4.7.3 b/metadata/cache/kde-base/kdnssd-4.7.3
deleted file mode 100644
index 4170bf4fa9e2..000000000000
--- a/metadata/cache/kde-base/kdnssd-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-zeroconf? ( >=kde-base/kdelibs-4.7.3:4[aqua=,zeroconf] ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-zeroconf? ( >=kde-base/kdelibs-4.7.3:4[aqua=,zeroconf] ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdenetwork-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-A DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug zeroconf aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdnssd-4.7.4 b/metadata/cache/kde-base/kdnssd-4.7.4
index 1d63fcfc7029..4501c365f0a1 100644
--- a/metadata/cache/kde-base/kdnssd-4.7.4
+++ b/metadata/cache/kde-base/kdnssd-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 A DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug zeroconf aqua kdeenablefinal
+debug zeroconf aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdontchangethehostname-4.6.3 b/metadata/cache/kde-base/kdontchangethehostname-4.6.3
index b4b62263afcc..44e69f3e44c2 100644
--- a/metadata/cache/kde-base/kdontchangethehostname-4.6.3
+++ b/metadata/cache/kde-base/kdontchangethehostname-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Tool to inform KDE about a change in hostname
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kdontchangethehostname-4.7.3 b/metadata/cache/kde-base/kdontchangethehostname-4.7.3
deleted file mode 100644
index 644f3e75100d..000000000000
--- a/metadata/cache/kde-base/kdontchangethehostname-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-x11-apps/xauth >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Tool to inform KDE about a change in hostname
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kdontchangethehostname-4.7.4 b/metadata/cache/kde-base/kdontchangethehostname-4.7.4
index cffcd2838232..d7bf9315c765 100644
--- a/metadata/cache/kde-base/kdontchangethehostname-4.7.4
+++ b/metadata/cache/kde-base/kdontchangethehostname-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Tool to inform KDE about a change in hostname
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/keditbookmarks-4.6.3 b/metadata/cache/kde-base/keditbookmarks-4.6.3
index 0a2dc942be21..2e483349cae0 100644
--- a/metadata/cache/kde-base/keditbookmarks-4.6.3
+++ b/metadata/cache/kde-base/keditbookmarks-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE's bookmarks editor
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/keditbookmarks-4.7.3 b/metadata/cache/kde-base/keditbookmarks-4.7.3
deleted file mode 100644
index 9a0cfb237e86..000000000000
--- a/metadata/cache/kde-base/keditbookmarks-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkonq-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/libkonq-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-baseapps-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-KDE's bookmarks editor
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/keditbookmarks-4.7.4 b/metadata/cache/kde-base/keditbookmarks-4.7.4
index d03a17bd2dd1..21d3ab271a8f 100644
--- a/metadata/cache/kde-base/keditbookmarks-4.7.4
+++ b/metadata/cache/kde-base/keditbookmarks-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE's bookmarks editor
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/keditfiletype-4.6.3 b/metadata/cache/kde-base/keditfiletype-4.6.3
index 80b7e2df54d4..6cd601b7d988 100644
--- a/metadata/cache/kde-base/keditfiletype-4.6.3
+++ b/metadata/cache/kde-base/keditfiletype-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE mime/file type assocciation editor
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/keditfiletype-4.7.3 b/metadata/cache/kde-base/keditfiletype-4.7.3
deleted file mode 100644
index 113c5b34489d..000000000000
--- a/metadata/cache/kde-base/keditfiletype-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-KDE mime/file type assocciation editor
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/keditfiletype-4.7.4 b/metadata/cache/kde-base/keditfiletype-4.7.4
index b00d6a407305..591702a7463c 100644
--- a/metadata/cache/kde-base/keditfiletype-4.7.4
+++ b/metadata/cache/kde-base/keditfiletype-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE mime/file type assocciation editor
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kephal-4.6.3 b/metadata/cache/kde-base/kephal-4.6.3
index a4b3dddf3e62..989ded32446b 100644
--- a/metadata/cache/kde-base/kephal-4.6.3
+++ b/metadata/cache/kde-base/kephal-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Allows handling of multihead systems via the XRandR extension
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kephal-4.7.3 b/metadata/cache/kde-base/kephal-4.7.3
deleted file mode 100644
index 657b8287e302..000000000000
--- a/metadata/cache/kde-base/kephal-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-libs/libxkbfile x11-libs/libXrandr x11-proto/randrproto >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-x11-libs/libxkbfile x11-libs/libXrandr >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Allows handling of multihead systems via the XRandR extension
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kephal-4.7.4 b/metadata/cache/kde-base/kephal-4.7.4
index 1117e7e292e7..d36e2a9088c4 100644
--- a/metadata/cache/kde-base/kephal-4.7.4
+++ b/metadata/cache/kde-base/kephal-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Allows handling of multihead systems via the XRandR extension
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kfile-4.6.3 b/metadata/cache/kde-base/kfile-4.6.3
index cb7994ffc6e3..b03e27219e8c 100644
--- a/metadata/cache/kde-base/kfile-4.6.3
+++ b/metadata/cache/kde-base/kfile-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 A commandline frontend to KFileMetaInfo
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kfile-4.7.3 b/metadata/cache/kde-base/kfile-4.7.3
deleted file mode 100644
index 4dec3719d076..000000000000
--- a/metadata/cache/kde-base/kfile-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-A commandline frontend to KFileMetaInfo
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kfile-4.7.4 b/metadata/cache/kde-base/kfile-4.7.4
index b29fa10c720f..8afc701eacad 100644
--- a/metadata/cache/kde-base/kfile-4.7.4
+++ b/metadata/cache/kde-base/kfile-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 A commandline frontend to KFileMetaInfo
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kfilereplace-4.6.3 b/metadata/cache/kde-base/kfilereplace-4.6.3
index 932fc87d4ff5..cc246de92a21 100644
--- a/metadata/cache/kde-base/kfilereplace-4.6.3
+++ b/metadata/cache/kde-base/kfilereplace-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE web development - powerful search and replace in multiple files
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kfilereplace-4.7.3 b/metadata/cache/kde-base/kfilereplace-4.7.3
deleted file mode 100644
index b03736bf70a7..000000000000
--- a/metadata/cache/kde-base/kfilereplace-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdewebdev-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE web development - powerful search and replace in multiple files
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kfilereplace-4.7.4 b/metadata/cache/kde-base/kfilereplace-4.7.4
index 2306d8098d7c..b31bc93e6f9c 100644
--- a/metadata/cache/kde-base/kfilereplace-4.7.4
+++ b/metadata/cache/kde-base/kfilereplace-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE web development - powerful search and replace in multiple files
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kfind-4.6.3 b/metadata/cache/kde-base/kfind-4.6.3
index 44443d765a88..c5b91cfc73c4 100644
--- a/metadata/cache/kde-base/kfind-4.6.3
+++ b/metadata/cache/kde-base/kfind-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE file finder utility
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kfind-4.7.3 b/metadata/cache/kde-base/kfind-4.7.3
deleted file mode 100644
index 7e45aced424d..000000000000
--- a/metadata/cache/kde-base/kfind-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkonq-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/libkonq-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-baseapps-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE file finder utility
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kfind-4.7.4 b/metadata/cache/kde-base/kfind-4.7.4
index 08ee4a542ee5..175d1103c021 100644
--- a/metadata/cache/kde-base/kfind-4.7.4
+++ b/metadata/cache/kde-base/kfind-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE file finder utility
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kfloppy-4.6.3 b/metadata/cache/kde-base/kfloppy-4.6.3
index 01b9fd6a1783..00eb5fcbf34c 100644
--- a/metadata/cache/kde-base/kfloppy-4.6.3
+++ b/metadata/cache/kde-base/kfloppy-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KFloppy - formats disks and puts a DOS or ext2fs filesystem on them.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kfloppy-4.7.3 b/metadata/cache/kde-base/kfloppy-4.7.3
deleted file mode 100644
index dfc6fe400ad6..000000000000
--- a/metadata/cache/kde-base/kfloppy-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeutils-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KFloppy - formats disks and puts a DOS or ext2fs filesystem on them.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kfloppy-4.7.4 b/metadata/cache/kde-base/kfloppy-4.7.4
index e261236a55e5..1ba17becfd82 100644
--- a/metadata/cache/kde-base/kfloppy-4.7.4
+++ b/metadata/cache/kde-base/kfloppy-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KFloppy - formats disks and puts a DOS or ext2fs filesystem on them.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kfmclient-4.6.3 b/metadata/cache/kde-base/kfmclient-4.6.3
index f62763f73655..e3bf77e032ba 100644
--- a/metadata/cache/kde-base/kfmclient-4.6.3
+++ b/metadata/cache/kde-base/kfmclient-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE tool for opening URLs from the command line
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kfmclient-4.7.3 b/metadata/cache/kde-base/kfmclient-4.7.3
deleted file mode 100644
index 8fad6368d4fc..000000000000
--- a/metadata/cache/kde-base/kfmclient-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-baseapps-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE tool for opening URLs from the command line
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kfmclient-4.7.4 b/metadata/cache/kde-base/kfmclient-4.7.4
index 61e60eb80667..fc8399523f1e 100644
--- a/metadata/cache/kde-base/kfmclient-4.7.4
+++ b/metadata/cache/kde-base/kfmclient-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE tool for opening URLs from the command line
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kfourinline-4.6.3 b/metadata/cache/kde-base/kfourinline-4.6.3
index 371d24f5e97d..153a0e9a4604 100644
--- a/metadata/cache/kde-base/kfourinline-4.6.3
+++ b/metadata/cache/kde-base/kfourinline-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE four-in-a-row game.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kfourinline-4.7.3 b/metadata/cache/kde-base/kfourinline-4.7.3
deleted file mode 100644
index 1a10b129424a..000000000000
--- a/metadata/cache/kde-base/kfourinline-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE four-in-a-row game.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kfourinline-4.7.4 b/metadata/cache/kde-base/kfourinline-4.7.4
index 50e576c8f4b9..c764123f95fa 100644
--- a/metadata/cache/kde-base/kfourinline-4.7.4
+++ b/metadata/cache/kde-base/kfourinline-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE four-in-a-row game.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kgamma-4.6.3 b/metadata/cache/kde-base/kgamma-4.6.3
index 8283c02a8ad2..70798341b61b 100644
--- a/metadata/cache/kde-base/kgamma-4.6.3
+++ b/metadata/cache/kde-base/kgamma-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE screen gamma values kcontrol module
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kgamma-4.7.3 b/metadata/cache/kde-base/kgamma-4.7.3
deleted file mode 100644
index a204be44fcf9..000000000000
--- a/metadata/cache/kde-base/kgamma-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-libs/libXxf86vm x11-proto/xf86vidmodeproto >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-x11-libs/libXxf86vm >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kgamma-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE screen gamma values kcontrol module
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kgamma-4.7.4 b/metadata/cache/kde-base/kgamma-4.7.4
index b7df9a32d43f..bb46065bee0f 100644
--- a/metadata/cache/kde-base/kgamma-4.7.4
+++ b/metadata/cache/kde-base/kgamma-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE screen gamma values kcontrol module
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kgeography-4.6.3 b/metadata/cache/kde-base/kgeography-4.6.3
index d89e8cb4769a..079386e166d2 100644
--- a/metadata/cache/kde-base/kgeography-4.6.3
+++ b/metadata/cache/kde-base/kgeography-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: a geography learning tool
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kgeography-4.7.3 b/metadata/cache/kde-base/kgeography-4.7.3
deleted file mode 100644
index 615e6268def5..000000000000
--- a/metadata/cache/kde-base/kgeography-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kgeography-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: a geography learning tool
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kgeography-4.7.4 b/metadata/cache/kde-base/kgeography-4.7.4
index 28c310d2a401..fd98a1f76aca 100644
--- a/metadata/cache/kde-base/kgeography-4.7.4
+++ b/metadata/cache/kde-base/kgeography-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: a geography learning tool
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kget-4.6.3 b/metadata/cache/kde-base/kget-4.6.3
index 7000af62d386..e87962c6ed09 100644
--- a/metadata/cache/kde-base/kget-4.6.3
+++ b/metadata/cache/kde-base/kget-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 An advanced download manager for KDE
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug bittorrent semantic-desktop sqlite webkit kdeprefix +handbook aqua kdeenablefinal
+debug bittorrent semantic-desktop sqlite webkit kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kget-4.7.3 b/metadata/cache/kde-base/kget-4.7.3
deleted file mode 100644
index e3c9d2210457..000000000000
--- a/metadata/cache/kde-base/kget-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-app-crypt/qca:2 >=kde-base/kdelibs-4.7.3:4[aqua=,semantic-desktop=] >=kde-base/kdepimlibs-4.7.3:4[aqua=] >=kde-base/libkonq-4.7.3:4[aqua=] >=kde-base/libkworkspace-4.7.3:4[aqua=] >=kde-base/solid-4.7.3:4[aqua=] bittorrent? ( >=net-libs/libktorrent-1.0.3 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) webkit? ( >=kde-misc/kwebkitpart-0.9.6 ) dev-libs/boost >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-app-crypt/qca:2 >=kde-base/kdelibs-4.7.3:4[aqua=,semantic-desktop=] >=kde-base/kdepimlibs-4.7.3:4[aqua=] >=kde-base/libkonq-4.7.3:4[aqua=] >=kde-base/libkworkspace-4.7.3:4[aqua=] >=kde-base/solid-4.7.3:4[aqua=] bittorrent? ( >=net-libs/libktorrent-1.0.3 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) webkit? ( >=kde-misc/kwebkitpart-0.9.6 ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdenetwork-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-An advanced download manager for KDE
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug bittorrent mms semantic-desktop sqlite webkit +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kget-4.7.4 b/metadata/cache/kde-base/kget-4.7.4
index 2f925b590ee2..8c588564f6fd 100644
--- a/metadata/cache/kde-base/kget-4.7.4
+++ b/metadata/cache/kde-base/kget-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 An advanced download manager for KDE
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug bittorrent mms semantic-desktop sqlite webkit +handbook aqua kdeenablefinal
+debug bittorrent mms semantic-desktop sqlite webkit +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kglobalaccel-4.6.3 b/metadata/cache/kde-base/kglobalaccel-4.6.3
index 6f2db7fe80f7..ee2d292133ac 100644
--- a/metadata/cache/kde-base/kglobalaccel-4.6.3
+++ b/metadata/cache/kde-base/kglobalaccel-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE's Global Shortcut Daemon
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kglobalaccel-4.7.3 b/metadata/cache/kde-base/kglobalaccel-4.7.3
deleted file mode 100644
index 66653d7723ce..000000000000
--- a/metadata/cache/kde-base/kglobalaccel-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE's Global Shortcut Daemon
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kglobalaccel-4.7.4 b/metadata/cache/kde-base/kglobalaccel-4.7.4
index 8a6487c047c3..84c35bcc546a 100644
--- a/metadata/cache/kde-base/kglobalaccel-4.7.4
+++ b/metadata/cache/kde-base/kglobalaccel-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE's Global Shortcut Daemon
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kgoldrunner-4.6.3 b/metadata/cache/kde-base/kgoldrunner-4.6.3
index 0342f9dc812b..5bc6eb0c3876 100644
--- a/metadata/cache/kde-base/kgoldrunner-4.6.3
+++ b/metadata/cache/kde-base/kgoldrunner-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: KGoldrunner is a game of action and puzzle solving
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kgoldrunner-4.7.3 b/metadata/cache/kde-base/kgoldrunner-4.7.3
deleted file mode 100644
index 4e16a75f865c..000000000000
--- a/metadata/cache/kde-base/kgoldrunner-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/libsndfile media-libs/openal >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-media-libs/libsndfile media-libs/openal >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: KGoldrunner is a game of action and puzzle solving
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kgoldrunner-4.7.4 b/metadata/cache/kde-base/kgoldrunner-4.7.4
index b9121daca774..ecdee30d2c40 100644
--- a/metadata/cache/kde-base/kgoldrunner-4.7.4
+++ b/metadata/cache/kde-base/kgoldrunner-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: KGoldrunner is a game of action and puzzle solving
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kgpg-4.6.3 b/metadata/cache/kde-base/kgpg-4.6.3
index 5337510024f3..1be8bcd8c96b 100644
--- a/metadata/cache/kde-base/kgpg-4.6.3
+++ b/metadata/cache/kde-base/kgpg-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE gpg keyring manager
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kgpg-4.7.3 b/metadata/cache/kde-base/kgpg-4.7.3
deleted file mode 100644
index fb43f3b85309..000000000000
--- a/metadata/cache/kde-base/kgpg-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/kdepimlibs-4.7.3:4[aqua=] app-crypt/gnupg >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeutils-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE gpg keyring manager
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kgpg-4.7.4 b/metadata/cache/kde-base/kgpg-4.7.4
index 8dc932fab80d..e5d5d8a82428 100644
--- a/metadata/cache/kde-base/kgpg-4.7.4
+++ b/metadata/cache/kde-base/kgpg-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE gpg keyring manager
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/khangman-4.6.3 b/metadata/cache/kde-base/khangman-4.6.3
index 40a0b4e1391e..ae788531c1fa 100644
--- a/metadata/cache/kde-base/khangman-4.6.3
+++ b/metadata/cache/kde-base/khangman-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Classical hangman game for KDE
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/khangman-4.7.3 b/metadata/cache/kde-base/khangman-4.7.3
deleted file mode 100644
index 372c095b3154..000000000000
--- a/metadata/cache/kde-base/khangman-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkdeedu-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/khangman-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Classical hangman game for KDE
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/khangman-4.7.4 b/metadata/cache/kde-base/khangman-4.7.4
index 242e37a3c1ae..9ecb32805f9b 100644
--- a/metadata/cache/kde-base/khangman-4.7.4
+++ b/metadata/cache/kde-base/khangman-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Classical hangman game for KDE
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/khelpcenter-4.6.3 b/metadata/cache/kde-base/khelpcenter-4.6.3
index e61de25e1b53..bfec4e05884a 100644
--- a/metadata/cache/kde-base/khelpcenter-4.6.3
+++ b/metadata/cache/kde-base/khelpcenter-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 The KDE Help Center
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/khelpcenter-4.7.3 b/metadata/cache/kde-base/khelpcenter-4.7.3
deleted file mode 100644
index 76dfa23cf8ef..000000000000
--- a/metadata/cache/kde-base/khelpcenter-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/kdesu-4.7.3:4[aqua=] >=www-misc/htdig-3.2.0_beta6-r1 >=kde-base/oxygen-icons-4.7.3:4[aqua=] >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-The KDE Help Center
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/khelpcenter-4.7.4 b/metadata/cache/kde-base/khelpcenter-4.7.4
index 294752b15e5f..ead3c062af72 100644
--- a/metadata/cache/kde-base/khelpcenter-4.7.4
+++ b/metadata/cache/kde-base/khelpcenter-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 The KDE Help Center
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/khotkeys-4.6.3 b/metadata/cache/kde-base/khotkeys-4.6.3
index 85c2167482c7..d3d7377ce0e3 100644
--- a/metadata/cache/kde-base/khotkeys-4.6.3
+++ b/metadata/cache/kde-base/khotkeys-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: hotkey daemon
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/khotkeys-4.7.3 b/metadata/cache/kde-base/khotkeys-4.7.3
deleted file mode 100644
index e24d710b59bb..000000000000
--- a/metadata/cache/kde-base/khotkeys-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkworkspace-4.7.3:4[aqua=] x11-libs/libXtst >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/libkworkspace-4.7.3:4[aqua=] x11-libs/libXtst >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: hotkey daemon
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/khotkeys-4.7.4 b/metadata/cache/kde-base/khotkeys-4.7.4
index 40a221b1aa8e..5f5ec9a1341e 100644
--- a/metadata/cache/kde-base/khotkeys-4.7.4
+++ b/metadata/cache/kde-base/khotkeys-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: hotkey daemon
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kiconfinder-4.6.3 b/metadata/cache/kde-base/kiconfinder-4.6.3
index e05a2e2a0555..810fb1c3d817 100644
--- a/metadata/cache/kde-base/kiconfinder-4.6.3
+++ b/metadata/cache/kde-base/kiconfinder-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Finds an icon based on its name
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kiconfinder-4.7.3 b/metadata/cache/kde-base/kiconfinder-4.7.3
deleted file mode 100644
index 21630e3fe7eb..000000000000
--- a/metadata/cache/kde-base/kiconfinder-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Finds an icon based on its name
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kiconfinder-4.7.4 b/metadata/cache/kde-base/kiconfinder-4.7.4
index 3cce924adaf1..06f15fef73f1 100644
--- a/metadata/cache/kde-base/kiconfinder-4.7.4
+++ b/metadata/cache/kde-base/kiconfinder-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Finds an icon based on its name
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kig-4.6.3 b/metadata/cache/kde-base/kig-4.6.3
index 44668fdcb8d2..654d6ef6b3b2 100644
--- a/metadata/cache/kde-base/kig-4.6.3
+++ b/metadata/cache/kde-base/kig-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Interactive Geometry tool
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kig-scripting kdeprefix +handbook aqua kdeenablefinal
+debug kig-scripting kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kig-4.7.3 b/metadata/cache/kde-base/kig-4.7.3
deleted file mode 100644
index b6378ca065c3..000000000000
--- a/metadata/cache/kde-base/kig-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-kig-scripting? ( >=dev-libs/boost-1.32 ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-kig-scripting? ( >=dev-libs/boost-1.32 ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kig-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Interactive Geometry tool
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug kig-scripting +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kig-4.7.4 b/metadata/cache/kde-base/kig-4.7.4
index 565969101e51..61bed15dd3e4 100644
--- a/metadata/cache/kde-base/kig-4.7.4
+++ b/metadata/cache/kde-base/kig-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Interactive Geometry tool
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug kig-scripting +handbook aqua kdeenablefinal
+debug kig-scripting +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kigo-4.6.3 b/metadata/cache/kde-base/kigo-4.6.3
index 22b78d812fc5..be3aefdbb403 100644
--- a/metadata/cache/kde-base/kigo-4.6.3
+++ b/metadata/cache/kde-base/kigo-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Go game
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic games-ggz gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kigo-4.7.3 b/metadata/cache/kde-base/kigo-4.7.3
deleted file mode 100644
index 5a0a37618a10..000000000000
--- a/metadata/cache/kde-base/kigo-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-games-board/gnugo >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Go game
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic games-ggz gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kigo-4.7.4 b/metadata/cache/kde-base/kigo-4.7.4
index f39985a4f4e4..9528e6c5458b 100644
--- a/metadata/cache/kde-base/kigo-4.7.4
+++ b/metadata/cache/kde-base/kigo-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Go game
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic games-ggz gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/killbots-4.6.3 b/metadata/cache/kde-base/killbots-4.6.3
index 7b0f0a98301d..7720318a1594 100644
--- a/metadata/cache/kde-base/killbots-4.6.3
+++ b/metadata/cache/kde-base/killbots-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Kill the bots or they kill you!
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/killbots-4.7.3 b/metadata/cache/kde-base/killbots-4.7.3
deleted file mode 100644
index 1ff2410d9a17..000000000000
--- a/metadata/cache/kde-base/killbots-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-Kill the bots or they kill you!
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/killbots-4.7.4 b/metadata/cache/kde-base/killbots-4.7.4
index b20f9e24507a..22e44c7f37a0 100644
--- a/metadata/cache/kde-base/killbots-4.7.4
+++ b/metadata/cache/kde-base/killbots-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Kill the bots or they kill you!
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kimagemapeditor-4.6.3 b/metadata/cache/kde-base/kimagemapeditor-4.6.3
index 104e106eb461..3b640d1d6913 100644
--- a/metadata/cache/kde-base/kimagemapeditor-4.6.3
+++ b/metadata/cache/kde-base/kimagemapeditor-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE web development - image map editor
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kimagemapeditor-4.7.3 b/metadata/cache/kde-base/kimagemapeditor-4.7.3
deleted file mode 100644
index f0fa2460f3d3..000000000000
--- a/metadata/cache/kde-base/kimagemapeditor-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdewebdev-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE web development - image map editor
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kimagemapeditor-4.7.4 b/metadata/cache/kde-base/kimagemapeditor-4.7.4
index ccab044e8faa..d119a8412909 100644
--- a/metadata/cache/kde-base/kimagemapeditor-4.7.4
+++ b/metadata/cache/kde-base/kimagemapeditor-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE web development - image map editor
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kimono-4.7.3 b/metadata/cache/kde-base/kimono-4.7.3
deleted file mode 100644
index ec3baac8c5da..000000000000
--- a/metadata/cache/kde-base/kimono-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-lang/mono >=kde-base/qyoto-4.7.3:4[aqua=,webkit] >=kde-base/smokeqt-4.7.3:4[aqua=] >=kde-base/smokekde-4.7.3:4[aqua=,akonadi?,semantic-desktop=] plasma? ( >=kde-base/smokeqt-4.7.3:4[aqua=,webkit] ) semantic-desktop? ( >=dev-libs/soprano-2.6.51[clucene] ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-dev-lang/mono >=kde-base/qyoto-4.7.3:4[aqua=,webkit] >=kde-base/smokeqt-4.7.3:4[aqua=] >=kde-base/smokekde-4.7.3:4[aqua=,akonadi?,semantic-desktop=] plasma? ( >=kde-base/smokeqt-4.7.3:4[aqua=,webkit] ) semantic-desktop? ( >=dev-libs/soprano-2.6.51[clucene] ) !kde-base/kdebindings-csharp:4 >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kimono-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-C# bindings for KDE
-amd64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions mono multilib portability toolchain-funcs user versionator virtualx
-akonadi debug plasma semantic-desktop aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kimono-4.7.4 b/metadata/cache/kde-base/kimono-4.7.4
index 63da0e998803..3c628972dbf5 100644
--- a/metadata/cache/kde-base/kimono-4.7.4
+++ b/metadata/cache/kde-base/kimono-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 C# bindings for KDE
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions mono multilib portability toolchain-funcs user versionator virtualx
-akonadi debug plasma semantic-desktop aqua kdeenablefinal
+akonadi debug plasma semantic-desktop aqua
 
 
 
diff --git a/metadata/cache/kde-base/kinfocenter-4.6.3 b/metadata/cache/kde-base/kinfocenter-4.6.3
index 1d6c2a87a39a..e6f7bcfd0dd0 100644
--- a/metadata/cache/kde-base/kinfocenter-4.6.3
+++ b/metadata/cache/kde-base/kinfocenter-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 The KDE Info Center
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug ieee1394 kdeprefix opengl +handbook aqua kdeenablefinal
+debug ieee1394 kdeprefix opengl +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kinfocenter-4.7.3 b/metadata/cache/kde-base/kinfocenter-4.7.3
deleted file mode 100644
index 4c760dee2cf4..000000000000
--- a/metadata/cache/kde-base/kinfocenter-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/solid-4.7.3:4[aqua=] sys-apps/pciutils ieee1394? ( sys-libs/libraw1394 ) opengl? ( virtual/glu virtual/opengl ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/solid-4.7.3:4[aqua=] sys-apps/pciutils ieee1394? ( sys-libs/libraw1394 ) opengl? ( virtual/glu virtual/opengl ) sys-apps/usbutils >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-The KDE Info Center
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug ieee1394 opengl +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kinfocenter-4.7.4 b/metadata/cache/kde-base/kinfocenter-4.7.4
index ac7b6ad60983..fe9c020f9042 100644
--- a/metadata/cache/kde-base/kinfocenter-4.7.4
+++ b/metadata/cache/kde-base/kinfocenter-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 The KDE Info Center
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug ieee1394 opengl +handbook aqua kdeenablefinal
+debug ieee1394 opengl +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kioclient-4.6.3 b/metadata/cache/kde-base/kioclient-4.6.3
index 00483c91ede2..171e4e323bb1 100644
--- a/metadata/cache/kde-base/kioclient-4.6.3
+++ b/metadata/cache/kde-base/kioclient-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Command-line tool for network-transparent operations
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kioclient-4.7.3 b/metadata/cache/kde-base/kioclient-4.7.3
deleted file mode 100644
index b89cb0907e18..000000000000
--- a/metadata/cache/kde-base/kioclient-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Command-line tool for network-transparent operations
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kioclient-4.7.4 b/metadata/cache/kde-base/kioclient-4.7.4
index 597afff0384c..3c775df81bd5 100644
--- a/metadata/cache/kde-base/kioclient-4.7.4
+++ b/metadata/cache/kde-base/kioclient-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Command-line tool for network-transparent operations
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kiriki-4.6.3 b/metadata/cache/kde-base/kiriki-4.6.3
index 9384636bcb4c..c7609d6e7dc3 100644
--- a/metadata/cache/kde-base/kiriki-4.6.3
+++ b/metadata/cache/kde-base/kiriki-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Kiriki - a gtali clone for KDE4
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kiriki-4.7.3 b/metadata/cache/kde-base/kiriki-4.7.3
deleted file mode 100644
index 2d5c7d9ef2dc..000000000000
--- a/metadata/cache/kde-base/kiriki-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Kiriki - a gtali clone for KDE4
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kiriki-4.7.4 b/metadata/cache/kde-base/kiriki-4.7.4
index 1ee3f92f3c01..0a8ad3647de3 100644
--- a/metadata/cache/kde-base/kiriki-4.7.4
+++ b/metadata/cache/kde-base/kiriki-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Kiriki - a gtali clone for KDE4
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kiten-4.6.3 b/metadata/cache/kde-base/kiten-4.6.3
index 351d602430fa..04a64ca1eaf3 100644
--- a/metadata/cache/kde-base/kiten-4.6.3
+++ b/metadata/cache/kde-base/kiten-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Japanese dictionary and reference
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kiten-4.7.3 b/metadata/cache/kde-base/kiten-4.7.3
deleted file mode 100644
index 8cf4aba1a579..000000000000
--- a/metadata/cache/kde-base/kiten-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kiten-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Japanese dictionary and reference
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kiten-4.7.4 b/metadata/cache/kde-base/kiten-4.7.4
index 2b4da594667b..85e15f89cd75 100644
--- a/metadata/cache/kde-base/kiten-4.7.4
+++ b/metadata/cache/kde-base/kiten-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Japanese dictionary and reference
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kjots-4.4.11.1 b/metadata/cache/kde-base/kjots-4.4.11.1
index 1ca74356c69b..ddd6436d5499 100644
--- a/metadata/cache/kde-base/kjots-4.4.11.1
+++ b/metadata/cache/kde-base/kjots-4.4.11.1
@@ -8,7 +8,7 @@ GPL-2
 KDE note taking utility
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook kdeprefix aqua kdeenablefinal +kontact
+debug +handbook kdeprefix aqua +kontact
 
 
 
diff --git a/metadata/cache/kde-base/kjots-4.7.3 b/metadata/cache/kde-base/kjots-4.7.3
deleted file mode 100644
index 88c5c27df9f5..000000000000
--- a/metadata/cache/kde-base/kjots-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/grantlee-0.1 >=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=dev-libs/grantlee-0.1 >=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] kontact? ( >=kde-base/kontact-4.7.3:4[aqua=] )
-4
-mirror://kde/stable/4.7.3/src/kdepim-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE note taking utility
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal +kontact
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kjots-4.7.4 b/metadata/cache/kde-base/kjots-4.7.4
index 5be5502a8ae1..c001095c87c2 100644
--- a/metadata/cache/kde-base/kjots-4.7.4
+++ b/metadata/cache/kde-base/kjots-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE note taking utility
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal +kontact
+debug +handbook aqua +kontact
 
 
 
diff --git a/metadata/cache/kde-base/kjumpingcube-4.6.3 b/metadata/cache/kde-base/kjumpingcube-4.6.3
index 389a1976d58a..8a32a0f0fe86 100644
--- a/metadata/cache/kde-base/kjumpingcube-4.6.3
+++ b/metadata/cache/kde-base/kjumpingcube-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: Tactical one or two player game
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kjumpingcube-4.7.3 b/metadata/cache/kde-base/kjumpingcube-4.7.3
deleted file mode 100644
index 15f50cbac4f2..000000000000
--- a/metadata/cache/kde-base/kjumpingcube-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: Tactical one or two player game
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kjumpingcube-4.7.4 b/metadata/cache/kde-base/kjumpingcube-4.7.4
index 8a4ac451e7d5..d3233ed035ac 100644
--- a/metadata/cache/kde-base/kjumpingcube-4.7.4
+++ b/metadata/cache/kde-base/kjumpingcube-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: Tactical one or two player game
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kleopatra-4.4.11.1 b/metadata/cache/kde-base/kleopatra-4.4.11.1
index 94603961cbee..057ef09f83b2 100644
--- a/metadata/cache/kde-base/kleopatra-4.4.11.1
+++ b/metadata/cache/kde-base/kleopatra-4.4.11.1
@@ -8,7 +8,7 @@ GPL-2
 Kleopatra - KDE X.509 key manager
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook kdeprefix aqua kdeenablefinal
+debug +handbook kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kleopatra-4.7.3 b/metadata/cache/kde-base/kleopatra-4.7.3
deleted file mode 100644
index 26aaa594920f..000000000000
--- a/metadata/cache/kde-base/kleopatra-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-app-crypt/gpgme dev-libs/boost dev-libs/libassuan dev-libs/libgpg-error >=kde-base/kdepimlibs-4.7.3:4[aqua=] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-app-crypt/gpgme dev-libs/boost dev-libs/libassuan dev-libs/libgpg-error >=kde-base/kdepimlibs-4.7.3:4[aqua=] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] app-crypt/gnupg >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdepim-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Kleopatra - KDE X.509 key manager
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kleopatra-4.7.4 b/metadata/cache/kde-base/kleopatra-4.7.4
index 4e1c87e5fde7..c778b32798d6 100644
--- a/metadata/cache/kde-base/kleopatra-4.7.4
+++ b/metadata/cache/kde-base/kleopatra-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Kleopatra - KDE X.509 key manager
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/klettres-4.6.3 b/metadata/cache/kde-base/klettres-4.6.3
index 3789da9215c7..10ac76d0f5d1 100644
--- a/metadata/cache/kde-base/klettres-4.6.3
+++ b/metadata/cache/kde-base/klettres-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: KLettres helps a very young child or an adult learning
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/klettres-4.7.3 b/metadata/cache/kde-base/klettres-4.7.3
deleted file mode 100644
index c7c289ac12e7..000000000000
--- a/metadata/cache/kde-base/klettres-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/knotify-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/klettres-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: KLettres helps a very young child or an adult learning
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/klettres-4.7.4 b/metadata/cache/kde-base/klettres-4.7.4
index 09f7ba99a5a8..311bcb6a8882 100644
--- a/metadata/cache/kde-base/klettres-4.7.4
+++ b/metadata/cache/kde-base/klettres-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: KLettres helps a very young child or an adult learning
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/klickety-4.6.3 b/metadata/cache/kde-base/klickety-4.6.3
index f6475748f60a..7b9b92a613ff 100644
--- a/metadata/cache/kde-base/klickety-4.6.3
+++ b/metadata/cache/kde-base/klickety-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 A KDE game almost the same as ksame, but a bit different.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/klickety-4.7.3 b/metadata/cache/kde-base/klickety-4.7.3
deleted file mode 100644
index b991b755e00b..000000000000
--- a/metadata/cache/kde-base/klickety-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-A KDE game almost the same as ksame, but a bit different.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/klickety-4.7.4 b/metadata/cache/kde-base/klickety-4.7.4
index 22f6e6f5bf01..c44d648bde8b 100644
--- a/metadata/cache/kde-base/klickety-4.7.4
+++ b/metadata/cache/kde-base/klickety-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 A KDE game almost the same as ksame, but a bit different.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/klines-4.6.3 b/metadata/cache/kde-base/klines-4.6.3
index 9e84e01314ae..a58e0f07099c 100644
--- a/metadata/cache/kde-base/klines-4.6.3
+++ b/metadata/cache/kde-base/klines-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: Kolor Lines - a little game about balls and how to get rid of them
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/klines-4.7.3 b/metadata/cache/kde-base/klines-4.7.3
deleted file mode 100644
index dd37f37eb550..000000000000
--- a/metadata/cache/kde-base/klines-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: Kolor Lines - a little game about balls and how to get rid of them
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/klines-4.7.4 b/metadata/cache/kde-base/klines-4.7.4
index 5a623ea48c49..db610cdbe818 100644
--- a/metadata/cache/kde-base/klines-4.7.4
+++ b/metadata/cache/kde-base/klines-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: Kolor Lines - a little game about balls and how to get rid of them
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/klinkstatus-4.6.3 b/metadata/cache/kde-base/klinkstatus-4.6.3
index 385103fd0ef1..db1589c1046f 100644
--- a/metadata/cache/kde-base/klinkstatus-4.6.3
+++ b/metadata/cache/kde-base/klinkstatus-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE web development - link validity checker
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug tidy kdeprefix +handbook aqua kdeenablefinal
+debug tidy kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/klinkstatus-4.7.3 b/metadata/cache/kde-base/klinkstatus-4.7.3
deleted file mode 100644
index a6f312e7fdf9..000000000000
--- a/metadata/cache/kde-base/klinkstatus-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] tidy? ( app-text/htmltidy ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] tidy? ( app-text/htmltidy ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdewebdev-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE web development - link validity checker
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug tidy +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/klinkstatus-4.7.4 b/metadata/cache/kde-base/klinkstatus-4.7.4
index fafe64ac1ba4..3524965c1985 100644
--- a/metadata/cache/kde-base/klinkstatus-4.7.4
+++ b/metadata/cache/kde-base/klinkstatus-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE web development - link validity checker
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug tidy +handbook aqua kdeenablefinal
+debug tidy +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/klipper-4.6.3 b/metadata/cache/kde-base/klipper-4.6.3
index 8cc2a63a69a7..32ef6de1fb75 100644
--- a/metadata/cache/kde-base/klipper-4.6.3
+++ b/metadata/cache/kde-base/klipper-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Applet for KDE and X clipboard management
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/klipper-4.7.3 b/metadata/cache/kde-base/klipper-4.7.3
deleted file mode 100644
index e9b72103a0de..000000000000
--- a/metadata/cache/kde-base/klipper-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkworkspace-4.7.3:4[aqua=] >=kde-base/libtaskmanager-4.7.3:4[aqua=] !aqua? ( x11-libs/libXfixes ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/libkworkspace-4.7.3:4[aqua=] >=kde-base/libtaskmanager-4.7.3:4[aqua=] !aqua? ( x11-libs/libXfixes ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Applet for KDE and X clipboard management
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/klipper-4.7.4 b/metadata/cache/kde-base/klipper-4.7.4
index e757dd94d0c5..e12f87cd3418 100644
--- a/metadata/cache/kde-base/klipper-4.7.4
+++ b/metadata/cache/kde-base/klipper-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Applet for KDE and X clipboard management
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kmag-4.6.3 b/metadata/cache/kde-base/kmag-4.6.3
index 9b82d383c332..b181dbb9478e 100644
--- a/metadata/cache/kde-base/kmag-4.6.3
+++ b/metadata/cache/kde-base/kmag-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE screen magnifier
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kmag-4.7.3 b/metadata/cache/kde-base/kmag-4.7.3
deleted file mode 100644
index 15efad180233..000000000000
--- a/metadata/cache/kde-base/kmag-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/kaccessible-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeaccessibility-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE screen magnifier
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kmag-4.7.4 b/metadata/cache/kde-base/kmag-4.7.4
index b06a7b276450..70796f5e38dc 100644
--- a/metadata/cache/kde-base/kmag-4.7.4
+++ b/metadata/cache/kde-base/kmag-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE screen magnifier
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kmahjongg-4.6.3 b/metadata/cache/kde-base/kmahjongg-4.6.3
index 3f6773950a3e..2c65dd6cb9c2 100644
--- a/metadata/cache/kde-base/kmahjongg-4.6.3
+++ b/metadata/cache/kde-base/kmahjongg-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Mahjongg for KDE
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kmahjongg-4.7.3 b/metadata/cache/kde-base/kmahjongg-4.7.3
deleted file mode 100644
index eae10c8815dd..000000000000
--- a/metadata/cache/kde-base/kmahjongg-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkmahjongg-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/libkmahjongg-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Mahjongg for KDE
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kmahjongg-4.7.4 b/metadata/cache/kde-base/kmahjongg-4.7.4
index 8edadc4c83c3..ea7350f05af1 100644
--- a/metadata/cache/kde-base/kmahjongg-4.7.4
+++ b/metadata/cache/kde-base/kmahjongg-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Mahjongg for KDE
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kmail-4.4.11.1 b/metadata/cache/kde-base/kmail-4.4.11.1
index c377215474ca..b90f3a7bdc05 100644
--- a/metadata/cache/kde-base/kmail-4.4.11.1
+++ b/metadata/cache/kde-base/kmail-4.4.11.1
@@ -8,7 +8,7 @@ GPL-2
 KMail is the email component of Kontact, the integrated personal information manager of KDE.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook test kdeprefix aqua kdeenablefinal +kontact
+debug +handbook test kdeprefix aqua +kontact
 
 
 
diff --git a/metadata/cache/kde-base/kmail-4.7.3 b/metadata/cache/kde-base/kmail-4.7.3
deleted file mode 100644
index 5b96b6c65fec..000000000000
--- a/metadata/cache/kde-base/kmail-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] >=kde-base/korganizer-4.7.3:4[aqua=] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] >=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 dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] >=kde-base/korganizer-4.7.3:4[aqua=] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] kontact? ( >=kde-base/kontact-4.7.3:4[aqua=] )
-4
-mirror://kde/stable/4.7.3/src/kdepim-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-KMail is the email component of Kontact, the integrated personal information manager of KDE.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug test +handbook aqua kdeenablefinal +kontact
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kmail-4.7.4 b/metadata/cache/kde-base/kmail-4.7.4
index b274bfb03caf..7b763073128c 100644
--- a/metadata/cache/kde-base/kmail-4.7.4
+++ b/metadata/cache/kde-base/kmail-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KMail is the email component of Kontact, the integrated personal information manager of KDE.
 ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug test +handbook aqua kdeenablefinal +kontact
+debug test +handbook aqua +kontact
 
 
 
diff --git a/metadata/cache/kde-base/kmail-4.7.4-r1 b/metadata/cache/kde-base/kmail-4.7.4-r1
index 096fb2273fbd..c0b2c33f9414 100644
--- a/metadata/cache/kde-base/kmail-4.7.4-r1
+++ b/metadata/cache/kde-base/kmail-4.7.4-r1
@@ -8,7 +8,7 @@ GPL-2
 KMail is the email component of Kontact, the integrated personal information manager of KDE.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug test +handbook aqua kdeenablefinal +kontact
+debug test +handbook aqua +kontact
 
 
 
diff --git a/metadata/cache/kde-base/kmenuedit-4.6.3 b/metadata/cache/kde-base/kmenuedit-4.6.3
index cdda07838c5b..35b3a293e18f 100644
--- a/metadata/cache/kde-base/kmenuedit-4.6.3
+++ b/metadata/cache/kde-base/kmenuedit-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE menu editor
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kmenuedit-4.7.3 b/metadata/cache/kde-base/kmenuedit-4.7.3
deleted file mode 100644
index 6ea3edda7ec4..000000000000
--- a/metadata/cache/kde-base/kmenuedit-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/khotkeys-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/khotkeys-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE menu editor
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kmenuedit-4.7.4 b/metadata/cache/kde-base/kmenuedit-4.7.4
index 3aa719ea23fb..6e31ceced5e1 100644
--- a/metadata/cache/kde-base/kmenuedit-4.7.4
+++ b/metadata/cache/kde-base/kmenuedit-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE menu editor
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kmimetypefinder-4.6.3 b/metadata/cache/kde-base/kmimetypefinder-4.6.3
index 85f55fecf5df..d73649e04127 100644
--- a/metadata/cache/kde-base/kmimetypefinder-4.6.3
+++ b/metadata/cache/kde-base/kmimetypefinder-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE application to report the mimetype for a given file
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kmimetypefinder-4.7.3 b/metadata/cache/kde-base/kmimetypefinder-4.7.3
deleted file mode 100644
index c930dd52336d..000000000000
--- a/metadata/cache/kde-base/kmimetypefinder-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE application to report the mimetype for a given file
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kmimetypefinder-4.7.4 b/metadata/cache/kde-base/kmimetypefinder-4.7.4
index 4516e16ef17c..f9051d569d1a 100644
--- a/metadata/cache/kde-base/kmimetypefinder-4.7.4
+++ b/metadata/cache/kde-base/kmimetypefinder-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE application to report the mimetype for a given file
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kmines-4.6.3 b/metadata/cache/kde-base/kmines-4.6.3
index 23f00156268f..83dacb26a356 100644
--- a/metadata/cache/kde-base/kmines-4.6.3
+++ b/metadata/cache/kde-base/kmines-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KMines is a classic mine sweeper game
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kmines-4.7.3 b/metadata/cache/kde-base/kmines-4.7.3
deleted file mode 100644
index 73d5db485d98..000000000000
--- a/metadata/cache/kde-base/kmines-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KMines is a classic mine sweeper game
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kmines-4.7.4 b/metadata/cache/kde-base/kmines-4.7.4
index 06eaf042ae3f..2e611aab9933 100644
--- a/metadata/cache/kde-base/kmines-4.7.4
+++ b/metadata/cache/kde-base/kmines-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KMines is a classic mine sweeper game
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kmix-4.6.3 b/metadata/cache/kde-base/kmix-4.6.3
index 82a299f1328b..1a4291f6a822 100644
--- a/metadata/cache/kde-base/kmix-4.6.3
+++ b/metadata/cache/kde-base/kmix-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE mixer gui
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-alsa debug pulseaudio kdeprefix +handbook aqua kdeenablefinal
+alsa debug pulseaudio kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kmix-4.7.3 b/metadata/cache/kde-base/kmix-4.7.3
deleted file mode 100644
index 36cff2fb929b..000000000000
--- a/metadata/cache/kde-base/kmix-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( >=media-sound/pulseaudio-0.9.12 ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( >=media-sound/pulseaudio-0.9.12 ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdemultimedia-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE mixer gui
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-alsa debug pulseaudio +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kmix-4.7.4 b/metadata/cache/kde-base/kmix-4.7.4
index 0d6fe80ef9cb..8086a8d33e4a 100644
--- a/metadata/cache/kde-base/kmix-4.7.4
+++ b/metadata/cache/kde-base/kmix-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE mixer gui
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-alsa debug pulseaudio +handbook aqua kdeenablefinal
+alsa debug pulseaudio +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kmousetool-4.6.3 b/metadata/cache/kde-base/kmousetool-4.6.3
index 77eb6fe1d417..ff492579a3d1 100644
--- a/metadata/cache/kde-base/kmousetool-4.6.3
+++ b/metadata/cache/kde-base/kmousetool-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE program that clicks the mouse for you.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kmousetool-4.7.3 b/metadata/cache/kde-base/kmousetool-4.7.3
deleted file mode 100644
index debf0db6a9a4..000000000000
--- a/metadata/cache/kde-base/kmousetool-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/knotify-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeaccessibility-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE program that clicks the mouse for you.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kmousetool-4.7.4 b/metadata/cache/kde-base/kmousetool-4.7.4
index 2c994c691b50..0575d52d2047 100644
--- a/metadata/cache/kde-base/kmousetool-4.7.4
+++ b/metadata/cache/kde-base/kmousetool-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE program that clicks the mouse for you.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kmouth-4.6.3 b/metadata/cache/kde-base/kmouth-4.6.3
index 65e39c8d639a..5c93d86ac863 100644
--- a/metadata/cache/kde-base/kmouth-4.6.3
+++ b/metadata/cache/kde-base/kmouth-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE application that reads what you type out loud. Doesn't include a speech synthesizer.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kmouth-4.7.3 b/metadata/cache/kde-base/kmouth-4.7.3
deleted file mode 100644
index ecdf574f5356..000000000000
--- a/metadata/cache/kde-base/kmouth-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeaccessibility-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE application that reads what you type out loud. Doesn't include a speech synthesizer.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kmouth-4.7.4 b/metadata/cache/kde-base/kmouth-4.7.4
index efbaea251e8a..8ec774db46fa 100644
--- a/metadata/cache/kde-base/kmouth-4.7.4
+++ b/metadata/cache/kde-base/kmouth-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE application that reads what you type out loud. Doesn't include a speech synthesizer.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kmplot-4.6.3 b/metadata/cache/kde-base/kmplot-4.6.3
index 46d93f03c3d7..6514fa84a83c 100644
--- a/metadata/cache/kde-base/kmplot-4.6.3
+++ b/metadata/cache/kde-base/kmplot-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Mathematical function plotter for KDE
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kmplot-4.7.3 b/metadata/cache/kde-base/kmplot-4.7.3
deleted file mode 100644
index 11073c1d8aa6..000000000000
--- a/metadata/cache/kde-base/kmplot-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/knotify-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kmplot-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Mathematical function plotter for KDE
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kmplot-4.7.4 b/metadata/cache/kde-base/kmplot-4.7.4
index 4836ce65f077..dd003f6941e7 100644
--- a/metadata/cache/kde-base/kmplot-4.7.4
+++ b/metadata/cache/kde-base/kmplot-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Mathematical function plotter for KDE
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/knetattach-4.6.3 b/metadata/cache/kde-base/knetattach-4.6.3
index 3ddaac70ea84..96fac269aedd 100644
--- a/metadata/cache/kde-base/knetattach-4.6.3
+++ b/metadata/cache/kde-base/knetattach-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE network wizard
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/knetattach-4.7.3 b/metadata/cache/kde-base/knetattach-4.7.3
deleted file mode 100644
index 4de5dd582b6c..000000000000
--- a/metadata/cache/kde-base/knetattach-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE network wizard
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/knetattach-4.7.4 b/metadata/cache/kde-base/knetattach-4.7.4
index efae8940f0c7..6c1b1b04e3f8 100644
--- a/metadata/cache/kde-base/knetattach-4.7.4
+++ b/metadata/cache/kde-base/knetattach-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE network wizard
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/knetwalk-4.6.3 b/metadata/cache/kde-base/knetwalk-4.6.3
index bc18807c7b0c..2698c6e16697 100644
--- a/metadata/cache/kde-base/knetwalk-4.6.3
+++ b/metadata/cache/kde-base/knetwalk-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: Knetwalk is the kde version of the popular NetWalk game for system administrators
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/knetwalk-4.7.3 b/metadata/cache/kde-base/knetwalk-4.7.3
deleted file mode 100644
index 3b04adb10940..000000000000
--- a/metadata/cache/kde-base/knetwalk-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: Knetwalk is the kde version of the popular NetWalk game for system administrators
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/knetwalk-4.7.4 b/metadata/cache/kde-base/knetwalk-4.7.4
index 5f75f230ea5c..0e10ca169f35 100644
--- a/metadata/cache/kde-base/knetwalk-4.7.4
+++ b/metadata/cache/kde-base/knetwalk-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: Knetwalk is the kde version of the popular NetWalk game for system administrators
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/knewstuff-4.6.3 b/metadata/cache/kde-base/knewstuff-4.6.3
index c3a4b31bea4f..b469028854ea 100644
--- a/metadata/cache/kde-base/knewstuff-4.6.3
+++ b/metadata/cache/kde-base/knewstuff-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE4 software to download and upload 'new stuff'
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/knewstuff-4.7.3 b/metadata/cache/kde-base/knewstuff-4.7.3
deleted file mode 100644
index ebd137405167..000000000000
--- a/metadata/cache/kde-base/knewstuff-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE4 software to download and upload 'new stuff'
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/knewstuff-4.7.4 b/metadata/cache/kde-base/knewstuff-4.7.4
index 58f4cc87dd87..e972f758ced5 100644
--- a/metadata/cache/kde-base/knewstuff-4.7.4
+++ b/metadata/cache/kde-base/knewstuff-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE4 software to download and upload 'new stuff'
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/knode-4.4.11.1 b/metadata/cache/kde-base/knode-4.4.11.1
index f893a2118af9..ba0b56de15c8 100644
--- a/metadata/cache/kde-base/knode-4.4.11.1
+++ b/metadata/cache/kde-base/knode-4.4.11.1
@@ -8,7 +8,7 @@ GPL-2
 A newsreader for KDE
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook kdeprefix aqua kdeenablefinal +kontact
+debug +handbook kdeprefix aqua +kontact
 
 
 
diff --git a/metadata/cache/kde-base/knode-4.7.3 b/metadata/cache/kde-base/knode-4.7.3
deleted file mode 100644
index 90009149b0d4..000000000000
--- a/metadata/cache/kde-base/knode-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.3:4[aqua=] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/kdepimlibs-4.7.3:4[aqua=] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] kontact? ( >=kde-base/kontact-4.7.3:4[aqua=] )
-4
-mirror://kde/stable/4.7.3/src/kdepim-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-A newsreader for KDE
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal +kontact
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/knode-4.7.4 b/metadata/cache/kde-base/knode-4.7.4
index 181578b4ac22..22f40feea0f4 100644
--- a/metadata/cache/kde-base/knode-4.7.4
+++ b/metadata/cache/kde-base/knode-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 A newsreader for KDE
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal +kontact
+debug +handbook aqua +kontact
 
 
 
diff --git a/metadata/cache/kde-base/knotes-4.4.11.1 b/metadata/cache/kde-base/knotes-4.4.11.1
index 15176b0b8eb4..2d890d2ac42d 100644
--- a/metadata/cache/kde-base/knotes-4.4.11.1
+++ b/metadata/cache/kde-base/knotes-4.4.11.1
@@ -8,7 +8,7 @@ GPL-2
 KDE Notes application
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook kdeprefix aqua kdeenablefinal +kontact
+debug +handbook kdeprefix aqua +kontact
 
 
 
diff --git a/metadata/cache/kde-base/knotes-4.7.3 b/metadata/cache/kde-base/knotes-4.7.3
deleted file mode 100644
index f455b4bc1d20..000000000000
--- a/metadata/cache/kde-base/knotes-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.3:4[aqua=] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/kdepimlibs-4.7.3:4[aqua=] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] kontact? ( >=kde-base/kontact-4.7.3:4[aqua=] )
-4
-mirror://kde/stable/4.7.3/src/kdepim-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Notes application
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal +kontact
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/knotes-4.7.4 b/metadata/cache/kde-base/knotes-4.7.4
index 114b95d0c9fd..90497155e448 100644
--- a/metadata/cache/kde-base/knotes-4.7.4
+++ b/metadata/cache/kde-base/knotes-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Notes application
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal +kontact
+debug +handbook aqua +kontact
 
 
 
diff --git a/metadata/cache/kde-base/knotify-4.6.3 b/metadata/cache/kde-base/knotify-4.6.3
index 687d4369b220..ab595e5bbeda 100644
--- a/metadata/cache/kde-base/knotify-4.6.3
+++ b/metadata/cache/kde-base/knotify-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 The KDE notification daemon.
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/knotify-4.7.3 b/metadata/cache/kde-base/knotify-4.7.3
deleted file mode 100644
index 950cea9375d0..000000000000
--- a/metadata/cache/kde-base/knotify-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-The KDE notification daemon.
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/knotify-4.7.4 b/metadata/cache/kde-base/knotify-4.7.4
index 4f9062c0c985..48db4b3436e2 100644
--- a/metadata/cache/kde-base/knotify-4.7.4
+++ b/metadata/cache/kde-base/knotify-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 The KDE notification daemon.
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kolf-4.6.3 b/metadata/cache/kde-base/kolf-4.6.3
index 1585f61fcc70..93bb69699f4c 100644
--- a/metadata/cache/kde-base/kolf-4.6.3
+++ b/metadata/cache/kde-base/kolf-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Minigolf Game
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kolf-4.7.3 b/metadata/cache/kde-base/kolf-4.7.3
deleted file mode 100644
index 34c056a53b95..000000000000
--- a/metadata/cache/kde-base/kolf-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Minigolf Game
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kolf-4.7.4 b/metadata/cache/kde-base/kolf-4.7.4
index a27fb3ee0511..80c356577b6f 100644
--- a/metadata/cache/kde-base/kolf-4.7.4
+++ b/metadata/cache/kde-base/kolf-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Minigolf Game
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kollision-4.6.3 b/metadata/cache/kde-base/kollision-4.6.3
index 3874c2673611..60fd453917f0 100644
--- a/metadata/cache/kde-base/kollision-4.6.3
+++ b/metadata/cache/kde-base/kollision-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: A simple ball dodging game
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kollision-4.7.3 b/metadata/cache/kde-base/kollision-4.7.3
deleted file mode 100644
index eb9e7133e9df..000000000000
--- a/metadata/cache/kde-base/kollision-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: A simple ball dodging game
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kollision-4.7.4 b/metadata/cache/kde-base/kollision-4.7.4
index bb4b14f94dfb..49bc4bea32af 100644
--- a/metadata/cache/kde-base/kollision-4.7.4
+++ b/metadata/cache/kde-base/kollision-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: A simple ball dodging game
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kolourpaint-4.6.3 b/metadata/cache/kde-base/kolourpaint-4.6.3
index 98da89700998..038709232c5c 100644
--- a/metadata/cache/kde-base/kolourpaint-4.6.3
+++ b/metadata/cache/kde-base/kolourpaint-4.6.3
@@ -8,7 +8,7 @@ BSD LGPL-2
 Paint Program for KDE
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kolourpaint-4.7.3 b/metadata/cache/kde-base/kolourpaint-4.7.3
deleted file mode 100644
index 8482024ce352..000000000000
--- a/metadata/cache/kde-base/kolourpaint-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/qimageblitz >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-media-libs/qimageblitz scanner? ( kde-base/ksaneplugin ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kolourpaint-4.7.3.tar.bz2
-
-http://www.kde.org/
-BSD LGPL-2
-Paint Program for KDE
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug scanner +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kolourpaint-4.7.4 b/metadata/cache/kde-base/kolourpaint-4.7.4
index 8aa7a1afaa38..1bafcdeea4ca 100644
--- a/metadata/cache/kde-base/kolourpaint-4.7.4
+++ b/metadata/cache/kde-base/kolourpaint-4.7.4
@@ -8,7 +8,7 @@ BSD LGPL-2
 Paint Program for KDE
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug scanner +handbook aqua kdeenablefinal
+debug scanner +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kommander-4.6.3 b/metadata/cache/kde-base/kommander-4.6.3
index 3e2a8ca3c387..05553899e4a4 100644
--- a/metadata/cache/kde-base/kommander-4.6.3
+++ b/metadata/cache/kde-base/kommander-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE dialog system for scripting
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kommander-4.7.3 b/metadata/cache/kde-base/kommander-4.7.3
deleted file mode 100644
index bf3d67955b47..000000000000
--- a/metadata/cache/kde-base/kommander-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdewebdev-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE dialog system for scripting
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kommander-4.7.4 b/metadata/cache/kde-base/kommander-4.7.4
index 94dbb5c0c3de..2aaaa96470bf 100644
--- a/metadata/cache/kde-base/kommander-4.7.4
+++ b/metadata/cache/kde-base/kommander-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE dialog system for scripting
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kompare-4.6.3 b/metadata/cache/kde-base/kompare-4.6.3
index ad14235c889f..da738b96611d 100644
--- a/metadata/cache/kde-base/kompare-4.6.3
+++ b/metadata/cache/kde-base/kompare-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Kompare is a program to view the differences between files.
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kompare-4.7.3 b/metadata/cache/kde-base/kompare-4.7.3
deleted file mode 100644
index 680d4a456e2a..000000000000
--- a/metadata/cache/kde-base/kompare-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdesdk-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Kompare is a program to view the differences between files.
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kompare-4.7.4 b/metadata/cache/kde-base/kompare-4.7.4
index 2ce0811ec6d7..9872690cd591 100644
--- a/metadata/cache/kde-base/kompare-4.7.4
+++ b/metadata/cache/kde-base/kompare-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Kompare is a program to view the differences between files.
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/konq-plugins-4.7.3 b/metadata/cache/kde-base/konq-plugins-4.7.3
deleted file mode 100644
index 5a2ffafdc12c..000000000000
--- a/metadata/cache/kde-base/konq-plugins-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkonq-4.7.3:4[aqua=] tidy? ( app-text/htmltidy ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/libkonq-4.7.3:4[aqua=] tidy? ( app-text/htmltidy ) !kde-misc/konq-plugins >=kde-base/kcmshell-4.7.3:4[aqua=] >=kde-base/konqueror-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-baseapps-4.7.3.tar.bz2
-
-http://kde.org/
-GPL-2
-Various plugins for konqueror
-amd64 ~arm ~ppc ~ppc64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug tidy aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/konq-plugins-4.7.4 b/metadata/cache/kde-base/konq-plugins-4.7.4
index e58b462ba022..74e3c06f0332 100644
--- a/metadata/cache/kde-base/konq-plugins-4.7.4
+++ b/metadata/cache/kde-base/konq-plugins-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Various plugins for konqueror
 amd64 ~arm ~ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug tidy aqua kdeenablefinal
+debug tidy aqua
 
 
 
diff --git a/metadata/cache/kde-base/konqueror-4.6.3 b/metadata/cache/kde-base/konqueror-4.6.3
index de86e8822cde..4c3004262424 100644
--- a/metadata/cache/kde-base/konqueror-4.6.3
+++ b/metadata/cache/kde-base/konqueror-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: Web browser, file manager, ...
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-+bookmarks debug svg kdeprefix +handbook aqua kdeenablefinal
++bookmarks debug svg kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/konqueror-4.7.3 b/metadata/cache/kde-base/konqueror-4.7.3
deleted file mode 100644
index 7d2e5bcdce1c..000000000000
--- a/metadata/cache/kde-base/konqueror-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkonq-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/libkonq-4.7.3:4[aqua=] >=kde-base/kfind-4.7.3:4[aqua=] >=kde-base/kfmclient-4.7.3:4[aqua=] bookmarks? ( >=kde-base/keditbookmarks-4.7.3:4[aqua=] ) svg? ( >=kde-base/svgpart-4.7.3:4[aqua=] ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-baseapps-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-KDE: Web browser, file manager, ...
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-+bookmarks debug svg +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/konqueror-4.7.4 b/metadata/cache/kde-base/konqueror-4.7.4
index 50d3147d3a6c..4f7c433688d5 100644
--- a/metadata/cache/kde-base/konqueror-4.7.4
+++ b/metadata/cache/kde-base/konqueror-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: Web browser, file manager, ...
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-+bookmarks debug svg +handbook aqua kdeenablefinal
++bookmarks debug svg +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/konquest-4.6.3 b/metadata/cache/kde-base/konquest-4.6.3
index 43a281d47775..6f15c485bfdd 100644
--- a/metadata/cache/kde-base/konquest-4.6.3
+++ b/metadata/cache/kde-base/konquest-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Galactic Strategy KDE Game
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/konquest-4.7.3 b/metadata/cache/kde-base/konquest-4.7.3
deleted file mode 100644
index 61938865ad8d..000000000000
--- a/metadata/cache/kde-base/konquest-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Galactic Strategy KDE Game
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/konquest-4.7.4 b/metadata/cache/kde-base/konquest-4.7.4
index 3f8252dba12e..3fdcda75e759 100644
--- a/metadata/cache/kde-base/konquest-4.7.4
+++ b/metadata/cache/kde-base/konquest-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Galactic Strategy KDE Game
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/konsole-4.6.3 b/metadata/cache/kde-base/konsole-4.6.3
index 052109216289..97b49ed4570f 100644
--- a/metadata/cache/kde-base/konsole-4.6.3
+++ b/metadata/cache/kde-base/konsole-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 X terminal for use with KDE.
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/konsole-4.7.3 b/metadata/cache/kde-base/konsole-4.7.3
deleted file mode 100644
index 04e61acfbb57..000000000000
--- a/metadata/cache/kde-base/konsole-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-!aqua? ( x11-libs/libX11 x11-libs/libXext >=x11-libs/libxklavier-3.2 x11-libs/libXrender x11-libs/libXtst ) !aqua? ( x11-apps/bdftopcf x11-proto/kbproto x11-proto/renderproto ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-!aqua? ( x11-libs/libX11 x11-libs/libXext >=x11-libs/libxklavier-3.2 x11-libs/libXrender x11-libs/libXtst ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/konsole-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-X terminal for use with KDE
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/konsole-4.7.4-r1 b/metadata/cache/kde-base/konsole-4.7.4-r1
index a65fdd615187..3f55bc3b82c0 100644
--- a/metadata/cache/kde-base/konsole-4.7.4-r1
+++ b/metadata/cache/kde-base/konsole-4.7.4-r1
@@ -8,7 +8,7 @@ GPL-2
 X terminal for use with KDE
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/konsolekalendar-4.4.11.1 b/metadata/cache/kde-base/konsolekalendar-4.4.11.1
index d1bfcaa05c9e..6085dc6d0b2f 100644
--- a/metadata/cache/kde-base/konsolekalendar-4.4.11.1
+++ b/metadata/cache/kde-base/konsolekalendar-4.4.11.1
@@ -8,7 +8,7 @@ GPL-2
 A command line interface to KDE calendars
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook kdeprefix aqua kdeenablefinal
+debug +handbook kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/konsolekalendar-4.7.3 b/metadata/cache/kde-base/konsolekalendar-4.7.3
deleted file mode 100644
index 472e8b6166f7..000000000000
--- a/metadata/cache/kde-base/konsolekalendar-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.3:4[aqua=] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/kdepimlibs-4.7.3:4[aqua=] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdepim-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-A command line interface to KDE calendars
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/konsolekalendar-4.7.4 b/metadata/cache/kde-base/konsolekalendar-4.7.4
index 52d0a493e0ff..e7e4beadaed9 100644
--- a/metadata/cache/kde-base/konsolekalendar-4.7.4
+++ b/metadata/cache/kde-base/konsolekalendar-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 A command line interface to KDE calendars
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kontact-4.4.11.1 b/metadata/cache/kde-base/kontact-4.4.11.1
index d481e732129e..290a2db7f1d7 100644
--- a/metadata/cache/kde-base/kontact-4.4.11.1
+++ b/metadata/cache/kde-base/kontact-4.4.11.1
@@ -8,7 +8,7 @@ GPL-2
 KDE personal information manager
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook kdeprefix aqua kdeenablefinal
+debug +handbook kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kontact-4.7.3 b/metadata/cache/kde-base/kontact-4.7.3
deleted file mode 100644
index 6fa2b7c2d4dd..000000000000
--- a/metadata/cache/kde-base/kontact-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.3:4[aqua=] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/kdepimlibs-4.7.3:4[aqua=] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdepim-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE personal information manager
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kontact-4.7.4 b/metadata/cache/kde-base/kontact-4.7.4
index 7e9dc9cfc782..47faac1806c7 100644
--- a/metadata/cache/kde-base/kontact-4.7.4
+++ b/metadata/cache/kde-base/kontact-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE personal information manager
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kopete-4.6.3 b/metadata/cache/kde-base/kopete-4.6.3
index 2b8bd6a6840c..7f129afd649b 100644
--- a/metadata/cache/kde-base/kopete-4.6.3
+++ b/metadata/cache/kde-base/kopete-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE multi-protocol IM client
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug ssl v4l +addbookmarks +autoreplace +contactnotes +highlight +history latex +nowlistening otr +pipes +privacy +statistics +texteffect +translator +urlpicpreview webpresence gadu groupwise jingle meanwhile msn oscar qq skype sms testbed winpopup +xmpp yahoo zeroconf kdeprefix +handbook aqua kdeenablefinal
+debug ssl v4l +addbookmarks +autoreplace +contactnotes +highlight +history latex +nowlistening otr +pipes +privacy +statistics +texteffect +translator +urlpicpreview webpresence gadu groupwise jingle meanwhile msn oscar qq skype sms testbed winpopup +xmpp yahoo zeroconf kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kopete-4.7.3 b/metadata/cache/kde-base/kopete-4.7.3
deleted file mode 100644
index 48fb268cb907..000000000000
--- a/metadata/cache/kde-base/kopete-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/libpcre >=kde-base/kdepimlibs-4.7.3:4[aqua=] media-libs/qimageblitz >=x11-libs/qt-gui-4.4.0:4[mng] !aqua? ( x11-libs/libXScrnSaver ) gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2 ) jingle? ( >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/ortp ) meanwhile? ( net-libs/meanwhile ) msn? ( >=net-libs/libmsn-4.1 ) otr? ( >=net-libs/libotr-3.2.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2 net-dns/libidn ) yahoo? ( media-libs/jasper ) !aqua? ( x11-proto/scrnsaverproto ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-dev-libs/libpcre >=kde-base/kdepimlibs-4.7.3:4[aqua=] media-libs/qimageblitz >=x11-libs/qt-gui-4.4.0:4[mng] !aqua? ( x11-libs/libXScrnSaver ) gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2 ) jingle? ( >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/ortp ) meanwhile? ( net-libs/meanwhile ) msn? ( >=net-libs/libmsn-4.1 ) otr? ( >=net-libs/libotr-3.2.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2 net-dns/libidn ) yahoo? ( media-libs/jasper ) latex? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base ) sms? ( app-mobilephone/smssend ) ssl? ( app-crypt/qca-ossl ) winpopup? ( net-fs/samba ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdenetwork-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-KDE multi-protocol IM client
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug ssl v4l +addbookmarks +autoreplace +contactnotes +highlight +history latex +nowlistening otr +pipes +privacy +statistics +texteffect +translator +urlpicpreview webpresence gadu groupwise jingle meanwhile msn oscar qq skype sms testbed winpopup +xmpp yahoo zeroconf +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kopete-4.7.4 b/metadata/cache/kde-base/kopete-4.7.4
index d6cdae2dce3b..44717d7c2972 100644
--- a/metadata/cache/kde-base/kopete-4.7.4
+++ b/metadata/cache/kde-base/kopete-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE multi-protocol IM client
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug ssl v4l +addbookmarks +autoreplace +contactnotes +highlight +history latex +nowlistening otr +pipes +privacy +statistics +texteffect +translator +urlpicpreview webpresence gadu groupwise jingle meanwhile msn oscar qq skype sms testbed winpopup +xmpp yahoo zeroconf +handbook aqua kdeenablefinal
+debug ssl v4l +addbookmarks +autoreplace +contactnotes +highlight +history latex +nowlistening otr +pipes +privacy +statistics +texteffect +translator +urlpicpreview webpresence gadu groupwise jingle meanwhile msn oscar qq skype sms testbed winpopup +xmpp yahoo zeroconf +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/korganizer-4.4.11.1 b/metadata/cache/kde-base/korganizer-4.4.11.1
index e640feae47b0..6d825d275f25 100644
--- a/metadata/cache/kde-base/korganizer-4.4.11.1
+++ b/metadata/cache/kde-base/korganizer-4.4.11.1
@@ -8,7 +8,7 @@ GPL-2
 A Personal Organizer for KDE
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook kdeprefix aqua kdeenablefinal +kontact
+debug +handbook kdeprefix aqua +kontact
 
 
 
diff --git a/metadata/cache/kde-base/korganizer-4.7.3 b/metadata/cache/kde-base/korganizer-4.7.3
deleted file mode 100644
index 80d3a45f7e95..000000000000
--- a/metadata/cache/kde-base/korganizer-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] sys-libs/zlib >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] sys-libs/zlib >=kde-base/ktimezoned-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] kontact? ( >=kde-base/kontact-4.7.3:4[aqua=] )
-4
-mirror://kde/stable/4.7.3/src/kdepim-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-A Personal Organizer for KDE
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal +kontact
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/korganizer-4.7.4 b/metadata/cache/kde-base/korganizer-4.7.4
index 0b98687904a7..deef42b822e3 100644
--- a/metadata/cache/kde-base/korganizer-4.7.4
+++ b/metadata/cache/kde-base/korganizer-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 A Personal Organizer for KDE
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal +kontact
+debug +handbook aqua +kontact
 
 
 
diff --git a/metadata/cache/kde-base/korundum-4.7.3 b/metadata/cache/kde-base/korundum-4.7.3
deleted file mode 100644
index beb8f043ec1c..000000000000
--- a/metadata/cache/kde-base/korundum-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/qtruby-4.7.3:4[aqua=] >=kde-base/smokekde-4.7.3:4[aqua=,akonadi?,kate?,okular?,semantic-desktop] >=kde-base/smokeqt-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) >=x11-libs/qt-opengl-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] ruby_targets_ruby18? ( dev-lang/ruby:1.8 )
->=kde-base/qtruby-4.7.3:4[aqua=] >=kde-base/smokekde-4.7.3:4[aqua=,akonadi?,kate?,okular?,semantic-desktop] >=kde-base/smokeqt-4.7.3:4[aqua=] !kde-base/kdebindings-ruby:4 >=kde-base/oxygen-icons-4.7.3:4[aqua=] >=x11-libs/qt-opengl-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] ruby_targets_ruby18? ( dev-lang/ruby:1.8 )
-4
-mirror://kde/stable/4.7.3/src/korundum-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Ruby bindings
-amd64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils java-utils-2 kde4-base kde4-functions multilib portability ruby-ng toolchain-funcs user versionator virtualx
-akonadi debug kate okular aqua kdeenablefinal elibc_FreeBSD ruby_targets_ruby18
-|| ( ruby_targets_ruby18 )
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/korundum-4.7.4 b/metadata/cache/kde-base/korundum-4.7.4
index fa3f5c0620cb..5dadb5003a62 100644
--- a/metadata/cache/kde-base/korundum-4.7.4
+++ b/metadata/cache/kde-base/korundum-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Ruby bindings
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils java-utils-2 kde4-base kde4-functions multilib portability ruby-ng toolchain-funcs user versionator virtualx
-akonadi debug kate okular aqua kdeenablefinal elibc_FreeBSD ruby_targets_ruby18
+akonadi debug kate okular aqua elibc_FreeBSD ruby_targets_ruby18
 || ( ruby_targets_ruby18 )
 
 
diff --git a/metadata/cache/kde-base/kpasswdserver-4.6.3 b/metadata/cache/kde-base/kpasswdserver-4.6.3
index 9c6d9ed0360a..18a2c6483eec 100644
--- a/metadata/cache/kde-base/kpasswdserver-4.6.3
+++ b/metadata/cache/kde-base/kpasswdserver-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDED Password Module
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kpasswdserver-4.7.3 b/metadata/cache/kde-base/kpasswdserver-4.7.3
deleted file mode 100644
index 4c10d87f1ce6..000000000000
--- a/metadata/cache/kde-base/kpasswdserver-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-KDED Password Module
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kpasswdserver-4.7.4 b/metadata/cache/kde-base/kpasswdserver-4.7.4
index dbb50eb9536b..c446ac0893ff 100644
--- a/metadata/cache/kde-base/kpasswdserver-4.7.4
+++ b/metadata/cache/kde-base/kpasswdserver-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDED Password Module
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kpat-4.6.3 b/metadata/cache/kde-base/kpat-4.6.3
index 1733add653c0..44296d564a9a 100644
--- a/metadata/cache/kde-base/kpat-4.6.3
+++ b/metadata/cache/kde-base/kpat-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE patience game
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kpat-4.7.3 b/metadata/cache/kde-base/kpat-4.7.3
deleted file mode 100644
index 6a0b7d6bedd4..000000000000
--- a/metadata/cache/kde-base/kpat-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE patience game
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kpat-4.7.4 b/metadata/cache/kde-base/kpat-4.7.4
index 27e979335daf..bc8db21c9dff 100644
--- a/metadata/cache/kde-base/kpat-4.7.4
+++ b/metadata/cache/kde-base/kpat-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE patience game
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kppp-4.6.3 b/metadata/cache/kde-base/kppp-4.6.3
index e5df9e81f650..1f4da5f44619 100644
--- a/metadata/cache/kde-base/kppp-4.6.3
+++ b/metadata/cache/kde-base/kppp-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: A dialer and front-end to pppd.
 amd64 ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kppp-4.7.3 b/metadata/cache/kde-base/kppp-4.7.3
deleted file mode 100644
index c21dde2c1b46..000000000000
--- a/metadata/cache/kde-base/kppp-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-net-dialup/ppp >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdenetwork-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: A dialer and front-end to pppd.
-amd64 ~ppc ~ppc64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kppp-4.7.4 b/metadata/cache/kde-base/kppp-4.7.4
index a416783e244c..4941a90731d6 100644
--- a/metadata/cache/kde-base/kppp-4.7.4
+++ b/metadata/cache/kde-base/kppp-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: A dialer and front-end to pppd.
 amd64 ~ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kquitapp-4.6.3 b/metadata/cache/kde-base/kquitapp-4.6.3
index 7336018a0457..9b42c92bf889 100644
--- a/metadata/cache/kde-base/kquitapp-4.6.3
+++ b/metadata/cache/kde-base/kquitapp-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 A CLI application quitter
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kquitapp-4.7.3 b/metadata/cache/kde-base/kquitapp-4.7.3
deleted file mode 100644
index 896b7722c25f..000000000000
--- a/metadata/cache/kde-base/kquitapp-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-A CLI application quitter
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kquitapp-4.7.4 b/metadata/cache/kde-base/kquitapp-4.7.4
index 6329cdbb6bd3..a6b93e87c760 100644
--- a/metadata/cache/kde-base/kquitapp-4.7.4
+++ b/metadata/cache/kde-base/kquitapp-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 A CLI application quitter
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/krdc-4.6.3 b/metadata/cache/kde-base/krdc-4.6.3
index 7531294c0d78..bd4c6e26baa2 100644
--- a/metadata/cache/kde-base/krdc-4.6.3
+++ b/metadata/cache/kde-base/krdc-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE remote desktop connection (RDP and VNC) client
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug jpeg rdesktop vnc zeroconf kdeprefix +handbook aqua kdeenablefinal
+debug jpeg rdesktop vnc zeroconf kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/krdc-4.7.3 b/metadata/cache/kde-base/krdc-4.7.3
deleted file mode 100644
index a573518b2f81..000000000000
--- a/metadata/cache/kde-base/krdc-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-jpeg? ( virtual/jpeg ) vnc? ( >=net-libs/libvncserver-0.9 ) zeroconf? ( || ( net-dns/avahi net-misc/mDNSResponder ) ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-jpeg? ( virtual/jpeg ) vnc? ( >=net-libs/libvncserver-0.9 ) zeroconf? ( || ( net-dns/avahi net-misc/mDNSResponder ) ) rdesktop? ( net-misc/rdesktop ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdenetwork-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE remote desktop connection (RDP and VNC) client
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug jpeg rdesktop vnc zeroconf +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/krdc-4.7.4 b/metadata/cache/kde-base/krdc-4.7.4
index 8db5623780df..a2c1ddb6ba3e 100644
--- a/metadata/cache/kde-base/krdc-4.7.4
+++ b/metadata/cache/kde-base/krdc-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE remote desktop connection (RDP and VNC) client
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug jpeg rdesktop vnc zeroconf +handbook aqua kdeenablefinal
+debug jpeg rdesktop vnc zeroconf +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kreadconfig-4.6.3 b/metadata/cache/kde-base/kreadconfig-4.6.3
index ce692d2427be..d964e68cbf0a 100644
--- a/metadata/cache/kde-base/kreadconfig-4.6.3
+++ b/metadata/cache/kde-base/kreadconfig-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: A command-line tool to read KConfig entries
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kreadconfig-4.7.3 b/metadata/cache/kde-base/kreadconfig-4.7.3
deleted file mode 100644
index 511137fa03b3..000000000000
--- a/metadata/cache/kde-base/kreadconfig-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: A command-line tool to read KConfig entries
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kreadconfig-4.7.4 b/metadata/cache/kde-base/kreadconfig-4.7.4
index 452b31e015d6..975ba86b5318 100644
--- a/metadata/cache/kde-base/kreadconfig-4.7.4
+++ b/metadata/cache/kde-base/kreadconfig-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: A command-line tool to read KConfig entries
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kremotecontrol-4.6.3 b/metadata/cache/kde-base/kremotecontrol-4.6.3
index 41689736fd25..7ff5fd86a6b7 100644
--- a/metadata/cache/kde-base/kremotecontrol-4.6.3
+++ b/metadata/cache/kde-base/kremotecontrol-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE frontend for remote controls
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kremotecontrol-4.7.3 b/metadata/cache/kde-base/kremotecontrol-4.7.3
deleted file mode 100644
index ee9ae5294c99..000000000000
--- a/metadata/cache/kde-base/kremotecontrol-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkworkspace-4.7.3:4[aqua=] >=kde-base/solid-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/libkworkspace-4.7.3:4[aqua=] >=kde-base/solid-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeutils-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE frontend for remote controls
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kremotecontrol-4.7.4 b/metadata/cache/kde-base/kremotecontrol-4.7.4
index 392b8ba34fec..5820fdb035ca 100644
--- a/metadata/cache/kde-base/kremotecontrol-4.7.4
+++ b/metadata/cache/kde-base/kremotecontrol-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE frontend for remote controls
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kreversi-4.6.3 b/metadata/cache/kde-base/kreversi-4.6.3
index 87783daf2928..4f11b770b6d2 100644
--- a/metadata/cache/kde-base/kreversi-4.6.3
+++ b/metadata/cache/kde-base/kreversi-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Board Game
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic games-ggz gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kreversi-4.7.3 b/metadata/cache/kde-base/kreversi-4.7.3
deleted file mode 100644
index 9391b7355d89..000000000000
--- a/metadata/cache/kde-base/kreversi-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Board Game
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic games-ggz gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kreversi-4.7.4 b/metadata/cache/kde-base/kreversi-4.7.4
index 252148eb6a3a..99e9d71f58af 100644
--- a/metadata/cache/kde-base/kreversi-4.7.4
+++ b/metadata/cache/kde-base/kreversi-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Board Game
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic games-ggz gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/krfb-4.6.3 b/metadata/cache/kde-base/krfb-4.6.3
index a1720d70da37..209e76434e03 100644
--- a/metadata/cache/kde-base/krfb-4.6.3
+++ b/metadata/cache/kde-base/krfb-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 VNC-compatible server to share KDE desktops
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/krfb-4.7.3 b/metadata/cache/kde-base/krfb-4.7.3
deleted file mode 100644
index 75f62a9c5c5e..000000000000
--- a/metadata/cache/kde-base/krfb-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-libs/zlib virtual/jpeg !aqua? ( x11-libs/libXdamage ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-sys-libs/zlib virtual/jpeg !aqua? ( x11-libs/libXdamage ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdenetwork-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-VNC-compatible server to share KDE desktops
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/krfb-4.7.4 b/metadata/cache/kde-base/krfb-4.7.4
index c7ddd5f7c35a..6fb23482139c 100644
--- a/metadata/cache/kde-base/krfb-4.7.4
+++ b/metadata/cache/kde-base/krfb-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 VNC-compatible server to share KDE desktops
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/krossjava-4.6.3 b/metadata/cache/kde-base/krossjava-4.6.3
index 5193b3dac5e3..aa35f8d069a9 100644
--- a/metadata/cache/kde-base/krossjava-4.6.3
+++ b/metadata/cache/kde-base/krossjava-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Java plugin for the kdelibs/kross scripting framework.
 amd64 ~ppc x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils java-ant-2 java-pkg-2 java-utils-2 kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug elibc_FreeBSD elibc_FreeBSD kdeprefix aqua kdeenablefinal
+debug elibc_FreeBSD elibc_FreeBSD kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/krossjava-4.7.3 b/metadata/cache/kde-base/krossjava-4.7.3
deleted file mode 100644
index a77052b77629..000000000000
--- a/metadata/cache/kde-base/krossjava-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=virtual/jdk-1.5 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kross-interpreters-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-Java plugin for the kdelibs/kross scripting framework.
-amd64 ~ppc x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils java-ant-2 java-pkg-2 java-utils-2 kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug elibc_FreeBSD elibc_FreeBSD aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/krossjava-4.7.4 b/metadata/cache/kde-base/krossjava-4.7.4
index 445d615cec9e..f7728ed2c84c 100644
--- a/metadata/cache/kde-base/krossjava-4.7.4
+++ b/metadata/cache/kde-base/krossjava-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Java plugin for the kdelibs/kross scripting framework.
 amd64 ~ppc x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils java-ant-2 java-pkg-2 java-utils-2 kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug elibc_FreeBSD elibc_FreeBSD aqua kdeenablefinal
+debug elibc_FreeBSD elibc_FreeBSD aqua
 
 
 
diff --git a/metadata/cache/kde-base/krosspython-4.6.3 b/metadata/cache/kde-base/krosspython-4.6.3
index 3cebed55e2e3..9963526a172c 100644
--- a/metadata/cache/kde-base/krosspython-4.6.3
+++ b/metadata/cache/kde-base/krosspython-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Kross scripting framework: Python interpreter
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability python toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/krosspython-4.7.3 b/metadata/cache/kde-base/krosspython-4.7.3
deleted file mode 100644
index d174aec9c96a..000000000000
--- a/metadata/cache/kde-base/krosspython-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-admin/eselect-python-20091230 =dev-lang/python-2* >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=app-admin/eselect-python-20091230 =dev-lang/python-2* >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kross-interpreters-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Kross scripting framework: Python interpreter
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability python toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/krosspython-4.7.4 b/metadata/cache/kde-base/krosspython-4.7.4
index a90f2e46bb6f..41251c04d83a 100644
--- a/metadata/cache/kde-base/krosspython-4.7.4
+++ b/metadata/cache/kde-base/krosspython-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Kross scripting framework: Python interpreter
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability python toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/krossruby-4.7.3 b/metadata/cache/kde-base/krossruby-4.7.3
deleted file mode 100644
index 18ea5f58b963..000000000000
--- a/metadata/cache/kde-base/krossruby-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] ruby_targets_ruby18? ( dev-lang/ruby:1.8 )
-!kde-base/kdebindings-ruby:4 >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] ruby_targets_ruby18? ( dev-lang/ruby:1.8 )
-4
-mirror://kde/stable/4.7.3/src/kross-interpreters-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Kross scripting framework: Ruby interpreter
-amd64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils java-utils-2 kde4-base kde4-functions kde4-meta multilib portability ruby-ng toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal elibc_FreeBSD ruby_targets_ruby18
-|| ( ruby_targets_ruby18 )
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/krossruby-4.7.4 b/metadata/cache/kde-base/krossruby-4.7.4
index a66be53d04c3..7e14691cf0ef 100644
--- a/metadata/cache/kde-base/krossruby-4.7.4
+++ b/metadata/cache/kde-base/krossruby-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Kross scripting framework: Ruby interpreter
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils java-utils-2 kde4-base kde4-functions kde4-meta multilib portability ruby-ng toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal elibc_FreeBSD ruby_targets_ruby18
+debug aqua elibc_FreeBSD ruby_targets_ruby18
 || ( ruby_targets_ruby18 )
 
 
diff --git a/metadata/cache/kde-base/kruler-4.6.3 b/metadata/cache/kde-base/kruler-4.6.3
index 691c5d2ed562..b58c3d43dee9 100644
--- a/metadata/cache/kde-base/kruler-4.6.3
+++ b/metadata/cache/kde-base/kruler-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 A screen ruler for KDE
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kruler-4.7.3 b/metadata/cache/kde-base/kruler-4.7.3
deleted file mode 100644
index 844fe1b0712e..000000000000
--- a/metadata/cache/kde-base/kruler-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kruler-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-A screen ruler for KDE
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kruler-4.7.4 b/metadata/cache/kde-base/kruler-4.7.4
index 8e2aa2df7fde..75d87f08edb1 100644
--- a/metadata/cache/kde-base/kruler-4.7.4
+++ b/metadata/cache/kde-base/kruler-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 A screen ruler for KDE
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/krunner-4.6.3 b/metadata/cache/kde-base/krunner-4.6.3
index f0f31ad67712..94afad792786 100644
--- a/metadata/cache/kde-base/krunner-4.6.3
+++ b/metadata/cache/kde-base/krunner-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Command Runner
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix opengl aqua kdeenablefinal
+debug kdeprefix opengl aqua
 
 
 
diff --git a/metadata/cache/kde-base/krunner-4.7.3 b/metadata/cache/kde-base/krunner-4.7.3
deleted file mode 100644
index c4cc74ae8f9b..000000000000
--- a/metadata/cache/kde-base/krunner-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kcheckpass-4.7.3:4[aqua=] >=kde-base/kephal-4.7.3:4[aqua=] >=kde-base/ksmserver-4.7.3:4[aqua=] >=kde-base/ksysguard-4.7.3:4[aqua=] >=kde-base/libkworkspace-4.7.3:4[aqua=] >=kde-base/libplasmagenericshell-4.7.3:4[aqua=] !aqua? ( x11-libs/libXcursor x11-libs/libXScrnSaver ) !aqua? ( x11-libs/libXcursor x11-proto/scrnsaverproto ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/kcheckpass-4.7.3:4[aqua=] >=kde-base/kephal-4.7.3:4[aqua=] >=kde-base/ksmserver-4.7.3:4[aqua=] >=kde-base/ksysguard-4.7.3:4[aqua=] >=kde-base/libkworkspace-4.7.3:4[aqua=] >=kde-base/libplasmagenericshell-4.7.3:4[aqua=] !aqua? ( x11-libs/libXcursor x11-libs/libXScrnSaver ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Command Runner
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug opengl aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/krunner-4.7.4 b/metadata/cache/kde-base/krunner-4.7.4
index c7f31e40e1e3..9344b5058132 100644
--- a/metadata/cache/kde-base/krunner-4.7.4
+++ b/metadata/cache/kde-base/krunner-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Command Runner
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug opengl aqua kdeenablefinal
+debug opengl aqua
 
 
 
diff --git a/metadata/cache/kde-base/ksaneplugin-4.6.3 b/metadata/cache/kde-base/ksaneplugin-4.6.3
index d37e8b596479..b0c1c77e191f 100644
--- a/metadata/cache/kde-base/ksaneplugin-4.6.3
+++ b/metadata/cache/kde-base/ksaneplugin-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 SANE Plugin for KDE
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/ksaneplugin-4.7.3 b/metadata/cache/kde-base/ksaneplugin-4.7.3
deleted file mode 100644
index 278608a69e88..000000000000
--- a/metadata/cache/kde-base/ksaneplugin-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libksane-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/libksane-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/ksaneplugin-4.7.3.tar.bz2
-
-http://www.kipi-plugins.org
-GPL-2
-SANE Plugin for KDE
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/ksaneplugin-4.7.4 b/metadata/cache/kde-base/ksaneplugin-4.7.4
index 1c679c992d61..e3b3ffcc9da4 100644
--- a/metadata/cache/kde-base/ksaneplugin-4.7.4
+++ b/metadata/cache/kde-base/ksaneplugin-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 SANE Plugin for KDE
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kscd-4.6.3 b/metadata/cache/kde-base/kscd-4.6.3
index c51a96c02e28..d4ae182ea5d3 100644
--- a/metadata/cache/kde-base/kscd-4.6.3
+++ b/metadata/cache/kde-base/kscd-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE CD player
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kscd-4.7.3 b/metadata/cache/kde-base/kscd-4.7.3
deleted file mode 100644
index c57386080b63..000000000000
--- a/metadata/cache/kde-base/kscd-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkcddb-4.7.3:4[aqua=] >=kde-base/libkcompactdisc-4.7.3:4[aqua=] media-libs/musicbrainz:3 >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/libkcddb-4.7.3:4[aqua=] >=kde-base/libkcompactdisc-4.7.3:4[aqua=] media-libs/musicbrainz:3 >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdemultimedia-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE CD player
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kscd-4.7.4-r1 b/metadata/cache/kde-base/kscd-4.7.4-r1
index bb6fc93c75ae..05526a086390 100644
--- a/metadata/cache/kde-base/kscd-4.7.4-r1
+++ b/metadata/cache/kde-base/kscd-4.7.4-r1
@@ -8,7 +8,7 @@ GPL-2
 KDE CD player
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kscreensaver-4.6.3 b/metadata/cache/kde-base/kscreensaver-4.6.3
index abb28f861f26..9a446b4c1b45 100644
--- a/metadata/cache/kde-base/kscreensaver-4.6.3
+++ b/metadata/cache/kde-base/kscreensaver-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE screensaver framework
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug pam kdeprefix opengl aqua kdeenablefinal
+debug pam kdeprefix opengl aqua
 
 
 
diff --git a/metadata/cache/kde-base/kscreensaver-4.7.3 b/metadata/cache/kde-base/kscreensaver-4.7.3
deleted file mode 100644
index 60d68753bfda..000000000000
--- a/metadata/cache/kde-base/kscreensaver-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/glib:2 >=kde-base/kcheckpass-4.7.3:4[aqua=] >=x11-libs/libxklavier-3.2 >=x11-libs/libXrandr-1.2.1 x11-libs/libXtst opengl? ( virtual/opengl ) pam? ( >=kde-base/kdebase-pam-7 ) x11-proto/randrproto >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-dev-libs/glib:2 >=kde-base/kcheckpass-4.7.3:4[aqua=] >=x11-libs/libxklavier-3.2 >=x11-libs/libXrandr-1.2.1 x11-libs/libXtst opengl? ( virtual/opengl ) pam? ( >=kde-base/kdebase-pam-7 ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE screensaver framework
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug pam opengl aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kscreensaver-4.7.4 b/metadata/cache/kde-base/kscreensaver-4.7.4
index deae3e1f3b29..9fd857ffd045 100644
--- a/metadata/cache/kde-base/kscreensaver-4.7.4
+++ b/metadata/cache/kde-base/kscreensaver-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE screensaver framework
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug pam opengl aqua kdeenablefinal
+debug pam opengl aqua
 
 
 
diff --git a/metadata/cache/kde-base/kshisen-4.6.3 b/metadata/cache/kde-base/kshisen-4.6.3
index f1cc4f4583cc..c299051028ec 100644
--- a/metadata/cache/kde-base/kshisen-4.6.3
+++ b/metadata/cache/kde-base/kshisen-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 A KDE game similiar to Mahjongg
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kshisen-4.7.3 b/metadata/cache/kde-base/kshisen-4.7.3
deleted file mode 100644
index da65afca06ab..000000000000
--- a/metadata/cache/kde-base/kshisen-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkmahjongg-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/libkmahjongg-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-A KDE game similiar to Mahjongg
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kshisen-4.7.4 b/metadata/cache/kde-base/kshisen-4.7.4
index d15f85c74aaf..9b1775a05a65 100644
--- a/metadata/cache/kde-base/kshisen-4.7.4
+++ b/metadata/cache/kde-base/kshisen-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 A KDE game similiar to Mahjongg
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/ksirk-4.6.3 b/metadata/cache/kde-base/ksirk-4.6.3
index 167c0829db93..35b3ba4441cb 100644
--- a/metadata/cache/kde-base/ksirk-4.6.3
+++ b/metadata/cache/kde-base/ksirk-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: Ksirk is a KDE port of the board game risk
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/ksirk-4.7.3 b/metadata/cache/kde-base/ksirk-4.7.3
deleted file mode 100644
index 019316b96a95..000000000000
--- a/metadata/cache/kde-base/ksirk-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-app-crypt/qca:2 >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-app-crypt/qca:2 >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: Ksirk is a KDE port of the board game risk
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/ksirk-4.7.4 b/metadata/cache/kde-base/ksirk-4.7.4
index e287b678b426..a13562b3c8ab 100644
--- a/metadata/cache/kde-base/ksirk-4.7.4
+++ b/metadata/cache/kde-base/ksirk-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: Ksirk is a KDE port of the board game risk
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/ksmserver-4.6.3 b/metadata/cache/kde-base/ksmserver-4.6.3
index 8d09ce152e23..1dace237a322 100644
--- a/metadata/cache/kde-base/ksmserver-4.6.3
+++ b/metadata/cache/kde-base/ksmserver-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 The reliable KDE session manager that talks the standard X11R6
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/ksmserver-4.7.3 b/metadata/cache/kde-base/ksmserver-4.7.3
deleted file mode 100644
index 3607bfad93f5..000000000000
--- a/metadata/cache/kde-base/ksmserver-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kcminit-4.7.3:4[aqua=] >=kde-base/libkworkspace-4.7.3:4[aqua=] >=kde-base/solid-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/kcminit-4.7.3:4[aqua=] >=kde-base/libkworkspace-4.7.3:4[aqua=] >=kde-base/solid-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-The reliable KDE session manager that talks the standard X11R6
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/ksmserver-4.7.4 b/metadata/cache/kde-base/ksmserver-4.7.4
index 9efe370f6001..a8cac28d8a73 100644
--- a/metadata/cache/kde-base/ksmserver-4.7.4
+++ b/metadata/cache/kde-base/ksmserver-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 The reliable KDE session manager that talks the standard X11R6
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/ksnapshot-4.6.3 b/metadata/cache/kde-base/ksnapshot-4.6.3
index 198478f778bf..307dc00fd99e 100644
--- a/metadata/cache/kde-base/ksnapshot-4.6.3
+++ b/metadata/cache/kde-base/ksnapshot-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Screenshot Utility
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kipi kdeprefix +handbook aqua kdeenablefinal
+debug kipi kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/ksnapshot-4.7.3 b/metadata/cache/kde-base/ksnapshot-4.7.3
deleted file mode 100644
index 872cea1daa7d..000000000000
--- a/metadata/cache/kde-base/ksnapshot-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-kipi? ( >=kde-base/libkipi-4.7.3:4[aqua=] ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-kipi? ( >=kde-base/libkipi-4.7.3:4[aqua=] ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/ksnapshot-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Screenshot Utility
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug kipi +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/ksnapshot-4.7.4 b/metadata/cache/kde-base/ksnapshot-4.7.4
index 797c73ce2487..b1d2b74627eb 100644
--- a/metadata/cache/kde-base/ksnapshot-4.7.4
+++ b/metadata/cache/kde-base/ksnapshot-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Screenshot Utility
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug kipi +handbook aqua kdeenablefinal
+debug kipi +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kspaceduel-4.6.3 b/metadata/cache/kde-base/kspaceduel-4.6.3
index 15ebac2d2075..369172c5f46f 100644
--- a/metadata/cache/kde-base/kspaceduel-4.6.3
+++ b/metadata/cache/kde-base/kspaceduel-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Space Game
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kspaceduel-4.7.3 b/metadata/cache/kde-base/kspaceduel-4.7.3
deleted file mode 100644
index 3852cb38c04c..000000000000
--- a/metadata/cache/kde-base/kspaceduel-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Space Game
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kspaceduel-4.7.4 b/metadata/cache/kde-base/kspaceduel-4.7.4
index 281332020faa..5100ebb437f5 100644
--- a/metadata/cache/kde-base/kspaceduel-4.7.4
+++ b/metadata/cache/kde-base/kspaceduel-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Space Game
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/ksplash-4.6.3 b/metadata/cache/kde-base/ksplash-4.6.3
index 1fbc584bb4af..e9c7640320da 100644
--- a/metadata/cache/kde-base/ksplash-4.6.3
+++ b/metadata/cache/kde-base/ksplash-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE splashscreen framework (the splashscreen of KDE itself, not of individual apps)
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-3dnow altivec debug mmx sse sse2 xinerama kdeprefix aqua kdeenablefinal
+3dnow altivec debug mmx sse sse2 xinerama kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/ksplash-4.7.3 b/metadata/cache/kde-base/ksplash-4.7.3
deleted file mode 100644
index dab07db63422..000000000000
--- a/metadata/cache/kde-base/ksplash-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/libpng xinerama? ( x11-libs/libXinerama ) xinerama? ( x11-proto/xineramaproto ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-media-libs/libpng xinerama? ( x11-libs/libXinerama ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE splashscreen framework (the splashscreen of KDE itself, not of individual apps)
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-3dnow altivec debug mmx sse sse2 xinerama aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/ksplash-4.7.4 b/metadata/cache/kde-base/ksplash-4.7.4
index 01082bef6d48..30feba4dba20 100644
--- a/metadata/cache/kde-base/ksplash-4.7.4
+++ b/metadata/cache/kde-base/ksplash-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE splashscreen framework (the splashscreen of KDE itself, not of individual apps)
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-3dnow altivec debug mmx sse sse2 xinerama aqua kdeenablefinal
+3dnow altivec debug mmx sse sse2 xinerama aqua
 
 
 
diff --git a/metadata/cache/kde-base/ksquares-4.6.3 b/metadata/cache/kde-base/ksquares-4.6.3
index dc9d129cd607..191d766569d8 100644
--- a/metadata/cache/kde-base/ksquares-4.6.3
+++ b/metadata/cache/kde-base/ksquares-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KSquares is an implementation of the game squares for KDE4
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic games-ggz gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/ksquares-4.7.3 b/metadata/cache/kde-base/ksquares-4.7.3
deleted file mode 100644
index 76f1a69b2e1c..000000000000
--- a/metadata/cache/kde-base/ksquares-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KSquares is an implementation of the game squares for KDE4
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic games-ggz gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/ksquares-4.7.4 b/metadata/cache/kde-base/ksquares-4.7.4
index 05429a6c1796..46e51d3ae5a4 100644
--- a/metadata/cache/kde-base/ksquares-4.7.4
+++ b/metadata/cache/kde-base/ksquares-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KSquares is an implementation of the game squares for KDE4
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic games-ggz gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kstars-4.6.3 b/metadata/cache/kde-base/kstars-4.6.3
index cdaaf1df940f..ce91e2ae2dc4 100644
--- a/metadata/cache/kde-base/kstars-4.6.3
+++ b/metadata/cache/kde-base/kstars-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Desktop Planetarium
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug fits indi kdeprefix +handbook aqua kdeenablefinal
+debug fits indi kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kstars-4.7.3 b/metadata/cache/kde-base/kstars-4.7.3
deleted file mode 100644
index 8e0a6ec6ae45..000000000000
--- a/metadata/cache/kde-base/kstars-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-cpp/eigen:2 >=kde-base/libkdeedu-4.7.3:4[aqua=] fits? ( >=sci-libs/cfitsio-0.390 ) indi? ( >=sci-libs/indilib-0.6.2[fits?] ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-dev-cpp/eigen:2 >=kde-base/libkdeedu-4.7.3:4[aqua=] fits? ( >=sci-libs/cfitsio-0.390 ) indi? ( >=sci-libs/indilib-0.6.2[fits?] ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kstars-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Desktop Planetarium
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug fits indi +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kstars-4.7.4 b/metadata/cache/kde-base/kstars-4.7.4
index 0f42d371e71a..4b283184b3e4 100644
--- a/metadata/cache/kde-base/kstars-4.7.4
+++ b/metadata/cache/kde-base/kstars-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Desktop Planetarium
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug fits indi +handbook aqua kdeenablefinal
+debug fits indi +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kstart-4.6.3 b/metadata/cache/kde-base/kstart-4.6.3
index c06dea9e1e68..8336b5a24d14 100644
--- a/metadata/cache/kde-base/kstart-4.6.3
+++ b/metadata/cache/kde-base/kstart-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: Utility to launch applications with special window properties
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kstart-4.7.3 b/metadata/cache/kde-base/kstart-4.7.3
deleted file mode 100644
index 8d70f95b1b93..000000000000
--- a/metadata/cache/kde-base/kstart-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: Utility to launch applications with special window properties
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kstart-4.7.4 b/metadata/cache/kde-base/kstart-4.7.4
index 5089fdaa2c45..8d496eb6f68a 100644
--- a/metadata/cache/kde-base/kstart-4.7.4
+++ b/metadata/cache/kde-base/kstart-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: Utility to launch applications with special window properties
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kstartperf-4.6.3 b/metadata/cache/kde-base/kstartperf-4.6.3
index 26e295b52651..98fbd7b64804 100644
--- a/metadata/cache/kde-base/kstartperf-4.6.3
+++ b/metadata/cache/kde-base/kstartperf-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Measures starting performance of applications
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kstartperf-4.7.3 b/metadata/cache/kde-base/kstartperf-4.7.3
deleted file mode 100644
index bbc17037d2be..000000000000
--- a/metadata/cache/kde-base/kstartperf-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdesdk-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Measures starting performance of applications
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kstartperf-4.7.4 b/metadata/cache/kde-base/kstartperf-4.7.4
index b1b54bb3ddcf..9ebcbdfb8fbe 100644
--- a/metadata/cache/kde-base/kstartperf-4.7.4
+++ b/metadata/cache/kde-base/kstartperf-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Measures starting performance of applications
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kstartupconfig-4.6.3 b/metadata/cache/kde-base/kstartupconfig-4.6.3
index 81d42e310d77..bcb2fc95cbfc 100644
--- a/metadata/cache/kde-base/kstartupconfig-4.6.3
+++ b/metadata/cache/kde-base/kstartupconfig-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: Utility to launch applications with special window properties
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kstartupconfig-4.7.3 b/metadata/cache/kde-base/kstartupconfig-4.7.3
deleted file mode 100644
index 63d6c80e982c..000000000000
--- a/metadata/cache/kde-base/kstartupconfig-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: Utility to launch applications with special window properties
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kstartupconfig-4.7.4 b/metadata/cache/kde-base/kstartupconfig-4.7.4
index 6af479a1b0f6..4cb9bb88f99d 100644
--- a/metadata/cache/kde-base/kstartupconfig-4.7.4
+++ b/metadata/cache/kde-base/kstartupconfig-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: Utility to launch applications with special window properties
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kstyles-4.6.3 b/metadata/cache/kde-base/kstyles-4.6.3
index e553a8e39856..f978dd97963c 100644
--- a/metadata/cache/kde-base/kstyles-4.6.3
+++ b/metadata/cache/kde-base/kstyles-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: A set of different KDE styles.
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kstyles-4.7.3 b/metadata/cache/kde-base/kstyles-4.7.3
deleted file mode 100644
index 931c35a2ba77..000000000000
--- a/metadata/cache/kde-base/kstyles-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/liboxygenstyle-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/liboxygenstyle-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: A set of different KDE styles.
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kstyles-4.7.4 b/metadata/cache/kde-base/kstyles-4.7.4
index ebd9e4412c0b..bfa4c348788c 100644
--- a/metadata/cache/kde-base/kstyles-4.7.4
+++ b/metadata/cache/kde-base/kstyles-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: A set of different KDE styles.
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/ksudoku-4.6.3 b/metadata/cache/kde-base/ksudoku-4.6.3
index d96a344d9efd..bfcee18084ac 100644
--- a/metadata/cache/kde-base/ksudoku-4.6.3
+++ b/metadata/cache/kde-base/ksudoku-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Sudoku
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/ksudoku-4.7.3 b/metadata/cache/kde-base/ksudoku-4.7.3
deleted file mode 100644
index fcfb89d99b1e..000000000000
--- a/metadata/cache/kde-base/ksudoku-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=x11-libs/qt-opengl-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) >=x11-libs/qt-opengl-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Sudoku
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/ksudoku-4.7.4 b/metadata/cache/kde-base/ksudoku-4.7.4
index ea8e77a98f52..24135fbc4ac5 100644
--- a/metadata/cache/kde-base/ksudoku-4.7.4
+++ b/metadata/cache/kde-base/ksudoku-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Sudoku
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/ksysguard-4.6.3 b/metadata/cache/kde-base/ksysguard-4.6.3
index 976e40126d89..018f29a1aa2c 100644
--- a/metadata/cache/kde-base/ksysguard-4.6.3
+++ b/metadata/cache/kde-base/ksysguard-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KSysguard is a network enabled task manager and system monitor application.
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug lm_sensors test test kdeprefix test +handbook aqua kdeenablefinal
+debug lm_sensors test test kdeprefix test +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/ksysguard-4.7.3 b/metadata/cache/kde-base/ksysguard-4.7.3
deleted file mode 100644
index 4ba4875862b5..000000000000
--- a/metadata/cache/kde-base/ksysguard-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-libs/libXrender x11-libs/libXres lm_sensors? ( sys-apps/lm_sensors ) x11-proto/renderproto >=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 ) test? ( dev-util/cppunit ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-x11-libs/libXrender x11-libs/libXres lm_sensors? ( sys-apps/lm_sensors ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-KSysguard is a network enabled task manager and system monitor application.
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug lm_sensors test test test +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/ksysguard-4.7.4 b/metadata/cache/kde-base/ksysguard-4.7.4
index 8f29d9def21e..6397343e33a7 100644
--- a/metadata/cache/kde-base/ksysguard-4.7.4
+++ b/metadata/cache/kde-base/ksysguard-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KSysguard is a network enabled task manager and system monitor application.
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug lm_sensors test test test +handbook aqua kdeenablefinal
+debug lm_sensors test test test +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/ksystemlog-4.6.3 b/metadata/cache/kde-base/ksystemlog-4.6.3
index c072daa2bc26..f4707d61535c 100644
--- a/metadata/cache/kde-base/ksystemlog-4.6.3
+++ b/metadata/cache/kde-base/ksystemlog-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE system log viewer
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug test test kdeprefix +handbook aqua kdeenablefinal
+debug test test kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/ksystemlog-4.7.3 b/metadata/cache/kde-base/ksystemlog-4.7.3
deleted file mode 100644
index d4660d41b07d..000000000000
--- a/metadata/cache/kde-base/ksystemlog-4.7.3
+++ /dev/null
@@ -1,22 +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 dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeadmin-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-KDE system log viewer
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug test test +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/ksystemlog-4.7.4 b/metadata/cache/kde-base/ksystemlog-4.7.4
index 14793bd6224e..83003460ddf8 100644
--- a/metadata/cache/kde-base/ksystemlog-4.7.4
+++ b/metadata/cache/kde-base/ksystemlog-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE system log viewer
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug test test +handbook aqua kdeenablefinal
+debug test test +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/ksystraycmd-4.6.3 b/metadata/cache/kde-base/ksystraycmd-4.6.3
index a2af0f9af1c2..fd7c0378fcfd 100644
--- a/metadata/cache/kde-base/ksystraycmd-4.6.3
+++ b/metadata/cache/kde-base/ksystraycmd-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Ksystraycmd embeds applications given as argument into the system tray.
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/ksystraycmd-4.7.3 b/metadata/cache/kde-base/ksystraycmd-4.7.3
deleted file mode 100644
index 524877155322..000000000000
--- a/metadata/cache/kde-base/ksystraycmd-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Ksystraycmd embeds applications given as argument into the system tray.
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/ksystraycmd-4.7.4 b/metadata/cache/kde-base/ksystraycmd-4.7.4
index dc6f5066db30..0fd807087f3b 100644
--- a/metadata/cache/kde-base/ksystraycmd-4.7.4
+++ b/metadata/cache/kde-base/ksystraycmd-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Ksystraycmd embeds applications given as argument into the system tray.
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kteatime-4.6.3 b/metadata/cache/kde-base/kteatime-4.6.3
index 35e7222e8bdd..b869008168fd 100644
--- a/metadata/cache/kde-base/kteatime-4.6.3
+++ b/metadata/cache/kde-base/kteatime-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE utility for making a fine cup of tea
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kteatime-4.7.3 b/metadata/cache/kde-base/kteatime-4.7.3
deleted file mode 100644
index b8fb6e85c477..000000000000
--- a/metadata/cache/kde-base/kteatime-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdetoys-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE utility for making a fine cup of tea
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kteatime-4.7.4 b/metadata/cache/kde-base/kteatime-4.7.4
index 9c745329443f..e19797f7f9af 100644
--- a/metadata/cache/kde-base/kteatime-4.7.4
+++ b/metadata/cache/kde-base/kteatime-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE utility for making a fine cup of tea
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/ktimer-4.6.3 b/metadata/cache/kde-base/ktimer-4.6.3
index 20cdf4be759d..83f78f5bf4eb 100644
--- a/metadata/cache/kde-base/ktimer-4.6.3
+++ b/metadata/cache/kde-base/ktimer-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Timer
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/ktimer-4.7.3 b/metadata/cache/kde-base/ktimer-4.7.3
deleted file mode 100644
index 0578d0ffbf44..000000000000
--- a/metadata/cache/kde-base/ktimer-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeutils-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Timer
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/ktimer-4.7.4 b/metadata/cache/kde-base/ktimer-4.7.4
index 2a1bbb04a34f..f98e71512855 100644
--- a/metadata/cache/kde-base/ktimer-4.7.4
+++ b/metadata/cache/kde-base/ktimer-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Timer
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/ktimetracker-4.4.11.1 b/metadata/cache/kde-base/ktimetracker-4.4.11.1
index 5f04bda364eb..1fe2c9b86924 100644
--- a/metadata/cache/kde-base/ktimetracker-4.4.11.1
+++ b/metadata/cache/kde-base/ktimetracker-4.4.11.1
@@ -8,7 +8,7 @@ GPL-2
 KTimeTracker tracks time spent on various tasks.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook kdeprefix aqua kdeenablefinal +kontact
+debug +handbook kdeprefix aqua +kontact
 
 
 
diff --git a/metadata/cache/kde-base/ktimetracker-4.7.3 b/metadata/cache/kde-base/ktimetracker-4.7.3
deleted file mode 100644
index e6678fe5ce45..000000000000
--- a/metadata/cache/kde-base/ktimetracker-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepim-kresources-4.7.3:4[aqua=] >=kde-base/kdepimlibs-4.7.3:4[aqua=] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] x11-libs/libXScrnSaver x11-proto/scrnsaverproto >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/kdepim-kresources-4.7.3:4[aqua=] >=kde-base/kdepimlibs-4.7.3:4[aqua=] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] x11-libs/libXScrnSaver >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] kontact? ( >=kde-base/kontact-4.7.3:4[aqua=] )
-4
-mirror://kde/stable/4.7.3/src/kdepim-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KTimeTracker tracks time spent on various tasks.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal +kontact
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/ktimetracker-4.7.4 b/metadata/cache/kde-base/ktimetracker-4.7.4
index 7c9ae3f9e719..786d5e15c0e4 100644
--- a/metadata/cache/kde-base/ktimetracker-4.7.4
+++ b/metadata/cache/kde-base/ktimetracker-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KTimeTracker tracks time spent on various tasks.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal +kontact
+debug +handbook aqua +kontact
 
 
 
diff --git a/metadata/cache/kde-base/ktimezoned-4.6.3 b/metadata/cache/kde-base/ktimezoned-4.6.3
index 1f9cb2f7558d..2c376d4026db 100644
--- a/metadata/cache/kde-base/ktimezoned-4.6.3
+++ b/metadata/cache/kde-base/ktimezoned-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: Timezone daemon
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/ktimezoned-4.7.3 b/metadata/cache/kde-base/ktimezoned-4.7.3
deleted file mode 100644
index 49ea8c9ce69b..000000000000
--- a/metadata/cache/kde-base/ktimezoned-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: Timezone daemon
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/ktimezoned-4.7.4 b/metadata/cache/kde-base/ktimezoned-4.7.4
index e7f8c5da8a0d..daca36d83ae6 100644
--- a/metadata/cache/kde-base/ktimezoned-4.7.4
+++ b/metadata/cache/kde-base/ktimezoned-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: Timezone daemon
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/ktouch-4.6.3 b/metadata/cache/kde-base/ktouch-4.6.3
index 39089afb3830..de114f8979da 100644
--- a/metadata/cache/kde-base/ktouch-4.6.3
+++ b/metadata/cache/kde-base/ktouch-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: A program that helps you to learn and practice touch typing
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/ktouch-4.7.3 b/metadata/cache/kde-base/ktouch-4.7.3
deleted file mode 100644
index 8fce51d22756..000000000000
--- a/metadata/cache/kde-base/ktouch-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/knotify-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/ktouch-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: A program that helps you to learn and practice touch typing
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/ktouch-4.7.4 b/metadata/cache/kde-base/ktouch-4.7.4
index 8def95c1a81f..c9080a31f17f 100644
--- a/metadata/cache/kde-base/ktouch-4.7.4
+++ b/metadata/cache/kde-base/ktouch-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: A program that helps you to learn and practice touch typing
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/ktraderclient-4.6.3 b/metadata/cache/kde-base/ktraderclient-4.6.3
index 4147f9bb4892..37fc52f17d1a 100644
--- a/metadata/cache/kde-base/ktraderclient-4.6.3
+++ b/metadata/cache/kde-base/ktraderclient-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 A command-line tool for querying the KDE trader system
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/ktraderclient-4.7.3 b/metadata/cache/kde-base/ktraderclient-4.7.3
deleted file mode 100644
index b5d579b4fa93..000000000000
--- a/metadata/cache/kde-base/ktraderclient-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-A command-line tool for querying the KDE trader system
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/ktraderclient-4.7.4 b/metadata/cache/kde-base/ktraderclient-4.7.4
index 97d44c21e47f..a76d12023c7d 100644
--- a/metadata/cache/kde-base/ktraderclient-4.7.4
+++ b/metadata/cache/kde-base/ktraderclient-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 A command-line tool for querying the KDE trader system
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/ktron-4.6.3 b/metadata/cache/kde-base/ktron-4.6.3
index f7ff4c7c2c34..751ed0698a3c 100644
--- a/metadata/cache/kde-base/ktron-4.6.3
+++ b/metadata/cache/kde-base/ktron-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Tron game
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/ktron-4.7.3 b/metadata/cache/kde-base/ktron-4.7.3
deleted file mode 100644
index 49f8ec1ecb90..000000000000
--- a/metadata/cache/kde-base/ktron-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Tron game
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/ktron-4.7.4 b/metadata/cache/kde-base/ktron-4.7.4
index 51ab22fb5bae..2b5e105e7926 100644
--- a/metadata/cache/kde-base/ktron-4.7.4
+++ b/metadata/cache/kde-base/ktron-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Tron game
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/ktuberling-4.6.3 b/metadata/cache/kde-base/ktuberling-4.6.3
index 1f047cc7613c..139d8599a7a8 100644
--- a/metadata/cache/kde-base/ktuberling-4.6.3
+++ b/metadata/cache/kde-base/ktuberling-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: potato game for kids
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/ktuberling-4.7.3 b/metadata/cache/kde-base/ktuberling-4.7.3
deleted file mode 100644
index cd393c79987a..000000000000
--- a/metadata/cache/kde-base/ktuberling-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: potato game for kids
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/ktuberling-4.7.4 b/metadata/cache/kde-base/ktuberling-4.7.4
index bf4b7aaf51b9..e8850f21a977 100644
--- a/metadata/cache/kde-base/ktuberling-4.7.4
+++ b/metadata/cache/kde-base/ktuberling-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: potato game for kids
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kturtle-4.6.3 b/metadata/cache/kde-base/kturtle-4.6.3
index d6b43007a9dd..a1f7bb008dc9 100644
--- a/metadata/cache/kde-base/kturtle-4.6.3
+++ b/metadata/cache/kde-base/kturtle-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: Educational programming environment using the Logo programming language
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kturtle-4.7.3 b/metadata/cache/kde-base/kturtle-4.7.3
deleted file mode 100644
index 82f65c92e82e..000000000000
--- a/metadata/cache/kde-base/kturtle-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/knotify-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kturtle-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: Educational programming environment using the Logo programming language
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kturtle-4.7.4 b/metadata/cache/kde-base/kturtle-4.7.4
index 7f004bf41f60..031ef8ac409a 100644
--- a/metadata/cache/kde-base/kturtle-4.7.4
+++ b/metadata/cache/kde-base/kturtle-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: Educational programming environment using the Logo programming language
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/ktux-4.6.3 b/metadata/cache/kde-base/ktux-4.6.3
index cc9705155b2f..ea9b1192ad21 100644
--- a/metadata/cache/kde-base/ktux-4.6.3
+++ b/metadata/cache/kde-base/ktux-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: screensaver featuring the Space-Faring Tux
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/ktux-4.7.3 b/metadata/cache/kde-base/ktux-4.7.3
deleted file mode 100644
index f4e0d87ad947..000000000000
--- a/metadata/cache/kde-base/ktux-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kscreensaver-4.7.3:4[aqua=] >=kde-base/libkworkspace-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/kscreensaver-4.7.3:4[aqua=] >=kde-base/libkworkspace-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdetoys-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: screensaver featuring the Space-Faring Tux
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/ktux-4.7.4 b/metadata/cache/kde-base/ktux-4.7.4
index 89eb08542a6d..7774d139a42c 100644
--- a/metadata/cache/kde-base/ktux-4.7.4
+++ b/metadata/cache/kde-base/ktux-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: screensaver featuring the Space-Faring Tux
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kubrick-4.6.3 b/metadata/cache/kde-base/kubrick-4.6.3
index ebd1e523c415..2f52d4ff53ee 100644
--- a/metadata/cache/kde-base/kubrick-4.6.3
+++ b/metadata/cache/kde-base/kubrick-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: Kubrick is a game based on "Rubik's Cube" puzzle.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kubrick-4.7.3 b/metadata/cache/kde-base/kubrick-4.7.3
deleted file mode 100644
index 218f4df5d0b5..000000000000
--- a/metadata/cache/kde-base/kubrick-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=x11-libs/qt-opengl-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) >=x11-libs/qt-opengl-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: Kubrick is a game based on "Rubik's Cube" puzzle.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kubrick-4.7.4 b/metadata/cache/kde-base/kubrick-4.7.4
index c7ea21e450ba..46de27f9e49a 100644
--- a/metadata/cache/kde-base/kubrick-4.7.4
+++ b/metadata/cache/kde-base/kubrick-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: Kubrick is a game based on "Rubik's Cube" puzzle.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kuiserver-4.6.3 b/metadata/cache/kde-base/kuiserver-4.6.3
index f28757c9b01d..57c2c732cb20 100644
--- a/metadata/cache/kde-base/kuiserver-4.6.3
+++ b/metadata/cache/kde-base/kuiserver-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: Progress Info UI server
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kuiserver-4.7.3 b/metadata/cache/kde-base/kuiserver-4.7.3
deleted file mode 100644
index 9f35f0aeaebd..000000000000
--- a/metadata/cache/kde-base/kuiserver-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: Progress Info UI server
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kuiserver-4.7.4 b/metadata/cache/kde-base/kuiserver-4.7.4
index f3bd2a4b6735..e9ec0caf548d 100644
--- a/metadata/cache/kde-base/kuiserver-4.7.4
+++ b/metadata/cache/kde-base/kuiserver-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: Progress Info UI server
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kuiviewer-4.6.3 b/metadata/cache/kde-base/kuiviewer-4.6.3
index 396151b3b1f9..9297f694c2c3 100644
--- a/metadata/cache/kde-base/kuiviewer-4.6.3
+++ b/metadata/cache/kde-base/kuiviewer-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE utility that displays and tests UI files generated by Qt Designer.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kuiviewer-4.7.3 b/metadata/cache/kde-base/kuiviewer-4.7.3
deleted file mode 100644
index 9bdcab81f046..000000000000
--- a/metadata/cache/kde-base/kuiviewer-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdesdk-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE utility that displays and tests UI files generated by Qt Designer.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kuiviewer-4.7.4 b/metadata/cache/kde-base/kuiviewer-4.7.4
index 7d4b9e0b0572..6c03aced0cd3 100644
--- a/metadata/cache/kde-base/kuiviewer-4.7.4
+++ b/metadata/cache/kde-base/kuiviewer-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE utility that displays and tests UI files generated by Qt Designer.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kurifilter-plugins-4.6.3 b/metadata/cache/kde-base/kurifilter-plugins-4.6.3
index 5c0ff6c42709..2502bbcd8322 100644
--- a/metadata/cache/kde-base/kurifilter-plugins-4.6.3
+++ b/metadata/cache/kde-base/kurifilter-plugins-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: Plugins to manage filtering URIs.
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kurifilter-plugins-4.7.3 b/metadata/cache/kde-base/kurifilter-plugins-4.7.3
deleted file mode 100644
index e03a490e33a5..000000000000
--- a/metadata/cache/kde-base/kurifilter-plugins-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-KDE: Plugins to manage filtering URIs.
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kurifilter-plugins-4.7.4 b/metadata/cache/kde-base/kurifilter-plugins-4.7.4
index 5d0375663dc8..2d6284d07512 100644
--- a/metadata/cache/kde-base/kurifilter-plugins-4.7.4
+++ b/metadata/cache/kde-base/kurifilter-plugins-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: Plugins to manage filtering URIs.
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kuser-4.6.3 b/metadata/cache/kde-base/kuser-4.6.3
index 14cf022e47ba..6522d9487ee7 100644
--- a/metadata/cache/kde-base/kuser-4.6.3
+++ b/metadata/cache/kde-base/kuser-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE application that helps you manage system users
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kuser-4.7.3 b/metadata/cache/kde-base/kuser-4.7.3
deleted file mode 100644
index becd335db1a6..000000000000
--- a/metadata/cache/kde-base/kuser-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/kdepimlibs-4.7.3:4[aqua=] >=kde-base/knotify-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeadmin-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE application that helps you manage system users
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kuser-4.7.4 b/metadata/cache/kde-base/kuser-4.7.4
index bb09fc4b7a36..ab4bc47b2a84 100644
--- a/metadata/cache/kde-base/kuser-4.7.4
+++ b/metadata/cache/kde-base/kuser-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE application that helps you manage system users
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kvtml-data-4.6.3 b/metadata/cache/kde-base/kvtml-data-4.6.3
index 2b78f6d028f1..a83dd9737e0b 100644
--- a/metadata/cache/kde-base/kvtml-data-4.6.3
+++ b/metadata/cache/kde-base/kvtml-data-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Kvtml data for various KDE games
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-kdeprefix aqua kdeenablefinal
+kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kwallet-4.6.3 b/metadata/cache/kde-base/kwallet-4.6.3
index 471926d39d33..b91c1fef0954 100644
--- a/metadata/cache/kde-base/kwallet-4.6.3
+++ b/metadata/cache/kde-base/kwallet-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Wallet Management Tool
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kwallet-4.7.3 b/metadata/cache/kde-base/kwallet-4.7.3
deleted file mode 100644
index 45335308acc9..000000000000
--- a/metadata/cache/kde-base/kwallet-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeutils-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Wallet Management Tool
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kwallet-4.7.4 b/metadata/cache/kde-base/kwallet-4.7.4
index 93d97bb69d91..0229b5e62db8 100644
--- a/metadata/cache/kde-base/kwallet-4.7.4
+++ b/metadata/cache/kde-base/kwallet-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Wallet Management Tool
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kwalletd-4.6.3 b/metadata/cache/kde-base/kwalletd-4.6.3
index 039d5a117c92..6e068f25a2a8 100644
--- a/metadata/cache/kde-base/kwalletd-4.6.3
+++ b/metadata/cache/kde-base/kwalletd-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Password Server
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kwalletd-4.7.3 b/metadata/cache/kde-base/kwalletd-4.7.3
deleted file mode 100644
index d0fe9984a6f0..000000000000
--- a/metadata/cache/kde-base/kwalletd-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Password Server
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kwalletd-4.7.4 b/metadata/cache/kde-base/kwalletd-4.7.4
index 5c7e85ae975f..c0c31498673d 100644
--- a/metadata/cache/kde-base/kwalletd-4.7.4
+++ b/metadata/cache/kde-base/kwalletd-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Password Server
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/kwin-4.6.3-r1 b/metadata/cache/kde-base/kwin-4.6.3-r1
index 840b1e5619f7..4475287d0926 100644
--- a/metadata/cache/kde-base/kwin-4.6.3-r1
+++ b/metadata/cache/kde-base/kwin-4.6.3-r1
@@ -8,7 +8,7 @@ GPL-2
 KDE window manager
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug xcomposite xinerama kdeprefix opengl aqua kdeenablefinal
+debug xcomposite xinerama kdeprefix opengl aqua
 
 
 
diff --git a/metadata/cache/kde-base/kwin-4.7.3 b/metadata/cache/kde-base/kwin-4.7.3
deleted file mode 100644
index b0e539970174..000000000000
--- a/metadata/cache/kde-base/kwin-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kephal-4.7.3:4[aqua=] >=kde-base/libkworkspace-4.7.3:4[aqua=] >=kde-base/liboxygenstyle-4.7.3:4[aqua=] x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes >=x11-libs/libXrandr-1.2.1 x11-libs/libXrender opengl? ( >=media-libs/mesa-7.10 ) gles? ( || ( ( >=media-libs/mesa-7.10[egl(+),gles] <media-libs/mesa-7.12[egl(+),gles] ) >=media-libs/mesa-7.12[egl(+),gles2] ) ) xinerama? ( x11-libs/libXinerama ) x11-proto/compositeproto x11-proto/damageproto x11-proto/fixesproto x11-proto/randrproto x11-proto/renderproto xinerama? ( x11-proto/xineramaproto ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/kephal-4.7.3:4[aqua=] >=kde-base/libkworkspace-4.7.3:4[aqua=] >=kde-base/liboxygenstyle-4.7.3:4[aqua=] x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes >=x11-libs/libXrandr-1.2.1 x11-libs/libXrender opengl? ( >=media-libs/mesa-7.10 ) gles? ( || ( ( >=media-libs/mesa-7.10[egl(+),gles] <media-libs/mesa-7.12[egl(+),gles] ) >=media-libs/mesa-7.12[egl(+),gles2] ) ) xinerama? ( x11-libs/libXinerama ) x11-apps/scripts >=kde-base/oxygen-icons-4.7.3:4[aqua=] opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE window manager
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug gles xinerama opengl aqua kdeenablefinal
-opengl? ( !gles ) gles? ( !opengl )
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kwin-4.7.4 b/metadata/cache/kde-base/kwin-4.7.4
index ac28c88de5b7..049ce6ff75d2 100644
--- a/metadata/cache/kde-base/kwin-4.7.4
+++ b/metadata/cache/kde-base/kwin-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE window manager
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug gles xinerama opengl aqua kdeenablefinal
+debug gles xinerama opengl aqua
 opengl? ( !gles ) gles? ( !opengl )
 
 
diff --git a/metadata/cache/kde-base/kwordquiz-4.6.3 b/metadata/cache/kde-base/kwordquiz-4.6.3
index 45d133d1974e..97ec115e5d84 100644
--- a/metadata/cache/kde-base/kwordquiz-4.6.3
+++ b/metadata/cache/kde-base/kwordquiz-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE: A powerful flashcard and vocabulary learning program
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kwordquiz-4.7.3 b/metadata/cache/kde-base/kwordquiz-4.7.3
deleted file mode 100644
index f1494fbcff3b..000000000000
--- a/metadata/cache/kde-base/kwordquiz-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkdeedu-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kwordquiz-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE: A powerful flashcard and vocabulary learning program
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kwordquiz-4.7.4 b/metadata/cache/kde-base/kwordquiz-4.7.4
index 8d4ef278ee10..5389e8b6e94c 100644
--- a/metadata/cache/kde-base/kwordquiz-4.7.4
+++ b/metadata/cache/kde-base/kwordquiz-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE: A powerful flashcard and vocabulary learning program
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kwrite-4.6.3 b/metadata/cache/kde-base/kwrite-4.6.3
index 4a4c48f3d9e6..1bd02cbac744 100644
--- a/metadata/cache/kde-base/kwrite-4.6.3
+++ b/metadata/cache/kde-base/kwrite-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE MDI editor/IDE
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kwrite-4.7.3 b/metadata/cache/kde-base/kwrite-4.7.3
deleted file mode 100644
index 36286b22b031..000000000000
--- a/metadata/cache/kde-base/kwrite-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/katepart-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kate-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE MDI editor/IDE
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kwrite-4.7.4 b/metadata/cache/kde-base/kwrite-4.7.4
index 0b93c6c51c0c..5b213b1ef4d5 100644
--- a/metadata/cache/kde-base/kwrite-4.7.4
+++ b/metadata/cache/kde-base/kwrite-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE MDI editor/IDE
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/kwrited-4.6.3 b/metadata/cache/kde-base/kwrited-4.6.3
index e7469fa8f68f..a6fd9488571d 100644
--- a/metadata/cache/kde-base/kwrited-4.6.3
+++ b/metadata/cache/kde-base/kwrited-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE daemon listening for wall and write messages.
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/kwrited-4.7.3 b/metadata/cache/kde-base/kwrited-4.7.3
deleted file mode 100644
index 2bfd027c9fd7..000000000000
--- a/metadata/cache/kde-base/kwrited-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-libs/libutempter-1.1.5 >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=sys-libs/libutempter-1.1.5 >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE daemon listening for wall and write messages.
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/kwrited-4.7.4 b/metadata/cache/kde-base/kwrited-4.7.4
index c692eb5e61cd..7bbcbe31f364 100644
--- a/metadata/cache/kde-base/kwrited-4.7.4
+++ b/metadata/cache/kde-base/kwrited-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE daemon listening for wall and write messages.
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/libkcddb-4.6.3 b/metadata/cache/kde-base/libkcddb-4.6.3
index 300a299dfe97..8ebbd12e9158 100644
--- a/metadata/cache/kde-base/libkcddb-4.6.3
+++ b/metadata/cache/kde-base/libkcddb-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE library for CDDB
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug musicbrainz kdeprefix aqua kdeenablefinal
+debug musicbrainz kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/libkcddb-4.7.3 b/metadata/cache/kde-base/libkcddb-4.7.3
deleted file mode 100644
index a27068bd6bab..000000000000
--- a/metadata/cache/kde-base/libkcddb-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-musicbrainz? ( media-libs/musicbrainz:3 ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-musicbrainz? ( media-libs/musicbrainz:3 ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdemultimedia-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-KDE library for CDDB
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug musicbrainz aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/libkcddb-4.7.4 b/metadata/cache/kde-base/libkcddb-4.7.4
index b6bca369e4f8..0e9dbb4adc14 100644
--- a/metadata/cache/kde-base/libkcddb-4.7.4
+++ b/metadata/cache/kde-base/libkcddb-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE library for CDDB
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug musicbrainz aqua kdeenablefinal
+debug musicbrainz aqua
 
 
 
diff --git a/metadata/cache/kde-base/libkcompactdisc-4.6.3 b/metadata/cache/kde-base/libkcompactdisc-4.6.3
index 1c76308c0117..bde0002f55ef 100644
--- a/metadata/cache/kde-base/libkcompactdisc-4.6.3
+++ b/metadata/cache/kde-base/libkcompactdisc-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE library for playing & ripping CDs
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-alsa debug kdeprefix aqua kdeenablefinal
+alsa debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/libkcompactdisc-4.7.3 b/metadata/cache/kde-base/libkcompactdisc-4.7.3
deleted file mode 100644
index 3003b7f0610f..000000000000
--- a/metadata/cache/kde-base/libkcompactdisc-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdemultimedia-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE library for playing & ripping CDs
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-alsa debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/libkcompactdisc-4.7.4 b/metadata/cache/kde-base/libkcompactdisc-4.7.4
index 7366b070502f..1aec82f30b0e 100644
--- a/metadata/cache/kde-base/libkcompactdisc-4.7.4
+++ b/metadata/cache/kde-base/libkcompactdisc-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE library for playing & ripping CDs
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-alsa debug aqua kdeenablefinal
+alsa debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/libkdcraw-4.6.3 b/metadata/cache/kde-base/libkdcraw-4.6.3
index 5adfb1e56728..d50c89d1b44d 100644
--- a/metadata/cache/kde-base/libkdcraw-4.6.3
+++ b/metadata/cache/kde-base/libkdcraw-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE digital camera raw image library wrapper
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/libkdcraw-4.7.3 b/metadata/cache/kde-base/libkdcraw-4.7.3
deleted file mode 100644
index b944bc07c8cb..000000000000
--- a/metadata/cache/kde-base/libkdcraw-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/lcms:0 virtual/jpeg >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-media-libs/lcms:0 virtual/jpeg >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/libkdcraw-4.7.3.tar.bz2
-
-http://www.kipi-plugins.org
-GPL-2
-KDE digital camera raw image library wrapper
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/libkdcraw-4.7.4 b/metadata/cache/kde-base/libkdcraw-4.7.4
index adbb9dddb0d3..f419aa37bf94 100644
--- a/metadata/cache/kde-base/libkdcraw-4.7.4
+++ b/metadata/cache/kde-base/libkdcraw-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE digital camera raw image library wrapper
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/libkdeedu-4.6.3 b/metadata/cache/kde-base/libkdeedu-4.6.3
index 11a334917049..2c2db8101821 100644
--- a/metadata/cache/kde-base/libkdeedu-4.6.3
+++ b/metadata/cache/kde-base/libkdeedu-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Common library for KDE educational apps
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/libkdeedu-4.7.3 b/metadata/cache/kde-base/libkdeedu-4.7.3
deleted file mode 100644
index cfbc442084f3..000000000000
--- a/metadata/cache/kde-base/libkdeedu-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-!kde-base/kvtml-data:4 >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/libkdeedu-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-Common library for KDE educational apps
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/libkdeedu-4.7.4 b/metadata/cache/kde-base/libkdeedu-4.7.4
index dabb53e29cb5..7f261c13dbb2 100644
--- a/metadata/cache/kde-base/libkdeedu-4.7.4
+++ b/metadata/cache/kde-base/libkdeedu-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Common library for KDE educational apps
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/libkdegames-4.6.3 b/metadata/cache/kde-base/libkdegames-4.6.3
index cf8342f9f730..37403ee62839 100644
--- a/metadata/cache/kde-base/libkdegames-4.6.3
+++ b/metadata/cache/kde-base/libkdegames-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Base library common to many KDE games.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/libkdegames-4.7.3 b/metadata/cache/kde-base/libkdegames-4.7.3
deleted file mode 100644
index 2855a5a65742..000000000000
--- a/metadata/cache/kde-base/libkdegames-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-games/ggz-client-libs-0.0.14 >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=dev-games/ggz-client-libs-0.0.14 >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Base library common to many KDE games.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/libkdegames-4.7.4 b/metadata/cache/kde-base/libkdegames-4.7.4
index 45f82e1929e7..260e6ffdb91d 100644
--- a/metadata/cache/kde-base/libkdegames-4.7.4
+++ b/metadata/cache/kde-base/libkdegames-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Base library common to many KDE games.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/libkdepim-4.4.11.1 b/metadata/cache/kde-base/libkdepim-4.4.11.1
index faec0d57dcfd..3d611485dc58 100644
--- a/metadata/cache/kde-base/libkdepim-4.4.11.1
+++ b/metadata/cache/kde-base/libkdepim-4.4.11.1
@@ -8,7 +8,7 @@ GPL-2
 Common library for KDE PIM apps
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/libkexiv2-4.6.3 b/metadata/cache/kde-base/libkexiv2-4.6.3
index 819bac8384e4..76f511087bd0 100644
--- a/metadata/cache/kde-base/libkexiv2-4.6.3
+++ b/metadata/cache/kde-base/libkexiv2-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Image Plugin Interface: an exiv2 library wrapper
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/libkexiv2-4.7.3 b/metadata/cache/kde-base/libkexiv2-4.7.3
deleted file mode 100644
index 3a46d70b416c..000000000000
--- a/metadata/cache/kde-base/libkexiv2-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=media-gfx/exiv2-0.20 media-libs/lcms:0 virtual/jpeg >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=media-gfx/exiv2-0.20 media-libs/lcms:0 virtual/jpeg >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/libkexiv2-4.7.3.tar.bz2
-
-http://www.kipi-plugins.org
-GPL-2
-KDE Image Plugin Interface: an exiv2 library wrapper
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/libkexiv2-4.7.4 b/metadata/cache/kde-base/libkexiv2-4.7.4
index 954d07b79e42..1fea908ee6d7 100644
--- a/metadata/cache/kde-base/libkexiv2-4.7.4
+++ b/metadata/cache/kde-base/libkexiv2-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Image Plugin Interface: an exiv2 library wrapper
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/libkipi-4.6.3 b/metadata/cache/kde-base/libkipi-4.6.3
index 43b8b04cde01..05cee5f06b8c 100644
--- a/metadata/cache/kde-base/libkipi-4.6.3
+++ b/metadata/cache/kde-base/libkipi-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 A library for image plugins accross KDE applications.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/libkipi-4.7.3 b/metadata/cache/kde-base/libkipi-4.7.3
deleted file mode 100644
index 76596b847857..000000000000
--- a/metadata/cache/kde-base/libkipi-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/libkipi-4.7.3.tar.bz2
-
-http://www.kipi-plugins.org
-GPL-2
-A library for image plugins accross KDE applications.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/libkipi-4.7.4 b/metadata/cache/kde-base/libkipi-4.7.4
index 316bd5756425..ad85129fea87 100644
--- a/metadata/cache/kde-base/libkipi-4.7.4
+++ b/metadata/cache/kde-base/libkipi-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 A library for image plugins accross KDE applications.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/libkleo-4.4.11.1 b/metadata/cache/kde-base/libkleo-4.4.11.1
index 303163877a2d..1a7bcecdea3c 100644
--- a/metadata/cache/kde-base/libkleo-4.4.11.1
+++ b/metadata/cache/kde-base/libkleo-4.4.11.1
@@ -8,7 +8,7 @@ GPL-2
 KDE library for encryption handling.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/libkmahjongg-4.6.3 b/metadata/cache/kde-base/libkmahjongg-4.6.3
index a6601d3e064a..93ab678570a5 100644
--- a/metadata/cache/kde-base/libkmahjongg-4.6.3
+++ b/metadata/cache/kde-base/libkmahjongg-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 LibKMahjongg for KDE
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/libkmahjongg-4.7.3 b/metadata/cache/kde-base/libkmahjongg-4.7.3
deleted file mode 100644
index f4c7f09b599b..000000000000
--- a/metadata/cache/kde-base/libkmahjongg-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-LibKMahjongg for KDE
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/libkmahjongg-4.7.4 b/metadata/cache/kde-base/libkmahjongg-4.7.4
index 3e0845fa3483..ef0b7861ae68 100644
--- a/metadata/cache/kde-base/libkmahjongg-4.7.4
+++ b/metadata/cache/kde-base/libkmahjongg-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 LibKMahjongg for KDE
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/libkonq-4.6.3 b/metadata/cache/kde-base/libkonq-4.6.3
index a817c7e3953c..bef493c6a82b 100644
--- a/metadata/cache/kde-base/libkonq-4.6.3
+++ b/metadata/cache/kde-base/libkonq-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 The embeddable part of konqueror
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix test aqua kdeenablefinal
+debug kdeprefix test aqua
 
 
 
diff --git a/metadata/cache/kde-base/libkonq-4.7.3 b/metadata/cache/kde-base/libkonq-4.7.3
deleted file mode 100644
index ecb1759879ba..000000000000
--- a/metadata/cache/kde-base/libkonq-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) test? ( dev-util/cppunit ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-baseapps-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-The embeddable part of konqueror
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug test aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/libkonq-4.7.4 b/metadata/cache/kde-base/libkonq-4.7.4
index f314bf0b52ef..c5df5534d91a 100644
--- a/metadata/cache/kde-base/libkonq-4.7.4
+++ b/metadata/cache/kde-base/libkonq-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 The embeddable part of konqueror
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug test aqua kdeenablefinal
+debug test aqua
 
 
 
diff --git a/metadata/cache/kde-base/libkpgp-4.4.11.1 b/metadata/cache/kde-base/libkpgp-4.4.11.1
index 75298ba72e89..82a7ff673c51 100644
--- a/metadata/cache/kde-base/libkpgp-4.4.11.1
+++ b/metadata/cache/kde-base/libkpgp-4.4.11.1
@@ -8,7 +8,7 @@ GPL-2
 KDE pgp abstraction library
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/libksane-4.6.3 b/metadata/cache/kde-base/libksane-4.6.3
index 4b6156415645..816b3833a386 100644
--- a/metadata/cache/kde-base/libksane-4.6.3
+++ b/metadata/cache/kde-base/libksane-4.6.3
@@ -8,7 +8,7 @@ LGPL-2
 SANE Library interface for KDE
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/libksane-4.7.3 b/metadata/cache/kde-base/libksane-4.7.3
deleted file mode 100644
index ad5bba81206b..000000000000
--- a/metadata/cache/kde-base/libksane-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-media-gfx/sane-backends >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-media-gfx/sane-backends >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/libksane-4.7.3.tar.bz2
-
-http://www.kipi-plugins.org
-LGPL-2
-SANE Library interface for KDE
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/libksane-4.7.4 b/metadata/cache/kde-base/libksane-4.7.4
index b1729f69fb72..4356cd0f82b6 100644
--- a/metadata/cache/kde-base/libksane-4.7.4
+++ b/metadata/cache/kde-base/libksane-4.7.4
@@ -8,7 +8,7 @@ LGPL-2
 SANE Library interface for KDE
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/libkworkspace-4.6.3-r1 b/metadata/cache/kde-base/libkworkspace-4.6.3-r1
index 917b671690af..98ed731c2b28 100644
--- a/metadata/cache/kde-base/libkworkspace-4.6.3-r1
+++ b/metadata/cache/kde-base/libkworkspace-4.6.3-r1
@@ -8,7 +8,7 @@ GPL-2
 A library for KDE desktop applications
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/libkworkspace-4.7.3-r1 b/metadata/cache/kde-base/libkworkspace-4.7.3-r1
deleted file mode 100644
index a1edbfe6aa43..000000000000
--- a/metadata/cache/kde-base/libkworkspace-4.7.3-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-libs/libxkbfile x11-libs/libXcomposite >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-x11-libs/libxkbfile x11-libs/libXcomposite >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-A library for KDE desktop applications
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/libkworkspace-4.7.4-r1 b/metadata/cache/kde-base/libkworkspace-4.7.4-r1
index 2a85992a499b..3df522689c64 100644
--- a/metadata/cache/kde-base/libkworkspace-4.7.4-r1
+++ b/metadata/cache/kde-base/libkworkspace-4.7.4-r1
@@ -8,7 +8,7 @@ GPL-2
 A library for KDE desktop applications
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/liboxygenstyle-4.6.3 b/metadata/cache/kde-base/liboxygenstyle-4.6.3
index 84c235fd42ad..b6fbd8731279 100644
--- a/metadata/cache/kde-base/liboxygenstyle-4.6.3
+++ b/metadata/cache/kde-base/liboxygenstyle-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Library to support the Oxygen style in KDE
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/liboxygenstyle-4.7.3 b/metadata/cache/kde-base/liboxygenstyle-4.7.3
deleted file mode 100644
index 4ea949c68062..000000000000
--- a/metadata/cache/kde-base/liboxygenstyle-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Library to support the Oxygen style in KDE
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/liboxygenstyle-4.7.4 b/metadata/cache/kde-base/liboxygenstyle-4.7.4
index 5e63bc5c9914..b3c917953730 100644
--- a/metadata/cache/kde-base/liboxygenstyle-4.7.4
+++ b/metadata/cache/kde-base/liboxygenstyle-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Library to support the Oxygen style in KDE
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/libplasmaclock-4.6.3 b/metadata/cache/kde-base/libplasmaclock-4.6.3
index 565b17dab7a9..51b73bc71e25 100644
--- a/metadata/cache/kde-base/libplasmaclock-4.6.3
+++ b/metadata/cache/kde-base/libplasmaclock-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Libraries for KDE Plasma's clocks
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +holidays kdeprefix opengl aqua kdeenablefinal
+debug +holidays kdeprefix opengl aqua
 
 
 
diff --git a/metadata/cache/kde-base/libplasmaclock-4.7.3 b/metadata/cache/kde-base/libplasmaclock-4.7.3
deleted file mode 100644
index ecc86a48ae14..000000000000
--- a/metadata/cache/kde-base/libplasmaclock-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kephal-4.7.3:4[aqua=] holidays? ( >=kde-base/kdepimlibs-4.7.3:4[aqua=] ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/kephal-4.7.3:4[aqua=] holidays? ( >=kde-base/kdepimlibs-4.7.3:4[aqua=] ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Libraries for KDE Plasma's clocks
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +holidays opengl aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/libplasmaclock-4.7.4 b/metadata/cache/kde-base/libplasmaclock-4.7.4
index c8a9187ca23a..b48296744b04 100644
--- a/metadata/cache/kde-base/libplasmaclock-4.7.4
+++ b/metadata/cache/kde-base/libplasmaclock-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Libraries for KDE Plasma's clocks
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +holidays opengl aqua kdeenablefinal
+debug +holidays opengl aqua
 
 
 
diff --git a/metadata/cache/kde-base/libplasmagenericshell-4.6.3 b/metadata/cache/kde-base/libplasmagenericshell-4.6.3
index 77cbdd4e8c6f..2f3af5ae3ea1 100644
--- a/metadata/cache/kde-base/libplasmagenericshell-4.6.3
+++ b/metadata/cache/kde-base/libplasmagenericshell-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Libraries for the KDE Plasma shell
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug test kdeprefix aqua kdeenablefinal
+debug test kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/libplasmagenericshell-4.7.3 b/metadata/cache/kde-base/libplasmagenericshell-4.7.3
deleted file mode 100644
index 1aa587930f11..000000000000
--- a/metadata/cache/kde-base/libplasmagenericshell-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kephal-4.7.3:4[aqua=] >=kde-base/libkworkspace-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/kephal-4.7.3:4[aqua=] >=kde-base/libkworkspace-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Libraries for the KDE Plasma shell
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug test aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/libplasmagenericshell-4.7.4 b/metadata/cache/kde-base/libplasmagenericshell-4.7.4
index 5d8b693d7029..7bed9b761206 100644
--- a/metadata/cache/kde-base/libplasmagenericshell-4.7.4
+++ b/metadata/cache/kde-base/libplasmagenericshell-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Libraries for the KDE Plasma shell
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug test aqua kdeenablefinal
+debug test aqua
 
 
 
diff --git a/metadata/cache/kde-base/libtaskmanager-4.6.3 b/metadata/cache/kde-base/libtaskmanager-4.6.3
index 279895bfb874..bce23deafa9b 100644
--- a/metadata/cache/kde-base/libtaskmanager-4.6.3
+++ b/metadata/cache/kde-base/libtaskmanager-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 A library that provides basic taskmanager functionality
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/libtaskmanager-4.7.3 b/metadata/cache/kde-base/libtaskmanager-4.7.3
deleted file mode 100644
index cbd607954e7e..000000000000
--- a/metadata/cache/kde-base/libtaskmanager-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kephal-4.7.3:4[aqua=] >=kde-base/libkworkspace-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/kephal-4.7.3:4[aqua=] >=kde-base/libkworkspace-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-A library that provides basic taskmanager functionality
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/libtaskmanager-4.7.4 b/metadata/cache/kde-base/libtaskmanager-4.7.4
index be8a9a3b60e6..0a6d1e993d7b 100644
--- a/metadata/cache/kde-base/libtaskmanager-4.7.4
+++ b/metadata/cache/kde-base/libtaskmanager-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 A library that provides basic taskmanager functionality
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/lokalize-4.6.3 b/metadata/cache/kde-base/lokalize-4.6.3
index 96aaf0d84529..eaa4caf0c821 100644
--- a/metadata/cache/kde-base/lokalize-4.6.3
+++ b/metadata/cache/kde-base/lokalize-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE4 translation tool
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability python toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/lokalize-4.7.3 b/metadata/cache/kde-base/lokalize-4.7.3
deleted file mode 100644
index 369648e356cc..000000000000
--- a/metadata/cache/kde-base/lokalize-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-text/hunspell-1.2.8 >=x11-libs/qt-sql-4.5.0:4[sqlite] semantic-desktop? ( dev-libs/soprano ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=app-text/hunspell-1.2.8 >=x11-libs/qt-sql-4.5.0:4[sqlite] semantic-desktop? ( dev-libs/soprano ) >=kde-base/kdesdk-strigi-analyzer-4.7.3:4[aqua=] >=kde-base/krosspython-4.7.3:4[aqua=] >=kde-base/pykde4-4.7.3:4[aqua=] >=app-admin/eselect-python-20091230 =dev-lang/python-2* >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdesdk-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE4 translation tool
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability python toolchain-funcs user versionator virtualx
-debug semantic-desktop +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/lokalize-4.7.4 b/metadata/cache/kde-base/lokalize-4.7.4
index ecd45db949d6..540c4c9aa144 100644
--- a/metadata/cache/kde-base/lokalize-4.7.4
+++ b/metadata/cache/kde-base/lokalize-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE4 translation tool
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability python toolchain-funcs user versionator virtualx
-debug semantic-desktop +handbook aqua kdeenablefinal
+debug semantic-desktop +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/lskat-4.6.3 b/metadata/cache/kde-base/lskat-4.6.3
index 086191b5ba55..4d1258f12af0 100644
--- a/metadata/cache/kde-base/lskat-4.6.3
+++ b/metadata/cache/kde-base/lskat-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Skat game for KDE
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/lskat-4.7.3 b/metadata/cache/kde-base/lskat-4.7.3
deleted file mode 100644
index 27663ec1aa0f..000000000000
--- a/metadata/cache/kde-base/lskat-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Skat game for KDE
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/lskat-4.7.4 b/metadata/cache/kde-base/lskat-4.7.4
index f2daab5c63d1..7e73b44161df 100644
--- a/metadata/cache/kde-base/lskat-4.7.4
+++ b/metadata/cache/kde-base/lskat-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Skat game for KDE
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/marble-4.6.3 b/metadata/cache/kde-base/marble-4.6.3
index 41b946247b59..ffc3eb912fc7 100644
--- a/metadata/cache/kde-base/marble-4.6.3
+++ b/metadata/cache/kde-base/marble-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Generic geographical map widget
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability python toolchain-funcs user versionator virtualx
-debug designer-plugin gps plasma python kdeprefix test +handbook aqua kdeenablefinal
+debug designer-plugin gps plasma python kdeprefix test +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/marble-4.7.3 b/metadata/cache/kde-base/marble-4.7.3
deleted file mode 100644
index b3f079f22ae9..000000000000
--- a/metadata/cache/kde-base/marble-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-gps? ( >=sci-geosciences/gpsd-2.95[qt4] ) python? ( >=dev-python/PyQt4-4.4.4-r1 kde? ( >=kde-base/pykde4-4.7.3:4[aqua=] ) ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) test? ( dev-util/cppunit ) kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
-gps? ( >=sci-geosciences/gpsd-2.95[qt4] ) python? ( >=dev-python/PyQt4-4.4.4-r1 kde? ( >=kde-base/pykde4-4.7.3:4[aqua=] ) ) kde? ( >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
-4
-mirror://kde/stable/4.7.3/src/marble-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-Generic geographical map widget
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability python toolchain-funcs user versionator virtualx
-debug designer-plugin gps +kde plasma python test +handbook aqua kde kdeenablefinal
-plasma? ( kde )
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/marble-4.7.4 b/metadata/cache/kde-base/marble-4.7.4
index 4229c99b34a9..9192c19dae14 100644
--- a/metadata/cache/kde-base/marble-4.7.4
+++ b/metadata/cache/kde-base/marble-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Generic geographical map widget
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability python toolchain-funcs user versionator virtualx
-debug designer-plugin gps +kde plasma python test +handbook aqua kde kdeenablefinal
+debug designer-plugin gps +kde plasma python test +handbook aqua kde
 plasma? ( kde )
 
 
diff --git a/metadata/cache/kde-base/mplayerthumbs-4.6.3 b/metadata/cache/kde-base/mplayerthumbs-4.6.3
index 5e6ea03fef23..40245f5a3630 100644
--- a/metadata/cache/kde-base/mplayerthumbs-4.6.3
+++ b/metadata/cache/kde-base/mplayerthumbs-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 A Thumbnail Generator for Video Files on KDE filemanagers.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug mplayer kdeprefix aqua kdeenablefinal
+debug mplayer kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/mplayerthumbs-4.7.3 b/metadata/cache/kde-base/mplayerthumbs-4.7.3
deleted file mode 100644
index b3a166cedacd..000000000000
--- a/metadata/cache/kde-base/mplayerthumbs-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-|| ( >=kde-base/dolphin-4.7.3:4[aqua=] >=kde-base/konqueror-4.7.3:4[aqua=] ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdemultimedia-4.7.3.tar.bz2
-
-http://www.kde-apps.org/content/show.php?content=41180
-GPL-2
-A Thumbnail Generator for Video Files on KDE filemanagers.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/mplayerthumbs-4.7.4 b/metadata/cache/kde-base/mplayerthumbs-4.7.4
index 2a9a9c432ee2..7d310ee7f923 100644
--- a/metadata/cache/kde-base/mplayerthumbs-4.7.4
+++ b/metadata/cache/kde-base/mplayerthumbs-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 A Thumbnail Generator for Video Files on KDE filemanagers.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/nepomuk-4.6.3 b/metadata/cache/kde-base/nepomuk-4.6.3
index f608b8f1b1d0..fa7f12f2239d 100644
--- a/metadata/cache/kde-base/nepomuk-4.6.3
+++ b/metadata/cache/kde-base/nepomuk-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Nepomuk KDE4 client
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/nepomuk-4.7.3 b/metadata/cache/kde-base/nepomuk-4.7.3
deleted file mode 100644
index 1c32b18bea2f..000000000000
--- a/metadata/cache/kde-base/nepomuk-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-misc/strigi-0.6.3[dbus,qt4] >=dev-libs/soprano-2.6.51[dbus,raptor,redland,virtuoso] >=kde-base/kdelibs-4.7.3:4[aqua=,semantic-desktop] !kde-misc/nepomukcontroller >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=app-misc/strigi-0.6.3[dbus,qt4] >=dev-libs/soprano-2.6.51[dbus,raptor,redland,virtuoso] >=kde-base/kdelibs-4.7.3:4[aqua=,semantic-desktop] !kde-misc/nepomukcontroller >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-Nepomuk KDE4 client
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/nepomuk-4.7.4 b/metadata/cache/kde-base/nepomuk-4.7.4
index 3aa5af3cd877..a73330fd78a2 100644
--- a/metadata/cache/kde-base/nepomuk-4.7.4
+++ b/metadata/cache/kde-base/nepomuk-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Nepomuk KDE4 client
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/nsplugins-4.6.3 b/metadata/cache/kde-base/nsplugins-4.6.3
index fdc7bf7d1abe..243bfd72a35e 100644
--- a/metadata/cache/kde-base/nsplugins-4.6.3
+++ b/metadata/cache/kde-base/nsplugins-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Netscape plugins support for Konqueror.
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/nsplugins-4.7.3 b/metadata/cache/kde-base/nsplugins-4.7.3
deleted file mode 100644
index 96b5b9698aba..000000000000
--- a/metadata/cache/kde-base/nsplugins-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-libs/libXt >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-x11-libs/libXt >=kde-base/konqueror-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-baseapps-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Netscape plugins support for Konqueror.
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/nsplugins-4.7.4 b/metadata/cache/kde-base/nsplugins-4.7.4
index 4304883e0b0f..07c362b96a2b 100644
--- a/metadata/cache/kde-base/nsplugins-4.7.4
+++ b/metadata/cache/kde-base/nsplugins-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Netscape plugins support for Konqueror.
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/okteta-4.6.3 b/metadata/cache/kde-base/okteta-4.6.3
index 82aa1dac3e36..606232b7cd45 100644
--- a/metadata/cache/kde-base/okteta-4.6.3
+++ b/metadata/cache/kde-base/okteta-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE hexeditor
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/okteta-4.7.3 b/metadata/cache/kde-base/okteta-4.7.3
deleted file mode 100644
index bebfd80537a6..000000000000
--- a/metadata/cache/kde-base/okteta-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-app-crypt/qca:2 >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-app-crypt/qca:2 >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdesdk-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-KDE hexeditor
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/okteta-4.7.4 b/metadata/cache/kde-base/okteta-4.7.4
index e2b75a7e9555..bf965ab7edeb 100644
--- a/metadata/cache/kde-base/okteta-4.7.4
+++ b/metadata/cache/kde-base/okteta-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE hexeditor
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/okular-4.6.3 b/metadata/cache/kde-base/okular-4.6.3
index 3490e13180e1..30552a69d353 100644
--- a/metadata/cache/kde-base/okular-4.6.3
+++ b/metadata/cache/kde-base/okular-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Okular is an universal document viewer based on KPDF for KDE 4.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-chm crypt debug djvu ebook +jpeg +ps +pdf +tiff kdeprefix +handbook aqua kdeenablefinal
+chm crypt debug djvu ebook +jpeg +ps +pdf +tiff kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/okular-4.7.3 b/metadata/cache/kde-base/okular-4.7.3
deleted file mode 100644
index 68159c7b5b83..000000000000
--- a/metadata/cache/kde-base/okular-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/freetype media-libs/qimageblitz sys-libs/zlib chm? ( dev-libs/chmlib ) crypt? ( app-crypt/qca:2 ) djvu? ( app-text/djvu ) ebook? ( app-text/ebook-tools ) jpeg? ( virtual/jpeg:0 ) pdf? ( >=app-text/poppler-0.12.3-r3[lcms,qt4,-exceptions(-)] ) ps? ( app-text/libspectre ) tiff? ( media-libs/tiff ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-media-libs/freetype media-libs/qimageblitz sys-libs/zlib chm? ( dev-libs/chmlib ) crypt? ( app-crypt/qca:2 ) djvu? ( app-text/djvu ) ebook? ( app-text/ebook-tools ) jpeg? ( virtual/jpeg:0 ) pdf? ( >=app-text/poppler-0.12.3-r3[lcms,qt4,-exceptions(-)] ) ps? ( app-text/libspectre ) tiff? ( media-libs/tiff ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/okular-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Okular is an universal document viewer based on KPDF for KDE 4.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-chm crypt debug djvu ebook +jpeg +ps +pdf +tiff +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/okular-4.7.4 b/metadata/cache/kde-base/okular-4.7.4
index c46f84240396..fd5874b1f8de 100644
--- a/metadata/cache/kde-base/okular-4.7.4
+++ b/metadata/cache/kde-base/okular-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Okular is an universal document viewer based on KPDF for KDE 4.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-chm crypt debug djvu ebook +jpeg +ps +pdf +tiff +handbook aqua kdeenablefinal
+chm crypt debug djvu ebook +jpeg +ps +pdf +tiff +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/oxygen-icons-4.6.3-r1 b/metadata/cache/kde-base/oxygen-icons-4.6.3-r1
index f7a4b45023af..d0bbde9bfe5c 100644
--- a/metadata/cache/kde-base/oxygen-icons-4.6.3-r1
+++ b/metadata/cache/kde-base/oxygen-icons-4.6.3-r1
@@ -8,7 +8,7 @@ LGPL-3
 Oxygen SVG icon theme.
 amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua bindist kdeprefix kdeenablefinal
+aqua bindist kdeprefix
 
 
 
diff --git a/metadata/cache/kde-base/oxygen-icons-4.7.3 b/metadata/cache/kde-base/oxygen-icons-4.7.3
deleted file mode 100644
index 06a59fc19b6e..000000000000
--- a/metadata/cache/kde-base/oxygen-icons-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-!bindist? ( app-arch/xz-utils ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-
-4
-!bindist? ( http://dev.gentoo.org/~alexxy/distfiles/oxygen-icons-4.7.2.tar.xz ) bindist? ( mirror://kde/stable/4.7.2/src/oxygen-icons-4.7.2.tar.bz2 )
-
-http://www.oxygen-icons.org/
-LGPL-3
-Oxygen SVG icon theme.
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua bindist kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/oxygen-icons-4.7.4 b/metadata/cache/kde-base/oxygen-icons-4.7.4
index 9d39ad638233..d72faeaf004d 100644
--- a/metadata/cache/kde-base/oxygen-icons-4.7.4
+++ b/metadata/cache/kde-base/oxygen-icons-4.7.4
@@ -8,7 +8,7 @@ LGPL-3
 Oxygen SVG icon theme.
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua bindist kdeenablefinal
+aqua bindist
 
 
 
diff --git a/metadata/cache/kde-base/palapeli-4.6.3 b/metadata/cache/kde-base/palapeli-4.6.3
index deca60721fff..4785798ad8bd 100644
--- a/metadata/cache/kde-base/palapeli-4.6.3
+++ b/metadata/cache/kde-base/palapeli-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE jigsaw puzzle game
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/palapeli-4.7.3 b/metadata/cache/kde-base/palapeli-4.7.3
deleted file mode 100644
index 89b8b54f807b..000000000000
--- a/metadata/cache/kde-base/palapeli-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=kde-base/libkdegames-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegames-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE jigsaw puzzle game
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/palapeli-4.7.4 b/metadata/cache/kde-base/palapeli-4.7.4
index d1e8c543aed8..bbbc1f2c317e 100644
--- a/metadata/cache/kde-base/palapeli-4.7.4
+++ b/metadata/cache/kde-base/palapeli-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE jigsaw puzzle game
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/parley-4.6.3 b/metadata/cache/kde-base/parley-4.6.3
index 59beccedc959..831c13e1c780 100644
--- a/metadata/cache/kde-base/parley-4.6.3
+++ b/metadata/cache/kde-base/parley-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Educational: vocabulary trainer
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +plasma kdeprefix +handbook aqua kdeenablefinal
+debug +plasma kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/parley-4.7.3 b/metadata/cache/kde-base/parley-4.7.3
deleted file mode 100644
index a055d5367542..000000000000
--- a/metadata/cache/kde-base/parley-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkdeedu-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/parley-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Educational: vocabulary trainer
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +plasma +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/parley-4.7.4 b/metadata/cache/kde-base/parley-4.7.4
index f140c539cbfb..2b6e6c1eaf99 100644
--- a/metadata/cache/kde-base/parley-4.7.4
+++ b/metadata/cache/kde-base/parley-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Educational: vocabulary trainer
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +plasma +handbook aqua kdeenablefinal
+debug +plasma +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/perlkde-4.7.3 b/metadata/cache/kde-base/perlkde-4.7.3
deleted file mode 100644
index 0717fe633c21..000000000000
--- a/metadata/cache/kde-base/perlkde-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-lang/perl-5.10.1 >=kde-base/perlqt-4.7.3:4[aqua=] >=kde-base/smokekde-4.7.3:4[aqua=,akonadi?,attica?,kate?,okular?,semantic-desktop=] semantic-desktop? ( >=dev-libs/soprano-2.6.51 ) test? ( dev-perl/List-MoreUtils ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=dev-lang/perl-5.10.1 >=kde-base/perlqt-4.7.3:4[aqua=] >=kde-base/smokekde-4.7.3:4[aqua=,akonadi?,attica?,kate?,okular?,semantic-desktop=] semantic-desktop? ( >=dev-libs/soprano-2.6.51 ) !kde-base/kdebindings-perl:4 >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/perlkde-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Perl bindings
-amd64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-akonadi attica debug kate okular semantic-desktop test aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/perlkde-4.7.4 b/metadata/cache/kde-base/perlkde-4.7.4
index a3cacaa65593..8cf67855906c 100644
--- a/metadata/cache/kde-base/perlkde-4.7.4
+++ b/metadata/cache/kde-base/perlkde-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Perl bindings
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-akonadi attica debug kate okular semantic-desktop test aqua kdeenablefinal
+akonadi attica debug kate okular semantic-desktop test aqua
 
 
 
diff --git a/metadata/cache/kde-base/perlqt-4.7.3 b/metadata/cache/kde-base/perlqt-4.7.3
deleted file mode 100644
index 90b059a6440f..000000000000
--- a/metadata/cache/kde-base/perlqt-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-lang/perl-5.10.1 dev-perl/List-MoreUtils >=kde-base/smokeqt-4.7.3:4[aqua=,declarative?,multimedia?,opengl?,phonon?,qimageblitz?,qscintilla?,qthelp?,qwt?,webkit?] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) declarative? ( >=x11-libs/qt-declarative-4.7.0:4 ) qthelp? ( >=x11-libs/qt-assistant-4.7.0:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.7.0:4 )
->=dev-lang/perl-5.10.1 dev-perl/List-MoreUtils >=kde-base/smokeqt-4.7.3:4[aqua=,declarative?,multimedia?,opengl?,phonon?,qimageblitz?,qscintilla?,qthelp?,qwt?,webkit?] !kde-base/kdebindings-perl:4 declarative? ( >=x11-libs/qt-declarative-4.7.0:4 ) qthelp? ( >=x11-libs/qt-assistant-4.7.0:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.7.0:4 )
-4
-mirror://kde/stable/4.7.3/src/perlqt-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-Qt Perl bindings
-amd64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug phonon qimageblitz qscintilla qwt webkit declarative qthelp opengl multimedia kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/perlqt-4.7.4 b/metadata/cache/kde-base/perlqt-4.7.4
index 2995b862d573..ac24fa63b350 100644
--- a/metadata/cache/kde-base/perlqt-4.7.4
+++ b/metadata/cache/kde-base/perlqt-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Qt Perl bindings
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug phonon qimageblitz qscintilla qwt webkit declarative qthelp opengl multimedia kdeenablefinal
+debug phonon qimageblitz qscintilla qwt webkit declarative qthelp opengl multimedia
 
 
 
diff --git a/metadata/cache/kde-base/phonon-kde-4.6.3 b/metadata/cache/kde-base/phonon-kde-4.6.3
index b4a6427c085a..861c4238fdb0 100644
--- a/metadata/cache/kde-base/phonon-kde-4.6.3
+++ b/metadata/cache/kde-base/phonon-kde-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Phonon KDE Integration
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-alsa debug xine pulseaudio kdeprefix aqua kdeenablefinal
+alsa debug xine pulseaudio kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/phonon-kde-4.7.3 b/metadata/cache/kde-base/phonon-kde-4.7.3
deleted file mode 100644
index d65f19d6d557..000000000000
--- a/metadata/cache/kde-base/phonon-kde-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=media-libs/phonon-4.4.3[xine?] alsa? ( media-libs/alsa-lib ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.21[glib] ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=media-libs/phonon-4.4.3[xine?] alsa? ( media-libs/alsa-lib ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.21[glib] ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://phonon.kde.org
-GPL-2
-Phonon KDE Integration
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-alsa debug xine pulseaudio aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/phonon-kde-4.7.4 b/metadata/cache/kde-base/phonon-kde-4.7.4
index 29cd4ab7f98c..725c8f21ad63 100644
--- a/metadata/cache/kde-base/phonon-kde-4.7.4
+++ b/metadata/cache/kde-base/phonon-kde-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Phonon KDE Integration
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-alsa debug xine pulseaudio aqua kdeenablefinal
+alsa debug xine pulseaudio aqua
 
 
 
diff --git a/metadata/cache/kde-base/plasma-apps-4.6.3 b/metadata/cache/kde-base/plasma-apps-4.6.3
index a2ee14117e89..79c7cff57078 100644
--- a/metadata/cache/kde-base/plasma-apps-4.6.3
+++ b/metadata/cache/kde-base/plasma-apps-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Additional Applets for Plasma
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/plasma-apps-4.7.3 b/metadata/cache/kde-base/plasma-apps-4.7.3
deleted file mode 100644
index 68d0601c1332..000000000000
--- a/metadata/cache/kde-base/plasma-apps-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkonq-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/libkonq-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-baseapps-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Additional Applets for Plasma
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/plasma-apps-4.7.4 b/metadata/cache/kde-base/plasma-apps-4.7.4
index 0c74d659045a..4c8659d12dfb 100644
--- a/metadata/cache/kde-base/plasma-apps-4.7.4
+++ b/metadata/cache/kde-base/plasma-apps-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Additional Applets for Plasma
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/plasma-runtime-4.6.3 b/metadata/cache/kde-base/plasma-runtime-4.6.3
index 724eedf97f13..9f7560947dce 100644
--- a/metadata/cache/kde-base/plasma-runtime-4.6.3
+++ b/metadata/cache/kde-base/plasma-runtime-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Script engine and package tool for plasma
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/plasma-runtime-4.7.3 b/metadata/cache/kde-base/plasma-runtime-4.7.3
deleted file mode 100644
index a475636c73e3..000000000000
--- a/metadata/cache/kde-base/plasma-runtime-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) >=x11-libs/qt-declarative-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-!<=kde-base/plasma-workspace-4.4.50:4 >=kde-base/oxygen-icons-4.7.3:4[aqua=] >=x11-libs/qt-declarative-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Script engine and package tool for plasma
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/plasma-runtime-4.7.4 b/metadata/cache/kde-base/plasma-runtime-4.7.4
index 97ecdd4db1a3..c89cf053e85c 100644
--- a/metadata/cache/kde-base/plasma-runtime-4.7.4
+++ b/metadata/cache/kde-base/plasma-runtime-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Script engine and package tool for plasma
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/plasma-workspace-4.6.3-r2 b/metadata/cache/kde-base/plasma-workspace-4.6.3-r2
index 1b673e018818..f14387d1a814 100644
--- a/metadata/cache/kde-base/plasma-workspace-4.6.3-r2
+++ b/metadata/cache/kde-base/plasma-workspace-4.6.3-r2
@@ -8,7 +8,7 @@ GPL-2
 Plasma: KDE desktop framework
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability python toolchain-funcs user versionator virtualx
-debug google-gadgets gps python qalculate +rss semantic-desktop xinerama kdeprefix +handbook aqua kdeenablefinal
+debug google-gadgets gps python qalculate +rss semantic-desktop xinerama kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/plasma-workspace-4.7.3-r7 b/metadata/cache/kde-base/plasma-workspace-4.7.3-r7
deleted file mode 100644
index b98df35a07b3..000000000000
--- a/metadata/cache/kde-base/plasma-workspace-4.7.3-r7
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kactivities-4.7.3:4[aqua=] >=kde-base/kdelibs-4.7.3:4[aqua=,semantic-desktop=] >=kde-base/kephal-4.7.3:4[aqua=] >=kde-base/ksysguard-4.7.3:4[aqua=] >=kde-base/libkworkspace-4.7.3:4[aqua=] >=kde-base/libplasmagenericshell-4.7.3:4[aqua=] >=kde-base/libtaskmanager-4.7.3:4[aqua=] >=kde-base/solid-4.7.3:4[aqua=] x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrender google-gadgets? ( >=x11-misc/google-gadgets-0.11.0[qt4] ) gps? ( >=sci-geosciences/gpsd-2.37 ) python? ( >=dev-python/PyQt4-4.4.0[X] >=dev-python/sip-4.7.1 >=kde-base/pykde4-4.7.3:4[aqua=] ) qalculate? ( sci-libs/libqalculate ) rss? ( >=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop=] >=kde-base/libplasmaclock-4.7.3:4[aqua=,holidays] ) !rss? ( >=kde-base/libplasmaclock-4.7.3:4[aqua=,-holidays] ) xinerama? ( x11-libs/libXinerama ) rss? ( dev-libs/boost ) x11-proto/compositeproto x11-proto/damageproto x11-proto/fixesproto x11-proto/renderproto xinerama? ( x11-proto/xineramaproto ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/kactivities-4.7.3:4[aqua=] >=kde-base/kdelibs-4.7.3:4[aqua=,semantic-desktop=] >=kde-base/kephal-4.7.3:4[aqua=] >=kde-base/ksysguard-4.7.3:4[aqua=] >=kde-base/libkworkspace-4.7.3:4[aqua=] >=kde-base/libplasmagenericshell-4.7.3:4[aqua=] >=kde-base/libtaskmanager-4.7.3:4[aqua=] >=kde-base/solid-4.7.3:4[aqua=] x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrender google-gadgets? ( >=x11-misc/google-gadgets-0.11.0[qt4] ) gps? ( >=sci-geosciences/gpsd-2.37 ) python? ( >=dev-python/PyQt4-4.4.0[X] >=dev-python/sip-4.7.1 >=kde-base/pykde4-4.7.3:4[aqua=] ) qalculate? ( sci-libs/libqalculate ) rss? ( >=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop=] >=kde-base/libplasmaclock-4.7.3:4[aqua=,holidays] ) !rss? ( >=kde-base/libplasmaclock-4.7.3:4[aqua=,-holidays] ) xinerama? ( x11-libs/libXinerama ) >=kde-base/activitymanager-4.7.3:4[aqua=] >=kde-base/plasma-runtime-4.7.3:4[aqua=] >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Plasma: KDE desktop framework
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability python toolchain-funcs user versionator virtualx
-debug google-gadgets gps python qalculate +rss semantic-desktop xinerama +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/plasma-workspace-4.7.4 b/metadata/cache/kde-base/plasma-workspace-4.7.4
index 8bb167489834..42749771f882 100644
--- a/metadata/cache/kde-base/plasma-workspace-4.7.4
+++ b/metadata/cache/kde-base/plasma-workspace-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Plasma: KDE desktop framework
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability python toolchain-funcs user versionator virtualx
-debug google-gadgets gps python qalculate +rss semantic-desktop xinerama +handbook aqua kdeenablefinal
+debug google-gadgets gps python qalculate +rss semantic-desktop xinerama +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/powerdevil-4.6.3 b/metadata/cache/kde-base/powerdevil-4.6.3
index e71ff9c4b44d..ce2e9bc9ac13 100644
--- a/metadata/cache/kde-base/powerdevil-4.6.3
+++ b/metadata/cache/kde-base/powerdevil-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 PowerDevil is an utility for KDE4 for Laptop Powermanagement.
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +pm-utils kdeprefix aqua kdeenablefinal
+debug +pm-utils kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/powerdevil-4.7.3 b/metadata/cache/kde-base/powerdevil-4.7.3
deleted file mode 100644
index 9d0ec50f883d..000000000000
--- a/metadata/cache/kde-base/powerdevil-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkworkspace-4.7.3:4[aqua=] >=kde-base/solid-4.7.3:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/libkworkspace-4.7.3:4[aqua=] >=kde-base/solid-4.7.3:4[aqua=] pm-utils? ( sys-power/pm-utils ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde-apps.org/content/show.php/PowerDevil?content=85078
-GPL-2
-PowerDevil is an utility for KDE4 for Laptop Powermanagement.
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +pm-utils aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/powerdevil-4.7.4 b/metadata/cache/kde-base/powerdevil-4.7.4
index 061f2ca61ae5..f46be01ed9ee 100644
--- a/metadata/cache/kde-base/powerdevil-4.7.4
+++ b/metadata/cache/kde-base/powerdevil-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 PowerDevil is an utility for KDE4 for Laptop Powermanagement.
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +pm-utils aqua kdeenablefinal
+debug +pm-utils aqua
 
 
 
diff --git a/metadata/cache/kde-base/printer-applet-4.6.3 b/metadata/cache/kde-base/printer-applet-4.6.3
index 82da2abe8d8d..122748c6c59d 100644
--- a/metadata/cache/kde-base/printer-applet-4.6.3
+++ b/metadata/cache/kde-base/printer-applet-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE printer system tray utility
 amd64 ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability python toolchain-funcs user versionator virtualx
-+handbook kdeprefix +handbook aqua kdeenablefinal
++handbook kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/printer-applet-4.7.3 b/metadata/cache/kde-base/printer-applet-4.7.3
deleted file mode 100644
index e2d2eafd897b..000000000000
--- a/metadata/cache/kde-base/printer-applet-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-admin/system-config-printer-common-1.2.2 >=kde-base/pykde4-4.7.3:4[aqua=] >=app-admin/eselect-python-20091230 =dev-lang/python-2* >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=app-admin/system-config-printer-common-1.2.2 >=kde-base/pykde4-4.7.3:4[aqua=] >=app-admin/eselect-python-20091230 =dev-lang/python-2* >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeutils-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE printer system tray utility
-amd64 ~ppc ~ppc64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability python toolchain-funcs user versionator virtualx
-+handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/printer-applet-4.7.4 b/metadata/cache/kde-base/printer-applet-4.7.4
index 0cc6cf8ba05b..38b1e124f734 100644
--- a/metadata/cache/kde-base/printer-applet-4.7.4
+++ b/metadata/cache/kde-base/printer-applet-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE printer system tray utility
 amd64 ~ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability python toolchain-funcs user versionator virtualx
-+handbook aqua kdeenablefinal
++handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/pykde4-4.6.3 b/metadata/cache/kde-base/pykde4-4.6.3
index f3bd10b9e9bd..fb33100a9a3f 100644
--- a/metadata/cache/kde-base/pykde4-4.6.3
+++ b/metadata/cache/kde-base/pykde4-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Python bindings for KDE4
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability python toolchain-funcs user versionator virtualx
-debug doc examples semantic-desktop kdeprefix aqua kdeenablefinal
+debug doc examples semantic-desktop kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/pykde4-4.6.3-r1 b/metadata/cache/kde-base/pykde4-4.6.3-r1
index 4d84bb789d68..c48c827a4c09 100644
--- a/metadata/cache/kde-base/pykde4-4.6.3-r1
+++ b/metadata/cache/kde-base/pykde4-4.6.3-r1
@@ -8,7 +8,7 @@ GPL-2
 Python bindings for KDE4
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability python toolchain-funcs user versionator virtualx
-debug doc examples semantic-desktop kdeprefix aqua kdeenablefinal
+debug doc examples semantic-desktop kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/pykde4-4.7.3 b/metadata/cache/kde-base/pykde4-4.7.3
deleted file mode 100644
index 081a03e152dd..000000000000
--- a/metadata/cache/kde-base/pykde4-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-python/sip-4.12.3-r2 >=kde-base/kdelibs-4.7.3:4[aqua=,opengl,semantic-desktop=] semantic-desktop? ( >=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] ) aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,aqua] ) !aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,X] ) sys-devel/libtool >=app-admin/eselect-python-20091230 || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-3.2*[threads] =dev-lang/python-3.1*[threads] =dev-lang/python-2.7*[threads] =dev-lang/python-2.6*[threads] =dev-lang/python-2.5*[threads] ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) >=x11-libs/qt-opengl-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=dev-python/sip-4.12.3-r2 >=kde-base/kdelibs-4.7.3:4[aqua=,opengl,semantic-desktop=] semantic-desktop? ( >=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] ) aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,aqua] ) !aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,X] ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-3.2*[threads] =dev-lang/python-3.1*[threads] =dev-lang/python-2.7*[threads] =dev-lang/python-2.6*[threads] =dev-lang/python-2.5*[threads] ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] >=x11-libs/qt-opengl-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/pykde4-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Python bindings for KDE4
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability python toolchain-funcs user versionator virtualx
-debug doc examples semantic-desktop aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/pykde4-4.7.4 b/metadata/cache/kde-base/pykde4-4.7.4
index 9343df3ce5f7..3d76a530ca49 100644
--- a/metadata/cache/kde-base/pykde4-4.7.4
+++ b/metadata/cache/kde-base/pykde4-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Python bindings for KDE4
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability python toolchain-funcs user versionator virtualx
-debug doc examples semantic-desktop aqua kdeenablefinal
+debug doc examples semantic-desktop aqua
 
 
 
diff --git a/metadata/cache/kde-base/qguiplatformplugin_kde-4.6.3 b/metadata/cache/kde-base/qguiplatformplugin_kde-4.6.3
index 001cf47943fa..02b8b4047a6c 100644
--- a/metadata/cache/kde-base/qguiplatformplugin_kde-4.6.3
+++ b/metadata/cache/kde-base/qguiplatformplugin_kde-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Helps integration of pure Qt applications with KDE Workspace
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/qguiplatformplugin_kde-4.7.3 b/metadata/cache/kde-base/qguiplatformplugin_kde-4.7.3
deleted file mode 100644
index 949050c7f114..000000000000
--- a/metadata/cache/kde-base/qguiplatformplugin_kde-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Helps integration of pure Qt applications with KDE Workspace
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/qguiplatformplugin_kde-4.7.4 b/metadata/cache/kde-base/qguiplatformplugin_kde-4.7.4
index 8719b71568b6..00d87ba2864d 100644
--- a/metadata/cache/kde-base/qguiplatformplugin_kde-4.7.4
+++ b/metadata/cache/kde-base/qguiplatformplugin_kde-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Helps integration of pure Qt applications with KDE Workspace
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/qtruby-4.7.3 b/metadata/cache/kde-base/qtruby-4.7.3
deleted file mode 100644
index 9598739d1b9a..000000000000
--- a/metadata/cache/kde-base/qtruby-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/smokeqt-4.7.3:4[aqua=,declarative?,opengl,phonon?,qscintilla?,qwt?,webkit?] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) declarative? ( >=x11-libs/qt-declarative-4.7.0:4 ) >=x11-libs/qt-opengl-4.7.0:4 ruby_targets_ruby18? ( dev-lang/ruby:1.8 )
->=kde-base/smokeqt-4.7.3:4[aqua=,declarative?,opengl,phonon?,qscintilla?,qwt?,webkit?] !kde-base/kdebindings-ruby:4 declarative? ( >=x11-libs/qt-declarative-4.7.0:4 ) >=x11-libs/qt-opengl-4.7.0:4 ruby_targets_ruby18? ( dev-lang/ruby:1.8 )
-4
-mirror://kde/stable/4.7.3/src/qtruby-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Qt Ruby bindings
-amd64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils java-utils-2 kde4-base kde4-functions multilib portability ruby-ng toolchain-funcs user versionator virtualx
-debug phonon qscintilla qwt webkit declarative kdeenablefinal elibc_FreeBSD ruby_targets_ruby18
-|| ( ruby_targets_ruby18 )
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/qtruby-4.7.4 b/metadata/cache/kde-base/qtruby-4.7.4
index 04389060e40b..bbd05ce59b1c 100644
--- a/metadata/cache/kde-base/qtruby-4.7.4
+++ b/metadata/cache/kde-base/qtruby-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Qt Ruby bindings
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils java-utils-2 kde4-base kde4-functions multilib portability ruby-ng toolchain-funcs user versionator virtualx
-debug phonon qscintilla qwt webkit declarative kdeenablefinal elibc_FreeBSD ruby_targets_ruby18
+debug phonon qscintilla qwt webkit declarative elibc_FreeBSD ruby_targets_ruby18
 || ( ruby_targets_ruby18 )
 
 
diff --git a/metadata/cache/kde-base/qyoto-4.7.3 b/metadata/cache/kde-base/qyoto-4.7.3
deleted file mode 100644
index f7136615eeac..000000000000
--- a/metadata/cache/kde-base/qyoto-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-lang/mono >=kde-base/smokeqt-4.7.3:4[aqua=,opengl,phonon?,qscintilla?,webkit?] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-dev-lang/mono >=kde-base/smokeqt-4.7.3:4[aqua=,opengl,phonon?,qscintilla?,webkit?] !kde-base/kdebindings-csharp:4
-4
-mirror://kde/stable/4.7.3/src/qyoto-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-C# bindings for Qt
-amd64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions mono multilib portability toolchain-funcs user versionator virtualx
-debug +phonon qscintilla webkit kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/qyoto-4.7.4 b/metadata/cache/kde-base/qyoto-4.7.4
index a19efcc23cdd..83ece3b92204 100644
--- a/metadata/cache/kde-base/qyoto-4.7.4
+++ b/metadata/cache/kde-base/qyoto-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 C# bindings for Qt
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions mono multilib portability toolchain-funcs user versionator virtualx
-debug +phonon qscintilla webkit kdeenablefinal
+debug +phonon qscintilla webkit
 
 
 
diff --git a/metadata/cache/kde-base/renamedlg-plugins-4.6.3 b/metadata/cache/kde-base/renamedlg-plugins-4.6.3
index 0d9f961a0fc0..4aed125a9d3f 100644
--- a/metadata/cache/kde-base/renamedlg-plugins-4.6.3
+++ b/metadata/cache/kde-base/renamedlg-plugins-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE RenameDlg plugins
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/renamedlg-plugins-4.7.3 b/metadata/cache/kde-base/renamedlg-plugins-4.7.3
deleted file mode 100644
index ae2388fce309..000000000000
--- a/metadata/cache/kde-base/renamedlg-plugins-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE RenameDlg plugins
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/renamedlg-plugins-4.7.4 b/metadata/cache/kde-base/renamedlg-plugins-4.7.4
index 6d8e43915c7e..19050c25d11b 100644
--- a/metadata/cache/kde-base/renamedlg-plugins-4.7.4
+++ b/metadata/cache/kde-base/renamedlg-plugins-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE RenameDlg plugins
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/rocs-4.6.3 b/metadata/cache/kde-base/rocs-4.6.3
index 48f3ddce2851..927d9e8fdde5 100644
--- a/metadata/cache/kde-base/rocs-4.6.3
+++ b/metadata/cache/kde-base/rocs-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE4 interface to work with Graph Theory
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/rocs-4.7.3 b/metadata/cache/kde-base/rocs-4.7.3
deleted file mode 100644
index ab12bfaba2eb..000000000000
--- a/metadata/cache/kde-base/rocs-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/boost >=dev-cpp/eigen-2.0.3:2 >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-dev-libs/boost >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/rocs-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-KDE4 interface to work with Graph Theory
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/rocs-4.7.4 b/metadata/cache/kde-base/rocs-4.7.4
index 1577fe5b90f5..5b232d34f091 100644
--- a/metadata/cache/kde-base/rocs-4.7.4
+++ b/metadata/cache/kde-base/rocs-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE4 interface to work with Graph Theory
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/smoke-4.6.3 b/metadata/cache/kde-base/smoke-4.6.3
index c721d01e55c6..255cd266489a 100644
--- a/metadata/cache/kde-base/smoke-4.6.3
+++ b/metadata/cache/kde-base/smoke-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Scripting Meta Object Kompiler Engine
 amd64 ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-akonadi attica debug kate okular +phonon qimageblitz qscintilla qwt semantic-desktop webkit kdeprefix declarative qthelp multimedia aqua kdeenablefinal
+akonadi attica debug kate okular +phonon qimageblitz qscintilla qwt semantic-desktop webkit kdeprefix declarative qthelp multimedia aqua
 
 
 
diff --git a/metadata/cache/kde-base/smokegen-4.7.3 b/metadata/cache/kde-base/smokegen-4.7.3
deleted file mode 100644
index 1fef97485230..000000000000
--- a/metadata/cache/kde-base/smokegen-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-libs/qt-core:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-x11-libs/qt-core:4[aqua=] !kde-base/smoke:4
-4
-mirror://kde/stable/4.7.3/src/smokegen-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Scripting Meta Object Kompiler Engine - generators
-amd64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua debug kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/smokegen-4.7.4-r1 b/metadata/cache/kde-base/smokegen-4.7.4-r1
index 426a890093d1..54948657838a 100644
--- a/metadata/cache/kde-base/smokegen-4.7.4-r1
+++ b/metadata/cache/kde-base/smokegen-4.7.4-r1
@@ -8,7 +8,7 @@ GPL-2
 Scripting Meta Object Kompiler Engine - generators
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua debug kdeenablefinal
+aqua debug
 
 
 
diff --git a/metadata/cache/kde-base/smokekde-4.7.3 b/metadata/cache/kde-base/smokekde-4.7.3
deleted file mode 100644
index 3f4c6def8696..000000000000
--- a/metadata/cache/kde-base/smokekde-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdelibs-4.7.3:4[aqua=,semantic-desktop=] >=kde-base/smokeqt-4.7.3:4[aqua=] akonadi? ( >=kde-base/kdepimlibs-4.7.3:4[aqua=] ) attica? ( dev-libs/libattica ) kate? ( >=kde-base/kate-4.7.3:4[aqua=] ) okular? ( >=kde-base/okular-4.7.3:4[aqua=] ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/kdelibs-4.7.3:4[aqua=,semantic-desktop=] >=kde-base/smokeqt-4.7.3:4[aqua=] akonadi? ( >=kde-base/kdepimlibs-4.7.3:4[aqua=] ) attica? ( dev-libs/libattica ) kate? ( >=kde-base/kate-4.7.3:4[aqua=] ) okular? ( >=kde-base/okular-4.7.3:4[aqua=] ) !kde-base/smoke:4 >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/smokekde-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Scripting Meta Object Kompiler Engine - KDE bindings
-amd64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-akonadi attica debug kate okular semantic-desktop aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/smokekde-4.7.4 b/metadata/cache/kde-base/smokekde-4.7.4
index 91ec81f8c80f..27d993a3ba76 100644
--- a/metadata/cache/kde-base/smokekde-4.7.4
+++ b/metadata/cache/kde-base/smokekde-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Scripting Meta Object Kompiler Engine - KDE bindings
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-akonadi attica debug kate okular semantic-desktop aqua kdeenablefinal
+akonadi attica debug kate okular semantic-desktop aqua
 
 
 
diff --git a/metadata/cache/kde-base/smokeqt-4.7.3 b/metadata/cache/kde-base/smokeqt-4.7.3
deleted file mode 100644
index d2cb6f530571..000000000000
--- a/metadata/cache/kde-base/smokeqt-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/smokegen-4.7.3:4[aqua=] x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 x11-libs/qt-script:4 x11-libs/qt-sql:4 x11-libs/qt-svg:4 x11-libs/qt-test:4 phonon? ( >=media-libs/phonon-4.4.3 ) qimageblitz? ( >=media-libs/qimageblitz-0.0.4 ) qscintilla? ( x11-libs/qscintilla ) qwt? ( x11-libs/qwt:5 ) webkit? ( x11-libs/qt-webkit:4 ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) declarative? ( >=x11-libs/qt-declarative-4.7.0:4 ) qthelp? ( >=x11-libs/qt-assistant-4.7.0:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.7.0:4 )
->=kde-base/smokegen-4.7.3:4[aqua=] x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 x11-libs/qt-script:4 x11-libs/qt-sql:4 x11-libs/qt-svg:4 x11-libs/qt-test:4 phonon? ( >=media-libs/phonon-4.4.3 ) qimageblitz? ( >=media-libs/qimageblitz-0.0.4 ) qscintilla? ( x11-libs/qscintilla ) qwt? ( x11-libs/qwt:5 ) webkit? ( x11-libs/qt-webkit:4 ) !kde-base/smoke:4 declarative? ( >=x11-libs/qt-declarative-4.7.0:4 ) qthelp? ( >=x11-libs/qt-assistant-4.7.0:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.7.0:4 )
-4
-mirror://kde/stable/4.7.3/src/smokeqt-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Scripting Meta Object Kompiler Engine - Qt bindings
-amd64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +phonon qimageblitz qscintilla qwt webkit declarative qthelp opengl multimedia kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/smokeqt-4.7.4 b/metadata/cache/kde-base/smokeqt-4.7.4
index d11c4e6b154f..4b13add17a07 100644
--- a/metadata/cache/kde-base/smokeqt-4.7.4
+++ b/metadata/cache/kde-base/smokeqt-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Scripting Meta Object Kompiler Engine - Qt bindings
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +phonon qimageblitz qscintilla qwt webkit declarative qthelp opengl multimedia kdeenablefinal
+debug +phonon qimageblitz qscintilla qwt webkit declarative qthelp opengl multimedia
 
 
 
diff --git a/metadata/cache/kde-base/solid-4.6.3 b/metadata/cache/kde-base/solid-4.6.3
index 9932d8f23ed4..7334d0339976 100644
--- a/metadata/cache/kde-base/solid-4.6.3
+++ b/metadata/cache/kde-base/solid-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Solid: the KDE hardware library
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug bluetooth networkmanager wicd kdeprefix aqua kdeenablefinal
+debug bluetooth networkmanager wicd kdeprefix aqua
 
 bluetooth? ( net-wireless/bluedevil )
 
diff --git a/metadata/cache/kde-base/solid-4.7.3 b/metadata/cache/kde-base/solid-4.7.3
deleted file mode 100644
index 219e23759132..000000000000
--- a/metadata/cache/kde-base/solid-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-networkmanager? ( net-misc/networkmanager ) wicd? ( net-misc/wicd ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-networkmanager? ( net-misc/networkmanager ) wicd? ( net-misc/wicd ) >=kde-base/solid-runtime-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Solid: the KDE hardware library
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug bluetooth networkmanager wicd aqua kdeenablefinal
-
-bluetooth? ( net-wireless/bluedevil )
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/solid-4.7.4 b/metadata/cache/kde-base/solid-4.7.4
index 8c3551ac3397..003e676f6d51 100644
--- a/metadata/cache/kde-base/solid-4.7.4
+++ b/metadata/cache/kde-base/solid-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Solid: the KDE hardware library
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug bluetooth networkmanager wicd aqua kdeenablefinal
+debug bluetooth networkmanager wicd aqua
 
 bluetooth? ( net-wireless/bluedevil )
 
diff --git a/metadata/cache/kde-base/solid-runtime-4.6.3 b/metadata/cache/kde-base/solid-runtime-4.6.3
index 68af0fb37a5b..73f328c10751 100644
--- a/metadata/cache/kde-base/solid-runtime-4.6.3
+++ b/metadata/cache/kde-base/solid-runtime-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE SC solid runtime modules (autoeject, automounter and others)
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/solid-runtime-4.7.3 b/metadata/cache/kde-base/solid-runtime-4.7.3
deleted file mode 100644
index 728bf3a1e4db..000000000000
--- a/metadata/cache/kde-base/solid-runtime-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-!<=kde-base/solid-4.4.50:4 >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE SC solid runtime modules (autoeject, automounter and others)
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/solid-runtime-4.7.4 b/metadata/cache/kde-base/solid-runtime-4.7.4
index 3980116abc77..4076e2269e88 100644
--- a/metadata/cache/kde-base/solid-runtime-4.7.4
+++ b/metadata/cache/kde-base/solid-runtime-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE SC solid runtime modules (autoeject, automounter and others)
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/step-4.6.3 b/metadata/cache/kde-base/step-4.6.3
index 67a4b6fb0f9c..cea2dd9ac408 100644
--- a/metadata/cache/kde-base/step-4.6.3
+++ b/metadata/cache/kde-base/step-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 The KDE physics simulator
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +gsl +qalculate kdeprefix +handbook aqua kdeenablefinal
+debug +gsl +qalculate kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/step-4.7.3 b/metadata/cache/kde-base/step-4.7.3
deleted file mode 100644
index 76d980a6857c..000000000000
--- a/metadata/cache/kde-base/step-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-cpp/eigen-2.0.3:2 sci-libs/cln >=sci-mathematics/gmm-3.0 gsl? ( >=sci-libs/gsl-1.9-r1 ) qalculate? ( >=sci-libs/libqalculate-0.9.5 ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=dev-cpp/eigen-2.0.3:2 sci-libs/cln >=sci-mathematics/gmm-3.0 gsl? ( >=sci-libs/gsl-1.9-r1 ) qalculate? ( >=sci-libs/libqalculate-0.9.5 ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/step-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-The KDE physics simulator
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +gsl +qalculate +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/step-4.7.4 b/metadata/cache/kde-base/step-4.7.4
index ad1bc95059ae..aca5888d2fa3 100644
--- a/metadata/cache/kde-base/step-4.7.4
+++ b/metadata/cache/kde-base/step-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 The KDE physics simulator
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +gsl +qalculate +handbook aqua kdeenablefinal
+debug +gsl +qalculate +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/superkaramba-4.6.3 b/metadata/cache/kde-base/superkaramba-4.6.3
index 8d8f7276b92b..6280615f2ecb 100644
--- a/metadata/cache/kde-base/superkaramba-4.6.3
+++ b/metadata/cache/kde-base/superkaramba-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 A tool to create interactive applets for the KDE desktop.
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability python toolchain-funcs user versionator virtualx
-debug python kdeprefix aqua kdeenablefinal
+debug python kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/superkaramba-4.7.3 b/metadata/cache/kde-base/superkaramba-4.7.3
deleted file mode 100644
index fdbcbba150aa..000000000000
--- a/metadata/cache/kde-base/superkaramba-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/qimageblitz python? ( >=kde-base/pykde4-4.7.3:4[aqua=] ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-media-libs/qimageblitz python? ( >=kde-base/pykde4-4.7.3:4[aqua=] ) python? ( >=kde-base/krosspython-4.7.3:4[aqua=] ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeutils-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-A tool to create interactive applets for the KDE desktop.
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability python toolchain-funcs user versionator virtualx
-debug python aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/superkaramba-4.7.4 b/metadata/cache/kde-base/superkaramba-4.7.4
index 923ccd5cffe2..ffeee492c3ce 100644
--- a/metadata/cache/kde-base/superkaramba-4.7.4
+++ b/metadata/cache/kde-base/superkaramba-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 A tool to create interactive applets for the KDE desktop.
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability python toolchain-funcs user versionator virtualx
-debug python aqua kdeenablefinal
+debug python aqua
 
 
 
diff --git a/metadata/cache/kde-base/svgpart-4.6.3 b/metadata/cache/kde-base/svgpart-4.6.3
index 2cca2d198110..7e05c64817fe 100644
--- a/metadata/cache/kde-base/svgpart-4.6.3
+++ b/metadata/cache/kde-base/svgpart-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 Svgpart is a kpart for viewing SVGs
 amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/svgpart-4.7.3 b/metadata/cache/kde-base/svgpart-4.7.3
deleted file mode 100644
index a5bd52850e16..000000000000
--- a/metadata/cache/kde-base/svgpart-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/svgpart-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Svgpart is a kpart for viewing SVGs
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/svgpart-4.7.4 b/metadata/cache/kde-base/svgpart-4.7.4
index 111ff46bb215..ede94081deae 100644
--- a/metadata/cache/kde-base/svgpart-4.7.4
+++ b/metadata/cache/kde-base/svgpart-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 Svgpart is a kpart for viewing SVGs
 amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/sweeper-4.6.3 b/metadata/cache/kde-base/sweeper-4.6.3
index 90158ab01f70..3ea1dda8779b 100644
--- a/metadata/cache/kde-base/sweeper-4.6.3
+++ b/metadata/cache/kde-base/sweeper-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE Privacy Settings Widget
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/sweeper-4.7.3 b/metadata/cache/kde-base/sweeper-4.7.3
deleted file mode 100644
index df5c477f9dd5..000000000000
--- a/metadata/cache/kde-base/sweeper-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeutils-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Privacy Settings Widget
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/sweeper-4.7.4 b/metadata/cache/kde-base/sweeper-4.7.4
index a56cc8812380..162257ead2ad 100644
--- a/metadata/cache/kde-base/sweeper-4.7.4
+++ b/metadata/cache/kde-base/sweeper-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE Privacy Settings Widget
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/system-config-printer-kde-4.6.3 b/metadata/cache/kde-base/system-config-printer-kde-4.6.3
index 66018265fb85..e8607450ac05 100644
--- a/metadata/cache/kde-base/system-config-printer-kde-4.6.3
+++ b/metadata/cache/kde-base/system-config-printer-kde-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE port of Red Hat's Gnome system-config-printer
 amd64 ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability python toolchain-funcs user versionator virtualx
-kdeprefix aqua kdeenablefinal
+kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/system-config-printer-kde-4.7.3 b/metadata/cache/kde-base/system-config-printer-kde-4.7.3
deleted file mode 100644
index 6e3143e266ce..000000000000
--- a/metadata/cache/kde-base/system-config-printer-kde-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-admin/system-config-printer-common-1.2.2 >=dev-python/pycups-1.9.49 >=kde-base/pykde4-4.7.3:4[aqua=] >=app-admin/eselect-python-20091230 =dev-lang/python-2* >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=app-admin/system-config-printer-common-1.2.2 >=dev-python/pycups-1.9.49 >=kde-base/pykde4-4.7.3:4[aqua=] net-print/cups[dbus] >=app-admin/eselect-python-20091230 =dev-lang/python-2* >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdeadmin-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE port of Red Hat's Gnome system-config-printer
-amd64 ~ppc ~ppc64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability python toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/system-config-printer-kde-4.7.4 b/metadata/cache/kde-base/system-config-printer-kde-4.7.4
index f96c9b630b11..6cb1339bd488 100644
--- a/metadata/cache/kde-base/system-config-printer-kde-4.7.4
+++ b/metadata/cache/kde-base/system-config-printer-kde-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE port of Red Hat's Gnome system-config-printer
 amd64 ~ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability python toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-base/systemsettings-4.6.3 b/metadata/cache/kde-base/systemsettings-4.6.3
index 4472d9845e10..ca777bc9c8f4 100644
--- a/metadata/cache/kde-base/systemsettings-4.6.3
+++ b/metadata/cache/kde-base/systemsettings-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 System settings utility
 amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug gtk +usb xinerama kdeprefix opengl +handbook aqua kdeenablefinal
+debug gtk +usb xinerama kdeprefix opengl +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/systemsettings-4.7.3 b/metadata/cache/kde-base/systemsettings-4.7.3
deleted file mode 100644
index 7d901393e376..000000000000
--- a/metadata/cache/kde-base/systemsettings-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/glib:2 >=kde-base/libkworkspace-4.7.3:4[aqua=] media-libs/fontconfig >=media-libs/freetype-2 >=x11-libs/libxklavier-3.2 x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXrandr x11-libs/libXtst opengl? ( virtual/opengl ) usb? ( =virtual/libusb-0* ) xinerama? ( x11-libs/libXinerama ) x11-proto/kbproto x11-proto/xextproto xinerama? ( x11-proto/xineramaproto ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-dev-libs/glib:2 >=kde-base/libkworkspace-4.7.3:4[aqua=] media-libs/fontconfig >=media-libs/freetype-2 >=x11-libs/libxklavier-3.2 x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXrandr x11-libs/libXtst opengl? ( virtual/opengl ) usb? ( =virtual/libusb-0* ) xinerama? ( x11-libs/libXinerama ) sys-libs/timezone-data x11-apps/setxkbmap x11-misc/xkeyboard-config gtk? ( kde-misc/kcm-gtk-config ) !<kde-base/kdeaccessibility-colorschemes-4.6.50:4 >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-System settings utility
-amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug gtk +usb xinerama opengl +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/systemsettings-4.7.3-r1 b/metadata/cache/kde-base/systemsettings-4.7.3-r1
deleted file mode 100644
index 3721d6f59d1f..000000000000
--- a/metadata/cache/kde-base/systemsettings-4.7.3-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/glib:2 >=kde-base/libkworkspace-4.7.3:4[aqua=] media-libs/fontconfig >=media-libs/freetype-2 >=x11-libs/libxklavier-3.2 x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXrandr x11-libs/libXtst opengl? ( virtual/opengl ) usb? ( =virtual/libusb-0* ) xinerama? ( x11-libs/libXinerama ) x11-proto/kbproto x11-proto/xextproto xinerama? ( x11-proto/xineramaproto ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-dev-libs/glib:2 >=kde-base/libkworkspace-4.7.3:4[aqua=] media-libs/fontconfig >=media-libs/freetype-2 >=x11-libs/libxklavier-3.2 x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXrandr x11-libs/libXtst opengl? ( virtual/opengl ) usb? ( =virtual/libusb-0* ) xinerama? ( x11-libs/libXinerama ) sys-libs/timezone-data x11-apps/setxkbmap x11-misc/xkeyboard-config gtk? ( kde-misc/kcm-gtk-config ) !<kde-base/kdeaccessibility-colorschemes-4.6.50:4 >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-System settings utility
-~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug gtk +usb xinerama opengl +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/systemsettings-4.7.4 b/metadata/cache/kde-base/systemsettings-4.7.4
index 652a92efc67a..db1f8cfc6a9c 100644
--- a/metadata/cache/kde-base/systemsettings-4.7.4
+++ b/metadata/cache/kde-base/systemsettings-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 System settings utility
 amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug gtk +usb xinerama opengl +handbook aqua kdeenablefinal
+debug gtk +usb xinerama opengl +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/thumbnailers-4.6.3 b/metadata/cache/kde-base/thumbnailers-4.6.3
index 43e39ff513e7..1d1e93e3b209 100644
--- a/metadata/cache/kde-base/thumbnailers-4.6.3
+++ b/metadata/cache/kde-base/thumbnailers-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE 4 thumbnail generators for PDF/PS files
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix aqua kdeenablefinal
+debug kdeprefix aqua
 
 
 
diff --git a/metadata/cache/kde-base/thumbnailers-4.7.3 b/metadata/cache/kde-base/thumbnailers-4.7.3
deleted file mode 100644
index 3d36b05978ac..000000000000
--- a/metadata/cache/kde-base/thumbnailers-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkdcraw-4.7.3:4[aqua=] >=kde-base/libkexiv2-4.7.3:4[aqua=] media-libs/lcms:0 >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
->=kde-base/libkdcraw-4.7.3:4[aqua=] >=kde-base/libkexiv2-4.7.3:4[aqua=] media-libs/lcms:0 >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdegraphics-thumbnailers-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE 4 thumbnail generators for PDF/PS files
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/thumbnailers-4.7.4 b/metadata/cache/kde-base/thumbnailers-4.7.4
index f180ca0c9f6e..33cc8b8e86e4 100644
--- a/metadata/cache/kde-base/thumbnailers-4.7.4
+++ b/metadata/cache/kde-base/thumbnailers-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE 4 thumbnail generators for PDF/PS files
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-base/umbrello-4.6.3 b/metadata/cache/kde-base/umbrello-4.6.3
index b033dc560943..8fb69db76787 100644
--- a/metadata/cache/kde-base/umbrello-4.6.3
+++ b/metadata/cache/kde-base/umbrello-4.6.3
@@ -8,7 +8,7 @@ GPL-2
 KDE UML Modeller
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug kdeprefix +handbook aqua kdeenablefinal
+debug kdeprefix +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-base/umbrello-4.7.3 b/metadata/cache/kde-base/umbrello-4.7.3
deleted file mode 100644
index d3eecd8b5d90..000000000000
--- a/metadata/cache/kde-base/umbrello-4.7.3
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/libxml2 dev-libs/libxslt dev-libs/boost >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-dev-libs/libxml2 dev-libs/libxslt >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
-4
-mirror://kde/stable/4.7.3/src/kdesdk-4.7.3.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE UML Modeller
-amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/umbrello-4.7.4 b/metadata/cache/kde-base/umbrello-4.7.4
index f1b04cb24c7c..f5d11263084c 100644
--- a/metadata/cache/kde-base/umbrello-4.7.4
+++ b/metadata/cache/kde-base/umbrello-4.7.4
@@ -8,7 +8,7 @@ GPL-2
 KDE UML Modeller
 amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-misc/adjustableclock-2.6.1 b/metadata/cache/kde-misc/adjustableclock-2.6.1
index b1cf4340a3b9..f4cbe270c547 100644
--- a/metadata/cache/kde-misc/adjustableclock-2.6.1
+++ b/metadata/cache/kde-misc/adjustableclock-2.6.1
@@ -8,7 +8,7 @@ GPL-2
 Plasmoid to show date and time in adjustable format using rich text.
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-misc/akonadi-google-0.2_p20111130 b/metadata/cache/kde-misc/akonadi-google-0.2_p20111130
index ce05a918af0f..11197134be42 100644
--- a/metadata/cache/kde-misc/akonadi-google-0.2_p20111130
+++ b/metadata/cache/kde-misc/akonadi-google-0.2_p20111130
@@ -8,7 +8,7 @@ GPL-2
 Google services integration in Akonadi
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-oldpim aqua kdeenablefinal
+oldpim aqua
 
 
 
diff --git a/metadata/cache/kde-misc/akonadi-google-0.2_p20111229 b/metadata/cache/kde-misc/akonadi-google-0.2_p20111229
index 5f3501bbdd1c..21d5bd50a44f 100644
--- a/metadata/cache/kde-misc/akonadi-google-0.2_p20111229
+++ b/metadata/cache/kde-misc/akonadi-google-0.2_p20111229
@@ -8,7 +8,7 @@ GPL-2
 Google services integration in Akonadi
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-oldpim aqua kdeenablefinal
+oldpim aqua
 
 
 
diff --git a/metadata/cache/kde-misc/basket-1.81 b/metadata/cache/kde-misc/basket-1.81
index ce748d2679c2..9ec0c82f89f3 100644
--- a/metadata/cache/kde-misc/basket-1.81
+++ b/metadata/cache/kde-misc/basket-1.81
@@ -8,7 +8,7 @@ GPL-2
 A DropDrawers clone. Multiple information organizer
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug crypt test aqua kdeenablefinal
+debug crypt test aqua
 
 
 
diff --git a/metadata/cache/kde-misc/bkodama-0.3.1 b/metadata/cache/kde-misc/bkodama-0.3.1
index 540e4cdcb68b..6b6440807f53 100644
--- a/metadata/cache/kde-misc/bkodama-0.3.1
+++ b/metadata/cache/kde-misc/bkodama-0.3.1
@@ -8,7 +8,7 @@ GPL-3
 A friendly, yet very simple-minded Kodama (Japanese ghost) wandering on your desktop
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-misc/colibri-0.2.2 b/metadata/cache/kde-misc/colibri-0.2.2
index ea4ca000d5e2..c1179c1320dd 100644
--- a/metadata/cache/kde-misc/colibri-0.2.2
+++ b/metadata/cache/kde-misc/colibri-0.2.2
@@ -8,7 +8,7 @@ GPL-2
 Alternative to KDE4 Plasma notifications
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-linguas_cs linguas_de linguas_es linguas_it linguas_pt_BR linguas_sk linguas_tr aqua kdeenablefinal
+linguas_cs linguas_de linguas_es linguas_it linguas_pt_BR linguas_sk linguas_tr aqua
 
 
 
diff --git a/metadata/cache/kde-misc/customizable-weather-1.5.1 b/metadata/cache/kde-misc/customizable-weather-1.5.1
index fdcbf13a28c5..01073e130cb8 100644
--- a/metadata/cache/kde-misc/customizable-weather-1.5.1
+++ b/metadata/cache/kde-misc/customizable-weather-1.5.1
@@ -8,7 +8,7 @@ GPL-3
 KDE4 weather plasmoid. It aims to be highly customizable, but is a little harder to setup.
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_br linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_nb linguas_nl linguas_pl linguas_ro linguas_ru linguas_sr linguas_sr@latin linguas_tr linguas_zh_CN aqua kdeenablefinal
+debug linguas_br linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_nb linguas_nl linguas_pl linguas_ro linguas_ru linguas_sr linguas_sr@latin linguas_tr linguas_zh_CN aqua
 
 
 
diff --git a/metadata/cache/kde-misc/customizable-weather-1.5.7 b/metadata/cache/kde-misc/customizable-weather-1.5.7
index 50e71218c271..9032391b5373 100644
--- a/metadata/cache/kde-misc/customizable-weather-1.5.7
+++ b/metadata/cache/kde-misc/customizable-weather-1.5.7
@@ -8,7 +8,7 @@ GPL-3
 KDE4 weather plasmoid. It aims to be highly customizable, but is a little harder to setup.
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_br linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_nb linguas_nl linguas_pl linguas_ro linguas_ru linguas_sr linguas_sr@latin linguas_tr linguas_zh_CN aqua kdeenablefinal
+debug linguas_br linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_nb linguas_nl linguas_pl linguas_ro linguas_ru linguas_sr linguas_sr@latin linguas_tr linguas_zh_CN aqua
 
 
 
diff --git a/metadata/cache/kde-misc/customizable-weather-1.5.6 b/metadata/cache/kde-misc/customizable-weather-1.5.8
similarity index 95%
rename from metadata/cache/kde-misc/customizable-weather-1.5.6
rename to metadata/cache/kde-misc/customizable-weather-1.5.8
index 1bd02f674a5b..ac8697e4d0d0 100644
--- a/metadata/cache/kde-misc/customizable-weather-1.5.6
+++ b/metadata/cache/kde-misc/customizable-weather-1.5.8
@@ -1,14 +1,14 @@
 >=kde-base/plasma-workspace-4.4:4[aqua=] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 >=kde-base/plasma-workspace-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_br? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_br(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) 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_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 4
-http://www.kde-look.org/CONTENT/content-files/98925-cwp-1.5.6.tar.bz2
+http://www.kde-look.org/CONTENT/content-files/98925-cwp-1.5.8.tar.bz2
 
 http://www.kde-look.org/content/show.php/Customizable+Weather+Plasmoid?content=98925
 GPL-3
 KDE4 weather plasmoid. It aims to be highly customizable, but is a little harder to setup.
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_br linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_nb linguas_nl linguas_pl linguas_ro linguas_ru linguas_sr linguas_sr@latin linguas_tr linguas_zh_CN aqua kdeenablefinal
+debug linguas_br linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_nb linguas_nl linguas_pl linguas_ro linguas_ru linguas_sr linguas_sr@latin linguas_tr linguas_zh_CN aqua
 
 
 
diff --git a/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc38 b/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc38
index e1ff2f7fbe44..86511989fc02 100644
--- a/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc38
+++ b/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc38
@@ -8,7 +8,7 @@ GPL-2
 Entropy Package Manager KDE kioslaves support
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc43 b/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc43
index c9f515217056..0b8ef0de8bcf 100644
--- a/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc43
+++ b/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc43
@@ -8,7 +8,7 @@ GPL-2
 Entropy Package Manager KDE kioslaves support
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc53 b/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc53
index 4b05bab72f98..2a2a64e75f44 100644
--- a/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc53
+++ b/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc53
@@ -8,7 +8,7 @@ GPL-2
 Entropy Package Manager KDE kioslaves support
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc59 b/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc59
index ab2b7e05cfba..66a97261d3a0 100644
--- a/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc59
+++ b/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc59
@@ -8,7 +8,7 @@ GPL-2
 Entropy Package Manager KDE kioslaves support
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc76 b/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc76
index 7e01887df80d..246899d852ac 100644
--- a/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc76
+++ b/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc76
@@ -8,7 +8,7 @@ GPL-2
 Entropy Package Manager KDE kioslaves support
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc77 b/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc77
index c0b9cb05665d..cef1df3b7d2f 100644
--- a/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc77
+++ b/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc77
@@ -8,7 +8,7 @@ GPL-2
 Entropy Package Manager KDE kioslaves support
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc80 b/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc80
index 10693e7a922e..ff26913dabc5 100644
--- a/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc80
+++ b/metadata/cache/kde-misc/entropy-kioslaves-1.0_rc80
@@ -8,7 +8,7 @@ GPL-2
 Entropy Package Manager KDE kioslaves support
 ~amd64 ~arm ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-misc/eventlist-0.4.95 b/metadata/cache/kde-misc/eventlist-0.4.95
index b2b9db5ccd72..303117a78096 100644
--- a/metadata/cache/kde-misc/eventlist-0.4.95
+++ b/metadata/cache/kde-misc/eventlist-0.4.95
@@ -8,7 +8,7 @@ GPL-2
 Plasmoid showing the events from Akonadi resources
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_cs linguas_de linguas_es linguas_et linguas_fr linguas_it linguas_ja linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sv linguas_uk aqua kdeenablefinal
+debug linguas_cs linguas_de linguas_es linguas_et linguas_fr linguas_it linguas_ja linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sv linguas_uk aqua
 
 
 
diff --git a/metadata/cache/kde-misc/eventlist-0.5.95 b/metadata/cache/kde-misc/eventlist-0.5.95
index a897c0299b85..3e78aa90d489 100644
--- a/metadata/cache/kde-misc/eventlist-0.5.95
+++ b/metadata/cache/kde-misc/eventlist-0.5.95
@@ -8,7 +8,7 @@ GPL-2
 Plasmoid showing the events from Akonadi resources
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_et linguas_fr linguas_it linguas_km linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sv linguas_uk aqua kdeenablefinal
+debug linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_et linguas_fr linguas_it linguas_km linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sv linguas_uk aqua
 
 
 
diff --git a/metadata/cache/kde-misc/fancytasks-1.0.96 b/metadata/cache/kde-misc/fancytasks-1.0.96
index b4e9fb209680..63907f838870 100644
--- a/metadata/cache/kde-misc/fancytasks-1.0.96
+++ b/metadata/cache/kde-misc/fancytasks-1.0.96
@@ -8,7 +8,7 @@ GPL-2
 Task and launch representation plasmoid
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_de linguas_en_GB linguas_es linguas_et linguas_fr linguas_km linguas_nds linguas_pl linguas_pt linguas_ru linguas_sv linguas_tr linguas_uk aqua kdeenablefinal
+debug linguas_de linguas_en_GB linguas_es linguas_et linguas_fr linguas_km linguas_nds linguas_pl linguas_pt linguas_ru linguas_sv linguas_tr linguas_uk aqua
 
 
 
diff --git a/metadata/cache/kde-misc/gx-mail-notify-0.4.4 b/metadata/cache/kde-misc/gx-mail-notify-0.4.4
index 8d7e0ddff3fb..80a0b510ac38 100644
--- a/metadata/cache/kde-misc/gx-mail-notify-0.4.4
+++ b/metadata/cache/kde-misc/gx-mail-notify-0.4.4
@@ -8,7 +8,7 @@ GPL-3
 A plasmoid for checking unread mail
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-misc/hdaps_monitor-0.3 b/metadata/cache/kde-misc/hdaps_monitor-0.3
index e71936cbbb5c..be5557550d7d 100644
--- a/metadata/cache/kde-misc/hdaps_monitor-0.3
+++ b/metadata/cache/kde-misc/hdaps_monitor-0.3
@@ -8,7 +8,7 @@ GPL-2
 KDE-based monitor for the IBM HDAPS system
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kbstateapplet-0_p1268845 b/metadata/cache/kde-misc/kbstateapplet-0_p1268845
index acb2615808be..a7027d88652d 100644
--- a/metadata/cache/kde-misc/kbstateapplet-0_p1268845
+++ b/metadata/cache/kde-misc/kbstateapplet-0_p1268845
@@ -8,7 +8,7 @@ GPL-2
 plasmoid that shows the state of keyboard leds
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kcaldav-1.2.0 b/metadata/cache/kde-misc/kcaldav-1.2.0
index ba02e0d621d1..b6372663d247 100644
--- a/metadata/cache/kde-misc/kcaldav-1.2.0
+++ b/metadata/cache/kde-misc/kcaldav-1.2.0
@@ -8,7 +8,7 @@ GPL-2
 CalDAV support plugin for KDE Kontact
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kcm-grub2-0.5.0 b/metadata/cache/kde-misc/kcm-grub2-0.5.0
index f97582939cc6..c14c3542fac8 100644
--- a/metadata/cache/kde-misc/kcm-grub2-0.5.0
+++ b/metadata/cache/kde-misc/kcm-grub2-0.5.0
@@ -8,7 +8,7 @@ GPL-3
 KCModule for configuring the GRUB2 bootloader.
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-+hwinfo imagemagick packagekit linguas_da linguas_de linguas_et linguas_hu linguas_nl linguas_pt linguas_pt_BR linguas_sv linguas_uk aqua kdeenablefinal
++hwinfo imagemagick packagekit linguas_da linguas_de linguas_et linguas_hu linguas_nl linguas_pt linguas_pt_BR linguas_sv linguas_uk aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kcm-grub2-0.5.5 b/metadata/cache/kde-misc/kcm-grub2-0.5.5
index aee0239e4882..c99284edd9c7 100644
--- a/metadata/cache/kde-misc/kcm-grub2-0.5.5
+++ b/metadata/cache/kde-misc/kcm-grub2-0.5.5
@@ -8,7 +8,7 @@ GPL-3
 KCModule for configuring the GRUB2 bootloader.
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-+hwinfo imagemagick packagekit linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_et linguas_fr linguas_ga linguas_hu linguas_lt linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sv linguas_uk linguas_zh_TW aqua kdeenablefinal
++hwinfo imagemagick packagekit linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_et linguas_fr linguas_ga linguas_hu linguas_lt linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sv linguas_uk linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kcm-gtk-config-1.5 b/metadata/cache/kde-misc/kcm-gtk-config-1.5
index 0bbd2e1249a2..9d512cefd553 100644
--- a/metadata/cache/kde-misc/kcm-gtk-config-1.5
+++ b/metadata/cache/kde-misc/kcm-gtk-config-1.5
@@ -8,7 +8,7 @@ GPL-3
 KCM for set the look&feel of your Gtk apps using the KDE systemsettings.
 amd64 ~arm ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-linguas_ca linguas_cs linguas_el linguas_es linguas_fr linguas_gl linguas_id linguas_it aqua kdeenablefinal
+linguas_ca linguas_cs linguas_el linguas_es linguas_fr linguas_gl linguas_id linguas_it aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kcm-gtk-config-1.6 b/metadata/cache/kde-misc/kcm-gtk-config-1.6
index 984b67966333..bc0ac97ed996 100644
--- a/metadata/cache/kde-misc/kcm-gtk-config-1.6
+++ b/metadata/cache/kde-misc/kcm-gtk-config-1.6
@@ -8,7 +8,7 @@ GPL-3
 KCM for set the look&feel of your Gtk apps using the KDE systemsettings.
 ~amd64 ~arm ~ppc ~ppc64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-linguas_ca linguas_cs linguas_el linguas_es linguas_eu linguas_fr linguas_gl linguas_id linguas_it aqua kdeenablefinal
+linguas_ca linguas_cs linguas_el linguas_es linguas_eu linguas_fr linguas_gl linguas_id linguas_it aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kcm-gtk-config-1.7 b/metadata/cache/kde-misc/kcm-gtk-config-1.7
index 0e6e3f2be00e..3af093bbf82d 100644
--- a/metadata/cache/kde-misc/kcm-gtk-config-1.7
+++ b/metadata/cache/kde-misc/kcm-gtk-config-1.7
@@ -8,7 +8,7 @@ GPL-3
 KCM for set the look&feel of your Gtk apps using the KDE systemsettings.
 amd64 ~arm ~ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-linguas_ca linguas_cs linguas_el linguas_es linguas_eu linguas_fr linguas_gl linguas_id linguas_it linguas_pl linguas_ru linguas_zh_CN aqua kdeenablefinal
+linguas_ca linguas_cs linguas_el linguas_es linguas_eu linguas_fr linguas_gl linguas_id linguas_it linguas_pl linguas_ru linguas_zh_CN aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kcm-ufw-0.4.1 b/metadata/cache/kde-misc/kcm-ufw-0.4.1
index 901ea094c02a..658807ffb80f 100644
--- a/metadata/cache/kde-misc/kcm-ufw-0.4.1
+++ b/metadata/cache/kde-misc/kcm-ufw-0.4.1
@@ -8,7 +8,7 @@ GPL-3
 KCM module to control the Uncomplicated Firewall
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-linguas_en linguas_es linguas_fr linguas_lt aqua kdeenablefinal
+linguas_en linguas_es linguas_fr linguas_lt aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kcm_touchpad-0.3.1 b/metadata/cache/kde-misc/kcm_touchpad-0.3.1
index aaf1894f763f..9a9b49d12f28 100644
--- a/metadata/cache/kde-misc/kcm_touchpad-0.3.1
+++ b/metadata/cache/kde-misc/kcm_touchpad-0.3.1
@@ -8,7 +8,7 @@ GPL-2
 KControl module for xf86-input-synaptics
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_de linguas_es linguas_nl linguas_pl aqua kdeenablefinal
+debug linguas_de linguas_es linguas_nl linguas_pl aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kcollectd-0.9 b/metadata/cache/kde-misc/kcollectd-0.9
index fa3371c05882..69a8f8000f0b 100644
--- a/metadata/cache/kde-misc/kcollectd-0.9
+++ b/metadata/cache/kde-misc/kcollectd-0.9
@@ -8,7 +8,7 @@ GPL-3
 Simple KDE-based live data viewer for collectd
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kcometen4-1.0.7 b/metadata/cache/kde-misc/kcometen4-1.0.7
index 4bdc16271d45..c550d349aebf 100644
--- a/metadata/cache/kde-misc/kcometen4-1.0.7
+++ b/metadata/cache/kde-misc/kcometen4-1.0.7
@@ -8,7 +8,7 @@ GPL-2
 OpenGL KDE4 screensaver
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kdesudo-3.4.2.4 b/metadata/cache/kde-misc/kdesudo-3.4.2.4
index 70464f6e97c9..4ab1b45d218a 100644
--- a/metadata/cache/kde-misc/kdesudo-3.4.2.4
+++ b/metadata/cache/kde-misc/kdesudo-3.4.2.4
@@ -8,7 +8,7 @@ FDL-1.2 GPL-2 LGPL-2
 A frontend for sudo. Unlike kdesu, it uses directly sudo as backend.
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_ar linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fa linguas_fi linguas_fr linguas_gl linguas_he linguas_hr linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_ko linguas_lt linguas_lv linguas_ms linguas_nb linguas_nl linguas_oc linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tl linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua kdeenablefinal
+debug linguas_ar linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fa linguas_fi linguas_fr linguas_gl linguas_he linguas_hr linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_ko linguas_lt linguas_lv linguas_ms linguas_nb linguas_nl linguas_oc linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tl linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kdiff3-0.9.95-r1 b/metadata/cache/kde-misc/kdiff3-0.9.95-r1
index 05b270616c20..c9e0dfdba468 100644
--- a/metadata/cache/kde-misc/kdiff3-0.9.95-r1
+++ b/metadata/cache/kde-misc/kdiff3-0.9.95-r1
@@ -8,7 +8,7 @@ GPL-2
 Qt/KDE based frontend to diff3
 amd64 ~ppc ~ppc64 x86 ~amd64-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability qt4-r2 toolchain-funcs user versionator virtualx
-debug kde konqueror linguas_ar linguas_bg linguas_br linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hi linguas_hu linguas_it linguas_ja linguas_ka linguas_lt linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_sv linguas_ta linguas_tg linguas_tr linguas_uk linguas_zh_CN +handbook aqua kde kdeenablefinal
+debug kde konqueror linguas_ar linguas_bg linguas_br linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hi linguas_hu linguas_it linguas_ja linguas_ka linguas_lt linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_sv linguas_ta linguas_tg linguas_tr linguas_uk linguas_zh_CN +handbook aqua kde
 
 
 
diff --git a/metadata/cache/kde-misc/kdiff3-0.9.96 b/metadata/cache/kde-misc/kdiff3-0.9.96
index 39fe26dcbf5e..531668b13f84 100644
--- a/metadata/cache/kde-misc/kdiff3-0.9.96
+++ b/metadata/cache/kde-misc/kdiff3-0.9.96
@@ -8,7 +8,7 @@ GPL-2
 Qt/KDE based frontend to diff3
 amd64 ~ppc ~ppc64 ~x86 ~amd64-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability qt4-r2 toolchain-funcs user versionator virtualx
-debug kde linguas_ar linguas_bg linguas_br linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_ka linguas_lt linguas_mai linguas_ml linguas_nb linguas_nds linguas_nl linguas_nn linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_sk linguas_sv linguas_ta linguas_tg linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua kde kdeenablefinal
+debug kde linguas_ar linguas_bg linguas_br linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_ka linguas_lt linguas_mai linguas_ml linguas_nb linguas_nds linguas_nl linguas_nn linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_sk linguas_sv linguas_ta linguas_tg linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua kde
 
 
 
diff --git a/metadata/cache/kde-misc/kdmthemegenerator-0.8 b/metadata/cache/kde-misc/kdmthemegenerator-0.8
index aa98fe624ded..5d22ac47470f 100644
--- a/metadata/cache/kde-misc/kdmthemegenerator-0.8
+++ b/metadata/cache/kde-misc/kdmthemegenerator-0.8
@@ -8,7 +8,7 @@ GPL-2
 A program that will generate kdm theme from your current plasma theme and wallpaper
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kgrubeditor-0.8.5 b/metadata/cache/kde-misc/kgrubeditor-0.8.5
index 66c85f7b6a01..e6dbea5a09f9 100644
--- a/metadata/cache/kde-misc/kgrubeditor-0.8.5
+++ b/metadata/cache/kde-misc/kgrubeditor-0.8.5
@@ -8,7 +8,7 @@ GPL-2
 A KDE utility that edits GRUB configuration files
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kgtk-0.10.1 b/metadata/cache/kde-misc/kgtk-0.10.1
index a0112dd81d67..0de5a256b938 100644
--- a/metadata/cache/kde-misc/kgtk-0.10.1
+++ b/metadata/cache/kde-misc/kgtk-0.10.1
@@ -8,7 +8,7 @@ GPL-2
 Allows *some* Gtk and Qt4 applications to use KDE's file dialogs when run under KDE
 ~amd64 ~ppc ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_cs linguas_de linguas_en_GB linguas_es linguas_fr linguas_pt_BR linguas_ru linguas_zh_CN aqua kdeenablefinal
+debug linguas_cs linguas_de linguas_en_GB linguas_es linguas_fr linguas_pt_BR linguas_ru linguas_zh_CN aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kio-ftps-0.2 b/metadata/cache/kde-misc/kio-ftps-0.2
index 41a88e8fc6f8..f7df3ea1b552 100644
--- a/metadata/cache/kde-misc/kio-ftps-0.2
+++ b/metadata/cache/kde-misc/kio-ftps-0.2
@@ -8,7 +8,7 @@ GPL-2
 A ftps KIO slave for KDE
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kio-locate-0.5.2 b/metadata/cache/kde-misc/kio-locate-0.5.2
index ae97d994c1ea..910967dd9e3e 100644
--- a/metadata/cache/kde-misc/kio-locate-0.5.2
+++ b/metadata/cache/kde-misc/kio-locate-0.5.2
@@ -8,7 +8,7 @@ GPL-2
 Locate KIO slave for KDE
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kio-locate-0.5.3 b/metadata/cache/kde-misc/kio-locate-0.5.3
index 498a1968707f..ea0204ec27dd 100644
--- a/metadata/cache/kde-misc/kio-locate-0.5.3
+++ b/metadata/cache/kde-misc/kio-locate-0.5.3
@@ -8,7 +8,7 @@ GPL-2
 Locate KIO slave for KDE
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_cs linguas_de linguas_el linguas_fr +handbook aqua kdeenablefinal
+debug linguas_cs linguas_de linguas_el linguas_fr +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kio-upnp-ms-1.0.0_p20110602 b/metadata/cache/kde-misc/kio-upnp-ms-1.0.0_p20110602
index 2a73645a26e7..76eaecd60729 100644
--- a/metadata/cache/kde-misc/kio-upnp-ms-1.0.0_p20110602
+++ b/metadata/cache/kde-misc/kio-upnp-ms-1.0.0_p20110602
@@ -8,7 +8,7 @@ GPL-2
 A upnp KIO slave for KDE
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kio_gopher-0.1.3 b/metadata/cache/kde-misc/kio_gopher-0.1.3
index 8d5af8426133..4ea72b313488 100644
--- a/metadata/cache/kde-misc/kio_gopher-0.1.3
+++ b/metadata/cache/kde-misc/kio_gopher-0.1.3
@@ -8,7 +8,7 @@ GPL-2
 Gopher Kioslave for Konqueror
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_ar linguas_bg linguas_br linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_is linguas_it linguas_ka linguas_km linguas_lt linguas_lv linguas_ms linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_sk linguas_sv linguas_ta linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
+debug linguas_ar linguas_bg linguas_br linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_is linguas_it linguas_ka linguas_km linguas_lt linguas_lv linguas_ms linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_sk linguas_sv linguas_ta linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/kde-misc/konq-plugins-4.6.1 b/metadata/cache/kde-misc/konq-plugins-4.6.1
index 9fcc8313e809..f1de3932f9f9 100644
--- a/metadata/cache/kde-misc/konq-plugins-4.6.1
+++ b/metadata/cache/kde-misc/konq-plugins-4.6.1
@@ -8,7 +8,7 @@ GPL-2 LGPL-2.1 FDL-1.2
 Various plugins for konqueror
 amd64 ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug tidy aqua kdeenablefinal
+debug tidy aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kookie-0.1.1 b/metadata/cache/kde-misc/kookie-0.1.1
index 2b18bec6d338..fdf85e740d99 100644
--- a/metadata/cache/kde-misc/kookie-0.1.1
+++ b/metadata/cache/kde-misc/kookie-0.1.1
@@ -8,7 +8,7 @@ GPL-2
 Program to manage recipes and shopping lists
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kopete-antispam-0.5 b/metadata/cache/kde-misc/kopete-antispam-0.5
index 174cd409be0e..619f9e76d665 100644
--- a/metadata/cache/kde-misc/kopete-antispam-0.5
+++ b/metadata/cache/kde-misc/kopete-antispam-0.5
@@ -8,7 +8,7 @@ GPL-2
 Antispam filter for Kopete instant messenger.
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kopete-thinklight-0.50 b/metadata/cache/kde-misc/kopete-thinklight-0.50
index 62c86d4c30bc..b3577ce9bfbd 100644
--- a/metadata/cache/kde-misc/kopete-thinklight-0.50
+++ b/metadata/cache/kde-misc/kopete-thinklight-0.50
@@ -8,7 +8,7 @@ GPL-2
 A thinkpad's light flash on every incoming message
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kosd-0.7.1 b/metadata/cache/kde-misc/kosd-0.7.1
index 9dac96d61f94..ee0a15727156 100644
--- a/metadata/cache/kde-misc/kosd-0.7.1
+++ b/metadata/cache/kde-misc/kosd-0.7.1
@@ -8,7 +8,7 @@ GPL-2
 KDE application that runs in the background and responds to button presses by showing a tiny OSD
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kosd-0.8.1 b/metadata/cache/kde-misc/kosd-0.8.1
index 199e1ff6ebbc..3db085d74e78 100644
--- a/metadata/cache/kde-misc/kosd-0.8.1
+++ b/metadata/cache/kde-misc/kosd-0.8.1
@@ -8,7 +8,7 @@ GPL-2
 KDE application that runs in the background and responds to button presses by showing a tiny OSD
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kprayertime-4.01 b/metadata/cache/kde-misc/kprayertime-4.01
index 4c191bb426e8..98b56066de47 100644
--- a/metadata/cache/kde-misc/kprayertime-4.01
+++ b/metadata/cache/kde-misc/kprayertime-4.01
@@ -8,7 +8,7 @@ GPL-2
 Islamic Prayer Times Plasmoid
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-misc/krcstat-0.7.3 b/metadata/cache/kde-misc/krcstat-0.7.3
index d3e0dffbf82d..9c82fcd42ac0 100644
--- a/metadata/cache/kde-misc/krcstat-0.7.3
+++ b/metadata/cache/kde-misc/krcstat-0.7.3
@@ -8,7 +8,7 @@ GPL-2
 A Gentoo system management tool
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-misc/krecipes-2.0_beta2 b/metadata/cache/kde-misc/krecipes-2.0_beta2
index 4b160d039d1e..eeaaaba12fb8 100644
--- a/metadata/cache/kde-misc/krecipes-2.0_beta2
+++ b/metadata/cache/kde-misc/krecipes-2.0_beta2
@@ -8,7 +8,7 @@ GPL-2 LGPL-2.1
 A KDE4 recipe application
 ~amd64 ~ppc ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_nn linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_sk linguas_sv linguas_tr linguas_uk linguas_zh_TW +handbook aqua kdeenablefinal
+debug linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_nn linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_sk linguas_sv linguas_tr linguas_uk linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-misc/krename-4.0.7 b/metadata/cache/kde-misc/krename-4.0.7
index cc0c590339de..f139d08854e5 100644
--- a/metadata/cache/kde-misc/krename-4.0.7
+++ b/metadata/cache/kde-misc/krename-4.0.7
@@ -8,7 +8,7 @@ GPL-2
 KRename - a very powerful batch file renamer.
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug exif pdf taglib truetype linguas_bs linguas_cs linguas_de linguas_el linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_nl linguas_pl linguas_pt linguas_ru linguas_sl linguas_sv linguas_tr linguas_uk linguas_zh_CN aqua kdeenablefinal
+debug exif pdf taglib truetype linguas_bs linguas_cs linguas_de linguas_el linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_nl linguas_pl linguas_pt linguas_ru linguas_sl linguas_sv linguas_tr linguas_uk linguas_zh_CN aqua
 
 
 
diff --git a/metadata/cache/kde-misc/krename-4.0.7-r1 b/metadata/cache/kde-misc/krename-4.0.7-r1
index 50ed1821fdd0..08df55656983 100644
--- a/metadata/cache/kde-misc/krename-4.0.7-r1
+++ b/metadata/cache/kde-misc/krename-4.0.7-r1
@@ -8,7 +8,7 @@ GPL-2
 KRename - a very powerful batch file renamer.
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug exif pdf taglib truetype linguas_bs linguas_cs linguas_de linguas_el linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_nl linguas_pl linguas_pt linguas_ru linguas_sl linguas_sv linguas_tr linguas_uk linguas_zh_CN aqua kdeenablefinal
+debug exif pdf taglib truetype linguas_bs linguas_cs linguas_de linguas_el linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_nl linguas_pl linguas_pt linguas_ru linguas_sl linguas_sv linguas_tr linguas_uk linguas_zh_CN aqua
 
 
 
diff --git a/metadata/cache/kde-misc/krename-4.0.9 b/metadata/cache/kde-misc/krename-4.0.9
index d3269a3c1c3d..8b52330a4ca3 100644
--- a/metadata/cache/kde-misc/krename-4.0.9
+++ b/metadata/cache/kde-misc/krename-4.0.9
@@ -8,7 +8,7 @@ GPL-2
 KRename - a very powerful batch file renamer.
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug exif pdf taglib truetype linguas_bs linguas_cs linguas_de linguas_el linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_lt linguas_nl linguas_pl linguas_pt linguas_ru linguas_sl linguas_sv linguas_tr linguas_uk linguas_zh_CN aqua kdeenablefinal
+debug exif pdf taglib truetype linguas_bs linguas_cs linguas_de linguas_el linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_lt linguas_nl linguas_pl linguas_pt linguas_ru linguas_sl linguas_sv linguas_tr linguas_uk linguas_zh_CN aqua
 
 
 
diff --git a/metadata/cache/kde-misc/krunner-kopete-contacts-0.4 b/metadata/cache/kde-misc/krunner-kopete-contacts-0.4
index e03f9a175987..7ed3b821580f 100644
--- a/metadata/cache/kde-misc/krunner-kopete-contacts-0.4
+++ b/metadata/cache/kde-misc/krunner-kopete-contacts-0.4
@@ -8,7 +8,7 @@ GPL-3
 A krunner plug-in that allows you to open conversation with your contact
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-misc/krusader-2.3.0_beta1 b/metadata/cache/kde-misc/krusader-2.3.0_beta1
index 1d24cd4ad9f0..456758228ec3 100644
--- a/metadata/cache/kde-misc/krusader-2.3.0_beta1
+++ b/metadata/cache/kde-misc/krusader-2.3.0_beta1
@@ -8,7 +8,7 @@ GPL-2
 An advanced twin-panel (commander-style) file-manager for KDE with many extras.
 amd64 ~ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_gl linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua kdeenablefinal
+debug linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_gl linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-misc/krusader-2.4.0_beta1 b/metadata/cache/kde-misc/krusader-2.4.0_beta1
index 1c36496bbff6..fb4e5886228e 100644
--- a/metadata/cache/kde-misc/krusader-2.4.0_beta1
+++ b/metadata/cache/kde-misc/krusader-2.4.0_beta1
@@ -8,7 +8,7 @@ GPL-2
 An advanced twin-panel (commander-style) file-manager for KDE with many extras.
 ~amd64 ~ppc ~ppc64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-+bookmarks debug linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua kdeenablefinal
++bookmarks debug linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kshutdown-2.0 b/metadata/cache/kde-misc/kshutdown-2.0
index 50772ce3122b..a968c833f469 100644
--- a/metadata/cache/kde-misc/kshutdown-2.0
+++ b/metadata/cache/kde-misc/kshutdown-2.0
@@ -8,7 +8,7 @@ GPL-2
 A shutdown manager for KDE
 ~amd64 ~ppc ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_ar linguas_bg linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_fr linguas_hu linguas_it linguas_nb linguas_nl linguas_pl linguas_pt_BR linguas_ru linguas_sk linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sr linguas_sv linguas_tr linguas_zh_CN aqua kdeenablefinal
+debug linguas_ar linguas_bg linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_fr linguas_hu linguas_it linguas_nb linguas_nl linguas_pl linguas_pt_BR linguas_ru linguas_sk linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sr linguas_sv linguas_tr linguas_zh_CN aqua
 
 
 
diff --git a/metadata/cache/kde-misc/ktrafficanalyzer-0.5.4.1 b/metadata/cache/kde-misc/ktrafficanalyzer-0.5.4.1
index 0d4f65045c85..15371c66ee0b 100644
--- a/metadata/cache/kde-misc/ktrafficanalyzer-0.5.4.1
+++ b/metadata/cache/kde-misc/ktrafficanalyzer-0.5.4.1
@@ -8,7 +8,7 @@ GPL-2
 A network traffic visualizer
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kvkbd-0.6 b/metadata/cache/kde-misc/kvkbd-0.6
index 93137b4bb56c..d28f8a8dffb7 100644
--- a/metadata/cache/kde-misc/kvkbd-0.6
+++ b/metadata/cache/kde-misc/kvkbd-0.6
@@ -8,7 +8,7 @@ GPL-2
 A virtual keyboard for KDE
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kwebkitpart-0.9.6 b/metadata/cache/kde-misc/kwebkitpart-0.9.6
index 04d1b6b33320..ce72ba2b2620 100644
--- a/metadata/cache/kde-misc/kwebkitpart-0.9.6
+++ b/metadata/cache/kde-misc/kwebkitpart-0.9.6
@@ -8,7 +8,7 @@ LGPL-2
 A WebKit KPart for konqueror
 amd64 ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_bg linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_km linguas_lt linguas_ms linguas_nb linguas_nds linguas_nl linguas_pa linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_tg linguas_th linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
+debug linguas_bg linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_km linguas_lt linguas_ms linguas_nb linguas_nds linguas_nl linguas_pa linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_tg linguas_th linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kwebkitpart-1.1.1 b/metadata/cache/kde-misc/kwebkitpart-1.1.1
index 817995dfe3ff..cf60348fadc7 100644
--- a/metadata/cache/kde-misc/kwebkitpart-1.1.1
+++ b/metadata/cache/kde-misc/kwebkitpart-1.1.1
@@ -8,7 +8,7 @@ LGPL-2
 A WebKit KPart for konqueror
 ~amd64 ~ppc ~ppc64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-misc/kwebkitpart-1.2.0 b/metadata/cache/kde-misc/kwebkitpart-1.2.0
index bc5ce7efb2a0..d3238fb0af25 100644
--- a/metadata/cache/kde-misc/kwebkitpart-1.2.0
+++ b/metadata/cache/kde-misc/kwebkitpart-1.2.0
@@ -8,7 +8,7 @@ LGPL-2
 A WebKit KPart for konqueror
 ~amd64 ~ppc ~ppc64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-misc/miniplayer-2.1 b/metadata/cache/kde-misc/miniplayer-2.1
index d3c67858cbad..38c4a724f512 100644
--- a/metadata/cache/kde-misc/miniplayer-2.1
+++ b/metadata/cache/kde-misc/miniplayer-2.1
@@ -8,7 +8,7 @@ GPL-3
 Multimedia Player Plasmoid
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-misc/nepomukcontroller-0.2 b/metadata/cache/kde-misc/nepomukcontroller-0.2
index 7913bee14094..b8f2d0e31662 100644
--- a/metadata/cache/kde-misc/nepomukcontroller-0.2
+++ b/metadata/cache/kde-misc/nepomukcontroller-0.2
@@ -8,7 +8,7 @@ GPL-3
 KDE 4.6 systray applet that allows you to suspend and resume the Nepomuk file indexer
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-misc/networkmanagement-0.8.98 b/metadata/cache/kde-misc/networkmanagement-0.8.98
index a1f387da3499..1ddb7b0ffbb7 100644
--- a/metadata/cache/kde-misc/networkmanagement-0.8.98
+++ b/metadata/cache/kde-misc/networkmanagement-0.8.98
@@ -8,7 +8,7 @@ GPL-2 LGPL-2
 KDE frontend for NetworkManager
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-consolekit debug linguas_ar linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_ko linguas_lt linguas_lv linguas_mai linguas_ms linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sq linguas_sv linguas_th linguas_tr linguas_ug linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
+consolekit debug linguas_ar linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_ko linguas_lt linguas_lv linguas_mai linguas_ms linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sq linguas_sv linguas_th linguas_tr linguas_ug linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/kde-misc/networkmanagement-0.8_p20110714 b/metadata/cache/kde-misc/networkmanagement-0.8_p20110714
index 347c10aa2691..2355f0be94ab 100644
--- a/metadata/cache/kde-misc/networkmanagement-0.8_p20110714
+++ b/metadata/cache/kde-misc/networkmanagement-0.8_p20110714
@@ -8,7 +8,7 @@ GPL-2 LGPL-2
 KDE frontend for NetworkManager
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-consolekit debug aqua kdeenablefinal
+consolekit debug aqua
 
 
 
diff --git a/metadata/cache/kde-misc/nightmode-0.2 b/metadata/cache/kde-misc/nightmode-0.2
index 89f763ca9945..0fe719c35f32 100644
--- a/metadata/cache/kde-misc/nightmode-0.2
+++ b/metadata/cache/kde-misc/nightmode-0.2
@@ -8,7 +8,7 @@ GPL-2
 kwin plugin that makes the entire screen darker
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-misc/openofficeorg-thumbnail-1.0.0 b/metadata/cache/kde-misc/openofficeorg-thumbnail-1.0.0
index f397979f57c7..08be7f6c18d5 100644
--- a/metadata/cache/kde-misc/openofficeorg-thumbnail-1.0.0
+++ b/metadata/cache/kde-misc/openofficeorg-thumbnail-1.0.0
@@ -8,7 +8,7 @@ LGPL-3
 KDE thumbnail-plugin that generates thumbnails for ODF files
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-misc/plasma-applet-daisy-0.0.4.25 b/metadata/cache/kde-misc/plasma-applet-daisy-0.0.4.25
index 2bd5d12a6f1a..b33bc4e61115 100644
--- a/metadata/cache/kde-misc/plasma-applet-daisy-0.0.4.25
+++ b/metadata/cache/kde-misc/plasma-applet-daisy-0.0.4.25
@@ -8,7 +8,7 @@ GPL-3
 Simple application launcher for KDE 4's plasma desktop
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-misc/plasma-mpd-nowplaying-0.2 b/metadata/cache/kde-misc/plasma-mpd-nowplaying-0.2
index b8c016ea42cb..73e304caf665 100644
--- a/metadata/cache/kde-misc/plasma-mpd-nowplaying-0.2
+++ b/metadata/cache/kde-misc/plasma-mpd-nowplaying-0.2
@@ -8,7 +8,7 @@ GPL-2
 Plasmoid attached to MPD displaying currently played item
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-linguas_de linguas_pt_BR aqua kdeenablefinal
+linguas_de linguas_pt_BR aqua
 
 
 
diff --git a/metadata/cache/kde-misc/plasma-widget-message-indicator-0.5.8 b/metadata/cache/kde-misc/plasma-widget-message-indicator-0.5.8
index 8afa859a88ef..34b79f488f08 100644
--- a/metadata/cache/kde-misc/plasma-widget-message-indicator-0.5.8
+++ b/metadata/cache/kde-misc/plasma-widget-message-indicator-0.5.8
@@ -8,7 +8,7 @@ GPL-3
 Plasmoid for displaying Ayatana indications
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug test aqua kdeenablefinal
+debug test aqua
 
 
 
diff --git a/metadata/cache/kde-misc/plasmatvgr-0.47 b/metadata/cache/kde-misc/plasmatvgr-0.47
index e4f595a81d99..cf3cda864ece 100644
--- a/metadata/cache/kde-misc/plasmatvgr-0.47
+++ b/metadata/cache/kde-misc/plasmatvgr-0.47
@@ -8,7 +8,7 @@ GPL-3
 KDE4 plasmoid. Shows greek TV program.
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-misc/polkit-kde-kcmodules-0.98_pre20101127 b/metadata/cache/kde-misc/polkit-kde-kcmodules-0.98_pre20101127
index 04f810a85639..5230dde82d9d 100644
--- a/metadata/cache/kde-misc/polkit-kde-kcmodules-0.98_pre20101127
+++ b/metadata/cache/kde-misc/polkit-kde-kcmodules-0.98_pre20101127
@@ -8,7 +8,7 @@ GPL-2
 PolKit agent module for KDE.
 amd64 ~arm ~ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-misc/qtrans-0.2.2.6 b/metadata/cache/kde-misc/qtrans-0.2.2.6
index 755c6ceb9466..03b395ab30ab 100644
--- a/metadata/cache/kde-misc/qtrans-0.2.2.6
+++ b/metadata/cache/kde-misc/qtrans-0.2.2.6
@@ -8,7 +8,7 @@ GPL-2
 A word translator for KDE
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-misc/quadkonsole-0.4.4 b/metadata/cache/kde-misc/quadkonsole-0.4.4
index 2809576fadc1..dca65d3ecaba 100644
--- a/metadata/cache/kde-misc/quadkonsole-0.4.4
+++ b/metadata/cache/kde-misc/quadkonsole-0.4.4
@@ -8,7 +8,7 @@ GPL-2
 Grid of Konsole terminals
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-misc/quickaccess-0.8.1b b/metadata/cache/kde-misc/quickaccess-0.8.1b
index 47f25ae02ef2..812053f0a69b 100644
--- a/metadata/cache/kde-misc/quickaccess-0.8.1b
+++ b/metadata/cache/kde-misc/quickaccess-0.8.1b
@@ -8,7 +8,7 @@ GPL-3
 KDE4 plasmoid. Designed for the panel, provides quick access to the most used folders
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/kde-misc/rsibreak-0.10 b/metadata/cache/kde-misc/rsibreak-0.10
index 42c57c701b50..39d56902782e 100644
--- a/metadata/cache/kde-misc/rsibreak-0.10
+++ b/metadata/cache/kde-misc/rsibreak-0.10
@@ -8,7 +8,7 @@ GPL-2 FDL-1.2
 A small utility which bothers you at certain intervals
 amd64 ~ppc ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook linguas_ar linguas_be linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_is linguas_it linguas_ja linguas_km linguas_ko linguas_lt linguas_ml linguas_nb linguas_nds linguas_nl linguas_nn linguas_oc linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_sk linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
+debug +handbook linguas_ar linguas_be linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_is linguas_it linguas_ja linguas_km linguas_ko linguas_lt linguas_ml linguas_nb linguas_nds linguas_nl linguas_nn linguas_oc linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_sk linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/kde-misc/rsibreak-0.11 b/metadata/cache/kde-misc/rsibreak-0.11
index c394c229c852..d8c4ee749b07 100644
--- a/metadata/cache/kde-misc/rsibreak-0.11
+++ b/metadata/cache/kde-misc/rsibreak-0.11
@@ -8,7 +8,7 @@ GPL-2 FDL-1.2
 A small utility which bothers you at certain intervals
 ~amd64 ~ppc ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_ar linguas_be linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_is linguas_it linguas_ja linguas_km linguas_ko linguas_lt linguas_ml linguas_nb linguas_nds linguas_nl linguas_nn linguas_oc linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_sk linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua kdeenablefinal
+debug linguas_ar linguas_be linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_is linguas_it linguas_ja linguas_km linguas_ko linguas_lt linguas_ml linguas_nb linguas_nds linguas_nl linguas_nn linguas_oc linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_sk linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-misc/semantik-0.7.3_p20091013 b/metadata/cache/kde-misc/semantik-0.7.3_p20091013
index 4c31b186edef..8ad6b056fa9e 100644
--- a/metadata/cache/kde-misc/semantik-0.7.3_p20091013
+++ b/metadata/cache/kde-misc/semantik-0.7.3_p20091013
@@ -8,7 +8,7 @@ GPL-3
 Mindmapping-like tool for document generation.
 ~amd64
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx waf-utils
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-misc/serverstatuswidget-1.5.1 b/metadata/cache/kde-misc/serverstatuswidget-1.5.1
index c7a8d775962f..e8fb5d349f78 100644
--- a/metadata/cache/kde-misc/serverstatuswidget-1.5.1
+++ b/metadata/cache/kde-misc/serverstatuswidget-1.5.1
@@ -8,7 +8,7 @@ GPL-2
 A KDE4 plasma widget used for monitoring servers via ping or tcp connect
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-linguas_de linguas_fr aqua kdeenablefinal
+linguas_de linguas_fr aqua
 
 
 
diff --git a/metadata/cache/kde-misc/skanlite-0.7 b/metadata/cache/kde-misc/skanlite-0.7
index 389c516cfbe7..c7eb0a3b035e 100644
--- a/metadata/cache/kde-misc/skanlite-0.7
+++ b/metadata/cache/kde-misc/skanlite-0.7
@@ -8,7 +8,7 @@ GPL-2
 KDE image scanning application
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_be linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_ko linguas_lt linguas_lv linguas_mai linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW +handbook aqua kdeenablefinal
+debug linguas_be linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_ko linguas_lt linguas_lv linguas_mai linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-misc/skanlite-0.8 b/metadata/cache/kde-misc/skanlite-0.8
index f32a2a3abe4b..a6ba81ab1d75 100644
--- a/metadata/cache/kde-misc/skanlite-0.8
+++ b/metadata/cache/kde-misc/skanlite-0.8
@@ -8,7 +8,7 @@ GPL-2
 KDE image scanning application
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_be linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_ko linguas_lt linguas_lv linguas_mai linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sq linguas_sv linguas_tr linguas_ug linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW +handbook aqua kdeenablefinal
+debug linguas_be linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_ko linguas_lt linguas_lv linguas_mai linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sq linguas_sv linguas_tr linguas_ug linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-misc/smooth-tasks-20101106 b/metadata/cache/kde-misc/smooth-tasks-20101106
index 3c0fbc6f865d..6279c2927278 100644
--- a/metadata/cache/kde-misc/smooth-tasks-20101106
+++ b/metadata/cache/kde-misc/smooth-tasks-20101106
@@ -8,7 +8,7 @@ GPL-2
 Alternate taskbar KDE plasmoid, similar to Windows 7
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_cs linguas_de linguas_fr linguas_hu linguas_pl linguas_ru linguas_zh_CN aqua kdeenablefinal
+debug linguas_cs linguas_de linguas_fr linguas_hu linguas_pl linguas_ru linguas_zh_CN aqua
 
 
 
diff --git a/metadata/cache/kde-misc/steamcompanion-0.5.1 b/metadata/cache/kde-misc/steamcompanion-0.5.1
index f199bc5bf0a0..0dea47971684 100644
--- a/metadata/cache/kde-misc/steamcompanion-0.5.1
+++ b/metadata/cache/kde-misc/steamcompanion-0.5.1
@@ -8,7 +8,7 @@ GPL-2
 Connector for web Steam service from Valve.
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_it aqua kdeenablefinal
+debug linguas_it aqua
 
 
 
diff --git a/metadata/cache/kde-misc/stock-quote-2.1 b/metadata/cache/kde-misc/stock-quote-2.1
index b923c53dad0f..71c8fd77169f 100644
--- a/metadata/cache/kde-misc/stock-quote-2.1
+++ b/metadata/cache/kde-misc/stock-quote-2.1
@@ -8,7 +8,7 @@ GPL-2
 Displays stock quotes pulled from the Yahoo! servers
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-misc/synaptiks-0.4.0-r1 b/metadata/cache/kde-misc/synaptiks-0.4.0-r1
index 4beccf47c495..fd97ce48c7a5 100644
--- a/metadata/cache/kde-misc/synaptiks-0.4.0-r1
+++ b/metadata/cache/kde-misc/synaptiks-0.4.0-r1
@@ -8,7 +8,7 @@ BSD-2
 Simple touchpad management service for KDE
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook linguas_cs linguas_da linguas_de linguas_es linguas_ga linguas_lt linguas_nds linguas_pt linguas_pt_BR linguas_ru linguas_sv linguas_uk aqua kdeenablefinal
+debug +handbook linguas_cs linguas_da linguas_de linguas_es linguas_ga linguas_lt linguas_nds linguas_pt linguas_pt_BR linguas_ru linguas_sv linguas_uk aqua
 
 
 
diff --git a/metadata/cache/kde-misc/synaptiks-0.8.0 b/metadata/cache/kde-misc/synaptiks-0.8.0
index 2d8dddf18473..73bccbc2d4c7 100644
--- a/metadata/cache/kde-misc/synaptiks-0.8.0
+++ b/metadata/cache/kde-misc/synaptiks-0.8.0
@@ -8,7 +8,7 @@ BSD-2
 Touchpad configuration and management tool for KDE
 ~amd64 ~x86
 base cmake-utils distutils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability python toolchain-funcs user versionator virtualx
-debug +upower +handbook aqua kdeenablefinal
+debug +upower +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-misc/tellico-2.3.4 b/metadata/cache/kde-misc/tellico-2.3.4
index 7ed19b4bf67e..1a65163b27a6 100644
--- a/metadata/cache/kde-misc/tellico-2.3.4
+++ b/metadata/cache/kde-misc/tellico-2.3.4
@@ -8,7 +8,7 @@ GPL-2
 A collection manager for the KDE environment
 amd64 ~ppc x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-addressbook cddb debug +handbook musicbrainz pdf scanner semantic-desktop taglib v4l xmp yaz linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_ia linguas_it linguas_ja linguas_lt linguas_ms linguas_nb linguas_nds linguas_nl linguas_nn linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
+addressbook cddb debug +handbook musicbrainz pdf scanner semantic-desktop taglib v4l xmp yaz linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_ia linguas_it linguas_ja linguas_lt linguas_ms linguas_nb linguas_nds linguas_nl linguas_nn linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/kde-misc/tellico-2.3.5 b/metadata/cache/kde-misc/tellico-2.3.5
new file mode 100644
index 000000000000..85202b25f5e8
--- /dev/null
+++ b/metadata/cache/kde-misc/tellico-2.3.5
@@ -0,0 +1,22 @@
+dev-libs/libxml2 dev-libs/libxslt dev-libs/qjson >=kde-base/kdelibs-4.4:4[aqua=,semantic-desktop?] media-libs/qimageblitz x11-libs/qt-dbus:4 addressbook? ( >=kde-base/kdepimlibs-4.4:4[aqua=] ) cddb? ( >=kde-base/libkcddb-4.4:4[aqua=] ) pdf? ( >=app-text/poppler-0.12.3-r3[qt4] ) musicbrainz? ( >=media-libs/musicbrainz-2.1.5 ) scanner? ( >=kde-base/libksane-4.4:4[aqua=] ) semantic-desktop? ( dev-libs/soprano[raptor,redland] ) taglib? ( >=media-libs/taglib-1.5 ) v4l? ( >=media-libs/libv4l-0.8.3 ) xmp? ( >=media-libs/exempi-2 ) yaz? ( >=dev-libs/yaz-2 ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+dev-libs/libxml2 dev-libs/libxslt dev-libs/qjson >=kde-base/kdelibs-4.4:4[aqua=,semantic-desktop?] media-libs/qimageblitz x11-libs/qt-dbus:4 addressbook? ( >=kde-base/kdepimlibs-4.4:4[aqua=] ) cddb? ( >=kde-base/libkcddb-4.4:4[aqua=] ) pdf? ( >=app-text/poppler-0.12.3-r3[qt4] ) musicbrainz? ( >=media-libs/musicbrainz-2.1.5 ) scanner? ( >=kde-base/libksane-4.4:4[aqua=] ) semantic-desktop? ( dev-libs/soprano[raptor,redland] ) taglib? ( >=media-libs/taglib-1.5 ) v4l? ( >=media-libs/libv4l-0.8.3 ) xmp? ( >=media-libs/exempi-2 ) yaz? ( >=dev-libs/yaz-2 ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) 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_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) 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_eu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eu(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_ia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ia(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ms(+)] ) 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_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) 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_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) 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_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) 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(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+4
+http://tellico-project.org/files/tellico-2.3.5.tar.bz2
+test
+http://tellico-project.org/
+GPL-2
+A collection manager for the KDE environment
+~amd64 ~ppc ~x86
+base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
+addressbook cddb debug musicbrainz pdf scanner semantic-desktop taglib v4l xmp yaz linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_ia linguas_it linguas_ja linguas_lt linguas_ms linguas_nb linguas_nds linguas_nl linguas_nn linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/kde-misc/wacomtablet-1.3.4 b/metadata/cache/kde-misc/wacomtablet-1.3.4
index 082afcf962d3..122556109304 100644
--- a/metadata/cache/kde-misc/wacomtablet-1.3.4
+++ b/metadata/cache/kde-misc/wacomtablet-1.3.4
@@ -8,7 +8,7 @@ GPL-2
 KControl module for wacom tablets
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_ja linguas_km linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_pa linguas_pt linguas_pt_BR linguas_ro linguas_sk linguas_sv linguas_tr linguas_uk linguas_zh_TW +handbook aqua kdeenablefinal
+debug linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_ja linguas_km linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_pa linguas_pt linguas_pt_BR linguas_ro linguas_sk linguas_sv linguas_tr linguas_uk linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-misc/wacomtablet-1.3.6 b/metadata/cache/kde-misc/wacomtablet-1.3.6
index aacf5e9180a4..2acafe0a27e4 100644
--- a/metadata/cache/kde-misc/wacomtablet-1.3.6
+++ b/metadata/cache/kde-misc/wacomtablet-1.3.6
@@ -8,7 +8,7 @@ GPL-2
 KControl module for wacom tablets
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_bs linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_ja linguas_km linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_sk linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_TW +handbook aqua kdeenablefinal
+debug linguas_bs linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_ja linguas_km linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_sk linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/kde-misc/wicd-client-kde-0.2.2 b/metadata/cache/kde-misc/wicd-client-kde-0.2.2
index 3019046bbf66..fd590ccab7a9 100644
--- a/metadata/cache/kde-misc/wicd-client-kde-0.2.2
+++ b/metadata/cache/kde-misc/wicd-client-kde-0.2.2
@@ -8,7 +8,7 @@ GPL-3
 Wicd client built on the KDE Development Platform
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-linguas_cs linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_fr linguas_hu linguas_it linguas_nb linguas_nl linguas_pa linguas_pt linguas_pt_BR linguas_ru linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
+linguas_cs linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_fr linguas_hu linguas_it linguas_nb linguas_nl linguas_pa linguas_pt linguas_pt_BR linguas_ru linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/kde-misc/wicd-client-kde-0.2.3 b/metadata/cache/kde-misc/wicd-client-kde-0.2.3
index 6ebdae184eaa..773dfc9fbc41 100644
--- a/metadata/cache/kde-misc/wicd-client-kde-0.2.3
+++ b/metadata/cache/kde-misc/wicd-client-kde-0.2.3
@@ -8,7 +8,7 @@ GPL-3
 Wicd client built on the KDE Development Platform
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-misc/wicd-client-kde-0.3.0 b/metadata/cache/kde-misc/wicd-client-kde-0.3.0
index 52f7c44a7b0c..734a7337f0dd 100644
--- a/metadata/cache/kde-misc/wicd-client-kde-0.3.0
+++ b/metadata/cache/kde-misc/wicd-client-kde-0.3.0
@@ -8,7 +8,7 @@ GPL-3
 Wicd client built on the KDE Development Platform
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/kde-misc/yakuake-2.9.8 b/metadata/cache/kde-misc/yakuake-2.9.8
index cf591e28f002..9012dfa188ab 100644
--- a/metadata/cache/kde-misc/yakuake-2.9.8
+++ b/metadata/cache/kde-misc/yakuake-2.9.8
@@ -8,7 +8,7 @@ GPL-2 LGPL-2
 A quake-style terminal emulator based on KDE konsole technology
 amd64 ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hr linguas_it linguas_ja linguas_ko linguas_nb linguas_nds linguas_nl linguas_nn linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN aqua kdeenablefinal
+linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hr linguas_it linguas_ja linguas_ko linguas_nb linguas_nds linguas_nl linguas_nn linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN aqua
 
 
 
diff --git a/metadata/cache/kde-misc/yawp-0.3.6 b/metadata/cache/kde-misc/yawp-0.3.6
index 8932506c4271..5165c20ad378 100644
--- a/metadata/cache/kde-misc/yawp-0.3.6
+++ b/metadata/cache/kde-misc/yawp-0.3.6
@@ -8,7 +8,7 @@ GPL-2
 Yet Another Weather Plasmoid
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_af linguas_cs linguas_de linguas_es linguas_fr linguas_he linguas_it linguas_pl linguas_ru linguas_sk linguas_sl linguas_uk aqua kdeenablefinal
+debug linguas_af linguas_cs linguas_de linguas_es linguas_fr linguas_he linguas_it linguas_pl linguas_ru linguas_sk linguas_sl linguas_uk aqua
 
 
 
diff --git a/metadata/cache/kde-misc/yawp-0.4.0 b/metadata/cache/kde-misc/yawp-0.4.0
index 8352ecf9eee9..c28b8faa799f 100644
--- a/metadata/cache/kde-misc/yawp-0.4.0
+++ b/metadata/cache/kde-misc/yawp-0.4.0
@@ -8,7 +8,7 @@ GPL-2
 Yet Another Weather Plasmoid
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_af linguas_cs linguas_de linguas_es linguas_fr linguas_he linguas_it linguas_pl linguas_ru linguas_sk linguas_sl linguas_tr linguas_uk aqua kdeenablefinal
+debug linguas_af linguas_cs linguas_de linguas_es linguas_fr linguas_he linguas_it linguas_pl linguas_ru linguas_sk linguas_sl linguas_tr linguas_uk aqua
 
 
 
diff --git a/metadata/cache/kde-misc/yawp-0.4.1 b/metadata/cache/kde-misc/yawp-0.4.1
index bb27698bed58..dc4b1a6ec31f 100644
--- a/metadata/cache/kde-misc/yawp-0.4.1
+++ b/metadata/cache/kde-misc/yawp-0.4.1
@@ -8,7 +8,7 @@ GPL-2
 Yet Another Weather Plasmoid
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_af linguas_cs linguas_de linguas_es linguas_fr linguas_he linguas_it linguas_pl linguas_ru linguas_sk linguas_sl linguas_tr linguas_uk aqua kdeenablefinal
+debug linguas_af linguas_cs linguas_de linguas_es linguas_fr linguas_he linguas_it linguas_pl linguas_ru linguas_sk linguas_sl linguas_tr linguas_uk aqua
 
 
 
diff --git a/metadata/cache/kde-misc/yawp-0.4.2 b/metadata/cache/kde-misc/yawp-0.4.2
index 48b2ea067efc..dcf3ed81761f 100644
--- a/metadata/cache/kde-misc/yawp-0.4.2
+++ b/metadata/cache/kde-misc/yawp-0.4.2
@@ -8,7 +8,7 @@ GPL-2
 Yet Another Weather Plasmoid
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_af linguas_cs linguas_de linguas_es linguas_fr linguas_he linguas_it linguas_pl linguas_ru linguas_sk linguas_sl linguas_tr linguas_uk aqua kdeenablefinal
+debug linguas_af linguas_cs linguas_de linguas_es linguas_fr linguas_he linguas_it linguas_pl linguas_ru linguas_sk linguas_sl linguas_tr linguas_uk aqua
 
 
 
diff --git a/metadata/cache/kde-misc/zanshin-0.2.0 b/metadata/cache/kde-misc/zanshin-0.2.0
index 0efc3a7ff1ac..ffbaff30123a 100644
--- a/metadata/cache/kde-misc/zanshin-0.2.0
+++ b/metadata/cache/kde-misc/zanshin-0.2.0
@@ -8,7 +8,7 @@ http://zanshin.kde.org/
 Todo management application for KDE
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/lxde-base/lxpolkit-0.1.0-r1 b/metadata/cache/lxde-base/lxpolkit-0.1.0-r1
index e15f884df9b6..f7a3a32b2345 100644
--- a/metadata/cache/lxde-base/lxpolkit-0.1.0-r1
+++ b/metadata/cache/lxde-base/lxpolkit-0.1.0-r1
@@ -6,7 +6,7 @@ mirror://sourceforge/project/lxde/LXPolkit/lxpolkit-0.1.0.tar.gz
 http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxpolkit;a=summary http://blog.lxde.org/?p=674
 GPL-3
 A simple PolicyKit authentication agent
-~amd64 ~x86
+amd64 ~x86
 
 
 
diff --git a/metadata/cache/mail-client/mutt-1.5.20-r18 b/metadata/cache/mail-client/mutt-1.5.20-r18
deleted file mode 100644
index 13fe5fcba873..000000000000
--- a/metadata/cache/mail-client/mutt-1.5.20-r18
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-libs/ncurses-5.2 tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( qdbm? ( dev-db/qdbm ) !qdbm? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) ) ) imap? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) pop? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) smtp? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0 ) smime? ( >=dev-libs/openssl-0.9.6 ) app-misc/mime-types net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
->=sys-libs/ncurses-5.2 tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( qdbm? ( dev-db/qdbm ) !qdbm? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) ) ) imap? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) pop? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) smtp? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0 ) smime? ( >=dev-libs/openssl-0.9.6 ) app-misc/mime-types
-0
-ftp://ftp.mutt.org/mutt/devel/mutt-1.5.20.tar.gz mirror://gentoo/mutt-1.5.20-gentoo-patches-r11.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/mutt-1.5.20-gentoo-patches-r11.tar.bz2
-
-http://www.mutt.org
-GPL-2
-a small but very powerful text-based mail client
-alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-autotools eutils flag-o-matic libtool multilib portability toolchain-funcs user
-berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl tokyocabinet
-
-
-
-3
-
-configure install postinst prepare
-
-
-
-
-
diff --git a/metadata/cache/mail-client/mutt-1.5.21-r3 b/metadata/cache/mail-client/mutt-1.5.21-r3
deleted file mode 100644
index 89e45803d3a1..000000000000
--- a/metadata/cache/mail-client/mutt-1.5.21-r3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-libs/ncurses-5.2 tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( qdbm? ( dev-db/qdbm ) !qdbm? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) ) ) imap? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) pop? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) smtp? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0 ) smime? ( >=dev-libs/openssl-0.9.6 ) app-misc/mime-types net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
->=sys-libs/ncurses-5.2 tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( qdbm? ( dev-db/qdbm ) !qdbm? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) ) ) imap? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) pop? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) smtp? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0 ) smime? ( >=dev-libs/openssl-0.9.6 ) app-misc/mime-types
-0
-ftp://ftp.mutt.org/mutt/devel/mutt-1.5.21.tar.gz mirror://gentoo/mutt-1.5.21-gentoo-patches-r3.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/mutt-1.5.21-gentoo-patches-r3.tar.bz2
-
-http://www.mutt.org
-GPL-2
-A small but very powerful text-based mail client
-~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-autotools eutils flag-o-matic libtool multilib portability toolchain-funcs user
-berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl tokyocabinet
-
-
-
-3
-
-configure install postinst prepare
-
-
-
-
-
diff --git a/metadata/cache/mail-client/mutt-1.5.21-r2 b/metadata/cache/mail-client/mutt-1.5.21-r8
similarity index 76%
rename from metadata/cache/mail-client/mutt-1.5.21-r2
rename to metadata/cache/mail-client/mutt-1.5.21-r8
index bcc7a29dcd9f..7c12bcf5a425 100644
--- a/metadata/cache/mail-client/mutt-1.5.21-r2
+++ b/metadata/cache/mail-client/mutt-1.5.21-r8
@@ -1,14 +1,14 @@
->=sys-libs/ncurses-5.2 tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( qdbm? ( dev-db/qdbm ) !qdbm? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) ) ) imap? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) pop? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) smtp? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0 ) smime? ( >=dev-libs/openssl-0.9.6 ) app-misc/mime-types net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
->=sys-libs/ncurses-5.2 tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( qdbm? ( dev-db/qdbm ) !qdbm? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) ) ) imap? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) pop? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) smtp? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0 ) smime? ( >=dev-libs/openssl-0.9.6 ) app-misc/mime-types
+>=sys-libs/ncurses-5.2 tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( qdbm? ( dev-db/qdbm ) !qdbm? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) ) ) imap? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) pop? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) smtp? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0 ) smime? ( >=dev-libs/openssl-0.9.6 ) selinux? ( sec-policy/selinux-mutt ) app-misc/mime-types net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+>=sys-libs/ncurses-5.2 tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( qdbm? ( dev-db/qdbm ) !qdbm? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) ) ) imap? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) pop? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) smtp? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0 ) smime? ( >=dev-libs/openssl-0.9.6 ) selinux? ( sec-policy/selinux-mutt ) app-misc/mime-types
 0
-ftp://ftp.mutt.org/mutt/devel/mutt-1.5.21.tar.gz mirror://gentoo/mutt-1.5.21-gentoo-patches-r2.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/mutt-1.5.21-gentoo-patches-r2.tar.bz2
+ftp://ftp.mutt.org/mutt/devel/mutt-1.5.21.tar.gz mirror://gentoo/mutt-1.5.21-gentoo-patches-r8.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/mutt-1.5.21-gentoo-patches-r8.tar.bz2
 
-http://www.mutt.org
+http://www.mutt.org/
 GPL-2
 A small but very powerful text-based mail client
 ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 autotools eutils flag-o-matic libtool multilib portability toolchain-funcs user
-berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl tokyocabinet
+berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl selinux sidebar smime smtp ssl tokyocabinet
 
 
 
diff --git a/metadata/cache/mail-filter/spamdyke-4.2.1 b/metadata/cache/mail-filter/spamdyke-4.2.1
index 634fce9f104f..9fad11e3a31b 100644
--- a/metadata/cache/mail-filter/spamdyke-4.2.1
+++ b/metadata/cache/mail-filter/spamdyke-4.2.1
@@ -6,7 +6,7 @@ http://www.spamdyke.org/releases/spamdyke-4.2.1.tgz
 http://www.spamdyke.org/
 GPL-2
 A drop-in connection-time spam filter for qmail
-amd64 ~x86
+amd64 x86
 autotools eutils libtool multilib portability toolchain-funcs user
 +tls
 
diff --git a/metadata/cache/mail-filter/spamdyke-4.3.0 b/metadata/cache/mail-filter/spamdyke-4.3.0
new file mode 100644
index 000000000000..a64362341736
--- /dev/null
+++ b/metadata/cache/mail-filter/spamdyke-4.3.0
@@ -0,0 +1,22 @@
+tls? ( dev-libs/openssl ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+tls? ( dev-libs/openssl ) virtual/qmail
+0
+http://www.spamdyke.org/releases/spamdyke-4.3.0.tgz
+
+http://www.spamdyke.org/
+GPL-2
+A drop-in connection-time spam filter for qmail
+amd64 x86
+autotools eutils libtool multilib portability toolchain-funcs user
++tls
+
+
+
+2
+
+compile configure install postinst prepare
+
+
+
+
+
diff --git a/metadata/cache/media-fonts/essays1743-1.203.1 b/metadata/cache/media-fonts/essays1743-1.203.1
index 7efdd8436167..fe99b500a50c 100644
--- a/metadata/cache/media-fonts/essays1743-1.203.1
+++ b/metadata/cache/media-fonts/essays1743-1.203.1
@@ -6,7 +6,7 @@ http://www.thibault.org/fonts/essays/essays1743-1.203-1-ttf.tar.gz
 http://www.thibault.org/fonts/essays/
 LGPL-2.1
 John Stracke's Essays 1743 font
-alpha amd64 arm ~hppa ia64 ~ppc s390 sh sparc x86 ~x86-fbsd
+alpha amd64 arm hppa ia64 ~ppc s390 sh sparc x86 ~x86-fbsd
 eutils font multilib portability toolchain-funcs user versionator
 X
 
diff --git a/metadata/cache/media-gfx/digikam-2.3.0 b/metadata/cache/media-gfx/digikam-2.3.0
index 90b8c472d517..a6b91643100b 100644
--- a/metadata/cache/media-gfx/digikam-2.3.0
+++ b/metadata/cache/media-gfx/digikam-2.3.0
@@ -8,7 +8,7 @@ GPL-2 handbook? ( FDL-1.2 )
 Digital photo management application for KDE
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video linguas_af linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_csb linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fo linguas_fr linguas_fy linguas_ga linguas_gl linguas_ha linguas_he linguas_hi linguas_hr linguas_hsb linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_ko linguas_ku linguas_lb linguas_lo linguas_lt linguas_lv linguas_mi linguas_mk linguas_mn linguas_ms linguas_mt linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_nso linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_se linguas_sk linguas_sl linguas_sq linguas_sr linguas_sr@Latn linguas_ss linguas_sv linguas_ta linguas_te linguas_tg linguas_th linguas_tr linguas_tt linguas_uk linguas_uz linguas_uz@cyrillic linguas_ven linguas_vi linguas_wa linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW linguas_zu +handbook aqua kdeenablefinal
+addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video linguas_af linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_csb linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fo linguas_fr linguas_fy linguas_ga linguas_gl linguas_ha linguas_he linguas_hi linguas_hr linguas_hsb linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_ko linguas_ku linguas_lb linguas_lo linguas_lt linguas_lv linguas_mi linguas_mk linguas_mn linguas_ms linguas_mt linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_nso linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_se linguas_sk linguas_sl linguas_sq linguas_sr linguas_sr@Latn linguas_ss linguas_sv linguas_ta linguas_te linguas_tg linguas_th linguas_tr linguas_tt linguas_uk linguas_uz linguas_uz@cyrillic linguas_ven linguas_vi linguas_wa linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW linguas_zu +handbook aqua
 
 
 
diff --git a/metadata/cache/media-gfx/digikam-2.4.1 b/metadata/cache/media-gfx/digikam-2.4.1
index 41fb145b1fe4..a2c2f4fa9f1e 100644
--- a/metadata/cache/media-gfx/digikam-2.4.1
+++ b/metadata/cache/media-gfx/digikam-2.4.1
@@ -8,7 +8,7 @@ GPL-2 handbook? ( FDL-1.2 )
 Digital photo management application for KDE
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video linguas_af linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_csb linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fo linguas_fr linguas_fy linguas_ga linguas_gl linguas_ha linguas_he linguas_hi linguas_hr linguas_hsb linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_ko linguas_ku linguas_lb linguas_lo linguas_lt linguas_lv linguas_mi linguas_mk linguas_mn linguas_ms linguas_mt linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_nso linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_se linguas_sk linguas_sl linguas_sq linguas_sr linguas_sr@Latn linguas_ss linguas_sv linguas_ta linguas_te linguas_tg linguas_th linguas_tr linguas_tt linguas_uk linguas_uz linguas_uz@cyrillic linguas_ven linguas_vi linguas_wa linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW linguas_zu +handbook aqua kdeenablefinal
+addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video linguas_af linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_csb linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fo linguas_fr linguas_fy linguas_ga linguas_gl linguas_ha linguas_he linguas_hi linguas_hr linguas_hsb linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_ko linguas_ku linguas_lb linguas_lo linguas_lt linguas_lv linguas_mi linguas_mk linguas_mn linguas_ms linguas_mt linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_nso linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_se linguas_sk linguas_sl linguas_sq linguas_sr linguas_sr@Latn linguas_ss linguas_sv linguas_ta linguas_te linguas_tg linguas_th linguas_tr linguas_tt linguas_uk linguas_uz linguas_uz@cyrillic linguas_ven linguas_vi linguas_wa linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW linguas_zu +handbook aqua
 
 
 
diff --git a/metadata/cache/media-gfx/digikam-2.5.0 b/metadata/cache/media-gfx/digikam-2.5.0
index d9c737c1671b..7eed7c7489cd 100644
--- a/metadata/cache/media-gfx/digikam-2.5.0
+++ b/metadata/cache/media-gfx/digikam-2.5.0
@@ -8,7 +8,7 @@ GPL-2 handbook? ( FDL-1.2 )
 Digital photo management application for KDE
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video linguas_af linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_csb linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fo linguas_fr linguas_fy linguas_ga linguas_gl linguas_ha linguas_he linguas_hi linguas_hr linguas_hsb linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_ko linguas_ku linguas_lb linguas_lo linguas_lt linguas_lv linguas_mi linguas_mk linguas_mn linguas_ms linguas_mt linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_nso linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_se linguas_sk linguas_sl linguas_sq linguas_sr linguas_sr@Latn linguas_ss linguas_sv linguas_ta linguas_te linguas_tg linguas_th linguas_tr linguas_tt linguas_uk linguas_uz linguas_uz@cyrillic linguas_ven linguas_vi linguas_wa linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW linguas_zu +handbook aqua kdeenablefinal
+addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video linguas_af linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_csb linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fo linguas_fr linguas_fy linguas_ga linguas_gl linguas_ha linguas_he linguas_hi linguas_hr linguas_hsb linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_ko linguas_ku linguas_lb linguas_lo linguas_lt linguas_lv linguas_mi linguas_mk linguas_mn linguas_ms linguas_mt linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_nso linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_se linguas_sk linguas_sl linguas_sq linguas_sr linguas_sr@Latn linguas_ss linguas_sv linguas_ta linguas_te linguas_tg linguas_th linguas_tr linguas_tt linguas_uk linguas_uz linguas_uz@cyrillic linguas_ven linguas_vi linguas_wa linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW linguas_zu +handbook aqua
 
 
 
diff --git a/metadata/cache/media-gfx/kcoloredit-2.0.0 b/metadata/cache/media-gfx/kcoloredit-2.0.0
index 22f8920085d1..deffe4e3e45d 100644
--- a/metadata/cache/media-gfx/kcoloredit-2.0.0
+++ b/metadata/cache/media-gfx/kcoloredit-2.0.0
@@ -8,7 +8,7 @@ GPL-2
 A tool for editing color palettes
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_af linguas_ar linguas_be linguas_bg linguas_br linguas_ca linguas_ca@valencia linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_ku linguas_lt linguas_lv linguas_mai linguas_mk linguas_ms linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_sk linguas_sl linguas_sv linguas_ta linguas_tg linguas_th linguas_tr linguas_uk linguas_vi linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW +handbook aqua kdeenablefinal
+debug linguas_af linguas_ar linguas_be linguas_bg linguas_br linguas_ca linguas_ca@valencia linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_ku linguas_lt linguas_lv linguas_mai linguas_mk linguas_ms linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_sk linguas_sl linguas_sv linguas_ta linguas_tg linguas_th linguas_tr linguas_uk linguas_vi linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/media-gfx/kfax-3.3.6-r1 b/metadata/cache/media-gfx/kfax-3.3.6-r1
index dc242d3f4829..33ac8ad1af27 100644
--- a/metadata/cache/media-gfx/kfax-3.3.6-r1
+++ b/metadata/cache/media-gfx/kfax-3.3.6-r1
@@ -8,7 +8,7 @@ GPL-2 LGPL-2.1
 A fax file viewer
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_af linguas_ar linguas_be linguas_bg linguas_br linguas_ca linguas_ca@valencia linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_ko linguas_lt linguas_lv linguas_mai linguas_mk linguas_ms linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_sk linguas_sl linguas_sv linguas_ta linguas_tg linguas_th linguas_tr linguas_uk linguas_vi linguas_wa linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW +handbook aqua kdeenablefinal
+debug linguas_af linguas_ar linguas_be linguas_bg linguas_br linguas_ca linguas_ca@valencia linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_ko linguas_lt linguas_lv linguas_mai linguas_mk linguas_ms linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_sk linguas_sl linguas_sv linguas_ta linguas_tg linguas_th linguas_tr linguas_uk linguas_vi linguas_wa linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/media-gfx/kflickr-0.9.1_p1 b/metadata/cache/media-gfx/kflickr-0.9.1_p1
index 0dd322f9b898..3d83af3f39b3 100644
--- a/metadata/cache/media-gfx/kflickr-0.9.1_p1
+++ b/metadata/cache/media-gfx/kflickr-0.9.1_p1
@@ -8,7 +8,7 @@ GPL-2 FDL-1.2
 A flickr.com image uploading program for KDE
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/media-gfx/kgrab-0.1.1 b/metadata/cache/media-gfx/kgrab-0.1.1
index 964f2a7a683d..9559247d327b 100644
--- a/metadata/cache/media-gfx/kgrab-0.1.1
+++ b/metadata/cache/media-gfx/kgrab-0.1.1
@@ -8,7 +8,7 @@ GPL-2 LGPL-2.1 FDL-1.2
 A screen grabbing utility
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_ar linguas_be linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_lt linguas_lv linguas_mai linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_se linguas_sk linguas_sv linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
+debug linguas_ar linguas_be linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_lt linguas_lv linguas_mai linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_se linguas_sk linguas_sv linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/media-gfx/kgraphviewer-2.1.1 b/metadata/cache/media-gfx/kgraphviewer-2.1.1
index 637ff4b8f5f0..4c363f3393e5 100644
--- a/metadata/cache/media-gfx/kgraphviewer-2.1.1
+++ b/metadata/cache/media-gfx/kgraphviewer-2.1.1
@@ -8,7 +8,7 @@ GPL-2 FDL-1.2
 A graphviz dot graph file viewer for KDE
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_ar linguas_be linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_hr linguas_is linguas_it linguas_ja linguas_km linguas_ku linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_sk linguas_sv linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW +handbook aqua kdeenablefinal
+debug linguas_ar linguas_be linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_hr linguas_is linguas_it linguas_ja linguas_km linguas_ku linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_sk linguas_sv linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/media-gfx/kiconedit-4.4.0 b/metadata/cache/media-gfx/kiconedit-4.4.0
index 99e58ac8c26c..d2781862e560 100644
--- a/metadata/cache/media-gfx/kiconedit-4.4.0
+++ b/metadata/cache/media-gfx/kiconedit-4.4.0
@@ -8,7 +8,7 @@ GPL-2 FDL-1.2
 KDE Icon Editor
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_af linguas_ar linguas_be linguas_bg linguas_br linguas_ca linguas_ca@valencia linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_ko linguas_lt linguas_lv linguas_mai linguas_mk linguas_ms linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_sk linguas_sl linguas_sv linguas_ta linguas_tg linguas_th linguas_tr linguas_uk linguas_vi linguas_wa linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW +handbook aqua kdeenablefinal
+debug linguas_af linguas_ar linguas_be linguas_bg linguas_br linguas_ca linguas_ca@valencia linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_ko linguas_lt linguas_lv linguas_mai linguas_mk linguas_ms linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_sk linguas_sl linguas_sv linguas_ta linguas_tg linguas_th linguas_tr linguas_uk linguas_vi linguas_wa linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/media-gfx/kphotoalbum-4.1.1-r1 b/metadata/cache/media-gfx/kphotoalbum-4.1.1-r1
index f55a7ec14464..a1fa314d5d75 100644
--- a/metadata/cache/media-gfx/kphotoalbum-4.1.1-r1
+++ b/metadata/cache/media-gfx/kphotoalbum-4.1.1-r1
@@ -8,7 +8,7 @@ GPL-2 FDL-1.2
 KDE Photo Album is a tool for indexing, searching, and viewing images.
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +exif +geolocation +kipi +raw +semantic-desktop linguas_ar linguas_be linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_is linguas_it linguas_ja linguas_km linguas_lt linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_se linguas_sk linguas_sv linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
+debug +exif +geolocation +kipi +raw +semantic-desktop linguas_ar linguas_be linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_is linguas_it linguas_ja linguas_km linguas_lt linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_se linguas_sk linguas_sv linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/media-gfx/kpovmodeler-1.1.3 b/metadata/cache/media-gfx/kpovmodeler-1.1.3
index f5050e2b6ffb..e01ea545ef8c 100644
--- a/metadata/cache/media-gfx/kpovmodeler-1.1.3
+++ b/metadata/cache/media-gfx/kpovmodeler-1.1.3
@@ -8,7 +8,7 @@ GPL-2 LGPL-2.1 FDL-1.2
 A modeling and composition program for creating POV-Ray(TM) scenes
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_af linguas_ar linguas_be linguas_bg linguas_br linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_lt linguas_mk linguas_ms linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_oc linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_sk linguas_sl linguas_sv linguas_ta linguas_tg linguas_tr linguas_uk linguas_vi linguas_xh linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
+debug linguas_af linguas_ar linguas_be linguas_bg linguas_br linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_lt linguas_mk linguas_ms linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_oc linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_sk linguas_sl linguas_sv linguas_ta linguas_tg linguas_tr linguas_uk linguas_vi linguas_xh linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/media-gfx/kuickshow-0.9.1 b/metadata/cache/media-gfx/kuickshow-0.9.1
index 4d5ec2586f1b..4ed6a0dfe5b4 100644
--- a/metadata/cache/media-gfx/kuickshow-0.9.1
+++ b/metadata/cache/media-gfx/kuickshow-0.9.1
@@ -8,7 +8,7 @@ GPL-2
 KDE4 program to view images
 amd64 ~ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook linguas_af linguas_ar linguas_be linguas_bg linguas_bn linguas_br linguas_ca linguas_ca@valencia linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_lt linguas_lv linguas_mai linguas_mk linguas_ms linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_sk linguas_sl linguas_sv linguas_ta linguas_tg linguas_th linguas_tr linguas_uk linguas_uz linguas_uz@cyrillic linguas_vi linguas_xh linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
+debug +handbook linguas_af linguas_ar linguas_be linguas_bg linguas_bn linguas_br linguas_ca linguas_ca@valencia linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_lt linguas_lv linguas_mai linguas_mk linguas_ms linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_sk linguas_sl linguas_sv linguas_ta linguas_tg linguas_th linguas_tr linguas_uk linguas_uz linguas_uz@cyrillic linguas_vi linguas_xh linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/media-gfx/wally-2.4.1 b/metadata/cache/media-gfx/wally-2.4.1
index 37f85df8c165..0443522a95e0 100644
--- a/metadata/cache/media-gfx/wally-2.4.1
+++ b/metadata/cache/media-gfx/wally-2.4.1
@@ -8,7 +8,7 @@ GPL-2
 A Qt4/KDE4 wallpaper changer
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug kde aqua kde kdeenablefinal
+debug kde aqua kde
 
 
 
diff --git a/metadata/cache/media-gfx/wally-2.4.2 b/metadata/cache/media-gfx/wally-2.4.2
index 8840f107b50f..7ab8a894544b 100644
--- a/metadata/cache/media-gfx/wally-2.4.2
+++ b/metadata/cache/media-gfx/wally-2.4.2
@@ -8,7 +8,7 @@ GPL-2
 A Qt4/KDE4 wallpaper changer
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug kde aqua kde kdeenablefinal
+debug kde aqua kde
 
 
 
diff --git a/metadata/cache/media-libs/gluon-0.70.0 b/metadata/cache/media-libs/gluon-0.70.0
index bd2df5a06e93..489943b8a870 100644
--- a/metadata/cache/media-libs/gluon-0.70.0
+++ b/metadata/cache/media-libs/gluon-0.70.0
@@ -8,7 +8,7 @@ GPL-2
 Gluon is a Free and Open Source framework for creating and distributing games.
 ~amd64
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/media-libs/libkface-2.3.0 b/metadata/cache/media-libs/libkface-2.3.0
index f20b34b1a59d..bcbd7514a222 100644
--- a/metadata/cache/media-libs/libkface-2.3.0
+++ b/metadata/cache/media-libs/libkface-2.3.0
@@ -8,7 +8,7 @@ GPL-2
 Qt/C++ wrapper around LibFace to perform face recognition and detection
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/media-libs/libkface-2.4.1 b/metadata/cache/media-libs/libkface-2.4.1
index 4f2560b359b6..a68cadd925e6 100644
--- a/metadata/cache/media-libs/libkface-2.4.1
+++ b/metadata/cache/media-libs/libkface-2.4.1
@@ -8,7 +8,7 @@ GPL-2
 Qt/C++ wrapper around LibFace to perform face recognition and detection
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/media-libs/libkface-2.5.0 b/metadata/cache/media-libs/libkface-2.5.0
index caca03402927..a2211a7b912a 100644
--- a/metadata/cache/media-libs/libkface-2.5.0
+++ b/metadata/cache/media-libs/libkface-2.5.0
@@ -8,7 +8,7 @@ GPL-2
 Qt/C++ wrapper around LibFace to perform face recognition and detection
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/media-libs/libkgeomap-2.3.0 b/metadata/cache/media-libs/libkgeomap-2.3.0
index cfc1874eff4b..75f073916988 100644
--- a/metadata/cache/media-libs/libkgeomap-2.3.0
+++ b/metadata/cache/media-libs/libkgeomap-2.3.0
@@ -8,7 +8,7 @@ GPL-2
 Wrapper library for world map components as marble, openstreetmap and googlemap
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/media-libs/libkgeomap-2.4.1 b/metadata/cache/media-libs/libkgeomap-2.4.1
index 05b525288f6b..d3c92f9671b6 100644
--- a/metadata/cache/media-libs/libkgeomap-2.4.1
+++ b/metadata/cache/media-libs/libkgeomap-2.4.1
@@ -8,7 +8,7 @@ GPL-2
 Wrapper library for world map components as marble, openstreetmap and googlemap
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/media-libs/libkgeomap-2.5.0 b/metadata/cache/media-libs/libkgeomap-2.5.0
index 752bd9e574dc..37910c3721e5 100644
--- a/metadata/cache/media-libs/libkgeomap-2.5.0
+++ b/metadata/cache/media-libs/libkgeomap-2.5.0
@@ -8,7 +8,7 @@ GPL-2
 Wrapper library for world map components as marble, openstreetmap and googlemap
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/media-libs/libmediawiki-2.3.0 b/metadata/cache/media-libs/libmediawiki-2.3.0
index 3d05ee939666..fc53f520b5cd 100644
--- a/metadata/cache/media-libs/libmediawiki-2.3.0
+++ b/metadata/cache/media-libs/libmediawiki-2.3.0
@@ -8,7 +8,7 @@ GPL-2
 KDE C++ interface for MediaWiki based web service as wikipedia.org
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/media-libs/libmediawiki-2.5.0 b/metadata/cache/media-libs/libmediawiki-2.5.0
index 0dc016d28c5e..0cb2082223c6 100644
--- a/metadata/cache/media-libs/libmediawiki-2.5.0
+++ b/metadata/cache/media-libs/libmediawiki-2.5.0
@@ -8,7 +8,7 @@ GPL-2
 KDE C++ interface for MediaWiki based web service as wikipedia.org
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/media-libs/memphis-0.2.3 b/metadata/cache/media-libs/memphis-0.2.3
index 3743fe831921..9886c2db9ed9 100644
--- a/metadata/cache/media-libs/memphis-0.2.3
+++ b/metadata/cache/media-libs/memphis-0.2.3
@@ -1,4 +1,4 @@
-dev-libs/expat dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection ) vala? ( dev-lang/vala:0.12 ) doc? ( >=dev-util/gtk-doc-1.12 )
+dev-libs/expat dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection ) vala? ( dev-lang/vala:0.12 ) dev-util/gtk-doc
 dev-libs/expat dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection ) vala? ( dev-lang/vala:0.12 )
 0.2
 http://wenner.ch/files/public/mirror/memphis/memphis-0.2.3.tar.gz
diff --git a/metadata/cache/media-libs/opengtl-0.9.16 b/metadata/cache/media-libs/opengtl-0.9.16
new file mode 100644
index 000000000000..ce51881c19ce
--- /dev/null
+++ b/metadata/cache/media-libs/opengtl-0.9.16
@@ -0,0 +1,22 @@
+media-libs/libpng >=sys-devel/llvm-3.0 sys-libs/zlib test? ( dev-util/lcov ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+media-libs/libpng >=sys-devel/llvm-3.0 sys-libs/zlib
+0
+http://download.opengtl.org/OpenGTL-0.9.16.tar.bz2
+
+http://opengtl.org/
+LGPL-2
+Collection of libraries for graphics transformation algorithms
+~amd64 ~x86
+base cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user
+debug test
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/media-libs/prison-1.0 b/metadata/cache/media-libs/prison-1.0
index ace6295de3c2..8f60998fd0a9 100644
--- a/metadata/cache/media-libs/prison-1.0
+++ b/metadata/cache/media-libs/prison-1.0
@@ -8,7 +8,7 @@ GPL-2
 QRCode and data matrix barcode library
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/media-libs/sdl-gfx-2.0.23 b/metadata/cache/media-libs/sdl-gfx-2.0.23
index 95c1a789a287..c4b8a3f36604 100644
--- a/metadata/cache/media-libs/sdl-gfx-2.0.23
+++ b/metadata/cache/media-libs/sdl-gfx-2.0.23
@@ -6,7 +6,7 @@ http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-2.0.23.tar.gz
 http://www.ferzkopp.net/joomla/content/view/19/14/
 ZLIB
 Graphics drawing primitives library for SDL
-~alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+~alpha amd64 hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 autotools eutils libtool multilib portability toolchain-funcs user
 doc mmx static-libs
 
diff --git a/metadata/cache/media-libs/sdl-mixer-1.2.12 b/metadata/cache/media-libs/sdl-mixer-1.2.12
new file mode 100644
index 000000000000..433a22ec2d9c
--- /dev/null
+++ b/metadata/cache/media-libs/sdl-mixer-1.2.12
@@ -0,0 +1,22 @@
+>=media-libs/libsdl-1.2.10 flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) timidity? ( media-sound/timidity++ ) mad? ( media-libs/libmad ) !mad? ( mp3? ( >=media-libs/smpeg-0.4.4-r1 ) ) modplug? ( media-libs/libmodplug ) mikmod? ( >=media-libs/libmikmod-3.1.10 ) vorbis? ( >=media-libs/libvorbis-1.0_beta4 media-libs/libogg )
+
+0
+http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.tar.gz
+
+http://www.libsdl.org/projects/SDL_mixer/
+ZLIB
+Simple Direct Media Layer Mixer Library
+~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+
+flac fluidsynth mad +midi mikmod modplug mp3 playtools static-libs timidity vorbis +wav
+midi? ( || ( timidity fluidsynth ) )
+
+
+4
+
+configure install
+
+
+
+
+
diff --git a/metadata/cache/media-libs/sdl-net-1.2.8 b/metadata/cache/media-libs/sdl-net-1.2.8
index c0822b1a4ca8..05f21cb430b4 100644
--- a/metadata/cache/media-libs/sdl-net-1.2.8
+++ b/metadata/cache/media-libs/sdl-net-1.2.8
@@ -1,5 +1,5 @@
->=media-libs/libsdl-1.2.5
->=media-libs/libsdl-1.2.5
+>=media-libs/libsdl-1.2.14
+>=media-libs/libsdl-1.2.14
 0
 http://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.8.tar.gz
 
diff --git a/metadata/cache/media-libs/sdl-sound-1.0.3 b/metadata/cache/media-libs/sdl-sound-1.0.3
index 771abc0de6fc..d5fd226d16f4 100644
--- a/metadata/cache/media-libs/sdl-sound-1.0.3
+++ b/metadata/cache/media-libs/sdl-sound-1.0.3
@@ -1,5 +1,5 @@
->=media-libs/libsdl-1.2 flac? ( media-libs/flac ) mikmod? ( >=media-libs/libmikmod-3.1.9 media-libs/libmodplug ) vorbis? ( >=media-libs/libvorbis-1.0_beta4 ) speex? ( media-libs/speex media-libs/libogg ) physfs? ( dev-games/physfs ) mpeg? ( media-libs/smpeg ) dev-util/pkgconfig
->=media-libs/libsdl-1.2 flac? ( media-libs/flac ) mikmod? ( >=media-libs/libmikmod-3.1.9 media-libs/libmodplug ) vorbis? ( >=media-libs/libvorbis-1.0_beta4 ) speex? ( media-libs/speex media-libs/libogg ) physfs? ( dev-games/physfs ) mpeg? ( media-libs/smpeg )
+>=media-libs/libsdl-1.2 flac? ( media-libs/flac ) mikmod? ( >=media-libs/libmikmod-3.1.9 ) modplug? ( media-libs/libmodplug ) vorbis? ( >=media-libs/libvorbis-1.0_beta4 ) speex? ( media-libs/speex media-libs/libogg ) physfs? ( dev-games/physfs ) mpeg? ( media-libs/smpeg ) dev-util/pkgconfig
+>=media-libs/libsdl-1.2 flac? ( media-libs/flac ) mikmod? ( >=media-libs/libmikmod-3.1.9 ) modplug? ( media-libs/libmodplug ) vorbis? ( >=media-libs/libvorbis-1.0_beta4 ) speex? ( media-libs/speex media-libs/libogg ) physfs? ( dev-games/physfs ) mpeg? ( media-libs/smpeg )
 0
 http://icculus.org/SDL_sound/downloads/SDL_sound-1.0.3.tar.gz
 
@@ -8,13 +8,13 @@ LGPL-2.1
 A library that handles the decoding of sound file formats
 amd64 ppc ppc64 sparc x86 ~x86-fbsd
 
-flac mikmod mp3 mpeg physfs speex static-libs vorbis
+flac mikmod modplug mp3 mpeg physfs speex static-libs vorbis
 
 
 
+2
 
-
-compile install
+configure install
 
 
 
diff --git a/metadata/cache/media-plugins/audacious-plugins-3.1 b/metadata/cache/media-plugins/audacious-plugins-3.1
index 60efdf6d2f08..c61206c1072e 100644
--- a/metadata/cache/media-plugins/audacious-plugins-3.1
+++ b/metadata/cache/media-plugins/audacious-plugins-3.1
@@ -6,7 +6,7 @@ http://distfiles.atheme.org/audacious-plugins-3.1.tar.bz2
 http://audacious-media-player.org/
 GPL-2
 Audacious Player - Your music, your way, no exceptions
-~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
+alpha amd64 hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
 eutils flag-o-matic multilib portability toolchain-funcs user
 aac adplug alsa aqua bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack lame libnotify libsamplerate midi mms mp3 mtp nls oss pulseaudio scrobbler sid sndfile sse2 vorbis wavpack
 
diff --git a/metadata/cache/media-plugins/kipi-plugins-2.3.0 b/metadata/cache/media-plugins/kipi-plugins-2.3.0
index 2541ee679e9a..ce6eca88137a 100644
--- a/metadata/cache/media-plugins/kipi-plugins-2.3.0
+++ b/metadata/cache/media-plugins/kipi-plugins-2.3.0
@@ -8,7 +8,7 @@ GPL-2 handbook? ( FDL-1.2 )
 Plugins for the KDE Image Plugin Interface
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-cdr calendar crypt debug expoblending gpssync +imagemagick ipod +mediawiki mjpeg panorama redeyes scanner vkontakte linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_csb linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fo linguas_fr linguas_fy linguas_ga linguas_gl linguas_ha linguas_he linguas_hi linguas_hr linguas_hsb linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_ko linguas_ku linguas_lb linguas_lo linguas_lt linguas_lv linguas_mi linguas_mk linguas_mn linguas_ms linguas_mt linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_nso linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_se linguas_sk linguas_sl linguas_sq linguas_sr linguas_ss linguas_sv linguas_ta linguas_te linguas_tg linguas_th linguas_tr linguas_tt linguas_uk linguas_uz linguas_ven linguas_vi linguas_wa linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW linguas_zu opengl +handbook aqua kdeenablefinal
+cdr calendar crypt debug expoblending gpssync +imagemagick ipod +mediawiki mjpeg panorama redeyes scanner vkontakte linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_csb linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fo linguas_fr linguas_fy linguas_ga linguas_gl linguas_ha linguas_he linguas_hi linguas_hr linguas_hsb linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_ko linguas_ku linguas_lb linguas_lo linguas_lt linguas_lv linguas_mi linguas_mk linguas_mn linguas_ms linguas_mt linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_nso linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_se linguas_sk linguas_sl linguas_sq linguas_sr linguas_ss linguas_sv linguas_ta linguas_te linguas_tg linguas_th linguas_tr linguas_tt linguas_uk linguas_uz linguas_ven linguas_vi linguas_wa linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW linguas_zu opengl +handbook aqua
 
 
 
diff --git a/metadata/cache/media-plugins/kipi-plugins-2.4.1 b/metadata/cache/media-plugins/kipi-plugins-2.4.1
index 365422e9d487..d58cd5784784 100644
--- a/metadata/cache/media-plugins/kipi-plugins-2.4.1
+++ b/metadata/cache/media-plugins/kipi-plugins-2.4.1
@@ -8,7 +8,7 @@ GPL-2 handbook? ( FDL-1.2 )
 Plugins for the KDE Image Plugin Interface
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-cdr calendar crypt debug expoblending gpssync +imagemagick ipod mjpeg panorama redeyes scanner vkontakte linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_csb linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fo linguas_fr linguas_fy linguas_ga linguas_gl linguas_ha linguas_he linguas_hi linguas_hr linguas_hsb linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_ko linguas_ku linguas_lb linguas_lo linguas_lt linguas_lv linguas_mi linguas_mk linguas_mn linguas_ms linguas_mt linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_nso linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_se linguas_sk linguas_sl linguas_sq linguas_sr linguas_ss linguas_sv linguas_ta linguas_te linguas_tg linguas_th linguas_tr linguas_tt linguas_uk linguas_uz linguas_ven linguas_vi linguas_wa linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW linguas_zu opengl +handbook aqua kdeenablefinal
+cdr calendar crypt debug expoblending gpssync +imagemagick ipod mjpeg panorama redeyes scanner vkontakte linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_csb linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fo linguas_fr linguas_fy linguas_ga linguas_gl linguas_ha linguas_he linguas_hi linguas_hr linguas_hsb linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_ko linguas_ku linguas_lb linguas_lo linguas_lt linguas_lv linguas_mi linguas_mk linguas_mn linguas_ms linguas_mt linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_nso linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_se linguas_sk linguas_sl linguas_sq linguas_sr linguas_ss linguas_sv linguas_ta linguas_te linguas_tg linguas_th linguas_tr linguas_tt linguas_uk linguas_uz linguas_ven linguas_vi linguas_wa linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW linguas_zu opengl +handbook aqua
 
 
 
diff --git a/metadata/cache/media-plugins/kipi-plugins-2.5.0 b/metadata/cache/media-plugins/kipi-plugins-2.5.0
index 7947b714f091..a29ead34153f 100644
--- a/metadata/cache/media-plugins/kipi-plugins-2.5.0
+++ b/metadata/cache/media-plugins/kipi-plugins-2.5.0
@@ -8,7 +8,7 @@ GPL-2 handbook? ( FDL-1.2 )
 Plugins for the KDE Image Plugin Interface
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-cdr calendar crypt debug expoblending gpssync +imagemagick ipod mjpeg panorama redeyes scanner vkontakte linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_csb linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fo linguas_fr linguas_fy linguas_ga linguas_gl linguas_ha linguas_he linguas_hi linguas_hr linguas_hsb linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_ko linguas_ku linguas_lb linguas_lo linguas_lt linguas_lv linguas_mi linguas_mk linguas_mn linguas_ms linguas_mt linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_nso linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_se linguas_sk linguas_sl linguas_sq linguas_sr linguas_ss linguas_sv linguas_ta linguas_te linguas_tg linguas_th linguas_tr linguas_tt linguas_uk linguas_uz linguas_ven linguas_vi linguas_wa linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW linguas_zu opengl +handbook aqua kdeenablefinal
+cdr calendar crypt debug expoblending gpssync +imagemagick ipod mjpeg panorama redeyes scanner vkontakte linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_csb linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fo linguas_fr linguas_fy linguas_ga linguas_gl linguas_ha linguas_he linguas_hi linguas_hr linguas_hsb linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_ko linguas_ku linguas_lb linguas_lo linguas_lt linguas_lv linguas_mi linguas_mk linguas_mn linguas_ms linguas_mt linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_nso linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_se linguas_sk linguas_sl linguas_sq linguas_sr linguas_ss linguas_sv linguas_ta linguas_te linguas_tg linguas_th linguas_tr linguas_tt linguas_uk linguas_uz linguas_ven linguas_vi linguas_wa linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW linguas_zu opengl +handbook aqua
 
 
 
diff --git a/metadata/cache/media-radio/fldigi-3.21.35_pre1 b/metadata/cache/media-radio/fldigi-3.21.35_pre1
index 83b887fe3502..cff79dd0f785 100644
--- a/metadata/cache/media-radio/fldigi-3.21.35_pre1
+++ b/metadata/cache/media-radio/fldigi-3.21.35_pre1
@@ -6,7 +6,7 @@ http://www.w1hkj.com/trials-1.3.0/src/fldigi-3.21.35AA.tar.gz
 http://www.w1hkj.com/Fldigi.html
 GPL-3
 Sound card based multimode software modem for Amateur Radio use
-~amd64 ~x86
+amd64 ~x86
 
 hamlib nls portaudio pulseaudio sndfile xmlrpc
 
diff --git a/metadata/cache/media-sound/abcm2ps-6.5.15 b/metadata/cache/media-sound/abcm2ps-6.5.15
deleted file mode 100644
index 04d259a487ae..000000000000
--- a/metadata/cache/media-sound/abcm2ps-6.5.15
+++ /dev/null
@@ -1,22 +0,0 @@
-pango? ( x11-libs/pango media-libs/freetype:2 ) dev-util/pkgconfig
-pango? ( x11-libs/pango media-libs/freetype:2 )
-0
-http://moinejf.free.fr/abcm2ps-6.5.15.tar.gz http://moinejf.free.fr/transpose_abc.pl
-
-http://moinejf.free.fr/
-GPL-2
-A program to convert abc files to Postscript files
-~amd64 ~ppc ~x86
-
-examples pango
-
-
-
-4
-
-configure install
-
-
-
-
-
diff --git a/metadata/cache/media-sound/abcm2ps-6.5.16 b/metadata/cache/media-sound/abcm2ps-6.6.3
similarity index 75%
rename from metadata/cache/media-sound/abcm2ps-6.5.16
rename to metadata/cache/media-sound/abcm2ps-6.6.3
index 32db34f147ba..aefb630d9293 100644
--- a/metadata/cache/media-sound/abcm2ps-6.5.16
+++ b/metadata/cache/media-sound/abcm2ps-6.6.3
@@ -1,7 +1,7 @@
 pango? ( x11-libs/pango media-libs/freetype:2 ) dev-util/pkgconfig
 pango? ( x11-libs/pango media-libs/freetype:2 )
 0
-http://moinejf.free.fr/abcm2ps-6.5.16.tar.gz http://moinejf.free.fr/transpose_abc.pl
+http://moinejf.free.fr/abcm2ps-6.6.3.tar.gz http://moinejf.free.fr/transpose_abc.pl
 
 http://moinejf.free.fr/
 GPL-2
diff --git a/metadata/cache/media-sound/amarok-2.4.0 b/metadata/cache/media-sound/amarok-2.4.0
index 2b69c0e546be..86c1b0620708 100644
--- a/metadata/cache/media-sound/amarok-2.4.0
+++ b/metadata/cache/media-sound/amarok-2.4.0
@@ -8,7 +8,7 @@ GPL-2
 Advanced audio player based on KDE framework.
 amd64 ppc x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-cdda daap debug +embedded handbook ipod lastfm mp3tunes mtp opengl +player semantic-desktop +utils linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_it linguas_ja linguas_km linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_TW kdeenablefinal
+cdda daap debug +embedded handbook ipod lastfm mp3tunes mtp opengl +player semantic-desktop +utils linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_it linguas_ja linguas_km linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_TW
 
 
 
diff --git a/metadata/cache/media-sound/amarok-2.4.3 b/metadata/cache/media-sound/amarok-2.4.3
index f17bccaa2113..f1bdf40bb1f3 100644
--- a/metadata/cache/media-sound/amarok-2.4.3
+++ b/metadata/cache/media-sound/amarok-2.4.3
@@ -8,7 +8,7 @@ GPL-2
 Advanced audio player based on KDE framework.
 ~amd64 ~ppc ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-cdda daap debug +embedded ipod lastfm mp3tunes mtp opengl +player semantic-desktop +utils linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_it linguas_ja linguas_km linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_TW kdeenablefinal
+cdda daap debug +embedded ipod lastfm mp3tunes mtp opengl +player semantic-desktop +utils linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_it linguas_ja linguas_km linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_TW
 
 
 
diff --git a/metadata/cache/media-sound/amarok-2.4.3-r1 b/metadata/cache/media-sound/amarok-2.4.3-r1
index d09d8ff36e93..0262f16433cf 100644
--- a/metadata/cache/media-sound/amarok-2.4.3-r1
+++ b/metadata/cache/media-sound/amarok-2.4.3-r1
@@ -8,7 +8,7 @@ GPL-2
 Advanced audio player based on KDE framework.
 amd64 ~ppc x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-cdda daap debug +embedded ipod lastfm mp3tunes mtp opengl semantic-desktop +utils linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_it linguas_ja linguas_km linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_TW kdeenablefinal
+cdda daap debug +embedded ipod lastfm mp3tunes mtp opengl semantic-desktop +utils linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_it linguas_ja linguas_km linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_TW
 
 
 
diff --git a/metadata/cache/media-sound/amarok-2.5.0 b/metadata/cache/media-sound/amarok-2.5.0
index cabda72cc67d..f824084a4919 100644
--- a/metadata/cache/media-sound/amarok-2.5.0
+++ b/metadata/cache/media-sound/amarok-2.5.0
@@ -8,7 +8,7 @@ GPL-2
 Advanced audio player based on KDE framework.
 ~amd64 ~ppc ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-cdda daap debug +embedded ipod lastfm mp3tunes mtp opengl +player semantic-desktop +utils linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_it linguas_ja linguas_km linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_TW kdeenablefinal
+cdda daap debug +embedded ipod lastfm mp3tunes mtp opengl +player semantic-desktop +utils linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_it linguas_ja linguas_km linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_TW
 
 
 
diff --git a/metadata/cache/media-sound/amarok-2.5.0-r1 b/metadata/cache/media-sound/amarok-2.5.0-r1
index ec7ae0f970fb..a07f163f5257 100644
--- a/metadata/cache/media-sound/amarok-2.5.0-r1
+++ b/metadata/cache/media-sound/amarok-2.5.0-r1
@@ -8,7 +8,7 @@ GPL-2
 Advanced audio player based on KDE framework.
 ~amd64 ~ppc ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop +utils linguas_af linguas_ar linguas_ast linguas_be linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_csb linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_ko linguas_ku linguas_lt linguas_lv linguas_mai linguas_ml linguas_ms linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_si linguas_sk linguas_sl linguas_sq linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@Latn linguas_sv linguas_tg linguas_th linguas_tr linguas_ug linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW kdeenablefinal
+cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop +utils linguas_af linguas_ar linguas_ast linguas_be linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_csb linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_ko linguas_ku linguas_lt linguas_lv linguas_mai linguas_ml linguas_ms linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_si linguas_sk linguas_sl linguas_sq linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@Latn linguas_sv linguas_tg linguas_th linguas_tr linguas_ug linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW
 
 
 
diff --git a/metadata/cache/media-sound/audacious-3.1 b/metadata/cache/media-sound/audacious-3.1
index dd3fc70880fe..c620aa5295bb 100644
--- a/metadata/cache/media-sound/audacious-3.1
+++ b/metadata/cache/media-sound/audacious-3.1
@@ -6,8 +6,8 @@ http://distfiles.atheme.org/audacious-3.1.tar.bz2 mirror://gentoo/gentoo_ice-xmm
 http://audacious-media-player.org/
 GPL-2
 Audacious Player - Your music, your way, no exceptions
-~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
-
+alpha amd64 hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
+eutils multilib portability toolchain-funcs user
 altivec chardet nls session sse2
 
 >=media-plugins/audacious-plugins-3.1
diff --git a/metadata/cache/media-sound/audacious-3.1.1 b/metadata/cache/media-sound/audacious-3.1.1
index 32a2cfe0b28b..8e9f9cd72e48 100644
--- a/metadata/cache/media-sound/audacious-3.1.1
+++ b/metadata/cache/media-sound/audacious-3.1.1
@@ -7,7 +7,7 @@ http://audacious-media-player.org/
 GPL-2
 Audacious Player - Your music, your way, no exceptions
 ~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
-
+eutils multilib portability toolchain-funcs user
 altivec chardet nls session sse2
 
 >=media-plugins/audacious-plugins-3.1.1
diff --git a/metadata/cache/media-sound/audex-0.74_beta1 b/metadata/cache/media-sound/audex-0.74_beta1
index 863f1007923e..e7514fbc9997 100644
--- a/metadata/cache/media-sound/audex-0.74_beta1
+++ b/metadata/cache/media-sound/audex-0.74_beta1
@@ -8,7 +8,7 @@ GPL-3
 KDE4 based CDDA extraction tool
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-linguas_cs linguas_da linguas_de linguas_en_GB linguas_eo linguas_es linguas_fr linguas_ga linguas_it linguas_ja linguas_km linguas_lt linguas_mai linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_ru linguas_sv linguas_tr linguas_uk aqua kdeenablefinal
+linguas_cs linguas_da linguas_de linguas_en_GB linguas_eo linguas_es linguas_fr linguas_ga linguas_it linguas_ja linguas_km linguas_lt linguas_mai linguas_nds linguas_nl linguas_pt linguas_pt_BR linguas_ru linguas_sv linguas_tr linguas_uk aqua
 
 
 
diff --git a/metadata/cache/media-sound/frescobaldi-1.2.0 b/metadata/cache/media-sound/frescobaldi-1.2.0
index c67140f9ca36..5de9543da056 100644
--- a/metadata/cache/media-sound/frescobaldi-1.2.0
+++ b/metadata/cache/media-sound/frescobaldi-1.2.0
@@ -8,7 +8,7 @@ GPL-2
 a LilyPond sheet music text editor for KDE
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability python toolchain-funcs user versionator virtualx
-+handbook linguas_cs linguas_de linguas_es linguas_fr linguas_gl linguas_it linguas_nl linguas_pl linguas_ru linguas_tr aqua kdeenablefinal
++handbook linguas_cs linguas_de linguas_es linguas_fr linguas_gl linguas_it linguas_nl linguas_pl linguas_ru linguas_tr aqua
 
 
 
diff --git a/metadata/cache/media-sound/k4guitune-1.1.0 b/metadata/cache/media-sound/k4guitune-1.1.0
index d0435b8b1dd1..fa663d7c6de6 100644
--- a/metadata/cache/media-sound/k4guitune-1.1.0
+++ b/metadata/cache/media-sound/k4guitune-1.1.0
@@ -8,7 +8,7 @@ GPL-3
 A program to tune a musical instrument using your computer and it's mic- or line- input
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/media-sound/k4guitune-1.1.1 b/metadata/cache/media-sound/k4guitune-1.1.1
index 1b6f8ae21508..f1e8caa9c8e9 100644
--- a/metadata/cache/media-sound/k4guitune-1.1.1
+++ b/metadata/cache/media-sound/k4guitune-1.1.1
@@ -8,7 +8,7 @@ GPL-3
 A program to tune a musical instrument using your computer and it's mic- or line- input
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/media-sound/kaudiocreator-1.3 b/metadata/cache/media-sound/kaudiocreator-1.3
index af981839db1f..12fe3adae5bf 100644
--- a/metadata/cache/media-sound/kaudiocreator-1.3
+++ b/metadata/cache/media-sound/kaudiocreator-1.3
@@ -8,7 +8,7 @@ GPL-2 FDL-1.2
 KDE CD ripper and audio encoder frontend
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_af linguas_ar linguas_be linguas_bg linguas_br linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_hr linguas_is linguas_it linguas_ja linguas_kk linguas_km linguas_lt linguas_lv linguas_mai linguas_mk linguas_ms linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt_BR linguas_pt linguas_ro linguas_ru linguas_se linguas_sk linguas_sl linguas_sr@ijekavianlatin linguas_sr@ijekavian linguas_sr@latin linguas_sr linguas_sv linguas_ta linguas_tg linguas_th linguas_tr linguas_ug linguas_uk linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW aqua kdeenablefinal
+debug linguas_af linguas_ar linguas_be linguas_bg linguas_br linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_hr linguas_is linguas_it linguas_ja linguas_kk linguas_km linguas_lt linguas_lv linguas_mai linguas_mk linguas_ms linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt_BR linguas_pt linguas_ro linguas_ru linguas_se linguas_sk linguas_sl linguas_sr@ijekavianlatin linguas_sr@ijekavian linguas_sr@latin linguas_sr linguas_sv linguas_ta linguas_tg linguas_th linguas_tr linguas_ug linguas_uk linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/media-sound/kenvy24-1.2 b/metadata/cache/media-sound/kenvy24-1.2
index 2701de305674..5ee381fb7ec4 100644
--- a/metadata/cache/media-sound/kenvy24-1.2
+++ b/metadata/cache/media-sound/kenvy24-1.2
@@ -8,7 +8,7 @@ GPL-3
 VIA Envy24 based sound card control utility for KDE
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/media-sound/kid3-1.4 b/metadata/cache/media-sound/kid3-1.4
index 071d480d3209..064ce2c756b9 100644
--- a/metadata/cache/media-sound/kid3-1.4
+++ b/metadata/cache/media-sound/kid3-1.4
@@ -8,7 +8,7 @@ GPL-2
 A simple tag editor for KDE
 amd64 ~ppc ~ppc64 x86 ~x86-fbsd
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-flac +handbook mp3 mp4 +taglib vorbis aqua kdeenablefinal
+flac +handbook mp3 mp4 +taglib vorbis aqua
 
 
 
diff --git a/metadata/cache/media-sound/kid3-1.6 b/metadata/cache/media-sound/kid3-1.6
index 52502731af55..8346a5094d35 100644
--- a/metadata/cache/media-sound/kid3-1.6
+++ b/metadata/cache/media-sound/kid3-1.6
@@ -8,7 +8,7 @@ GPL-2
 A simple tag editor for KDE
 ~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-flac mp3 mp4 +taglib vorbis linguas_cs linguas_de linguas_es linguas_et linguas_fi linguas_fr linguas_it linguas_nl linguas_pl linguas_ru linguas_tr linguas_zh_TW +handbook aqua kdeenablefinal
+flac mp3 mp4 +taglib vorbis linguas_cs linguas_de linguas_es linguas_et linguas_fi linguas_fr linguas_it linguas_nl linguas_pl linguas_ru linguas_tr linguas_zh_TW +handbook aqua
 flac? ( vorbis )
 
 
diff --git a/metadata/cache/media-sound/kid3-2.0 b/metadata/cache/media-sound/kid3-2.0
index 7ea946932d0f..87ccb6615626 100644
--- a/metadata/cache/media-sound/kid3-2.0
+++ b/metadata/cache/media-sound/kid3-2.0
@@ -8,7 +8,7 @@ GPL-2
 A simple tag editor for KDE
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-flac mp3 mp4 +taglib vorbis linguas_cs linguas_de linguas_es linguas_et linguas_fi linguas_fr linguas_it linguas_nl linguas_pl linguas_ru linguas_tr linguas_zh_TW +handbook aqua kdeenablefinal
+flac mp3 mp4 +taglib vorbis linguas_cs linguas_de linguas_es linguas_et linguas_fi linguas_fr linguas_it linguas_nl linguas_pl linguas_ru linguas_tr linguas_zh_TW +handbook aqua
 flac? ( vorbis )
 
 
diff --git a/metadata/cache/media-sound/kid3-2.0.1 b/metadata/cache/media-sound/kid3-2.0.1
index c08338946931..5ea080a4a6b1 100644
--- a/metadata/cache/media-sound/kid3-2.0.1
+++ b/metadata/cache/media-sound/kid3-2.0.1
@@ -8,7 +8,7 @@ GPL-2
 A simple tag editor for KDE
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-flac mp3 mp4 +taglib vorbis linguas_cs linguas_de linguas_es linguas_et linguas_fi linguas_fr linguas_it linguas_nl linguas_pl linguas_ru linguas_tr linguas_zh_TW +handbook aqua kdeenablefinal
+flac mp3 mp4 +taglib vorbis linguas_cs linguas_de linguas_es linguas_et linguas_fi linguas_fr linguas_it linguas_nl linguas_pl linguas_ru linguas_tr linguas_zh_TW +handbook aqua
 flac? ( vorbis )
 
 
diff --git a/metadata/cache/media-sound/kmetronome-0.10.0 b/metadata/cache/media-sound/kmetronome-0.10.0
index f03bf83fb871..f68b4ea28f04 100644
--- a/metadata/cache/media-sound/kmetronome-0.10.0
+++ b/metadata/cache/media-sound/kmetronome-0.10.0
@@ -8,7 +8,7 @@ GPL-2
 MIDI based metronome using ALSA sequencer
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/media-sound/kmid-2.4.0 b/metadata/cache/media-sound/kmid-2.4.0
index 38a3e331a974..33000ccda739 100644
--- a/metadata/cache/media-sound/kmid-2.4.0
+++ b/metadata/cache/media-sound/kmid-2.4.0
@@ -8,7 +8,7 @@ GPL-2
 a MIDI/Karaoke player for KDE
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_en_GB linguas_es linguas_fr linguas_gl linguas_nb linguas_nl linguas_pt_BR linguas_pt linguas_sr@ijekavianlatin linguas_sr@ijekavian linguas_sr@Latn linguas_sr linguas_sv linguas_tr linguas_uk linguas_zh_CN aqua kdeenablefinal
+debug +handbook linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_en_GB linguas_es linguas_fr linguas_gl linguas_nb linguas_nl linguas_pt_BR linguas_pt linguas_sr@ijekavianlatin linguas_sr@ijekavian linguas_sr@Latn linguas_sr linguas_sv linguas_tr linguas_uk linguas_zh_CN aqua
 
 
 
diff --git a/metadata/cache/media-sound/kmidimon-0.7.4 b/metadata/cache/media-sound/kmidimon-0.7.4
index dd2c5fba30fb..4dfd6b0d5234 100644
--- a/metadata/cache/media-sound/kmidimon-0.7.4
+++ b/metadata/cache/media-sound/kmidimon-0.7.4
@@ -8,7 +8,7 @@ GPL-2
 A MIDI monitor for ALSA sequencer
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook aqua kdeenablefinal
+debug +handbook aqua
 
 
 
diff --git a/metadata/cache/media-sound/konvertible-1.0.1 b/metadata/cache/media-sound/konvertible-1.0.1
index dcc224f428b6..5e1470ad94c6 100644
--- a/metadata/cache/media-sound/konvertible-1.0.1
+++ b/metadata/cache/media-sound/konvertible-1.0.1
@@ -8,7 +8,7 @@ GPL-2
 A program to convert audio formats with FFmpeg
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook taglib aqua kdeenablefinal
+debug +handbook taglib aqua
 
 
 
diff --git a/metadata/cache/media-sound/kradio-4.0.2 b/metadata/cache/media-sound/kradio-4.0.2
index db1485383370..714e5ff00aeb 100644
--- a/metadata/cache/media-sound/kradio-4.0.2
+++ b/metadata/cache/media-sound/kradio-4.0.2
@@ -8,7 +8,7 @@ GPL-2
 kradio is a radio tuner application for KDE
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-alsa debug encode ffmpeg lirc +mp3 +vorbis v4l linguas_cs linguas_de linguas_es linguas_is linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_uk aqua kdeenablefinal
+alsa debug encode ffmpeg lirc +mp3 +vorbis v4l linguas_cs linguas_de linguas_es linguas_is linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_uk aqua
 
 
 
diff --git a/metadata/cache/media-sound/kstreamripper-0.7.100 b/metadata/cache/media-sound/kstreamripper-0.7.100
index d0736ee28c7c..7138e3b2cef1 100644
--- a/metadata/cache/media-sound/kstreamripper-0.7.100
+++ b/metadata/cache/media-sound/kstreamripper-0.7.100
@@ -8,7 +8,7 @@ GPL-2 GPL-3
 Program for ripping internet radios
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/media-sound/kstreamripper-0.7.100-r1 b/metadata/cache/media-sound/kstreamripper-0.7.100-r1
index d0736ee28c7c..7138e3b2cef1 100644
--- a/metadata/cache/media-sound/kstreamripper-0.7.100-r1
+++ b/metadata/cache/media-sound/kstreamripper-0.7.100-r1
@@ -8,7 +8,7 @@ GPL-2 GPL-3
 Program for ripping internet radios
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/media-sound/kwave-0.8.7 b/metadata/cache/media-sound/kwave-0.8.7
index a93d2e4c8fb2..a40deb695a4f 100644
--- a/metadata/cache/media-sound/kwave-0.8.7
+++ b/metadata/cache/media-sound/kwave-0.8.7
@@ -8,7 +8,7 @@ BSD FDL-1.2 GPL-2 LGPL-2
 Kwave is a sound editor for KDE
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-alsa debug flac +handbook mad oss pulseaudio vorbis linguas_cs linguas_de linguas_fr aqua kdeenablefinal
+alsa debug flac +handbook mad oss pulseaudio vorbis linguas_cs linguas_de linguas_fr aqua
 
 
 
diff --git a/metadata/cache/media-sound/qtmpc-0.6.1 b/metadata/cache/media-sound/qtmpc-0.6.1
index 67a25d48c639..5ae4313b48a1 100644
--- a/metadata/cache/media-sound/qtmpc-0.6.1
+++ b/metadata/cache/media-sound/qtmpc-0.6.1
@@ -8,7 +8,7 @@ GPL-2
 Qt MPD client with a tree view music library interface
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/media-sound/rhythmbox-2.95 b/metadata/cache/media-sound/rhythmbox-2.95
index 1059855ef9c5..e905d37e1987 100644
--- a/metadata/cache/media-sound/rhythmbox-2.95
+++ b/metadata/cache/media-sound/rhythmbox-2.95
@@ -1,5 +1,5 @@
->=dev-libs/glib-2.26.0:2 dev-libs/libxml2:2 >=x11-libs/gtk+-2.91.4: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 >=media-libs/gstreamer-0.10.32:0.10[introspection] >=sys-libs/tdb-1.2.6 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 ) lastfm? ( dev-libs/json-glib ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 gnome-base/gconf:2 ) python? ( dev-python/pygobject:3 ) udev? ( ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) dev-util/pkgconfig >=dev-util/intltool-0.35 app-text/scrollkeeper >=app-text/gnome-doc-utils-0.9.1 doc? ( >=dev-util/gtk-doc-1.4 ) test? ( dev-libs/check ) app-arch/xz-utils >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 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 )
->=dev-libs/glib-2.26.0:2 dev-libs/libxml2:2 >=x11-libs/gtk+-2.91.4: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 >=media-libs/gstreamer-0.10.32:0.10[introspection] >=sys-libs/tdb-1.2.6 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 ) lastfm? ( dev-libs/json-glib ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 gnome-base/gconf:2 ) python? ( dev-python/pygobject:3 ) udev? ( ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) >=media-plugins/gst-plugins-soup-0.10 >=media-plugins/gst-plugins-libmms-0.10 || ( >=media-plugins/gst-plugins-cdparanoia-0.10 >=media-plugins/gst-plugins-cdio-0.10 ) >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-taglib-0.10.6 upnp? ( >=media-libs/grilo-0.1.17 >=media-plugins/grilo-plugins-0.1.17[upnp] ) python? ( >=dev-python/gst-python-0.10.8 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] ) ) >=app-admin/eselect-python-20091230 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] ) )
+>=dev-libs/glib-2.26.0:2 dev-libs/libxml2: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 >=media-libs/gstreamer-0.10.32:0.10[introspection] >=sys-libs/tdb-1.2.6 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 ) lastfm? ( dev-libs/json-glib ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 gnome-base/gconf:2 ) python? ( dev-python/pygobject:3 ) udev? ( ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) dev-util/pkgconfig >=dev-util/intltool-0.35 app-text/scrollkeeper >=app-text/gnome-doc-utils-0.9.1 doc? ( >=dev-util/gtk-doc-1.4 ) test? ( dev-libs/check ) app-arch/xz-utils >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 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 )
+>=dev-libs/glib-2.26.0:2 dev-libs/libxml2: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 >=media-libs/gstreamer-0.10.32:0.10[introspection] >=sys-libs/tdb-1.2.6 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 ) lastfm? ( dev-libs/json-glib ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 gnome-base/gconf:2 ) python? ( dev-python/pygobject:3 ) udev? ( ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) >=media-plugins/gst-plugins-soup-0.10 >=media-plugins/gst-plugins-libmms-0.10 || ( >=media-plugins/gst-plugins-cdparanoia-0.10 >=media-plugins/gst-plugins-cdio-0.10 ) >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-taglib-0.10.6 upnp? ( >=media-libs/grilo-0.1.17 >=media-plugins/grilo-plugins-0.1.17[upnp] ) python? ( >=dev-python/gst-python-0.10.8 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] ) ) >=app-admin/eselect-python-20091230 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] ) )
 0
 mirror://gnome/sources/rhythmbox/2.95/rhythmbox-2.95.tar.xz
 
diff --git a/metadata/cache/media-sound/soundkonverter-1.2.1 b/metadata/cache/media-sound/soundkonverter-1.2.1
index dcd61e005af4..5a62d3ca5429 100644
--- a/metadata/cache/media-sound/soundkonverter-1.2.1
+++ b/metadata/cache/media-sound/soundkonverter-1.2.1
@@ -8,7 +8,7 @@ GPL-2
 Frontend to various audio converters
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/media-sound/waheela-0.3 b/metadata/cache/media-sound/waheela-0.3
index 86f51ff86e79..23fb6aaeb3d1 100644
--- a/metadata/cache/media-sound/waheela-0.3
+++ b/metadata/cache/media-sound/waheela-0.3
@@ -8,7 +8,7 @@ GPL-2
 Amarok Fullscreen Player
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/media-tv/linuxtv-dvb-headers-3.1 b/metadata/cache/media-tv/linuxtv-dvb-headers-3.1
deleted file mode 100644
index f5a0c7425897..000000000000
--- a/metadata/cache/media-tv/linuxtv-dvb-headers-3.1
+++ /dev/null
@@ -1,22 +0,0 @@
-
-|| ( >=sys-kernel/linux-headers-2.6.11-r2 media-tv/linuxtv-dvb )
-0
-
-
-http://www.linuxtv.org
-GPL-2
-Virtual Package installing the Header files for DVB
-amd64 hppa ppc x86
-eutils multilib portability toolchain-funcs user
-
-
-
-
-
-
--
-
-
-
-
-
diff --git a/metadata/cache/media-tv/linuxtv-dvb-headers-5 b/metadata/cache/media-tv/linuxtv-dvb-headers-5
index 49e0a324b56f..f7429953f86d 100644
--- a/metadata/cache/media-tv/linuxtv-dvb-headers-5
+++ b/metadata/cache/media-tv/linuxtv-dvb-headers-5
@@ -1,5 +1,5 @@
 
->=sys-kernel/linux-headers-2.6.29
+>=sys-kernel/linux-headers-2.6.28 <sys-kernel/linux-headers-3.0
 0
 
 
@@ -7,7 +7,7 @@ http://www.linuxtv.org
 GPL-2
 Virtual Package installing the Header files for DVB
 ~arm amd64 ~hppa ~ppc ppc64 x86
-eutils multilib portability toolchain-funcs user
+
 
 
 
diff --git a/metadata/cache/media-video/bangarang-2.0.1 b/metadata/cache/media-video/bangarang-2.0.1
index 6efecf6968ac..b0aa3b6e10a7 100644
--- a/metadata/cache/media-video/bangarang-2.0.1
+++ b/metadata/cache/media-video/bangarang-2.0.1
@@ -8,7 +8,7 @@ GPL-3
 Media player for KDE utilizing Nepomuk for tagging
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_fi linguas_fr linguas_it linguas_lt linguas_nl linguas_pl linguas_pt_BR linguas_uk linguas_zh_CN aqua kdeenablefinal
+debug linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_fi linguas_fr linguas_it linguas_lt linguas_nl linguas_pl linguas_pt_BR linguas_uk linguas_zh_CN aqua
 
 
 
diff --git a/metadata/cache/media-video/bangarang-2.1 b/metadata/cache/media-video/bangarang-2.1
index d0d774d5930d..c14d20d3edd4 100644
--- a/metadata/cache/media-video/bangarang-2.1
+++ b/metadata/cache/media-video/bangarang-2.1
@@ -8,7 +8,7 @@ GPL-3
 Media player for KDE utilizing Nepomuk for tagging
 ~x86 ~amd64
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_fi linguas_fr linguas_hu linguas_it linguas_lt linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_uk linguas_zh_CN aqua kdeenablefinal
+debug linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_fi linguas_fr linguas_hu linguas_it linguas_lt linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_uk linguas_zh_CN aqua
 
 
 
diff --git a/metadata/cache/media-video/kaffeine-1.2.2 b/metadata/cache/media-video/kaffeine-1.2.2
index 17c92a478082..3b9bd2dd8a5d 100644
--- a/metadata/cache/media-video/kaffeine-1.2.2
+++ b/metadata/cache/media-video/kaffeine-1.2.2
@@ -8,7 +8,7 @@ GPL-2 FDL-1.2
 A media player for KDE with digital TV support
 amd64 ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_ar linguas_ast linguas_be linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_it linguas_ja linguas_km linguas_ko linguas_ku linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_sk linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
+debug linguas_ar linguas_ast linguas_be linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_it linguas_ja linguas_km linguas_ko linguas_ku linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_sk linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/media-video/kamerka-0.6 b/metadata/cache/media-video/kamerka-0.6
index 62310292a1f0..a4094c82896c 100644
--- a/metadata/cache/media-video/kamerka-0.6
+++ b/metadata/cache/media-video/kamerka-0.6
@@ -8,7 +8,7 @@ GPL-2
 Simple photo taking application with fancy animated interface
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/media-video/kamerka-0.8.1 b/metadata/cache/media-video/kamerka-0.8.1
index 45c2eaa56180..82cc8fc868c9 100644
--- a/metadata/cache/media-video/kamerka-0.8.1
+++ b/metadata/cache/media-video/kamerka-0.8.1
@@ -8,7 +8,7 @@ GPL-2
 Simple photo taking application with fancy animated interface
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/media-video/kdenlive-0.7.8 b/metadata/cache/media-video/kdenlive-0.7.8
index f8b40e7d5a8d..5af7a770a7c3 100644
--- a/metadata/cache/media-video/kdenlive-0.7.8
+++ b/metadata/cache/media-video/kdenlive-0.7.8
@@ -8,7 +8,7 @@ GPL-2
 Kdenlive! (pronounced Kay-den-live) is a Non Linear Video Editing Suite for KDE.
 amd64 ~ppc x86 ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug semantic-desktop linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_fi linguas_fr linguas_gl linguas_he linguas_hr linguas_hu linguas_it linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_tr linguas_uk linguas_zh aqua kdeenablefinal
+debug semantic-desktop linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_fi linguas_fr linguas_gl linguas_he linguas_hr linguas_hu linguas_it linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_tr linguas_uk linguas_zh aqua
 
 
 
diff --git a/metadata/cache/media-video/kdenlive-0.8.2.1 b/metadata/cache/media-video/kdenlive-0.8.2.1
index d8cfc8993aa6..63a5813668c7 100644
--- a/metadata/cache/media-video/kdenlive-0.8.2.1
+++ b/metadata/cache/media-video/kdenlive-0.8.2.1
@@ -8,7 +8,7 @@ GPL-2
 Kdenlive! (pronounced Kay-den-live) is a Non Linear Video Editing Suite for KDE.
 ~amd64 ~ppc ~x86 ~x86-linux
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug semantic-desktop linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_he linguas_hr linguas_hu linguas_it linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_tr linguas_uk linguas_zh linguas_zh_CN linguas_zh_TW +handbook aqua kdeenablefinal
+debug semantic-desktop linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_he linguas_hr linguas_hu linguas_it linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_tr linguas_uk linguas_zh linguas_zh_CN linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/media-video/kffmpegthumbnailer-1.1.0 b/metadata/cache/media-video/kffmpegthumbnailer-1.1.0
index eaa515f0508e..17cec1fa6db2 100644
--- a/metadata/cache/media-video/kffmpegthumbnailer-1.1.0
+++ b/metadata/cache/media-video/kffmpegthumbnailer-1.1.0
@@ -8,7 +8,7 @@ GPL-2
 A thumbnailer for KDE based on ffmpegthumbnailer
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/media-video/kmplayer-0.11.2c b/metadata/cache/media-video/kmplayer-0.11.2c
index f5f4a42ed8ad..4765c8bbffc1 100644
--- a/metadata/cache/media-video/kmplayer-0.11.2c
+++ b/metadata/cache/media-video/kmplayer-0.11.2c
@@ -8,7 +8,7 @@ GPL-2 FDL-1.2 LGPL-2.1
 KMPlayer is a Video player plugin for Konqueror and basic MPlayer/Xine/ffmpeg/ffserver/VDR frontend.
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-cairo debug expat handbook npp linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_it linguas_ja linguas_km linguas_ku linguas_lt linguas_lv linguas_mai linguas_nb linguas_nds linguas_nl linguas_nn linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
+cairo debug expat handbook npp linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_it linguas_ja linguas_km linguas_ku linguas_lt linguas_lv linguas_mai linguas_nb linguas_nds linguas_nl linguas_nn linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/media-video/kmplayer-0.11.3a b/metadata/cache/media-video/kmplayer-0.11.3a
index 5898ac273ad8..945a0d0142c1 100644
--- a/metadata/cache/media-video/kmplayer-0.11.3a
+++ b/metadata/cache/media-video/kmplayer-0.11.3a
@@ -8,7 +8,7 @@ GPL-2 FDL-1.2 LGPL-2.1
 KMPlayer is a Video player plugin for Konqueror and basic MPlayer/Xine/ffmpeg/ffserver/VDR frontend.
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-cairo debug expat handbook npp linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_it linguas_ja linguas_km linguas_ku linguas_lt linguas_lv linguas_mai linguas_nb linguas_nds linguas_nl linguas_nn linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua kdeenablefinal
+cairo debug expat handbook npp linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_it linguas_ja linguas_km linguas_ku linguas_lt linguas_lv linguas_mai linguas_nb linguas_nds linguas_nl linguas_nn linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/media-video/kplayer-0.7.1 b/metadata/cache/media-video/kplayer-0.7.1
index bd74c0e5bcba..fe85581e2832 100644
--- a/metadata/cache/media-video/kplayer-0.7.1
+++ b/metadata/cache/media-video/kplayer-0.7.1
@@ -8,7 +8,7 @@ GPL-3
 KPlayer is a KDE media player based on mplayer.
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_be linguas_bg linguas_br linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hne linguas_hr linguas_hu linguas_it linguas_ja linguas_km linguas_ku linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua kdeenablefinal
+debug linguas_be linguas_bg linguas_br linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hne linguas_hr linguas_hu linguas_it linguas_ja linguas_km linguas_ku linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/media-video/loopy-0.5.3 b/metadata/cache/media-video/loopy-0.5.3
index 020d4a13d608..bba627304d76 100644
--- a/metadata/cache/media-video/loopy-0.5.3
+++ b/metadata/cache/media-video/loopy-0.5.3
@@ -8,7 +8,7 @@ GPL-2
 A simple video player for KDE
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_cs linguas_de linguas_hu linguas_pt_BR aqua kdeenablefinal
+debug linguas_cs linguas_de linguas_hu linguas_pt_BR aqua
 
 
 
diff --git a/metadata/cache/media-video/subtitlecomposer-0.5.3 b/metadata/cache/media-video/subtitlecomposer-0.5.3
index 3583398a62bc..2f0efef4abea 100644
--- a/metadata/cache/media-video/subtitlecomposer-0.5.3
+++ b/metadata/cache/media-video/subtitlecomposer-0.5.3
@@ -8,7 +8,7 @@ GPL-2
 Text-based subtitles editor.
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug gstreamer xine linguas_bg linguas_cs linguas_de linguas_el linguas_es linguas_fr linguas_pl linguas_pt_BR linguas_sr aqua kdeenablefinal
+debug gstreamer xine linguas_bg linguas_cs linguas_de linguas_el linguas_es linguas_fr linguas_pl linguas_pt_BR linguas_sr aqua
 
 
 
diff --git a/metadata/cache/media-video/vdr-1.6.0_p2-r7 b/metadata/cache/media-video/vdr-1.6.0_p2-r7
index 205f7f7875c7..58469f326348 100644
--- a/metadata/cache/media-video/vdr-1.6.0_p2-r7
+++ b/metadata/cache/media-video/vdr-1.6.0_p2-r7
@@ -1,4 +1,4 @@
-virtual/jpeg sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2 sys-devel/gettext dvdarchive? ( dvdchapjump? ( >=media-libs/libdvdread-4.1.3_p1168 ) ) ~media-tv/linuxtv-dvb-headers-5 dev-util/unifdef setup? ( >=dev-libs/tinyxml-2.6.1[stl] )
+virtual/jpeg sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2 sys-devel/gettext dvdarchive? ( dvdchapjump? ( >=media-libs/libdvdread-4.1.3_p1168 ) ) =media-tv/linuxtv-dvb-headers-5* dev-util/unifdef setup? ( >=dev-libs/tinyxml-2.6.1[stl] )
 virtual/jpeg sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2 sys-devel/gettext dvdarchive? ( dvdchapjump? ( >=media-libs/libdvdread-4.1.3_p1168 ) ) dev-lang/perl >=media-tv/gentoo-vdr-scripts-0.4.5 media-fonts/corefonts
 0
 ftp://ftp.tvdr.de/vdr/vdr-1.6.0.tar.bz2 ftp://ftp.tvdr.de/vdr/Developer/vdr-1.6.0-1.diff ftp://ftp.tvdr.de/vdr/Developer/vdr-1.6.0-2.diff http://www.zulu-entertainment.de/files/patches/VDR-Extensions-Patch-72.tar.bz2
diff --git a/metadata/cache/net-analyzer/dhcp_probe-1.3.0-r2 b/metadata/cache/net-analyzer/dhcp_probe-1.3.0-r3
similarity index 85%
rename from metadata/cache/net-analyzer/dhcp_probe-1.3.0-r2
rename to metadata/cache/net-analyzer/dhcp_probe-1.3.0-r3
index e17c3431baf8..d09c80a064b7 100644
--- a/metadata/cache/net-analyzer/dhcp_probe-1.3.0-r2
+++ b/metadata/cache/net-analyzer/dhcp_probe-1.3.0-r3
@@ -7,7 +7,7 @@ http://www.net.princeton.edu/software/dhcp_probe/
 GPL-2
 dhcp_probe attempts to discover DHCP and BootP servers on a directly-attached Ethernet network
 ~x86 ~amd64
-eutils multilib portability toolchain-funcs user
+eutils flag-o-matic multilib portability toolchain-funcs user
 
 
 
diff --git a/metadata/cache/net-analyzer/firewalk-5.0 b/metadata/cache/net-analyzer/firewalk-5.0
deleted file mode 100644
index 7e2568887f50..000000000000
--- a/metadata/cache/net-analyzer/firewalk-5.0
+++ /dev/null
@@ -1,22 +0,0 @@
-net-libs/libpcap >=net-libs/libnet-1.1.1 >=dev-libs/libdnet-1.7
-net-libs/libpcap >=net-libs/libnet-1.1.1 >=dev-libs/libdnet-1.7
-0
-mirror://gentoo/firewalk-5.0.tgz
-
-http://packetfactory.openwall.net/projects/firewalk/
-BSD
-A tool for determining a firewall's rule set
-amd64 ~ppc x86
-eutils multilib portability toolchain-funcs user
-
-
-
-
-
-
-install unpack
-
-
-
-
-
diff --git a/metadata/cache/net-analyzer/hunt-1.5 b/metadata/cache/net-analyzer/hunt-1.5
deleted file mode 100644
index bc13516557aa..000000000000
--- a/metadata/cache/net-analyzer/hunt-1.5
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-0
-http://lin.fsid.cvut.cz/~kra/hunt/hunt-1.5.tgz
-
-http://lin.fsid.cvut.cz/~kra/index.html
-GPL-2
-tool for checking well known weaknesses in the TCP/IP protocol
-~amd64 ~ppc x86
-
-
-
-
-
-
-
-compile install unpack
-
-
-
-
-
diff --git a/metadata/cache/net-analyzer/ipband-0.8 b/metadata/cache/net-analyzer/ipband-0.8
deleted file mode 100644
index 2795d86642f9..000000000000
--- a/metadata/cache/net-analyzer/ipband-0.8
+++ /dev/null
@@ -1,22 +0,0 @@
->=net-libs/libpcap-0.4
->=net-libs/libpcap-0.4
-0
-http://ipband.sourceforge.net/ipband-0.8.tgz
-
-http://ipband.sourceforge.net/
-GPL-2
-A pcap based IP traffic and bandwidth monitor with configurable reporting and alarm abilities
-~amd64 x86
-eutils multilib portability toolchain-funcs user
-
-
-
-
-
-
-compile install postinst unpack
-
-
-
-
-
diff --git a/metadata/cache/net-analyzer/tcpflow-1.0.6 b/metadata/cache/net-analyzer/tcpflow-1.0.6
index 3685e20ae4fc..9d9612fc243a 100644
--- a/metadata/cache/net-analyzer/tcpflow-1.0.6
+++ b/metadata/cache/net-analyzer/tcpflow-1.0.6
@@ -6,7 +6,7 @@ http://afflib.org/downloads/tcpflow-1.0.6.tar.gz
 http://afflib.org/
 GPL-2
 A tool for monitoring, capturing and storing TCP connections flows
-~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos
 
 test
 
diff --git a/metadata/cache/net-analyzer/tcpflow-1.1.0_beta3 b/metadata/cache/net-analyzer/tcpflow-1.1.0_beta3
new file mode 100644
index 000000000000..434fe284bd0d
--- /dev/null
+++ b/metadata/cache/net-analyzer/tcpflow-1.1.0_beta3
@@ -0,0 +1,22 @@
+net-libs/libpcap test? ( sys-apps/coreutils )
+net-libs/libpcap
+0
+http://afflib.org/downloads/tcpflow-1.1.0-beta3.tar.gz
+
+http://afflib.org/
+GPL-2
+A tool for monitoring, capturing and storing TCP connections flows
+~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+
+test
+
+
+
+4
+
+prepare
+
+
+
+
+
diff --git a/metadata/cache/net-ftp/tnftp-20100108 b/metadata/cache/net-ftp/tnftp-20100108
index 706a751d8c1f..b2dea08517d4 100644
--- a/metadata/cache/net-ftp/tnftp-20100108
+++ b/metadata/cache/net-ftp/tnftp-20100108
@@ -6,7 +6,7 @@ ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/tnftp-20100108.tar.gz ftp://ftp.netbs
 ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/
 as-is
 NetBSD FTP client with several advanced features
-~alpha ~amd64 ~ppc ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
+~alpha amd64 ~ppc ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
 
 ipv6 socks5
 
diff --git a/metadata/cache/net-im/choqok-1.2 b/metadata/cache/net-im/choqok-1.2
index 4881645e6158..f954cb817280 100644
--- a/metadata/cache/net-im/choqok-1.2
+++ b/metadata/cache/net-im/choqok-1.2
@@ -8,7 +8,7 @@ GPL-3
 Free/Open Source micro-blogging client for KDE
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-ayatana debug linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_is linguas_ja linguas_km linguas_lt linguas_ms linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sq linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua kdeenablefinal
+ayatana debug linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_is linguas_ja linguas_km linguas_lt linguas_ms linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sq linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/net-im/kmess-2.0.6-r3 b/metadata/cache/net-im/kmess-2.0.6-r3
index 9554159d7b28..b2e8f55f875f 100644
--- a/metadata/cache/net-im/kmess-2.0.6-r3
+++ b/metadata/cache/net-im/kmess-2.0.6-r3
@@ -8,7 +8,7 @@ GPL-2
 KMess is an alternative MSN Messenger chat client for Linux
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug gif konqueror libnotify xscreensaver linguas_ar linguas_ca linguas_de linguas_el linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_hu linguas_it linguas_ja linguas_nl linguas_pt_BR linguas_ru linguas_sk linguas_tr linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
+debug gif konqueror libnotify xscreensaver linguas_ar linguas_ca linguas_de linguas_el linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_hu linguas_it linguas_ja linguas_nl linguas_pt_BR linguas_ru linguas_sk linguas_tr linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/net-im/kmess-2.0.9999 b/metadata/cache/net-im/kmess-2.0.9999
index 610ad5db18a2..5965c2a2e8bb 100644
--- a/metadata/cache/net-im/kmess-2.0.9999
+++ b/metadata/cache/net-im/kmess-2.0.9999
@@ -8,7 +8,7 @@ GPL-2
 KMess is an alternative MSN Messenger chat client for Linux
 
 base cmake-utils eutils fdo-mime flag-o-matic git-2 gnome2-utils kde4-base kde4-functions multilib portability subversion toolchain-funcs user versionator virtualx
-debug gif konqueror libnotify xscreensaver aqua kdeenablefinal
+debug gif konqueror libnotify xscreensaver aqua
 
 
 
diff --git a/metadata/cache/net-im/kmess-9999 b/metadata/cache/net-im/kmess-9999
index 610ad5db18a2..5965c2a2e8bb 100644
--- a/metadata/cache/net-im/kmess-9999
+++ b/metadata/cache/net-im/kmess-9999
@@ -8,7 +8,7 @@ GPL-2
 KMess is an alternative MSN Messenger chat client for Linux
 
 base cmake-utils eutils fdo-mime flag-o-matic git-2 gnome2-utils kde4-base kde4-functions multilib portability subversion toolchain-funcs user versionator virtualx
-debug gif konqueror libnotify xscreensaver aqua kdeenablefinal
+debug gif konqueror libnotify xscreensaver aqua
 
 
 
diff --git a/metadata/cache/net-irc/epic4-2.10.1 b/metadata/cache/net-irc/epic4-2.10.1
index 8a092eac6250..2ee97aef91d8 100644
--- a/metadata/cache/net-irc/epic4-2.10.1
+++ b/metadata/cache/net-irc/epic4-2.10.1
@@ -6,7 +6,7 @@ ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/epic4-2.10.1.tar.bz2 ftp://prbh.
 http://epicsol.org/
 as-is
 Epic4 IRC Client
-~alpha amd64 ~hppa ~ia64 ~ppc ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+~alpha amd64 hppa ~ia64 ~ppc ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
 autotools eutils flag-o-matic libtool multilib portability toolchain-funcs user
 ipv6 perl ssl
 
diff --git a/metadata/cache/net-irc/konversation-1.4 b/metadata/cache/net-irc/konversation-1.4
index e2ca7b7eb535..c0a70166da01 100644
--- a/metadata/cache/net-irc/konversation-1.4
+++ b/metadata/cache/net-irc/konversation-1.4
@@ -8,7 +8,7 @@ GPL-2
 A user friendly IRC Client for KDE4
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-+crypt debug linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_hu linguas_it linguas_ja linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_si linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua kdeenablefinal
++crypt debug linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_hu linguas_it linguas_ja linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_si linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/net-libs/libbluedevil-1.9 b/metadata/cache/net-libs/libbluedevil-1.9
index 27e5ef20c7dc..ea44a0728e30 100644
--- a/metadata/cache/net-libs/libbluedevil-1.9
+++ b/metadata/cache/net-libs/libbluedevil-1.9
@@ -8,7 +8,7 @@ GPL-2
 Qt wrapper for bluez used in the KDE bluetooth stack
 amd64 ~arm x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/net-libs/libbluedevil-1.9.1 b/metadata/cache/net-libs/libbluedevil-1.9.1
index 53286028000c..f2c3d8b6dfdb 100644
--- a/metadata/cache/net-libs/libbluedevil-1.9.1
+++ b/metadata/cache/net-libs/libbluedevil-1.9.1
@@ -8,7 +8,7 @@ GPL-2
 Qt wrapper for bluez used in the KDE bluetooth stack
 ~amd64 ~arm ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/net-libs/libktorrent-1.1.1 b/metadata/cache/net-libs/libktorrent-1.1.1
index 491b43282fa4..a287fbcde5fe 100644
--- a/metadata/cache/net-libs/libktorrent-1.1.1
+++ b/metadata/cache/net-libs/libktorrent-1.1.1
@@ -8,7 +8,7 @@ GPL-2
 A BitTorrent library based on KDE Platform
 amd64 ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_ar linguas_ast linguas_be linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_ku linguas_lt linguas_lv linguas_ms linguas_nb linguas_nds linguas_nl linguas_nn linguas_oc linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_si linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW test +handbook aqua kdeenablefinal
+debug linguas_ar linguas_ast linguas_be linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_ku linguas_lt linguas_lv linguas_ms linguas_nb linguas_nds linguas_nl linguas_nn linguas_oc linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_si linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW test +handbook aqua
 
 
 
diff --git a/metadata/cache/net-libs/libktorrent-1.1.2 b/metadata/cache/net-libs/libktorrent-1.1.2
index ae10c43840ec..5775bf9e8d4c 100644
--- a/metadata/cache/net-libs/libktorrent-1.1.2
+++ b/metadata/cache/net-libs/libktorrent-1.1.2
@@ -8,7 +8,7 @@ GPL-2
 A BitTorrent library based on KDE Platform
 amd64 ~ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_ar linguas_ast linguas_be linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_ku linguas_lt linguas_lv linguas_ms linguas_nb linguas_nds linguas_nl linguas_nn linguas_oc linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_si linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW test +handbook aqua kdeenablefinal
+debug linguas_ar linguas_ast linguas_be linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_ku linguas_lt linguas_lv linguas_ms linguas_nb linguas_nds linguas_nl linguas_nn linguas_oc linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_si linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW test +handbook aqua
 
 
 
diff --git a/metadata/cache/net-libs/libktorrent-1.1.3 b/metadata/cache/net-libs/libktorrent-1.1.3
index bb16cb025225..c20a3b93e7f4 100644
--- a/metadata/cache/net-libs/libktorrent-1.1.3
+++ b/metadata/cache/net-libs/libktorrent-1.1.3
@@ -8,7 +8,7 @@ GPL-2
 A BitTorrent library based on KDE Platform
 ~amd64 ~ppc ~ppc64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_ar linguas_ast linguas_be linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_ku linguas_lt linguas_lv linguas_ms linguas_nb linguas_nds linguas_nl linguas_nn linguas_oc linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_si linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW test +handbook aqua kdeenablefinal
+debug linguas_ar linguas_ast linguas_be linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_ku linguas_lt linguas_lv linguas_ms linguas_nb linguas_nds linguas_nl linguas_nn linguas_oc linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_si linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW test +handbook aqua
 
 
 
diff --git a/metadata/cache/net-libs/libkvkontakte-2.3.0 b/metadata/cache/net-libs/libkvkontakte-2.3.0
index 2b001cb0188d..e366c7b5345d 100644
--- a/metadata/cache/net-libs/libkvkontakte-2.3.0
+++ b/metadata/cache/net-libs/libkvkontakte-2.3.0
@@ -8,7 +8,7 @@ GPL-2
 Library for accessing the features of social networking site vkontakte.ru
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/net-libs/libkvkontakte-2.4.1 b/metadata/cache/net-libs/libkvkontakte-2.4.1
index 1b726432bea7..a1c403d5fc7c 100644
--- a/metadata/cache/net-libs/libkvkontakte-2.4.1
+++ b/metadata/cache/net-libs/libkvkontakte-2.4.1
@@ -8,7 +8,7 @@ GPL-2
 Library for accessing the features of social networking site vkontakte.ru
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/net-libs/libkvkontakte-2.5.0 b/metadata/cache/net-libs/libkvkontakte-2.5.0
index cb0de1baf677..94fec800ca67 100644
--- a/metadata/cache/net-libs/libkvkontakte-2.5.0
+++ b/metadata/cache/net-libs/libkvkontakte-2.5.0
@@ -8,7 +8,7 @@ GPL-2
 Library for accessing the features of social networking site vkontakte.ru
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/net-libs/nodejs-0.6.7-r1 b/metadata/cache/net-libs/nodejs-0.6.7-r1
new file mode 100644
index 000000000000..d2909a58ff1f
--- /dev/null
+++ b/metadata/cache/net-libs/nodejs-0.6.7-r1
@@ -0,0 +1,22 @@
+>=dev-lang/v8-3.5.10.22 dev-libs/openssl
+>=dev-lang/v8-3.5.10.22 dev-libs/openssl
+0
+http://nodejs.org/dist/v0.6.7/node-v0.6.7.tar.gz
+test
+http://nodejs.org/
+GPL-2
+Evented IO for V8 Javascript
+~x86 ~amd64
+eutils multilib pax-utils portability toolchain-funcs user
+
+
+
+
+2
+
+compile configure install test
+
+
+
+
+
diff --git a/metadata/cache/net-mail/offlineimap-6.5.2 b/metadata/cache/net-mail/offlineimap-6.5.2
new file mode 100644
index 000000000000..f6110597f42a
--- /dev/null
+++ b/metadata/cache/net-mail/offlineimap-6.5.2
@@ -0,0 +1,22 @@
+doc? ( dev-python/docutils ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[threads,ssl?] =dev-lang/python-2.6*[threads,ssl?] )
+>=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[threads,ssl?] =dev-lang/python-2.6*[threads,ssl?] )
+0
+https://github.com/downloads/spaetz/offlineimap/offlineimap-v6.5.2.tar.gz -> offlineimap-6.5.2.tar.gz
+
+http://offlineimap.org
+GPL-2
+Powerful IMAP/Maildir synchronization and reader support
+~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+distutils eutils multilib portability python toolchain-funcs user
+doc ssl
+
+
+
+3
+
+compile install postinst postrm prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/net-misc/apt-cacher-ng-0.6.12 b/metadata/cache/net-misc/apt-cacher-ng-0.6.12
new file mode 100644
index 000000000000..fe9618544087
--- /dev/null
+++ b/metadata/cache/net-misc/apt-cacher-ng-0.6.12
@@ -0,0 +1,22 @@
+app-arch/bzip2 sys-libs/zlib app-arch/xz-utils dev-util/cmake >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+app-arch/bzip2 sys-libs/zlib lzma? ( app-arch/xz-utils ) fuse? ( sys-fs/fuse ) tcpd? ( sys-apps/tcp-wrappers ) dev-lang/perl
+0
+mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_0.6.12.orig.tar.xz
+
+http://www.unix-ag.uni-kl.de/~bloch/acng/
+as-is
+Yet another implementation of an HTTP proxy for Debian/Ubuntu software packages written in C++
+~amd64 ~x86
+base cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user
+doc fuse lzma tcpd
+
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/net-misc/guidedog-1.1 b/metadata/cache/net-misc/guidedog-1.1
index 85764930ac5d..6cfa9a757ae4 100644
--- a/metadata/cache/net-misc/guidedog-1.1
+++ b/metadata/cache/net-misc/guidedog-1.1
@@ -8,7 +8,7 @@ GPL-2
 A network/routing configuration utility for KDE 4
 ~amd64 ~ppc x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/net-misc/knemo-0.7.0 b/metadata/cache/net-misc/knemo-0.7.0
index 4caa8ef6c420..2070d35d79a2 100644
--- a/metadata/cache/net-misc/knemo-0.7.0
+++ b/metadata/cache/net-misc/knemo-0.7.0
@@ -8,7 +8,7 @@ GPL-2
 KNemo - the KDE Network Monitor
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_ar linguas_bg linguas_br linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_ka linguas_km linguas_lt linguas_ms linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_sk linguas_sr linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
+debug linguas_ar linguas_bg linguas_br linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_ka linguas_km linguas_lt linguas_ms linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_sk linguas_sr linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/net-misc/knemo-0.7.2 b/metadata/cache/net-misc/knemo-0.7.2
index d3cd9f26b284..5e7330679cbb 100644
--- a/metadata/cache/net-misc/knemo-0.7.2
+++ b/metadata/cache/net-misc/knemo-0.7.2
@@ -8,7 +8,7 @@ GPL-2
 KNemo - the KDE Network Monitor
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_ar linguas_bg linguas_br linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_ka linguas_km linguas_lt linguas_ms linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_sk linguas_sr linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
+debug linguas_ar linguas_bg linguas_br linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_ka linguas_km linguas_lt linguas_ms linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_sk linguas_sr linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/net-misc/knemo-0.7.3 b/metadata/cache/net-misc/knemo-0.7.3
index 96b1667a5a74..994c11892a25 100644
--- a/metadata/cache/net-misc/knemo-0.7.3
+++ b/metadata/cache/net-misc/knemo-0.7.3
@@ -8,7 +8,7 @@ GPL-2
 KNemo - the KDE Network Monitor
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug wifi linguas_ar linguas_bg linguas_br linguas_bs linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_ka linguas_km linguas_lt linguas_ms linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_sk linguas_sr linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
+debug wifi linguas_ar linguas_bg linguas_br linguas_bs linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_ka linguas_km linguas_lt linguas_ms linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_sk linguas_sr linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/net-misc/knutclient-1.0.4 b/metadata/cache/net-misc/knutclient-1.0.4
index 63bff3cef398..b1bfc3967db1 100644
--- a/metadata/cache/net-misc/knutclient-1.0.4
+++ b/metadata/cache/net-misc/knutclient-1.0.4
@@ -8,7 +8,7 @@ GPL-2
 A visual KDE client for UPS systems
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_cs linguas_de linguas_es linguas_fr linguas_it linguas_pl linguas_pt_BR linguas_ru linguas_uk +handbook aqua kdeenablefinal
+debug linguas_cs linguas_de linguas_es linguas_fr linguas_it linguas_pl linguas_pt_BR linguas_ru linguas_uk +handbook aqua
 
 
 
diff --git a/metadata/cache/net-misc/ksshaskpass-0.5.3 b/metadata/cache/net-misc/ksshaskpass-0.5.3
index 66435c03b108..92a11de80b5f 100644
--- a/metadata/cache/net-misc/ksshaskpass-0.5.3
+++ b/metadata/cache/net-misc/ksshaskpass-0.5.3
@@ -8,7 +8,7 @@ GPL-2
 KDE implementation of ssh-askpass with Kwallet integration.
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/net-misc/kvpnc-0.9.6a b/metadata/cache/net-misc/kvpnc-0.9.6a
index 598611d6a834..e5d772b5e2b0 100644
--- a/metadata/cache/net-misc/kvpnc-0.9.6a
+++ b/metadata/cache/net-misc/kvpnc-0.9.6a
@@ -8,7 +8,7 @@ GPL-2
 KDE frontend for various VPN clients
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-+crypt debug linguas_ar linguas_br linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_it linguas_ja linguas_ka linguas_lt linguas_ms linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
++crypt debug linguas_ar linguas_br linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_it linguas_ja linguas_ka linguas_lt linguas_ms linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/net-misc/memcached-1.4.11 b/metadata/cache/net-misc/memcached-1.4.11
new file mode 100644
index 000000000000..8218831df8ff
--- /dev/null
+++ b/metadata/cache/net-misc/memcached-1.4.11
@@ -0,0 +1,22 @@
+>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl )
+0
+http://memcached.googlecode.com/files/memcached-1.4.11.tar.gz
+
+http://code.google.com/p/memcached/
+BSD
+High-performance, distributed memory object caching system
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+autotools eutils flag-o-matic libtool multilib portability toolchain-funcs user
+test slabs-reassign debug sasl
+
+
+
+2
+
+compile configure install postinst prepare test
+
+
+
+
+
diff --git a/metadata/cache/net-misc/smb4k-0.10.10 b/metadata/cache/net-misc/smb4k-0.10.10
index 051932ba31b9..ae0eadc8d37d 100644
--- a/metadata/cache/net-misc/smb4k-0.10.10
+++ b/metadata/cache/net-misc/smb4k-0.10.10
@@ -8,7 +8,7 @@ GPL-2
 The advanced network neighborhood browser for KDE
 amd64 ~ppc x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_bg linguas_cs linguas_da linguas_de linguas_es linguas_fr linguas_hu linguas_is linguas_it linguas_ja linguas_nb linguas_nl linguas_pl linguas_pt_BR linguas_ru linguas_sk linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua kdeenablefinal
+debug linguas_bg linguas_cs linguas_da linguas_de linguas_es linguas_fr linguas_hu linguas_is linguas_it linguas_ja linguas_nb linguas_nl linguas_pl linguas_pt_BR linguas_ru linguas_sk linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/net-misc/smb4k-0.10.91 b/metadata/cache/net-misc/smb4k-0.10.91
index ec6f0f1e1a76..8f0cb84d413f 100644
--- a/metadata/cache/net-misc/smb4k-0.10.91
+++ b/metadata/cache/net-misc/smb4k-0.10.91
@@ -8,7 +8,7 @@ GPL-2
 The advanced network neighborhood browser for KDE
 ~amd64 ~ppc ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_bg linguas_cs linguas_da linguas_de linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hu linguas_is linguas_it linguas_ja linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua kdeenablefinal
+debug linguas_bg linguas_cs linguas_da linguas_de linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hu linguas_is linguas_it linguas_ja linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/net-misc/smb4k-0.10.90 b/metadata/cache/net-misc/smb4k-0.10.92
similarity index 97%
rename from metadata/cache/net-misc/smb4k-0.10.90
rename to metadata/cache/net-misc/smb4k-0.10.92
index e93e894a6aca..64316e12fa79 100644
--- a/metadata/cache/net-misc/smb4k-0.10.90
+++ b/metadata/cache/net-misc/smb4k-0.10.92
@@ -1,14 +1,14 @@
 >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7:4[qt3support,ssl] >=x11-libs/qt-gui-4.7:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7:4[accessibility,kde] >=x11-libs/qt-script-4.7:4 >=x11-libs/qt-sql-4.7:4[qt3support] >=x11-libs/qt-svg-4.7:4 >=x11-libs/qt-test-4.7:4 >=x11-libs/qt-webkit-4.7:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 >=net-fs/samba-3.4.2[cups] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) 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_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) 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_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) 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(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7:4[qt3support,ssl] >=x11-libs/qt-gui-4.7:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7:4[accessibility,kde] >=x11-libs/qt-script-4.7:4 >=x11-libs/qt-sql-4.7:4[qt3support] >=x11-libs/qt-svg-4.7:4 >=x11-libs/qt-test-4.7:4 >=x11-libs/qt-webkit-4.7:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 4
-mirror://sourceforge/smb4k/smb4k-0.10.90.tar.bz2
+mirror://sourceforge/smb4k/smb4k-0.10.92.tar.bz2
 
 http://sourceforge.net/projects/smb4k/
 GPL-2
 The advanced network neighborhood browser for KDE
 ~amd64 ~ppc ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_bg linguas_cs linguas_da linguas_de linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hu linguas_is linguas_it linguas_ja linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua kdeenablefinal
+debug linguas_bg linguas_cs linguas_da linguas_de linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hu linguas_is linguas_it linguas_ja linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/net-misc/socat-1.7.2.0 b/metadata/cache/net-misc/socat-1.7.2.0
index 2d5ef62ef0d4..0dc1cf841262 100644
--- a/metadata/cache/net-misc/socat-1.7.2.0
+++ b/metadata/cache/net-misc/socat-1.7.2.0
@@ -6,7 +6,7 @@ http://www.dest-unreach.org/socat/download/socat-1.7.2.0.tar.bz2
 http://www.dest-unreach.org/socat/
 GPL-2
 Multipurpose relay (SOcket CAT)
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~ppc-macos
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~ppc-macos
 autotools eutils flag-o-matic libtool multilib portability toolchain-funcs user
 ssl readline ipv6 tcpd
 
diff --git a/metadata/cache/net-nntp/kwooty-0.6.2 b/metadata/cache/net-nntp/kwooty-0.6.2
index 5726e63af502..830d8e29d104 100644
--- a/metadata/cache/net-nntp/kwooty-0.6.2
+++ b/metadata/cache/net-nntp/kwooty-0.6.2
@@ -8,7 +8,7 @@ GPL-2
 A friendly nzb linux usenet binary client
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/net-nntp/kwooty-0.7.2 b/metadata/cache/net-nntp/kwooty-0.7.2
index 4c84384ee4e9..d4508e514e67 100644
--- a/metadata/cache/net-nntp/kwooty-0.7.2
+++ b/metadata/cache/net-nntp/kwooty-0.7.2
@@ -8,7 +8,7 @@ GPL-2
 Friendly nzb linux usenet binary client
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_cs linguas_de aqua kdeenablefinal
+debug linguas_cs linguas_de aqua
 
 
 
diff --git a/metadata/cache/net-nntp/kwooty-0.7.3 b/metadata/cache/net-nntp/kwooty-0.7.3
index ad8033ea254a..48b8f71366c1 100644
--- a/metadata/cache/net-nntp/kwooty-0.7.3
+++ b/metadata/cache/net-nntp/kwooty-0.7.3
@@ -8,7 +8,7 @@ GPL-2
 Friendly nzb linux usenet binary client
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_cs linguas_de aqua kdeenablefinal
+debug linguas_cs linguas_de aqua
 
 
 
diff --git a/metadata/cache/net-nntp/kwooty-0.8.0 b/metadata/cache/net-nntp/kwooty-0.8.0
index d116195ff133..e5941cc86271 100644
--- a/metadata/cache/net-nntp/kwooty-0.8.0
+++ b/metadata/cache/net-nntp/kwooty-0.8.0
@@ -8,7 +8,7 @@ GPL-2
 Friendly nzb linux usenet binary client
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_cs linguas_de aqua kdeenablefinal
+debug linguas_cs linguas_de aqua
 
 
 
diff --git a/metadata/cache/net-p2p/kmldonkey-2.0.2-r2 b/metadata/cache/net-p2p/kmldonkey-2.0.2-r2
index b5cca60b9ebd..fdada301089b 100644
--- a/metadata/cache/net-p2p/kmldonkey-2.0.2-r2
+++ b/metadata/cache/net-p2p/kmldonkey-2.0.2-r2
@@ -8,7 +8,7 @@ GPL-2 LGPL-2
 Provides integration for the MLDonkey P2P software and KDE 4.
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug plasma linguas_ca linguas_cs linguas_el linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_it linguas_nb linguas_nl linguas_pt linguas_ru linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
+debug plasma linguas_ca linguas_cs linguas_el linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_it linguas_nb linguas_nl linguas_pt linguas_ru linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/net-p2p/ktorrent-4.1.1 b/metadata/cache/net-p2p/ktorrent-4.1.1
index cc94478e875f..d1a9f1e97bfe 100644
--- a/metadata/cache/net-p2p/ktorrent-4.1.1
+++ b/metadata/cache/net-p2p/ktorrent-4.1.1
@@ -8,7 +8,7 @@ GPL-2
 A BitTorrent program for KDE.
 amd64 ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-+bwscheduler debug +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator +mediaplayer plasma rss +scanfolder +search +shutdown +stats +upnp webinterface +zeroconf linguas_ar linguas_ast linguas_be linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_lt linguas_lv linguas_mai linguas_ms linguas_nb linguas_nds linguas_nl linguas_nn linguas_oc linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_si linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua kdeenablefinal
++bwscheduler debug +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator +mediaplayer plasma rss +scanfolder +search +shutdown +stats +upnp webinterface +zeroconf linguas_ar linguas_ast linguas_be linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_lt linguas_lv linguas_mai linguas_ms linguas_nb linguas_nds linguas_nl linguas_nn linguas_oc linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_si linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/net-p2p/ktorrent-4.1.2 b/metadata/cache/net-p2p/ktorrent-4.1.2
index 63eb084970ab..fe655c55186f 100644
--- a/metadata/cache/net-p2p/ktorrent-4.1.2
+++ b/metadata/cache/net-p2p/ktorrent-4.1.2
@@ -8,7 +8,7 @@ GPL-2
 A BitTorrent program for KDE.
 amd64 ~ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-+bwscheduler debug +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator +mediaplayer plasma rss +scanfolder +search +shutdown +stats +upnp webinterface +zeroconf linguas_ar linguas_ast linguas_be linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_lt linguas_lv linguas_mai linguas_ms linguas_nb linguas_nds linguas_nl linguas_nn linguas_oc linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_si linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua kdeenablefinal
++bwscheduler debug +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator +mediaplayer plasma rss +scanfolder +search +shutdown +stats +upnp webinterface +zeroconf linguas_ar linguas_ast linguas_be linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_lt linguas_lv linguas_mai linguas_ms linguas_nb linguas_nds linguas_nl linguas_nn linguas_oc linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_si linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/net-p2p/ktorrent-4.1.3 b/metadata/cache/net-p2p/ktorrent-4.1.3
index 570b974aae2f..36ae680dfc6d 100644
--- a/metadata/cache/net-p2p/ktorrent-4.1.3
+++ b/metadata/cache/net-p2p/ktorrent-4.1.3
@@ -8,7 +8,7 @@ GPL-2
 A BitTorrent program for KDE.
 ~amd64 ~ppc ~ppc64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-+bwscheduler debug +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator +mediaplayer plasma rss +scanfolder +search +shutdown +stats +upnp webinterface +zeroconf linguas_ar linguas_ast linguas_be linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_lt linguas_lv linguas_mai linguas_ms linguas_nb linguas_nds linguas_nl linguas_nn linguas_oc linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_si linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua kdeenablefinal
++bwscheduler debug +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator +mediaplayer plasma rss +scanfolder +search +shutdown +stats +upnp webinterface +zeroconf linguas_ar linguas_ast linguas_be linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_lt linguas_lv linguas_mai linguas_ms linguas_nb linguas_nds linguas_nl linguas_nn linguas_oc linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_si linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/net-print/foomatic-db-4.0.20120117 b/metadata/cache/net-print/foomatic-db-4.0.20120117
new file mode 100644
index 000000000000..daf0affc5ffb
--- /dev/null
+++ b/metadata/cache/net-print/foomatic-db-4.0.20120117
@@ -0,0 +1,22 @@
+
+net-print/foomatic-db-engine !net-print/foo2zjs[hp2600n]
+0
+http://www.openprinting.org/download/foomatic/foomatic-db-4.0-20120117.tar.gz
+
+http://www.linuxprinting.org/foomatic.html
+GPL-2
+Printer information files for foomatic-db-engine to generate ppds
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+eutils multilib portability toolchain-funcs user versionator
+
+
+
+
+4
+
+configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/net-print/foomatic-db-engine-4.0.7 b/metadata/cache/net-print/foomatic-db-engine-4.0.7
index 84db94fb014e..72a9f33f8616 100644
--- a/metadata/cache/net-print/foomatic-db-engine-4.0.7
+++ b/metadata/cache/net-print/foomatic-db-engine-4.0.7
@@ -6,7 +6,7 @@ http://www.linuxprinting.org/download/foomatic/foomatic-db-engine-4.0.7.tar.gz
 http://www.linuxprinting.org/foomatic.html
 GPL-2
 Generates ppds out of xml foomatic printer description files
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 base eutils multilib perl-app perl-module portability toolchain-funcs user versionator
 
 
diff --git a/metadata/cache/net-print/foomatic-db-engine-4.0.8 b/metadata/cache/net-print/foomatic-db-engine-4.0.8
new file mode 100644
index 000000000000..98de5cd35c22
--- /dev/null
+++ b/metadata/cache/net-print/foomatic-db-engine-4.0.8
@@ -0,0 +1,22 @@
+dev-lang/perl[-build]
+dev-libs/libxml2 net-print/foomatic-filters dev-lang/perl[-build]
+0
+http://www.openprinting.org/download/foomatic/foomatic-db-engine-4.0.8.tar.gz
+
+http://www.linuxprinting.org/foomatic.html
+GPL-2
+Generates ppds out of xml foomatic printer description files
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+base eutils multilib perl-app perl-module portability toolchain-funcs user versionator
+
+
+net-print/foomatic-db
+
+2
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/net-print/foomatic-db-ppds-4.0.20120117 b/metadata/cache/net-print/foomatic-db-ppds-4.0.20120117
new file mode 100644
index 000000000000..d921cd8b0793
--- /dev/null
+++ b/metadata/cache/net-print/foomatic-db-ppds-4.0.20120117
@@ -0,0 +1,22 @@
+
+
+0
+http://dev.gentoo.org/~jlec/distfiles/foomatic-db-4.0-20120117.tar.gz http://linuxprinting.org/download/foomatic/foomatic-db-4.0-20120117.tar.gz
+
+http://www.linuxprinting.org/foomatic.html
+GPL-2
+linuxprinting.org PPD files for postscript printers
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd
+eutils multilib portability toolchain-funcs user versionator
+
+
+
+
+4
+
+prepare
+
+
+
+
+
diff --git a/metadata/cache/net-print/foomatic-filters-4.0.9 b/metadata/cache/net-print/foomatic-filters-4.0.9
new file mode 100644
index 000000000000..6f433d999b37
--- /dev/null
+++ b/metadata/cache/net-print/foomatic-filters-4.0.9
@@ -0,0 +1,22 @@
+dev-lang/perl app-text/ghostscript-gpl cups? ( >=net-print/cups-1.1.19 ) !cups? ( || ( app-text/enscript app-text/a2ps app-text/mpage ) ) dbus? ( sys-apps/dbus ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+dev-lang/perl app-text/ghostscript-gpl cups? ( >=net-print/cups-1.1.19 ) !cups? ( || ( app-text/enscript app-text/a2ps app-text/mpage ) ) dbus? ( sys-apps/dbus )
+0
+http://www.openprinting.org/download/foomatic/foomatic-filters-4.0.9.tar.gz
+
+http://www.linuxprinting.org/foomatic.html
+GPL-2
+Foomatic wrapper scripts
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+autotools eutils libtool multilib portability toolchain-funcs user versionator
+cups dbus
+
+
+
+4
+
+configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/net-print/foomatic-gui-0.7.9.4 b/metadata/cache/net-print/foomatic-gui-0.7.9.5
similarity index 89%
rename from metadata/cache/net-print/foomatic-gui-0.7.9.4
rename to metadata/cache/net-print/foomatic-gui-0.7.9.5
index 776aa1257494..e1f97659e594 100644
--- a/metadata/cache/net-print/foomatic-gui-0.7.9.4
+++ b/metadata/cache/net-print/foomatic-gui-0.7.9.5
@@ -1,7 +1,7 @@
 >=app-admin/eselect-python-20091230 =dev-lang/python-2*
 dev-python/libgnome-python dev-python/pygobject:2 dev-python/libbonobo-python dev-python/gnome-vfs-python dev-python/ipy dev-python/pygtk:2 dev-python/pywebkitgtk >=dev-python/pyxml-0.8 net-print/foomatic-db-engine >=app-admin/eselect-python-20091230 =dev-lang/python-2*
 0
-mirror://debian/pool/main/f/foomatic-gui/foomatic-gui_0.7.9.4.tar.gz
+mirror://debian/pool/main/f/foomatic-gui/foomatic-gui_0.7.9.5.tar.gz
 
 http://freshmeat.net/projects/foomatic-gui/
 GPL-2
diff --git a/metadata/cache/net-voip/ekiga-3.2.7 b/metadata/cache/net-voip/ekiga-3.2.7
index 480a97f44bdb..94c9ef01b460 100644
--- a/metadata/cache/net-voip/ekiga-3.2.7
+++ b/metadata/cache/net-voip/ekiga-3.2.7
@@ -8,7 +8,7 @@ GPL-2
 H.323 and SIP VoIP softphone
 ~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
 base eutils fdo-mime gnome.org gnome2 gnome2-utils kde4-base kde4-functions libtool multilib portability toolchain-funcs user versionator virtualx
-avahi dbus debug doc eds gconf gnome gstreamer h323 kde kontact ldap libnotify mmx nls +shm static v4l xcap xv aqua kde kdeenablefinal
+avahi dbus debug doc eds gconf gnome gstreamer h323 kde kontact ldap libnotify mmx nls +shm static v4l xcap xv aqua kde
 
 
 
diff --git a/metadata/cache/net-wireless/bluedevil-1.2.1 b/metadata/cache/net-wireless/bluedevil-1.2.1
index d1d4034590f4..06d3071920fe 100644
--- a/metadata/cache/net-wireless/bluedevil-1.2.1
+++ b/metadata/cache/net-wireless/bluedevil-1.2.1
@@ -8,7 +8,7 @@ GPL-3
 Bluetooth stack for KDE
 amd64 ~arm x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_mai linguas_ms linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
+debug linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_mai linguas_ms linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/net-wireless/bluedevil-1.2.2 b/metadata/cache/net-wireless/bluedevil-1.2.2
index b7dc777a15f4..cd50256e1e7c 100644
--- a/metadata/cache/net-wireless/bluedevil-1.2.2
+++ b/metadata/cache/net-wireless/bluedevil-1.2.2
@@ -8,7 +8,7 @@ GPL-3
 Bluetooth stack for KDE
 ~amd64 ~arm ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_mai linguas_ms linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW aqua kdeenablefinal
+debug linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_mai linguas_ms linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/sci-calculators/keurocalc-1.1.0 b/metadata/cache/sci-calculators/keurocalc-1.1.0
index 3cef612e345d..fb2972d37997 100644
--- a/metadata/cache/sci-calculators/keurocalc-1.1.0
+++ b/metadata/cache/sci-calculators/keurocalc-1.1.0
@@ -8,7 +8,7 @@ GPL-2 FDL-1.2
 A universal currency converter and calculator
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_ar linguas_bg linguas_br linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_ja linguas_ka linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sr@Latn linguas_sr linguas_sv linguas_ta linguas_tr linguas_uk linguas_zh_TW +handbook aqua kdeenablefinal
+debug linguas_ar linguas_bg linguas_br linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_ja linguas_ka linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sr@Latn linguas_sr linguas_sv linguas_ta linguas_tr linguas_uk linguas_zh_TW +handbook aqua
 
 
 
diff --git a/metadata/cache/sci-chemistry/votca-csg-1.2.2 b/metadata/cache/sci-chemistry/votca-csg-1.2.2
index 70ed2f35a741..bfdd7fb3edcc 100644
--- a/metadata/cache/sci-chemistry/votca-csg-1.2.2
+++ b/metadata/cache/sci-chemistry/votca-csg-1.2.2
@@ -6,7 +6,7 @@ primaryuri
 http://www.votca.org
 Apache-2.0
 Votca coarse-graining engine
-~amd64 ~x86 ~amd64-linux
+amd64 ~x86 ~amd64-linux
 base bash-completion-r1 cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user
 doc examples extras +gromacs +system-boost
 
diff --git a/metadata/cache/sci-chemistry/votca-csgapps-1.2.2 b/metadata/cache/sci-chemistry/votca-csgapps-1.2.2
index f848548958b3..b8445b9189f1 100644
--- a/metadata/cache/sci-chemistry/votca-csgapps-1.2.2
+++ b/metadata/cache/sci-chemistry/votca-csgapps-1.2.2
@@ -6,7 +6,7 @@ primaryuri
 http://www.votca.org
 Apache-2.0
 Extra applications for votca-csg
-~amd64 ~x86 ~amd64-linux
+amd64 ~x86 ~amd64-linux
 base cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user
 
 
diff --git a/metadata/cache/sci-electronics/cirkuit-0.3.2 b/metadata/cache/sci-electronics/cirkuit-0.3.2
index 5bfb83227ec5..f0a54819811d 100644
--- a/metadata/cache/sci-electronics/cirkuit-0.3.2
+++ b/metadata/cache/sci-electronics/cirkuit-0.3.2
@@ -8,7 +8,7 @@ GPL-2
 An application to generate publication-ready figures
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/sci-libs/dsdp-5.8 b/metadata/cache/sci-libs/dsdp-5.8-r1
similarity index 100%
rename from metadata/cache/sci-libs/dsdp-5.8
rename to metadata/cache/sci-libs/dsdp-5.8-r1
diff --git a/metadata/cache/sci-libs/votca-tools-1.2.2 b/metadata/cache/sci-libs/votca-tools-1.2.2
index 61928d1f38d7..3caa8da76427 100644
--- a/metadata/cache/sci-libs/votca-tools-1.2.2
+++ b/metadata/cache/sci-libs/votca-tools-1.2.2
@@ -6,7 +6,7 @@ primaryuri
 http://www.votca.org
 Apache-2.0
 Votca tools library
-~amd64 ~x86 ~amd64-linux ~x86-macos
+amd64 ~x86 ~amd64-linux ~x86-macos
 base cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user
 doc +fftw +gsl sqlite +system-boost
 
diff --git a/metadata/cache/sci-mathematics/octave-3.4.3-r1 b/metadata/cache/sci-mathematics/octave-3.4.3-r1
index a1e6e79ab9ae..1a963272ed2b 100644
--- a/metadata/cache/sci-mathematics/octave-3.4.3-r1
+++ b/metadata/cache/sci-mathematics/octave-3.4.3-r1
@@ -6,7 +6,7 @@ ftp://ftp.gnu.org/pub/gnu/octave/octave-3.4.3.tar.bz2
 http://www.octave.org/
 GPL-3
 High-level interactive language for numerical computations
-~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 autotools base eutils libtool multilib portability toolchain-funcs user
 curl doc fftw +glpk +imagemagick opengl +qhull +qrupdate readline +sparse X zlib
 
diff --git a/metadata/cache/sci-mathematics/rkward-0.5.4 b/metadata/cache/sci-mathematics/rkward-0.5.4
index 575a96685a0f..abed6c14da89 100644
--- a/metadata/cache/sci-mathematics/rkward-0.5.4
+++ b/metadata/cache/sci-mathematics/rkward-0.5.4
@@ -8,7 +8,7 @@ GPL-2
 An IDE/GUI for the R-project
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/sci-mathematics/rkward-0.5.5 b/metadata/cache/sci-mathematics/rkward-0.5.5
index a61d354f9e8e..940d6fcc2f9e 100644
--- a/metadata/cache/sci-mathematics/rkward-0.5.5
+++ b/metadata/cache/sci-mathematics/rkward-0.5.5
@@ -8,7 +8,7 @@ GPL-2
 An IDE/GUI for the R-project
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_fr linguas_it linguas_lt linguas_pl linguas_tr linguas_zh_CN +handbook aqua kdeenablefinal
+debug linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_fr linguas_it linguas_lt linguas_pl linguas_tr linguas_zh_CN +handbook aqua
 
 
 
diff --git a/metadata/cache/sci-mathematics/rkward-0.5.6 b/metadata/cache/sci-mathematics/rkward-0.5.6
index 9c2c52f0f8ae..2a3defdd7fb6 100644
--- a/metadata/cache/sci-mathematics/rkward-0.5.6
+++ b/metadata/cache/sci-mathematics/rkward-0.5.6
@@ -8,7 +8,7 @@ GPL-2
 An IDE/GUI for the R-project
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_fr linguas_it linguas_lt linguas_pl linguas_tr linguas_zh_CN +handbook aqua kdeenablefinal
+debug linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_fr linguas_it linguas_lt linguas_pl linguas_tr linguas_zh_CN +handbook aqua
 
 
 
diff --git a/metadata/cache/sci-mathematics/rkward-0.5.6-r1 b/metadata/cache/sci-mathematics/rkward-0.5.6-r1
index 9c2c52f0f8ae..2a3defdd7fb6 100644
--- a/metadata/cache/sci-mathematics/rkward-0.5.6-r1
+++ b/metadata/cache/sci-mathematics/rkward-0.5.6-r1
@@ -8,7 +8,7 @@ GPL-2
 An IDE/GUI for the R-project
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_fr linguas_it linguas_lt linguas_pl linguas_tr linguas_zh_CN +handbook aqua kdeenablefinal
+debug linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_fr linguas_it linguas_lt linguas_pl linguas_tr linguas_zh_CN +handbook aqua
 
 
 
diff --git a/metadata/cache/sci-mathematics/rkward-0.5.7 b/metadata/cache/sci-mathematics/rkward-0.5.7
index 1575db5c37de..3e9bd149652f 100644
--- a/metadata/cache/sci-mathematics/rkward-0.5.7
+++ b/metadata/cache/sci-mathematics/rkward-0.5.7
@@ -8,7 +8,7 @@ GPL-2
 An IDE/GUI for the R-project
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_fr linguas_it linguas_lt linguas_pl linguas_tr linguas_zh_CN +handbook aqua kdeenablefinal
+debug linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_fr linguas_it linguas_lt linguas_pl linguas_tr linguas_zh_CN +handbook aqua
 
 
 
diff --git a/metadata/cache/sci-visualization/gnuplot-4.4.4 b/metadata/cache/sci-visualization/gnuplot-4.4.4
deleted file mode 100644
index 4db0c578e130..000000000000
--- a/metadata/cache/sci-visualization/gnuplot-4.4.4
+++ /dev/null
@@ -1,22 +0,0 @@
-cairo? ( x11-libs/cairo x11-libs/pango ) emacs? ( virtual/emacs ) gd? ( media-libs/gd[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) lua? ( dev-lang/lua ) plotutils? ( media-libs/plotutils ) readline? ( sys-libs/readline ) svga? ( media-libs/svgalib ) wxwidgets? ( x11-libs/wxGTK:2.8[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:2 ) X? ( x11-libs/libXaw ) xemacs? ( app-editors/xemacs app-xemacs/xemacs-base ) dev-util/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-latexextra app-text/ghostscript-gpl ) !emacs? ( xemacs? ( app-xemacs/texinfo ) )
-cairo? ( x11-libs/cairo x11-libs/pango ) emacs? ( virtual/emacs ) gd? ( media-libs/gd[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) lua? ( dev-lang/lua ) plotutils? ( media-libs/plotutils ) readline? ( sys-libs/readline ) svga? ( media-libs/svgalib ) wxwidgets? ( x11-libs/wxGTK:2.8[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:2 ) X? ( x11-libs/libXaw ) xemacs? ( app-editors/xemacs app-xemacs/xemacs-base )
-0
-mirror://sourceforge/gnuplot/gnuplot-4.4.4.tar.gz
-wxwidgets? ( test )
-http://www.gnuplot.info/
-gnuplot GPL-2
-Command-line driven interactive plotting program
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-elisp-common eutils multilib portability toolchain-funcs user wxwidgets
-cairo doc emacs examples +gd ggi latex lua plotutils readline svga thin-splines wxwidgets X xemacs
-
-
-
-3
-
-compile configure install postinst postrm prepare
-
-
-
-
-
diff --git a/metadata/cache/sci-visualization/mayavi-4.1.0 b/metadata/cache/sci-visualization/mayavi-4.1.0
new file mode 100644
index 000000000000..9bdd33f8c8b6
--- /dev/null
+++ b/metadata/cache/sci-visualization/mayavi-4.1.0
@@ -0,0 +1,22 @@
+dev-python/setuptools test? ( dev-python/configobj dev-python/ipython >=dev-python/pyface-4 >=dev-python/traitsui-4 >=dev-python/envisage-4 >=dev-python/apptools-4 >=dev-python/traitsui-4 dev-python/numpy >=sci-libs/vtk-5[python] dev-python/wxpython[opengl] media-fonts/font-cursor-misc media-fonts/font-misc-misc ) >=app-admin/eselect-python-20091230 dev-lang/python test? ( dev-python/nose ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+dev-python/configobj dev-python/ipython >=dev-python/pyface-4 >=dev-python/traitsui-4 >=dev-python/envisage-4 >=dev-python/apptools-4 >=dev-python/traitsui-4 dev-python/numpy >=sci-libs/vtk-5[python] >=app-admin/eselect-python-20091230 dev-lang/python
+2
+http://www.enthought.com/repo/ets/mayavi-4.1.0.tar.gz
+
+http://code.enthought.com/projects/mayavi/ http://pypi.python.org/pypi/mayavi
+BSD
+Enthought Tool Suite: Scientific data 3-dimensional visualizer
+~amd64 ~x86
+distutils eutils multilib portability python toolchain-funcs user virtualx
+doc examples test test test
+
+
+
+4
+
+compile install postinst postrm prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/sys-apps/coreutils-8.14 b/metadata/cache/sys-apps/coreutils-8.14
index 17fa0c58c305..5d4d010d6769 100644
--- a/metadata/cache/sys-apps/coreutils-8.14
+++ b/metadata/cache/sys-apps/coreutils-8.14
@@ -6,7 +6,7 @@ ftp://alpha.gnu.org/gnu/coreutils/coreutils-8.14.tar.xz mirror://gnu/coreutils/c
 http://www.gnu.org/software/coreutils/
 GPL-3
 Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilities (sort, tr, head, wc..), and shell utilities (whoami, who,...)
-~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 eutils flag-o-matic multilib portability toolchain-funcs user
 acl caps gmp nls selinux static unicode vanilla xattr
 
diff --git a/metadata/cache/sys-apps/grep-2.9 b/metadata/cache/sys-apps/grep-2.9
index 8cb5ab3b6cec..6e34921aa5e7 100644
--- a/metadata/cache/sys-apps/grep-2.9
+++ b/metadata/cache/sys-apps/grep-2.9
@@ -6,7 +6,7 @@ mirror://gnu/grep/grep-2.9.tar.xz mirror://gentoo/grep-2.9.tar.xz
 http://www.gnu.org/software/grep/
 GPL-3
 GNU regular expression matcher
-~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 
 nls pcre
 
diff --git a/metadata/cache/sys-apps/hdparm-9.38 b/metadata/cache/sys-apps/hdparm-9.38
new file mode 100644
index 000000000000..c6d8d41adff7
--- /dev/null
+++ b/metadata/cache/sys-apps/hdparm-9.38
@@ -0,0 +1,22 @@
+
+
+0
+mirror://sourceforge/hdparm/hdparm-9.38.tar.gz
+
+http://sourceforge.net/projects/hdparm/
+as-is
+Utility to change hard drive performance parameters
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux
+multilib toolchain-funcs
+
+
+
+
+
+
+compile install unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-apps/lm_sensors-3.3.1 b/metadata/cache/sys-apps/lm_sensors-3.3.1
index d7da02bf1d97..0ee0b32aa726 100644
--- a/metadata/cache/sys-apps/lm_sensors-3.3.1
+++ b/metadata/cache/sys-apps/lm_sensors-3.3.1
@@ -6,7 +6,7 @@ http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-3.3.1.tar.bz2
 http://www.lm-sensors.org/
 GPL-2 LGPL-2.1
 Hardware Monitoring user-space utilities
-~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-linux
+~alpha amd64 ~mips ~ppc ~sparc ~x86 ~x86-linux
 eutils linux-info multilib portability toolchain-funcs user versionator
 sensord static-libs
 
diff --git a/metadata/cache/sys-apps/man-1.6g b/metadata/cache/sys-apps/man-1.6g
index e06ae2770a80..3971058681e9 100644
--- a/metadata/cache/sys-apps/man-1.6g
+++ b/metadata/cache/sys-apps/man-1.6g
@@ -6,7 +6,7 @@ http://primates.ximian.com/~flucifredi/man/man-1.6g.tar.gz
 http://primates.ximian.com/~flucifredi/man/
 GPL-2
 Standard commands to read man pages
-~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
 eutils multilib portability toolchain-funcs user
 +lzma nls
 
diff --git a/metadata/cache/sys-apps/seabios-0.6.3_pre20110817 b/metadata/cache/sys-apps/seabios-0.6.3_pre20110817
deleted file mode 100644
index 124afe06a606..000000000000
--- a/metadata/cache/sys-apps/seabios-0.6.3_pre20110817
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-vcs/git >=app-admin/eselect-python-20091230
-!app-emulation/qemu !<=app-emulation/qemu-kvm-0.15.0 >=app-admin/eselect-python-20091230
-0
-
-
-http://www.seabios.org
-LGPL-3 GPL-3
-Open Source implementation of a 16-bit x86 BIOS
-~amd64 ~x86
-git-2 multilib python toolchain-funcs
-
-
-
-
-4
-
-compile configure install prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-auth/pam_mktemp-1.1.1 b/metadata/cache/sys-auth/pam_mktemp-1.1.1
index d9ba9e0c4ea2..46edaa4b17d1 100644
--- a/metadata/cache/sys-auth/pam_mktemp-1.1.1
+++ b/metadata/cache/sys-auth/pam_mktemp-1.1.1
@@ -6,7 +6,7 @@ http://www.openwall.com/pam/modules/pam_mktemp/pam_mktemp-1.1.1.tar.gz
 http://www.openwall.com/pam/
 BSD-2
 Create per-user private temporary directories during login
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
+~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
 eutils flag-o-matic multilib pam portability toolchain-funcs user
 selinux +prevent-removal
 
diff --git a/metadata/cache/sys-auth/polkit-kde-0.95.1-r1 b/metadata/cache/sys-auth/polkit-kde-0.95.1-r1
index 7a4c1eb85f1a..6b62dd2a1c3c 100644
--- a/metadata/cache/sys-auth/polkit-kde-0.95.1-r1
+++ b/metadata/cache/sys-auth/polkit-kde-0.95.1-r1
@@ -8,7 +8,7 @@ GPL-2
 PolicyKit integration module for KDE.
 amd64 ~arm ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_da linguas_en_GB linguas_et linguas_gl linguas_lt linguas_nl linguas_pt linguas_pt_BR linguas_sk linguas_sv linguas_uk linguas_zh_TW aqua kdeenablefinal
+debug linguas_da linguas_en_GB linguas_et linguas_gl linguas_lt linguas_nl linguas_pt linguas_pt_BR linguas_sk linguas_sv linguas_uk linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/sys-auth/polkit-kde-agent-0.99.0 b/metadata/cache/sys-auth/polkit-kde-agent-0.99.0
index 109e1f85cac2..575f7fe5e224 100644
--- a/metadata/cache/sys-auth/polkit-kde-agent-0.99.0
+++ b/metadata/cache/sys-auth/polkit-kde-agent-0.99.0
@@ -8,7 +8,7 @@ GPL-2
 PolKit agent module for KDE.
 amd64 ~arm ~ppc ~ppc64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_lt linguas_nb linguas_mai linguas_ms linguas_nds linguas_nl linguas_pa linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_uk linguas_zh_TW aqua kdeenablefinal
+debug linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_lt linguas_nb linguas_mai linguas_ms linguas_nds linguas_nl linguas_pa linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_uk linguas_zh_TW aqua
 
 
 
diff --git a/metadata/cache/sys-block/partitionmanager-1.0.3_p20110912 b/metadata/cache/sys-block/partitionmanager-1.0.3_p20110912
index 878a8fa79efd..833bd16c0a00 100644
--- a/metadata/cache/sys-block/partitionmanager-1.0.3_p20110912
+++ b/metadata/cache/sys-block/partitionmanager-1.0.3_p20110912
@@ -8,7 +8,7 @@ GPL-2
 KDE utility for management of partitions and file systems.
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/sys-cluster/ceph-0.40 b/metadata/cache/sys-cluster/ceph-0.40
new file mode 100644
index 000000000000..e586d42ff0e7
--- /dev/null
+++ b/metadata/cache/sys-cluster/ceph-0.40
@@ -0,0 +1,22 @@
+dev-libs/boost dev-libs/libedit dev-libs/crypto++ sys-apps/keyutils fuse? ( sys-fs/fuse ) libatomic? ( dev-libs/libatomic_ops ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat ) tcmalloc? ( dev-util/google-perftools ) dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+dev-libs/boost dev-libs/libedit dev-libs/crypto++ sys-apps/keyutils fuse? ( sys-fs/fuse ) libatomic? ( dev-libs/libatomic_ops ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat ) tcmalloc? ( dev-util/google-perftools ) sys-fs/btrfs-progs
+0
+http://ceph.newdream.net/download/ceph-0.40.tar.gz
+
+http://ceph.newdream.net/
+LGPL-2.1
+Ceph distributed filesystem
+~amd64 ~x86
+autotools eutils libtool multilib portability toolchain-funcs user
+debug fuse gtk libatomic radosgw static-libs tcmalloc
+
+
+
+4
+
+configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/sys-kernel/amd-ucode-2012.01.17 b/metadata/cache/sys-kernel/amd-ucode-2012.01.17
new file mode 100644
index 000000000000..583a06c495b7
--- /dev/null
+++ b/metadata/cache/sys-kernel/amd-ucode-2012.01.17
@@ -0,0 +1,22 @@
+
+
+0
+http://www.amd64.org/pub/microcode/amd-ucode-2012-01-17.tar
+mirror
+http://www.amd64.org/support/microcode.html
+amd-ucode
+AMD Family 10h, 11h and 14h microcode patch data
+-* ~amd64 ~x86
+eutils linux-info multilib portability toolchain-funcs user versionator
+
+
+
+
+4
+
+install postinst setup
+
+
+
+
+
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.0.17 b/metadata/cache/sys-kernel/gentoo-sources-3.0.17
new file mode 100644
index 000000000000..ec1519de7a1c
--- /dev/null
+++ b/metadata/cache/sys-kernel/gentoo-sources-3.0.17
@@ -0,0 +1,22 @@
+!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+3.0.17
+mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 ) mirror://gentoo/genpatches-3.0-16.base.tar.bz2 mirror://gentoo/genpatches-3.0-16.extras.tar.bz2
+binchecks strip
+http://dev.gentoo.org/~mpagano/genpatches
+GPL-2 !deblob? ( freedist )
+Full sources including the Gentoo patchset for the 3.0 kernel tree
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+eutils kernel-2 multilib portability toolchain-funcs user versionator
+deblob symlink build deblob
+
+!build? ( virtual/dev-manager )
+
+2
+
+compile install postinst postrm preinst setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-kernel/pf-sources-3.2.1 b/metadata/cache/sys-kernel/pf-sources-3.2.1
new file mode 100644
index 000000000000..511cf95225b0
--- /dev/null
+++ b/metadata/cache/sys-kernel/pf-sources-3.2.1
@@ -0,0 +1,22 @@
+!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+3.2.1
+mirror://kernel/linux/kernel/v3.1/linux-3.2.tar.bz2 http://pf.natalenko.name/sources/3.2/patch-3.2.1-pf.bz2
+binchecks strip
+http://pf.natalenko.name/
+GPL-2 freedist
+Linux kernel fork with new features, including the -ck patchset (BFS), BFQ, TuxOnIce and LinuxIMQ
+-* ~amd64 ~ppc ~ppc64 ~x86
+eutils kernel-2 multilib portability toolchain-funcs user versionator
+symlink build
+
+!build? ( virtual/dev-manager )
+
+2
+
+compile install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.0.14 b/metadata/cache/sys-kernel/vanilla-sources-3.0.14
deleted file mode 100644
index 51f743c06d16..000000000000
--- a/metadata/cache/sys-kernel/vanilla-sources-3.0.14
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-3.0.14
-mirror://kernel/linux/kernel/v3.x/patch-3.0.14.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 )
-binchecks strip
-http://www.kernel.org
-GPL-2 !deblob? ( freedist )
-Full sources for the Linux kernel
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-eutils kernel-2 multilib portability toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-2
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.0.15 b/metadata/cache/sys-kernel/vanilla-sources-3.0.15
deleted file mode 100644
index 3e949a481207..000000000000
--- a/metadata/cache/sys-kernel/vanilla-sources-3.0.15
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-3.0.15
-mirror://kernel/linux/kernel/v3.x/patch-3.0.15.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 )
-binchecks strip
-http://www.kernel.org
-GPL-2 !deblob? ( freedist )
-Full sources for the Linux kernel
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-eutils kernel-2 multilib portability toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-2
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-libs/glibc-2.10.1-r1 b/metadata/cache/sys-libs/glibc-2.10.1-r1
index e557dc3b0793..c0824d2b19da 100644
--- a/metadata/cache/sys-libs/glibc-2.10.1-r1
+++ b/metadata/cache/sys-libs/glibc-2.10.1-r1
@@ -1,5 +1,5 @@
->=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers nls? ( sys-devel/gettext ) !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 selinux? ( sys-libs/libselinux ) >=sys-libs/timezone-data-2007c sys-devel/gnuconfig
-!sys-kernel/ps3-sources nls? ( sys-devel/gettext ) selinux? ( sys-libs/libselinux ) sys-libs/timezone-data
+>=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 selinux? ( sys-libs/libselinux ) >=sys-libs/timezone-data-2007c sys-devel/gnuconfig
+!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) sys-libs/timezone-data
 2.2
 mirror://gnu/glibc/glibc-2.10.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-2.10.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.10.1.tar.bz2 mirror://gentoo/glibc-2.10.1.tar.bz2 mirror://gnu/glibc/glibc-libidn-2.10.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-libidn-2.10.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-libidn-2.10.1.tar.bz2 mirror://gentoo/glibc-libidn-2.10.1.tar.bz2 mirror://gnu/glibc/glibc-ports-2.10.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.10.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.10.1.tar.bz2 mirror://gentoo/glibc-ports-2.10.1.tar.bz2 mirror://gentoo/glibc-2.10.1-patches-7.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.10.1-patches-7.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.10.1-patches-7.tar.bz2
 strip
@@ -8,7 +8,7 @@ LGPL-2
 GNU libc6 (also called glibc2) C library
 alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86
 eutils flag-o-matic gnuconfig libtool multilib portability toolchain-funcs user versionator
-debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only
+debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only
 
 
 
diff --git a/metadata/cache/sys-libs/glibc-2.11.3 b/metadata/cache/sys-libs/glibc-2.11.3
index db9852b7f1d3..0901884b8058 100644
--- a/metadata/cache/sys-libs/glibc-2.11.3
+++ b/metadata/cache/sys-libs/glibc-2.11.3
@@ -1,5 +1,5 @@
->=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers nls? ( sys-devel/gettext ) !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig
-!sys-kernel/ps3-sources nls? ( sys-devel/gettext ) selinux? ( sys-libs/libselinux ) vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
+>=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig
+!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
 2.2
 mirror://gnu/glibc/glibc-2.11.3.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-2.11.3.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.11.3.tar.bz2 mirror://gentoo/glibc-2.11.3.tar.bz2 mirror://gnu/glibc/glibc-ports-2.11.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.11.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.11.tar.bz2 mirror://gentoo/glibc-ports-2.11.tar.bz2 mirror://gentoo/glibc-2.11.3-patches-2.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.11.3-patches-2.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.11.3-patches-2.tar.bz2
 strip
@@ -8,7 +8,7 @@ LGPL-2
 GNU libc6 (also called glibc2) C library
 alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sh sparc x86
 eutils flag-o-matic gnuconfig libtool multilib portability toolchain-funcs user versionator
-debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only
+debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only
 
 
 
diff --git a/metadata/cache/sys-libs/glibc-2.12.1-r3 b/metadata/cache/sys-libs/glibc-2.12.1-r3
index f67ca3fdf607..be32b1e42bd6 100644
--- a/metadata/cache/sys-libs/glibc-2.12.1-r3
+++ b/metadata/cache/sys-libs/glibc-2.12.1-r3
@@ -1,5 +1,5 @@
->=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers nls? ( sys-devel/gettext ) !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig
-!sys-kernel/ps3-sources nls? ( sys-devel/gettext ) selinux? ( sys-libs/libselinux ) vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
+>=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig
+!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
 2.2
 mirror://gnu/glibc/glibc-2.12.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-2.12.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.12.1.tar.bz2 mirror://gentoo/glibc-2.12.1.tar.bz2 mirror://gnu/glibc/glibc-ports-2.12.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.12.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.12.1.tar.bz2 mirror://gentoo/glibc-ports-2.12.1.tar.bz2 mirror://gentoo/glibc-2.12.1-patches-8.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.12.1-patches-8.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.12.1-patches-8.tar.bz2
 strip
@@ -8,7 +8,7 @@ LGPL-2
 GNU libc6 (also called glibc2) C library
 ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 eutils flag-o-matic gnuconfig libtool multilib portability toolchain-funcs user versionator
-debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only
+debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only
 
 
 
diff --git a/metadata/cache/sys-libs/glibc-2.12.2 b/metadata/cache/sys-libs/glibc-2.12.2
index 8ee83983f13a..b22aefd0b685 100644
--- a/metadata/cache/sys-libs/glibc-2.12.2
+++ b/metadata/cache/sys-libs/glibc-2.12.2
@@ -1,5 +1,5 @@
->=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers nls? ( sys-devel/gettext ) !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig
-!sys-kernel/ps3-sources nls? ( sys-devel/gettext ) selinux? ( sys-libs/libselinux ) vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
+>=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig
+!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
 2.2
 mirror://gnu/glibc/glibc-2.12.2.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-2.12.2.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.12.2.tar.bz2 mirror://gentoo/glibc-2.12.2.tar.bz2 mirror://gnu/glibc/glibc-ports-2.12.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.12.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.12.1.tar.bz2 mirror://gentoo/glibc-ports-2.12.1.tar.bz2 mirror://gentoo/glibc-2.12.2-patches-3.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.12.2-patches-3.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.12.2-patches-3.tar.bz2
 strip
@@ -8,7 +8,7 @@ LGPL-2
 GNU libc6 (also called glibc2) C library
 amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86
 eutils flag-o-matic gnuconfig libtool multilib portability toolchain-funcs user versionator
-debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only
+debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only
 
 
 
diff --git a/metadata/cache/sys-libs/glibc-2.13-r2 b/metadata/cache/sys-libs/glibc-2.13-r2
index 4aee338ec307..df402ab78f9f 100644
--- a/metadata/cache/sys-libs/glibc-2.13-r2
+++ b/metadata/cache/sys-libs/glibc-2.13-r2
@@ -1,5 +1,5 @@
->=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers nls? ( sys-devel/gettext ) !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 !<sys-devel/patch-2.6 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig
-!sys-kernel/ps3-sources nls? ( sys-devel/gettext ) selinux? ( sys-libs/libselinux ) vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
+>=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 !<sys-devel/patch-2.6 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig
+!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
 2.2
 mirror://gnu/glibc/glibc-2.13.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-2.13.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.13.tar.bz2 mirror://gentoo/glibc-2.13.tar.bz2 mirror://gnu/glibc/glibc-ports-2.13.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.13.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.13.tar.bz2 mirror://gentoo/glibc-ports-2.13.tar.bz2 mirror://gentoo/glibc-2.13-patches-6.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.13-patches-6.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.13-patches-6.tar.bz2
 strip
@@ -8,7 +8,7 @@ LGPL-2
 GNU libc6 (also called glibc2) C library
 ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 eutils flag-o-matic gnuconfig libtool multilib portability toolchain-funcs user versionator
-debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only
+debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only
 
 
 
diff --git a/metadata/cache/sys-libs/glibc-2.13-r4 b/metadata/cache/sys-libs/glibc-2.13-r4
index af8c4954908a..8f8e5cd8da73 100644
--- a/metadata/cache/sys-libs/glibc-2.13-r4
+++ b/metadata/cache/sys-libs/glibc-2.13-r4
@@ -1,5 +1,5 @@
->=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers nls? ( sys-devel/gettext ) !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 !<sys-devel/patch-2.6 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig
-!sys-kernel/ps3-sources nls? ( sys-devel/gettext ) selinux? ( sys-libs/libselinux ) vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
+>=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 !<sys-devel/patch-2.6 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig
+!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
 2.2
 mirror://gnu/glibc/glibc-2.13.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-2.13.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.13.tar.bz2 mirror://gentoo/glibc-2.13.tar.bz2 mirror://gnu/glibc/glibc-ports-2.13.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.13.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.13.tar.bz2 mirror://gentoo/glibc-ports-2.13.tar.bz2 mirror://gentoo/glibc-2.13-patches-8.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.13-patches-8.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.13-patches-8.tar.bz2
 strip
@@ -8,7 +8,7 @@ LGPL-2
 GNU libc6 (also called glibc2) C library
 alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
 eutils flag-o-matic gnuconfig libtool multilib portability toolchain-funcs user versionator
-debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only
+debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only
 
 
 
diff --git a/metadata/cache/sys-libs/glibc-2.14 b/metadata/cache/sys-libs/glibc-2.14
index e69ee7233368..687159857040 100644
--- a/metadata/cache/sys-libs/glibc-2.14
+++ b/metadata/cache/sys-libs/glibc-2.14
@@ -1,5 +1,5 @@
->=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers nls? ( sys-devel/gettext ) !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 !<sys-devel/patch-2.6 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig
-!sys-kernel/ps3-sources nls? ( sys-devel/gettext ) selinux? ( sys-libs/libselinux ) vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
+>=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 !<sys-devel/patch-2.6 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig
+!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
 2.2
 mirror://gnu/glibc/glibc-2.14.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-2.14.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.14.tar.bz2 mirror://gentoo/glibc-2.14.tar.bz2 mirror://gnu/glibc/glibc-ports-2.14.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.14.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.14.tar.bz2 mirror://gentoo/glibc-ports-2.14.tar.bz2 mirror://gentoo/glibc-2.14-patches-7.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.14-patches-7.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.14-patches-7.tar.bz2
 strip
@@ -8,7 +8,7 @@ LGPL-2
 GNU libc6 (also called glibc2) C library
 ~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 eutils flag-o-matic gnuconfig libtool multilib portability toolchain-funcs user versionator
-debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only
+debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only
 
 
 
diff --git a/metadata/cache/sys-libs/glibc-2.14.1 b/metadata/cache/sys-libs/glibc-2.14.1
index 55627d48dbd7..72a59c18092f 100644
--- a/metadata/cache/sys-libs/glibc-2.14.1
+++ b/metadata/cache/sys-libs/glibc-2.14.1
@@ -1,5 +1,5 @@
->=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers nls? ( sys-devel/gettext ) !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 !<sys-devel/patch-2.6 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig
-!sys-kernel/ps3-sources nls? ( sys-devel/gettext ) selinux? ( sys-libs/libselinux ) vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
+>=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 !<sys-devel/patch-2.6 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig
+!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
 2.2
 mirror://gnu/glibc/glibc-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.14.1.tar.bz2 mirror://gentoo/glibc-2.14.1.tar.bz2 mirror://gnu/glibc/glibc-ports-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.14.1.tar.bz2 mirror://gentoo/glibc-ports-2.14.1.tar.bz2 mirror://gentoo/glibc-2.14.1-patches-1.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.14.1-patches-1.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.14.1-patches-1.tar.bz2
 strip
@@ -8,7 +8,7 @@ LGPL-2
 GNU libc6 (also called glibc2) C library
 ~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 eutils flag-o-matic gnuconfig libtool multilib portability toolchain-funcs user versionator
-debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only
+debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only
 
 
 
diff --git a/metadata/cache/sys-libs/glibc-2.14.1-r1 b/metadata/cache/sys-libs/glibc-2.14.1-r1
index ceb70e9e1540..85421fdfcf77 100644
--- a/metadata/cache/sys-libs/glibc-2.14.1-r1
+++ b/metadata/cache/sys-libs/glibc-2.14.1-r1
@@ -1,5 +1,5 @@
->=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers nls? ( sys-devel/gettext ) !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 !<sys-devel/patch-2.6 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig
-!sys-kernel/ps3-sources nls? ( sys-devel/gettext ) selinux? ( sys-libs/libselinux ) vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
+>=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 !<sys-devel/patch-2.6 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig
+!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
 2.2
 mirror://gnu/glibc/glibc-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.14.1.tar.bz2 mirror://gentoo/glibc-2.14.1.tar.bz2 mirror://gnu/glibc/glibc-ports-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.14.1.tar.bz2 mirror://gentoo/glibc-ports-2.14.1.tar.bz2 mirror://gentoo/glibc-2.14.1-patches-2.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.14.1-patches-2.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.14.1-patches-2.tar.bz2
 strip
@@ -8,7 +8,7 @@ LGPL-2
 GNU libc6 (also called glibc2) C library
 ~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 eutils flag-o-matic gnuconfig libtool multilib portability toolchain-funcs user versionator
-debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only
+debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only
 
 
 
diff --git a/metadata/cache/sys-libs/glibc-2.14.1-r2 b/metadata/cache/sys-libs/glibc-2.14.1-r2
index 4c360bee0f4c..e15a38abd0f7 100644
--- a/metadata/cache/sys-libs/glibc-2.14.1-r2
+++ b/metadata/cache/sys-libs/glibc-2.14.1-r2
@@ -1,5 +1,5 @@
->=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers nls? ( sys-devel/gettext ) !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 !<sys-devel/patch-2.6 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig
-!sys-kernel/ps3-sources nls? ( sys-devel/gettext ) selinux? ( sys-libs/libselinux ) vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
+>=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 !<sys-devel/patch-2.6 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig
+!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
 2.2
 mirror://gnu/glibc/glibc-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.14.1.tar.bz2 mirror://gentoo/glibc-2.14.1.tar.bz2 mirror://gnu/glibc/glibc-ports-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.14.1.tar.bz2 mirror://gentoo/glibc-ports-2.14.1.tar.bz2 mirror://gentoo/glibc-2.14.1-patches-3.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.14.1-patches-3.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.14.1-patches-3.tar.bz2
 strip
@@ -8,7 +8,7 @@ LGPL-2
 GNU libc6 (also called glibc2) C library
 ~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 eutils flag-o-matic gnuconfig libtool multilib portability toolchain-funcs user versionator
-debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only
+debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only
 
 
 
diff --git a/metadata/cache/sys-libs/glibc-2.15 b/metadata/cache/sys-libs/glibc-2.15
index 8af9f7ff6a4d..8b221f2c76ef 100644
--- a/metadata/cache/sys-libs/glibc-2.15
+++ b/metadata/cache/sys-libs/glibc-2.15
@@ -1,5 +1,5 @@
->=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers nls? ( sys-devel/gettext ) !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 !<sys-devel/patch-2.6 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig
-!sys-kernel/ps3-sources nls? ( sys-devel/gettext ) selinux? ( sys-libs/libselinux ) vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
+>=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 !<sys-devel/patch-2.6 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig
+!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
 2.2
 mirror://gnu/glibc/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.15.tar.xz mirror://gentoo/glibc-2.15.tar.xz mirror://gnu/glibc/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-2.15-patches-3.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.15-patches-3.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.15-patches-3.tar.bz2
 strip
@@ -8,7 +8,7 @@ LGPL-2
 GNU libc6 (also called glibc2) C library
 
 eutils flag-o-matic gnuconfig libtool multilib portability toolchain-funcs user versionator
-debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only
+debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only
 
 
 
diff --git a/metadata/cache/sys-libs/glibc-2.9_p20081201-r3 b/metadata/cache/sys-libs/glibc-2.9_p20081201-r3
index 73b9b5d2c313..d8e976b6c571 100644
--- a/metadata/cache/sys-libs/glibc-2.9_p20081201-r3
+++ b/metadata/cache/sys-libs/glibc-2.9_p20081201-r3
@@ -1,5 +1,5 @@
->=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers nls? ( sys-devel/gettext ) !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 selinux? ( sys-libs/libselinux ) >=sys-libs/timezone-data-2007c sys-devel/gnuconfig
-!sys-kernel/ps3-sources nls? ( sys-devel/gettext ) selinux? ( sys-libs/libselinux ) sys-libs/timezone-data
+>=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 selinux? ( sys-libs/libselinux ) >=sys-libs/timezone-data-2007c sys-devel/gnuconfig
+!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) sys-libs/timezone-data
 2.2
 mirror://gnu/glibc/glibc-2.9-20081201.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-2.9-20081201.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.9-20081201.tar.bz2 mirror://gentoo/glibc-2.9-20081201.tar.bz2 mirror://gnu/glibc/glibc-2.9-ports-20081201.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-2.9-ports-20081201.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.9-ports-20081201.tar.bz2 mirror://gentoo/glibc-2.9-ports-20081201.tar.bz2 mirror://gentoo/glibc-2.9-patches-8.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.9-patches-8.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.9-patches-8.tar.bz2
 strip
@@ -8,7 +8,7 @@ LGPL-2
 GNU libc6 (also called glibc2) C library
 alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 eutils flag-o-matic gnuconfig libtool multilib portability toolchain-funcs user versionator
-debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only
+debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only
 
 
 
diff --git a/metadata/cache/sys-libs/glibc-9999 b/metadata/cache/sys-libs/glibc-9999
index f7e2ea9c2718..c56011b688e2 100644
--- a/metadata/cache/sys-libs/glibc-9999
+++ b/metadata/cache/sys-libs/glibc-9999
@@ -1,5 +1,5 @@
->=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers nls? ( sys-devel/gettext ) !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig dev-vcs/git
-!sys-kernel/ps3-sources nls? ( sys-devel/gettext ) selinux? ( sys-libs/libselinux ) vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
+>=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig dev-vcs/git
+!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
 2.2
 
 strip
@@ -8,7 +8,7 @@ LGPL-2
 GNU libc6 (also called glibc2) C library
 
 eutils flag-o-matic git-2 gnuconfig libtool multilib portability toolchain-funcs user versionator
-debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only
+debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only
 
 
 
diff --git a/metadata/cache/sys-libs/gwenhywfar-4.2.1 b/metadata/cache/sys-libs/gwenhywfar-4.2.1
index 2e1b6133ca6b..65e7229e82ef 100644
--- a/metadata/cache/sys-libs/gwenhywfar-4.2.1
+++ b/metadata/cache/sys-libs/gwenhywfar-4.2.1
@@ -6,7 +6,7 @@ test
 http://www.aquamaniac.de/aqbanking/
 LGPL-2.1
 A multi-platform helper library for other libraries
-amd64 ~hppa ppc ~ppc64 ~sparc ~x86
+amd64 hppa ppc ~ppc64 ~sparc ~x86
 
 debug doc fox gtk qt4
 
diff --git a/metadata/cache/www-client/phantomjs-1.4.1 b/metadata/cache/www-client/phantomjs-1.4.1
new file mode 100644
index 000000000000..1c6475c460c5
--- /dev/null
+++ b/metadata/cache/www-client/phantomjs-1.4.1
@@ -0,0 +1,22 @@
+x11-libs/qt-webkit python? ( dev-python/PyQt4 ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+x11-libs/qt-webkit python? ( dev-python/PyQt4 ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+0
+http://phantomjs.googlecode.com/files/phantomjs-1.4.1-source.tar.gz
+
+http://www.phantomjs.org/
+GPL-3
+headless WebKit with JavaScript API
+~amd64 ~x86
+base distutils eutils multilib portability python qt4-r2 toolchain-funcs user
+examples python
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare prerm setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/www-client/rekonq-0.8.1 b/metadata/cache/www-client/rekonq-0.8.1
index 315f087ceaff..5da14e959016 100644
--- a/metadata/cache/www-client/rekonq-0.8.1
+++ b/metadata/cache/www-client/rekonq-0.8.1
@@ -8,7 +8,7 @@ GPL-3
 A browser based on qt-webkit
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug test +handbook aqua kdeenablefinal
+debug test +handbook aqua
 
 
 
diff --git a/metadata/cache/www-plugins/gnash-0.8.8 b/metadata/cache/www-plugins/gnash-0.8.8
index 23e537efa015..371627ef124a 100644
--- a/metadata/cache/www-plugins/gnash-0.8.8
+++ b/metadata/cache/www-plugins/gnash-0.8.8
@@ -8,7 +8,7 @@ GPL-3
 GNU Flash movie player that supports many SWF v7,8,9 features
 amd64 ppc ~ppc64 ~sparc x86
 autotools base eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions libtool multilib nsplugins portability python toolchain-funcs user versionator virtualx
-+agg cairo cygnal dbus doc fbcon +ffmpeg gnome gstreamer gtk kde lirc mysql +nls nsplugin opengl python +sdl sdl-sound ssh ssl test vaapi video_cards_intel xv aqua kde kdeenablefinal
++agg cairo cygnal dbus doc fbcon +ffmpeg gnome gstreamer gtk kde lirc mysql +nls nsplugin opengl python +sdl sdl-sound ssh ssl test vaapi video_cards_intel xv aqua kde
 
 
 
diff --git a/metadata/cache/www-plugins/gnash-0.8.9 b/metadata/cache/www-plugins/gnash-0.8.9
index acf120695ccf..942db243bf41 100644
--- a/metadata/cache/www-plugins/gnash-0.8.9
+++ b/metadata/cache/www-plugins/gnash-0.8.9
@@ -8,7 +8,7 @@ GPL-3
 GNU Flash movie player that supports many SWF v7,8,9 features
 ~amd64 ~ppc ~ppc64 ~sparc ~x86
 autotools base eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions libtool multilib nsplugins portability python toolchain-funcs user versionator virtualx
-+agg cairo cygnal dbus doc fbcon +ffmpeg gnome gstreamer gtk kde lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi aqua kde kdeenablefinal
++agg cairo cygnal dbus doc fbcon +ffmpeg gnome gstreamer gtk kde lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi aqua kde
 
 
 
diff --git a/metadata/cache/www-plugins/gnash-0.8.9-r2 b/metadata/cache/www-plugins/gnash-0.8.9-r2
index b0d2e77abcda..0dacedbe3b13 100644
--- a/metadata/cache/www-plugins/gnash-0.8.9-r2
+++ b/metadata/cache/www-plugins/gnash-0.8.9-r2
@@ -8,7 +8,7 @@ GPL-3
 GNU Flash movie player that supports many SWF v7,8,9 features
 amd64 ~ppc ~ppc64 ~sparc x86
 autotools base eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions libtool multilib nsplugins portability python toolchain-funcs user versionator virtualx
-+agg cairo cygnal dbus doc fbcon +ffmpeg gnome gstreamer gtk kde lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi aqua kde kdeenablefinal
++agg cairo cygnal dbus doc fbcon +ffmpeg gnome gstreamer gtk kde lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi aqua kde
 
 
 
diff --git a/metadata/cache/www-plugins/kpartsplugin-20101216 b/metadata/cache/www-plugins/kpartsplugin-20101216
index a07d786f3c73..5782779dcac0 100644
--- a/metadata/cache/www-plugins/kpartsplugin-20101216
+++ b/metadata/cache/www-plugins/kpartsplugin-20101216
@@ -8,7 +8,7 @@ GPL-3 BSD
 Plugin using KDE's KParts technology to embed file viewers into non-KDE browsers
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib nsplugins portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/www-plugins/kpartsplugin-20110823 b/metadata/cache/www-plugins/kpartsplugin-20110823
index 4299ecfdb748..f758941d6f25 100644
--- a/metadata/cache/www-plugins/kpartsplugin-20110823
+++ b/metadata/cache/www-plugins/kpartsplugin-20110823
@@ -8,7 +8,7 @@ GPL-3 BSD
 Plugin using KDE's KParts technology to embed file viewers into non-KDE browsers
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib nsplugins portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/x11-libs/compizconfig-backend-kconfig4-0.8.4 b/metadata/cache/x11-libs/compizconfig-backend-kconfig4-0.8.4
index 00fb300bb031..d7fbae8b8939 100644
--- a/metadata/cache/x11-libs/compizconfig-backend-kconfig4-0.8.4
+++ b/metadata/cache/x11-libs/compizconfig-backend-kconfig4-0.8.4
@@ -8,7 +8,7 @@ GPL-2 LGPL-2.1
 Compizconfig Kconfig Backend
 ~amd64 ~ppc ~ppc64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/x11-misc/redshift-1.7 b/metadata/cache/x11-misc/redshift-1.7
index 4065ee6ac922..a11270692ebc 100644
--- a/metadata/cache/x11-misc/redshift-1.7
+++ b/metadata/cache/x11-misc/redshift-1.7
@@ -6,7 +6,7 @@ http://launchpad.net/redshift/trunk/1.7/+download/redshift-1.7.tar.bz2
 http://jonls.dk/redshift/
 GPL-3
 A screen color temperature adjusting software
-~amd64 ~x86
+amd64 ~x86
 eutils gnome2-utils multilib portability python toolchain-funcs user
 geoclue gnome gtk nls
 
diff --git a/metadata/cache/x11-themes/crystal-2.0.5 b/metadata/cache/x11-themes/crystal-2.0.5
index 77a983005e70..fa6309cb2a44 100644
--- a/metadata/cache/x11-themes/crystal-2.0.5
+++ b/metadata/cache/x11-themes/crystal-2.0.5
@@ -8,7 +8,7 @@ GPL-2
 Crystal decoration theme for KDE4.x
 amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/x11-themes/crystal-2.1.0 b/metadata/cache/x11-themes/crystal-2.1.0
index 9cb25f7a02d3..6a189d91b95f 100644
--- a/metadata/cache/x11-themes/crystal-2.1.0
+++ b/metadata/cache/x11-themes/crystal-2.1.0
@@ -8,7 +8,7 @@ GPL-2
 Crystal decoration theme for KDE4.x
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
+aqua
 
 
 
diff --git a/metadata/cache/x11-themes/dekorator-0.5.1 b/metadata/cache/x11-themes/dekorator-0.5.1
index f14c1960aa22..0eefaab35ae2 100644
--- a/metadata/cache/x11-themes/dekorator-0.5.1
+++ b/metadata/cache/x11-themes/dekorator-0.5.1
@@ -8,7 +8,7 @@ GPL-2
 A window decoration engine for KDE4
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/x11-themes/nitrogen-3.3.3 b/metadata/cache/x11-themes/nitrogen-3.3.3
index 692e407b0ab8..97e616b347a1 100644
--- a/metadata/cache/x11-themes/nitrogen-3.3.3
+++ b/metadata/cache/x11-themes/nitrogen-3.3.3
@@ -8,7 +8,7 @@ GPL-2
 A window decoration for KDE4
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_de linguas_pl aqua kdeenablefinal
+debug linguas_de linguas_pl aqua
 
 
 
diff --git a/metadata/cache/x11-themes/oxygen-gtk-1.0.0-r1 b/metadata/cache/x11-themes/oxygen-gtk-1.0.0-r1
new file mode 100644
index 000000000000..50ad9bde90b2
--- /dev/null
+++ b/metadata/cache/x11-themes/oxygen-gtk-1.0.0-r1
@@ -0,0 +1,22 @@
+dev-libs/dbus-glib dev-libs/glib x11-libs/cairo x11-libs/gtk+:3 x11-libs/libX11 !x11-themes/oxygen-gtk:0 dev-util/pkgconfig doc? ( app-doc/doxygen ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+dev-libs/dbus-glib dev-libs/glib x11-libs/cairo x11-libs/gtk+:3 x11-libs/libX11
+3
+mirror://kde/stable/oxygen-gtk3/1.0.0/src/oxygen-gtk3-1.0.0.tar.bz2
+
+https://projects.kde.org/projects/playground/artwork/oxygen-gtk
+LGPL-2.1
+Official GTK+:2 port of KDE's Oxygen widget style
+~amd64 ~x86
+base cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user
+debug doc
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/x11-themes/oxygen-gtk-1.2.0-r1 b/metadata/cache/x11-themes/oxygen-gtk-1.2.0-r1
new file mode 100644
index 000000000000..b1557f29dfa1
--- /dev/null
+++ b/metadata/cache/x11-themes/oxygen-gtk-1.2.0-r1
@@ -0,0 +1,22 @@
+dev-libs/dbus-glib dev-libs/glib x11-libs/cairo >=x11-libs/gtk+-2.24.2:2 x11-libs/libX11 x11-libs/pango !x11-themes/oxygen-gtk:0 dev-util/pkgconfig doc? ( app-doc/doxygen ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+dev-libs/dbus-glib dev-libs/glib x11-libs/cairo >=x11-libs/gtk+-2.24.2:2 x11-libs/libX11 x11-libs/pango
+2
+mirror://kde/stable/oxygen-gtk2/1.2.0/src/oxygen-gtk2-1.2.0.tar.bz2
+
+https://projects.kde.org/projects/playground/artwork/oxygen-gtk
+LGPL-2.1
+Official GTK+:2 port of KDE's Oxygen widget style
+~amd64 ~x86
+base cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user
+debug doc
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/x11-themes/qtcurve-qt4-1.6.4-r1 b/metadata/cache/x11-themes/qtcurve-qt4-1.6.4-r1
index d5b6a3492149..ca5a738617c3 100644
--- a/metadata/cache/x11-themes/qtcurve-qt4-1.6.4-r1
+++ b/metadata/cache/x11-themes/qtcurve-qt4-1.6.4-r1
@@ -8,7 +8,7 @@ GPL-2
 A set of widget styles for Qt4 based apps, also available for GTK2
 alpha amd64 hppa ppc ~ppc64 sparc x86
 base cmake-utils confutils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-kde windeco aqua kde kdeenablefinal
+kde windeco aqua kde
 
 
 
diff --git a/metadata/cache/x11-themes/qtcurve-qt4-1.8.8 b/metadata/cache/x11-themes/qtcurve-qt4-1.8.8
index 6b7248779c02..78a5a92b6406 100644
--- a/metadata/cache/x11-themes/qtcurve-qt4-1.8.8
+++ b/metadata/cache/x11-themes/qtcurve-qt4-1.8.8
@@ -8,7 +8,7 @@ GPL-2
 A set of widget styles for Qt4 based apps, also available for GTK2
 ~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-kde windeco aqua kde kdeenablefinal
+kde windeco aqua kde
 windeco? ( kde )
 
 
diff --git a/metadata/cache/x11-themes/qtcurve-qt4-1.8.9 b/metadata/cache/x11-themes/qtcurve-qt4-1.8.9
index 45ee5720edb6..4b900e78171e 100644
--- a/metadata/cache/x11-themes/qtcurve-qt4-1.8.9
+++ b/metadata/cache/x11-themes/qtcurve-qt4-1.8.9
@@ -8,7 +8,7 @@ GPL-2
 A set of widget styles for Qt4 based apps, also available for GTK2
 ~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-kde windeco aqua kde kdeenablefinal
+kde windeco aqua kde
 windeco? ( kde )
 
 
diff --git a/metadata/cache/x11-themes/skulpture-0.2.4 b/metadata/cache/x11-themes/skulpture-0.2.4
index 65cfa46fb6c2..db0c8e2744aa 100644
--- a/metadata/cache/x11-themes/skulpture-0.2.4
+++ b/metadata/cache/x11-themes/skulpture-0.2.4
@@ -8,7 +8,7 @@ GPL-3
 Classical style and window decorations for KDE 4.x
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/cache/x11-themes/smaragd-0.0.7 b/metadata/cache/x11-themes/smaragd-0.0.7
index cb17e60c731c..64821b7c5c1b 100644
--- a/metadata/cache/x11-themes/smaragd-0.0.7
+++ b/metadata/cache/x11-themes/smaragd-0.0.7
@@ -8,7 +8,7 @@ GPL-2
 KWin theme engine that uses Emerald themes
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug aqua kdeenablefinal
+debug aqua
 
 
 
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 873d7f83028f..43e38155b5f0 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 17 Jan 2012 01:06:47 +0000
+Wed, 18 Jan 2012 01:06:46 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 873d7f83028f..43e38155b5f0 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 17 Jan 2012 01:06:47 +0000
+Wed, 18 Jan 2012 01:06:46 +0000
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 1634815ccb21..35bff87a0d91 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 17 Jan 2012 01:06:49 +0000
+Wed, 18 Jan 2012 01:06:48 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 4682d9557c04..38b4b56163d5 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Jan 17 01:06:47 UTC 2012
+Wed Jan 18 01:06:46 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 1c10dcbf941c..2d016ac0ebcb 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 17 Jan 2012 01:30:01 +0000
+Wed, 18 Jan 2012 01:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 10fdfc6edf48..b7b9de8a0a3f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1326762301 Tue Jan 17 01:05:01 2012 UTC
+1326848701 Wed Jan 18 01:05:01 2012 UTC
diff --git a/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r2.ebuild b/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r3.ebuild
similarity index 84%
rename from net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r2.ebuild
rename to net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r3.ebuild
index c59b6cb2b376..c9c74eb0a950 100644
--- a/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r2.ebuild
+++ b/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r3.ebuild
@@ -1,10 +1,10 @@
-# 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-analyzer/dhcp_probe/dhcp_probe-1.3.0-r2.ebuild,v 1.1 2010/02/20 16:31:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r3.ebuild,v 1.1 2012/01/17 17:44:01 jer Exp $
 
 EAPI="2"
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="dhcp_probe attempts to discover DHCP and BootP servers on a directly-attached Ethernet network"
 HOMEPAGE="http://www.net.princeton.edu/software/dhcp_probe/"
@@ -26,6 +26,7 @@ src_prepare() {
 }
 
 src_configure() {
+	use amd64 && append-flags -D__ARCH__=64
 	STRIP=true econf || die "econf failed"
 }
 
diff --git a/net-analyzer/dhcp_probe/files/dhcp_probe.initd b/net-analyzer/dhcp_probe/files/dhcp_probe.initd
index e150a48ba48d..0192b337b65e 100644
--- a/net-analyzer/dhcp_probe/files/dhcp_probe.initd
+++ b/net-analyzer/dhcp_probe/files/dhcp_probe.initd
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dhcp_probe/files/dhcp_probe.initd,v 1.2 2010/02/20 16:31:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dhcp_probe/files/dhcp_probe.initd,v 1.3 2012/01/17 17:44:02 jer Exp $
 
-opts="reload"
+extra_commands="reload"
 
 DHCP_PROBE_BINARY="/usr/sbin/dhcp_probe"
 DHCP_PROBE_CONFIG="/etc/dhcp_probe.cf"
diff --git a/net-analyzer/firewalk/firewalk-5.0.ebuild b/net-analyzer/firewalk/firewalk-5.0.ebuild
deleted file mode 100644
index 84874b8150d1..000000000000
--- a/net-analyzer/firewalk/firewalk-5.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/firewalk/firewalk-5.0.ebuild,v 1.13 2011/04/02 12:55:00 ssuominen Exp $
-
-inherit eutils
-
-DESCRIPTION="A tool for determining a firewall's rule set"
-HOMEPAGE="http://packetfactory.openwall.net/projects/firewalk/"
-SRC_URI="mirror://gentoo/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="net-libs/libpcap
-	>=net-libs/libnet-1.1.1
-	>=dev-libs/libdnet-1.7"
-
-S="${WORKDIR}/Firewalk"
-
-src_unpack() {
-	unpack "${A}"
-	cd ${S}
-	epatch "${FILESDIR}"/${P}-gcc3.4.diff
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	doman man/firewalk.8
-	dodoc README TODO BUGS
-}
diff --git a/net-analyzer/hunt/hunt-1.5.ebuild b/net-analyzer/hunt/hunt-1.5.ebuild
deleted file mode 100644
index 20d90e43748e..000000000000
--- a/net-analyzer/hunt/hunt-1.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hunt/hunt-1.5.ebuild,v 1.7 2009/09/23 18:19:17 patrick Exp $
-
-DESCRIPTION="tool for checking well known weaknesses in the TCP/IP protocol"
-HOMEPAGE="http://lin.fsid.cvut.cz/~kra/index.html"
-SRC_URI="http://lin.fsid.cvut.cz/~kra/hunt/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i "s:-O2 -g:${CFLAGS}:" Makefile
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dobin hunt
-	doman man/hunt.1
-	dodoc CHANGES README* TODO tpsetup/transproxy
-}
diff --git a/net-analyzer/ipband/Manifest b/net-analyzer/ipband/Manifest
index c6a3b77f1ebd..ed8f5ea0ff05 100644
--- a/net-analyzer/ipband/Manifest
+++ b/net-analyzer/ipband/Manifest
@@ -1,2 +1 @@
 DIST ipband-0.8.1.tgz 36675 RMD160 6269e5273fb1506f655e0ca1f8ea8f357a7205ec SHA1 401bfa12f81e6a6c57f827bdb3d22445e33e2f64 SHA256 f0a5860647d5364df812f7660d28f1ee8fbd35eb27088ab0cd445963db5806ad
-DIST ipband-0.8.tgz 36378 RMD160 4b7889ce52edcab9b8eec9e478fd4bde3c019be9 SHA1 c5f99e0a300aaf99ddfea1e756b6a450b8559420 SHA256 21be87c2755d66d17eadacd4611dfe1bed7e0c0af9c71d2f26b13fc16f1a61cf
diff --git a/net-analyzer/ipband/ipband-0.8.ebuild b/net-analyzer/ipband/ipband-0.8.ebuild
deleted file mode 100644
index bde882e67f56..000000000000
--- a/net-analyzer/ipband/ipband-0.8.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipband/ipband-0.8.ebuild,v 1.5 2007/05/01 17:51:28 genone Exp $
-
-inherit eutils
-
-DESCRIPTION="A pcap based IP traffic and bandwidth monitor with configurable reporting and alarm abilities"
-HOMEPAGE="http://ipband.sourceforge.net/"
-SRC_URI="http://ipband.sourceforge.net/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=">=net-libs/libpcap-0.4"
-
-src_unpack() {
-	unpack ${A}
-
-	# Provide a postfix MTA string in the author's ipband.conf example
-	sed -rie 's:(#mtastring.*):# Sendmail\n\1\n# Postfix\n#mtastring "/usr/sbin/sendmail -t":g' \
-		"${S}"/ipband.sample.conf
-}
-
-src_compile() {
-	emake || die "Compile problem"
-}
-
-src_install() {
-	doman ipband.1
-	dodoc CHANGELOG README
-	exeinto /usr/bin ; doexe ipband
-	newinitd "${FILESDIR}"/ipband-init ipband
-	insinto /etc/ ; newins ipband.sample.conf ipband.conf
-}
-
-pkg_postinst() {
-	ewarn "If you plan to use ipband as a service, you must edit"
-	ewarn "/etc/ipband.conf"
-	elog ""
-	elog "The following command line example will:"
-	elog "  o Listen on eth0"
-	elog "  o Group results into a summary relative to 192.168.1.0/24"
-	elog "  o Average bandwidth every 5 seconds"
-	elog "  o Report when average bandwidth has exceeded 7 kB/sec"
-	elog "    over the previous 10 seconds. The report is written to"
-	elog "    stdout but can also be emailed or stored in a file."
-	elog ""
-	elog "ipband eth0 -L 192.168.1.0/24 -a 5 -r 10 -b 7 -o -"
-}
diff --git a/net-analyzer/tcpflow/Manifest b/net-analyzer/tcpflow/Manifest
index c6aa2fe0ed83..4b870831bbf1 100644
--- a/net-analyzer/tcpflow/Manifest
+++ b/net-analyzer/tcpflow/Manifest
@@ -1,2 +1,3 @@
 DIST tcpflow-1.0.2.tar.gz 227817 RMD160 4cff09514f9980a8b9acc849a6af5d90310b38f9 SHA1 0d28edb6c8c81dadb4884c6444972f48e5241b47 SHA256 b625820dbfc898d96cdc9e6c06423610e998ca0e0131eafa3057e216b9c7746a
 DIST tcpflow-1.0.6.tar.gz 228162 RMD160 77e86cd7496f7e207056ce2139039e1ff125397b SHA1 aa5f57b331be4574440074a919befaca2839afd9 SHA256 0be3f9c07b40b68c22794d249104184b8b4e1b2444aa6e647108f2c5cb582579
+DIST tcpflow-1.1.0-beta3.tar.gz 193979 RMD160 9dd6b5b9fdd4ff720853a6d2efd449327494964f SHA1 1a9168d993256873f8cb87463b460032ccc51122 SHA256 d46f46e7de9688eb63ea10bcb902ea5c8cbd4cfa33bc7578024be2152d774d04
diff --git a/net-analyzer/tcpflow/tcpflow-1.0.6.ebuild b/net-analyzer/tcpflow/tcpflow-1.0.6.ebuild
index 0d34fa9e72ea..9356598b7346 100644
--- a/net-analyzer/tcpflow/tcpflow-1.0.6.ebuild
+++ b/net-analyzer/tcpflow/tcpflow-1.0.6.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-analyzer/tcpflow/tcpflow-1.0.6.ebuild,v 1.1 2011/12/05 10:28:49 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpflow/tcpflow-1.0.6.ebuild,v 1.2 2012/01/17 13:05:15 ago Exp $
 
 EAPI="4"
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://afflib.org/"
 SRC_URI="http://afflib.org/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 SLOT="0"
 IUSE="test"
 
diff --git a/net-analyzer/tcpflow/tcpflow-1.1.0_beta3.ebuild b/net-analyzer/tcpflow/tcpflow-1.1.0_beta3.ebuild
new file mode 100644
index 000000000000..d7fb5b015cdd
--- /dev/null
+++ b/net-analyzer/tcpflow/tcpflow-1.1.0_beta3.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/net-analyzer/tcpflow/tcpflow-1.1.0_beta3.ebuild,v 1.1 2012/01/17 04:53:23 jer Exp $
+
+EAPI="4"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="A tool for monitoring, capturing and storing TCP connections flows"
+HOMEPAGE="http://afflib.org/"
+SRC_URI="http://afflib.org/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}
+	test? ( sys-apps/coreutils )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i -e 's:`md5 -q \(.*\)`:`md5sum \1 | cut -f1 -d" "`:' tests/*.sh || die
+}
diff --git a/net-ftp/tnftp/tnftp-20100108.ebuild b/net-ftp/tnftp/tnftp-20100108.ebuild
index 5eee9a859ce1..e0146ad2f80a 100644
--- a/net-ftp/tnftp/tnftp-20100108.ebuild
+++ b/net-ftp/tnftp/tnftp-20100108.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/tnftp-20100108.ebuild,v 1.2 2012/01/15 15:28:28 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/tnftp-20100108.ebuild,v 1.3 2012/01/17 13:54:18 ago Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@ HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 socks5"
 
 DEPEND=">=sys-libs/ncurses-5.1
diff --git a/net-irc/epic4/epic4-2.10.1.ebuild b/net-irc/epic4/epic4-2.10.1.ebuild
index f28e61a84124..9b64e3ad1edd 100644
--- a/net-irc/epic4/epic4-2.10.1.ebuild
+++ b/net-irc/epic4/epic4-2.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-2.10.1.ebuild,v 1.3 2012/01/15 15:26:53 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-2.10.1.ebuild,v 1.4 2012/01/17 23:19:43 jer Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/${P}.tar.bz2
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 perl ssl"
 
 DEPEND=">=sys-libs/ncurses-5.2
diff --git a/net-libs/nodejs/nodejs-0.6.7-r1.ebuild b/net-libs/nodejs/nodejs-0.6.7-r1.ebuild
new file mode 100644
index 000000000000..90cc5ccbf0e9
--- /dev/null
+++ b/net-libs/nodejs/nodejs-0.6.7-r1.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/net-libs/nodejs/nodejs-0.6.7-r1.ebuild,v 1.1 2012/01/17 09:13:26 chainsaw Exp $
+
+EAPI="2"
+
+inherit eutils pax-utils
+
+# omgwtf
+RESTRICT="test"
+
+DESCRIPTION="Evented IO for V8 Javascript"
+HOMEPAGE="http://nodejs.org/"
+SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND=">=dev-lang/v8-3.5.10.22
+	dev-libs/openssl"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/node-v${PV}
+
+src_configure() {
+	# this is a waf confuserator
+	./configure --shared-v8 --prefix=/usr || die
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	pax-mark -m "${D}"/usr/bin/node
+}
+
+src_test() {
+	emake test || die
+}
diff --git a/net-mail/offlineimap/Manifest b/net-mail/offlineimap/Manifest
index e5085b596a8c..f229aaa20368 100644
--- a/net-mail/offlineimap/Manifest
+++ b/net-mail/offlineimap/Manifest
@@ -2,3 +2,4 @@ DIST offlineimap-6.3.1.tar.gz 113632 RMD160 9f449057766c02968b9df12af5d03d480f08
 DIST offlineimap-6.3.2.2.tar.gz 93051 RMD160 323aecc256012722fe0411cd1380ec8196469f9d SHA1 efe70b4a6ad11b5d0ada4ba9879e091790487b4a SHA256 8a92c200c8920d2baa0d0ac0c8fed4730a4e243d9e6a6602415364afacd70ce1
 DIST offlineimap-6.3.4.tar.gz 137313 RMD160 1e59b2535f6a606bcff82b653cc8e9178d1f66cb SHA1 2ba3d1145a3e36d0e81ba0eea73bd4c5b48631e6 SHA256 a2ac69a58605338e971658e930e095e4c2611383837a9378b88c0749cd374333
 DIST offlineimap-6.5.1.2.tar.gz 155153 RMD160 e1d50541abc7c037b2ef3b55118110f6ff5ba888 SHA1 427adfa77f961dd4adef22e97be3d16a433f4519 SHA256 29dce215fc6d7a05538222941cb1047dc631c3c06ef1c016663b62ecd3a9dc4c
+DIST offlineimap-6.5.2.tar.gz 156658 RMD160 1e07f294a3ab99985b8a57c30435598b2296bed5 SHA1 8632a23ccda515ac549ab38700ce9fa6c9a08855 SHA256 c3301e082641797c90e7beace177392bf81667ae97b0b661efafc8b6b5060706
diff --git a/net-mail/offlineimap/offlineimap-6.5.2.ebuild b/net-mail/offlineimap/offlineimap-6.5.2.ebuild
new file mode 100644
index 000000000000..58b01ee255e7
--- /dev/null
+++ b/net-mail/offlineimap/offlineimap-6.5.2.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/net-mail/offlineimap/offlineimap-6.5.2.ebuild,v 1.1 2012/01/17 10:15:50 tomka Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.6"
+PYTHON_USE_WITH="threads ssl?"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.[45] 3.*"  #see bug 394307
+
+inherit eutils distutils
+
+DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
+HOMEPAGE="http://offlineimap.org"
+# SRC_URI="http://offlineimap.org/downloads/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+# Lately only spaetz gitub:
+SRC_URI="https://github.com/downloads/spaetz/${PN}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc ssl"
+
+DEPEND="doc? ( dev-python/docutils )"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	mv *-${PN}-* "${S}"
+}
+
+src_prepare() {
+	distutils_src_prepare
+	epatch "${FILESDIR}"/offlineimap-6.3.2-darwin10.patch
+}
+
+src_compile() {
+	distutils_src_compile
+	if use doc ; then
+		cd docs
+		rst2man.py MANUAL.rst offlineimap.1 || die "building manpage failed"
+	fi
+}
+
+src_install() {
+	distutils_src_install
+	dodoc offlineimap.conf offlineimap.conf.minimal
+	if use doc ; then
+		cd docs
+		doman offlineimap.1 || die "installing manpage failed"
+	fi
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+
+	elog ""
+	elog "You will need to configure offlineimap by creating ~/.offlineimaprc"
+	elog "Sample configurations are in /usr/share/doc/${PF}/"
+	elog ""
+
+	elog "If you upgraded from 6.3.* then you may need to update your config:"
+	elog ""
+	elog "If you use nametrans= settings on a remote repository, you will have"
+	elog "to add a \"reverse\" nametrans setting to the local repository, so that"
+	elog "it knows which folders it should (not) create on the remote side."
+	elog ""
+	elog "If you connect via ssl/tls and don't use CA cert checking, it will"
+	elog "display the server's cert fingerprint and require you to add it to the"
+	elog "configuration file to be sure it connects to the same server every"
+	elog "time. This serves to help fixing CVE-2010-4532 (offlineimap doesn't"
+	elog "check SSL server certificate) in cases where you have no CA cert."
+	elog ""
+}
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 48343ee98003..35eb50e2e248 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -1,2 +1,3 @@
 DIST apt-cacher-ng_0.6.10.orig.tar.xz 250264 RMD160 93e56317c5f5f151141704c0fd177380015c4912 SHA1 f6568778e8dd8d8680d963b98359ed40614d4ae3 SHA256 dfa1a55ac846eb00ee04f650c50140c43b9020a20e507fc50ec9389ef9fa6fd5
 DIST apt-cacher-ng_0.6.11.orig.tar.xz 251384 RMD160 b1ffb7ade5f944f038e70e5bc7e87765ed2a4883 SHA1 53d74b4fac154ca9cc958f9dfb29667606bd48cd SHA256 3576ea1f5a6c07d48a5382bd58fff97cc738899b7deff1949c4acdc101a310d2
+DIST apt-cacher-ng_0.6.12.orig.tar.xz 252528 RMD160 00676fee07ba94d23d82e3616af0e57f35041ff7 SHA1 e0a47d8613de4ef3d4e84259b21eef723c4e3186 SHA256 595eb6c9e661891abf52caadb157dbf94bef6af4a6c00dd659239f1dbc344be8
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-0.6.12.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-0.6.12.ebuild
new file mode 100644
index 000000000000..4e3734851dd7
--- /dev/null
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-0.6.12.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/apt-cacher-ng-0.6.12.ebuild,v 1.1 2012/01/17 04:45:21 jer Exp $
+
+EAPI="4"
+
+inherit eutils cmake-utils
+
+DESCRIPTION="Yet another implementation of an HTTP proxy for Debian/Ubuntu software packages written in C++"
+HOMEPAGE="http://www.unix-ag.uni-kl.de/~bloch/acng/"
+LICENSE="as-is"
+SLOT="0"
+SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.xz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fuse lzma tcpd"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+"
+DEPEND="
+	${COMMON_DEPEND}
+	app-arch/xz-utils
+	dev-util/cmake
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	lzma? ( app-arch/xz-utils )
+	fuse? ( sys-fs/fuse )
+	tcpd? ( sys-apps/tcp-wrappers )
+	dev-lang/perl
+"
+
+pkg_setup() {
+	# add new user & group for daemon
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_configure(){
+	mycmakeargs="-DCMAKE_INSTALL_PREFIX=/usr"
+	if use fuse; then
+		mycmakeargs="-DHAVE_FUSE_26=yes ${mycmakeargs}"
+	else
+		mycmakeargs="-DHAVE_FUSE_26=no ${mycmakeargs}"
+	fi
+	if use lzma; then
+		mycmakeargs="-DHAVE_LZMA=yes ${mycmakeargs}"
+	else
+		mycmakeargs="-DHAVE_LZMA=no ${mycmakeargs}"
+	fi
+	if use tcpd; then
+		mycmakeargs="-DHAVE_LIBWRAP=yes ${mycmakeargs}"
+	else
+		mycmakeargs="-DHAVE_LIBWRAP=no ${mycmakeargs}"
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	pushd ${CMAKE_BUILD_DIR}
+	dosbin ${PN}
+	if use fuse; then
+		dobin acngfs
+	fi
+	popd
+
+	newinitd "${FILESDIR}"/initd ${PN}
+	newconfd "${FILESDIR}"/confd ${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/logrotate ${PN}
+
+	doman doc/man/${PN}*
+	if use fuse; then
+		doman doc/man/acngfs*
+	fi
+
+	# Documentation
+	dodoc README TODO VERSION INSTALL ChangeLog
+	if use doc; then
+		dodoc doc/*.pdf
+		dohtml doc/html/*
+		docinto examples/conf
+		dodoc conf/*
+	fi
+
+	# perl daily cron script
+	dosbin expire-caller.pl
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/cron.daily ${PN}
+
+	# default configuration
+	insinto /etc/${PN}
+	newins conf/acng.conf ${PN}.conf
+	doins $( echo conf/* | sed 's|conf/acng.conf||g' )
+
+	dodir /var/cache/${PN}
+	dodir /var/log/${PN}
+	# Some directories must exists
+	keepdir /var/log/${PN}
+	keepdir /var/run/${PN}
+	fowners -R ${PN}:${PN} \
+		/etc/${PN} \
+		/var/log/${PN} \
+		/var/cache/${PN} \
+		/var/run/${PN}
+}
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 67c25a321028..4425d49e743b 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -10,6 +10,7 @@ DIST memcached-1.3.3.tar.gz 260203 RMD160 c9ac975da30b3c005336b15c90216ce4e7e4bc
 DIST memcached-1.4.0.tar.gz 267420 RMD160 0bf281c694ba24672c4285c5f65137b2fbb3f484 SHA1 84881977cc34a1039ce619227ff2910d8e1e3e5b SHA256 b2648fb514fb36fa22cdeb468b8e8a8d49fef86a2cfbc7738f630e09b4977d35
 DIST memcached-1.4.1.tar.gz 277221 RMD160 18f2ef91a1f282e37316e107a90647cf246d98d9 SHA1 6acf8941c494edb4f19efc402b844a494608b679 SHA256 6bb6e52290bbe987990e83d57856f762402c9a625e9c4f8da785dc7f53acbd83
 DIST memcached-1.4.10.tar.gz 311926 RMD160 67f4677ba644b1b15151a6865a8377966fe19706 SHA1 0ae300f858b767abf812009d53ed58647ceb498a SHA256 2cc3de341b561464da29fc5d5e2a4facc0f6aafc151f0e1d94228705e0758fdf
+DIST memcached-1.4.11.tar.gz 319642 RMD160 9f59c76a08132f16d784e9677d1a46770a84b3d7 SHA1 30ac7cf87d1714803c265ea543312a702e09eb99 SHA256 e3dcc4ff29d2b3f3c66f2b5b95a1bcef0163a65b588d6ba92a56cd6c8d73e83e
 DIST memcached-1.4.2.tar.gz 283071 RMD160 bc1b8d8317e375565ea829a77cdf38d1359bf344 SHA1 28bceaa24c4bc6d7dc9c700e143ee4b2ff09f760 SHA256 d44b611341b7dcf2e87c0f60ecc78e95fc61acb801fdd9853940b039027066aa
 DIST memcached-1.4.4.tar.gz 297920 RMD160 9d10ce383684bf94f4c169471e1ca49d271653ad SHA1 32a4f2cee9e1c0f4d7a247844714756e3affe96a SHA256 6bbca41460ded17c6d56c76d96309cd3dee518603fa093938e252262935f8bac
 DIST memcached-1.4.5.tar.gz 302516 RMD160 c1f534fbc585a1ea033bbd12d6fc94c77a085032 SHA1 c7d6517764b82d23ae2de76b56c2494343c53f02 SHA256 9571b4b85484e46b3b10f07ccba77a1fa97d60660b32859f990effefb3005f91
diff --git a/net-misc/memcached/memcached-1.4.11.ebuild b/net-misc/memcached/memcached-1.4.11.ebuild
new file mode 100644
index 000000000000..75793577d7cd
--- /dev/null
+++ b/net-misc/memcached/memcached-1.4.11.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.11.ebuild,v 1.1 2012/01/17 08:13:01 robbat2 Exp $
+
+EAPI=2
+inherit eutils autotools flag-o-matic
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://code.google.com/p/memcached/"
+SRC_URI="http://memcached.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test slabs-reassign debug sasl" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4
+		 dev-lang/perl
+		 sasl? ( dev-libs/cyrus-sasl )"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	# Handled different upstream
+	#epatch "${FILESDIR}/${PN}-1.3.3-gcc4-slab-fixup.patch"
+	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die "sed failed"
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		$(use_enable sasl)
+	# The xml2rfc tool to build the additional docs requires TCL :-(
+	# `use_enable doc docs`
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG
+	emake testapp memcached-debug CFLAGS="${CFLAGS}" || die "emake of testapp and memcached-debug failed."
+	filter-flags -UNDEBUG
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}"/1.3.3/conf memcached
+	newinitd "${FILESDIR}"/1.3.3/init memcached
+}
+
+pkg_postinst() {
+	enewuser memcached -1 -1 /dev/null daemon
+
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}
+
+src_test() {
+	emake -j1 test || die "Failed testing"
+}
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index 9c6a64506dea..a43477112ff6 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,3 +1,3 @@
 DIST smb4k-0.10.10.tar.bz2 1875665 RMD160 4f6d1f3c05eb4ff992a2b27ac061b17785383e63 SHA1 5db37ca3578fa268f852ee97c43c0c4abd7d37c0 SHA256 3242fbcae3c5750954c239d9a87d93b30e9a6063fe40cd3a6b86cfd23e09fe1c
-DIST smb4k-0.10.90.tar.bz2 2188556 RMD160 00bd567e35a1da4e246159178dc9f36914795652 SHA1 e0e0eee3b07dd4a5896683f0f9e99f71eda023a4 SHA256 baa2957f21e08d0bd9caaac3d063a247c68ef3f49b7fd75212de96d865cbd651
 DIST smb4k-0.10.91.tar.bz2 2631280 RMD160 99ad5876779a8cc8516bdfad3d821e60adde3ded SHA1 9d2e6a9e9431bdc8394425eb22942e60c4206fa5 SHA256 54999dc7805d0cd91d071051b9185419bfcb1b53a207402ae3b4eb4414079090
+DIST smb4k-0.10.92.tar.bz2 2635905 RMD160 c394cdb9552b1ffbe7eba481863050cf2ce4d04a SHA1 62e6f844b0bcb66d0658add25103a30587e375de SHA256 2bccff23b21539c23d6bf2a19e0740ca6024f6e4db662cba9fa2783e50bb4f9f
diff --git a/net-misc/smb4k/smb4k-0.10.90.ebuild b/net-misc/smb4k/smb4k-0.10.92.ebuild
similarity index 76%
rename from net-misc/smb4k/smb4k-0.10.90.ebuild
rename to net-misc/smb4k/smb4k-0.10.92.ebuild
index 1d5a7b111ec5..5e6687a23c2c 100644
--- a/net-misc/smb4k/smb4k-0.10.90.ebuild
+++ b/net-misc/smb4k/smb4k-0.10.92.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-misc/smb4k/smb4k-0.10.90.ebuild,v 1.1 2011/10/26 07:49:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/smb4k/smb4k-0.10.92.ebuild,v 1.1 2012/01/17 16:55:19 johu Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ IUSE="debug"
 
 RDEPEND=">=net-fs/samba-3.4.2[cups]"
 
-DOCS="AUTHORS BUGS ChangeLog FAQ README TODO"
+DOCS=( AUTHORS BUGS ChangeLog README TODO )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/net-misc/socat/socat-1.7.2.0.ebuild b/net-misc/socat/socat-1.7.2.0.ebuild
index bcc2f4c2d9c3..6d6497210685 100644
--- a/net-misc/socat/socat-1.7.2.0.ebuild
+++ b/net-misc/socat/socat-1.7.2.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/net-misc/socat/socat-1.7.2.0.ebuild,v 1.2 2011/12/15 19:33:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.7.2.0.ebuild,v 1.3 2012/01/17 22:43:23 ago Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~ppc-macos"
 IUSE="ssl readline ipv6 tcpd"
 
 DEPEND="
diff --git a/net-print/foomatic-db-engine/Manifest b/net-print/foomatic-db-engine/Manifest
index 7b4d324334c2..a5515c838dfa 100644
--- a/net-print/foomatic-db-engine/Manifest
+++ b/net-print/foomatic-db-engine/Manifest
@@ -1,3 +1,4 @@
 DIST foomatic-db-engine-3.0-20060720.tar.gz 314205 RMD160 12df8a9a9e18192862f1334758ff861096dd4aed SHA1 295c52857def6d704b26a58078367cde592f930b SHA256 c5331e4445b49bb7fd4909a38eb0bf2e325f7d653b06b3dbc8a9f507685e0b02
 DIST foomatic-db-engine-4.0.4.tar.gz 347184 RMD160 24781e7fdb4bc934a4ce6f12865a8a151beaf6f3 SHA1 7f54f18008612813fd63f008c157cb4af3e82d1f SHA256 262cd628ad3fd5a92d8594db1c6d8e9f55675f3fea445771d725704c83fc0dbe
 DIST foomatic-db-engine-4.0.7.tar.gz 354069 RMD160 5cdf25cbc7af12a4e624faa65e1de4719ab769f4 SHA1 c7fb1d1e095b2b7812061073147dd9b9764737c7 SHA256 fc0712f23d9d70fa02295ac5ac3aad0f8e2b7bd15020d44b83c40f295ab6fe9c
+DIST foomatic-db-engine-4.0.8.tar.gz 354578 RMD160 56523835ba5de0e5bdb37b78529775334e96ad76 SHA1 e47f5ee9b9256077f70b5ecf2481dfbce416d97a SHA256 f0c4892ae5566ea2efaae8bd58352fd32001d112f2f9dfff63f7de03b46733e1
diff --git a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.7.ebuild b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.7.ebuild
index 62b4824a9361..f30e50a67a1d 100644
--- a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.7.ebuild
+++ b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.7.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-print/foomatic-db-engine/foomatic-db-engine-4.0.7.ebuild,v 1.1 2011/05/06 16:03:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-engine/foomatic-db-engine-4.0.7.ebuild,v 1.2 2012/01/17 22:41:02 ago Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.linuxprinting.org/download/foomatic/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.8.ebuild b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.8.ebuild
new file mode 100644
index 000000000000..360a5ade7b6a
--- /dev/null
+++ b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.8.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-engine/foomatic-db-engine-4.0.8.ebuild,v 1.1 2012/01/17 13:34:45 jlec Exp $
+
+EAPI="2"
+
+inherit eutils perl-app versionator
+
+DESCRIPTION="Generates ppds out of xml foomatic printer description files"
+HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
+SRC_URI="http://www.openprinting.org/download/foomatic/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libxml2
+	net-print/foomatic-filters"
+PDEPEND="net-print/foomatic-db"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/4.0.7-perl-module.patch \
+		"${FILESDIR}"/4.0.7-respect-ldflag.patch
+	sed -i -e "s:@LIB_CUPS@:$(cups-config --serverbin):" "${S}"/Makefile.in
+}
+
+src_configure() {
+	default
+	emake defaults || die "emake defaults failed"
+
+	cd lib
+	perl-app_src_configure
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	cd lib
+	perl-app_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	cd lib
+	perl-module_src_install
+}
+
+src_test() {
+	cd lib
+	perl-module_src_test
+}
diff --git a/net-print/foomatic-db-engine/metadata.xml b/net-print/foomatic-db-engine/metadata.xml
index 1fa0ca569505..e450ba260ec9 100644
--- a/net-print/foomatic-db-engine/metadata.xml
+++ b/net-print/foomatic-db-engine/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
+	<herd>printing</herd>
 </pkgmetadata>
diff --git a/net-print/foomatic-db-ppds/Manifest b/net-print/foomatic-db-ppds/Manifest
index 53506baa5d37..466d26c79e28 100644
--- a/net-print/foomatic-db-ppds/Manifest
+++ b/net-print/foomatic-db-ppds/Manifest
@@ -2,3 +2,4 @@ DIST foomatic-db-3.0-20060720.tar.gz 12345043 RMD160 0cf48903e617ebc5725f9ed42bf
 DIST foomatic-db-4.0-20100218.tar.gz 24878025 RMD160 764965fb96db593414fe56bc10ad8af6962d34a1 SHA1 6ea2b857a5d0b3375f6d866a19e925aedff5e0f8 SHA256 79a98b8afd0f44f5133e595d881fd82d97d09a68e9aeb458aa616fb743792cb0
 DIST foomatic-db-4.0-20101123.tar.gz 26799362 RMD160 948510c5b578142de316c0be2f1c96eeccd219bd SHA1 911b9025be3d20c9771a9f13b88c1ceea4b569e3 SHA256 87c2f864db5194d6eb78b33977ea7a2d0eea775eb98babafca91879e1448500b
 DIST foomatic-db-4.0-20110506.tar.gz 30112960 RMD160 c11d730bd8da16ab92209e6a1f3e1e73f78284f6 SHA1 6702e5ef481114bde658d4eab2bf799668b5ef65 SHA256 7d4c3c8a9ad5c7b440d923651cda9e277605e1fc4924287c0f6baa7a260caaf4
+DIST foomatic-db-4.0-20120117.tar.gz 30534575 RMD160 e7cbe466822713823573beb877218278d963ae7c SHA1 ed0043fd40a9e39cf2f6f805c277374e2fa3518c SHA256 e89cf2346b7c977f45a94c8a2f096b68a6d06489939f0f42f129b9e74632332c
diff --git a/net-print/foomatic-db-ppds/files/Makefile.in-4.0.20120117.patch b/net-print/foomatic-db-ppds/files/Makefile.in-4.0.20120117.patch
new file mode 100644
index 000000000000..67928e3f46f9
--- /dev/null
+++ b/net-print/foomatic-db-ppds/files/Makefile.in-4.0.20120117.patch
@@ -0,0 +1,24 @@
+diff -urN foomatic-db-20070508.orig/Makefile.in foomatic-db-20070508/Makefile.in
+--- foomatic-db-20070508.orig/Makefile.in	2007-05-08 09:22:03.000000000 +0200
++++ foomatic-db-20070508/Makefile.in	2007-05-08 13:08:48.000000000 +0200
+@@ -66,13 +66,13 @@
+ 	install -d $(DESTDIR)$(LIBDIR)/db/source/opt
+ 	install -d $(DESTDIR)$(LIBDIR)/db/source/PPD
+ 	install -d $(DESTDIR)$(LIBDIR)/xmlschema
+-	cp db/oldprinterids $(DESTDIR)$(LIBDIR)/db
+-	cp db/source/printer/*.xml $(DESTDIR)$(LIBDIR)/db/source/printer
+-	( cd db/source/driver/; \
+-	  for d in $(DRIVERXMLS); do \
+-	    cp $$d $(DESTDIR)$(LIBDIR)/db/source/driver; \
+-	  done )
+-	cp db/source/opt/*.xml $(DESTDIR)$(LIBDIR)/db/source/opt
++#	cp db/oldprinterids $(DESTDIR)$(LIBDIR)/db
++#	cp db/source/printer/*.xml $(DESTDIR)$(LIBDIR)/db/source/printer
++#	( cd db/source/driver/; \
++#	  for d in $(DRIVERXMLS); do \
++#	    cp $$d $(DESTDIR)$(LIBDIR)/db/source/driver; \
++#	  done )
++#	cp db/source/opt/*.xml $(DESTDIR)$(LIBDIR)/db/source/opt
+ 	( cd db/source && tar cf - --exclude=.svn PPD ) | \
+ 	  ( cd $(DESTDIR)$(LIBDIR)/db/source && tar xf -)
+ 	if test $(GZIP) != GZIP_NOT_FOUND -a $(GZIP_PPDS) != no ; then \
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20120117.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20120117.ebuild
new file mode 100644
index 000000000000..bc6c4ab03165
--- /dev/null
+++ b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20120117.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/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20120117.ebuild,v 1.1 2012/01/17 13:48:46 jlec Exp $
+
+EAPI=4
+
+inherit eutils versionator
+
+MY_P=${PN/-ppds}-$(replace_version_separator 2 '-')
+
+DESCRIPTION="linuxprinting.org PPD files for postscript printers"
+HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
+SRC_URI="
+	http://dev.gentoo.org/~jlec/distfiles/${MY_P}.tar.gz
+	http://linuxprinting.org/download/foomatic/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
+
+src_prepare() {
+	epatch "${FILESDIR}/Makefile.in-${PV}.patch"
+}
diff --git a/net-print/foomatic-db-ppds/metadata.xml b/net-print/foomatic-db-ppds/metadata.xml
index 1fa0ca569505..e450ba260ec9 100644
--- a/net-print/foomatic-db-ppds/metadata.xml
+++ b/net-print/foomatic-db-ppds/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
+	<herd>printing</herd>
 </pkgmetadata>
diff --git a/net-print/foomatic-db/Manifest b/net-print/foomatic-db/Manifest
index 18d042613b76..cd2666991900 100644
--- a/net-print/foomatic-db/Manifest
+++ b/net-print/foomatic-db/Manifest
@@ -1,3 +1,4 @@
 DIST foomatic-db-3.0-20060720.tar.gz 12345043 RMD160 0cf48903e617ebc5725f9ed42bf1ec8ffb155a0c SHA1 87558c3ad2f0c6b52ba7b3d1696d8a6d18f98470 SHA256 28ff1433b9719595caf3f722db166ab8e0e2e6c57184762541dab564bc5bc295
 DIST foomatic-db-4.0-20101123.tar.gz 26799362 RMD160 948510c5b578142de316c0be2f1c96eeccd219bd SHA1 911b9025be3d20c9771a9f13b88c1ceea4b569e3 SHA256 87c2f864db5194d6eb78b33977ea7a2d0eea775eb98babafca91879e1448500b
 DIST foomatic-db-4.0-20110506.tar.gz 30112960 RMD160 c11d730bd8da16ab92209e6a1f3e1e73f78284f6 SHA1 6702e5ef481114bde658d4eab2bf799668b5ef65 SHA256 7d4c3c8a9ad5c7b440d923651cda9e277605e1fc4924287c0f6baa7a260caaf4
+DIST foomatic-db-4.0-20120117.tar.gz 30534575 RMD160 e7cbe466822713823573beb877218278d963ae7c SHA1 ed0043fd40a9e39cf2f6f805c277374e2fa3518c SHA256 e89cf2346b7c977f45a94c8a2f096b68a6d06489939f0f42f129b9e74632332c
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20120117.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20120117.ebuild
new file mode 100644
index 000000000000..a5763fc09016
--- /dev/null
+++ b/net-print/foomatic-db/foomatic-db-4.0.20120117.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/foomatic-db-4.0.20120117.ebuild,v 1.1 2012/01/17 13:33:39 jlec Exp $
+
+EAPI=4
+
+inherit versionator
+
+DESCRIPTION="Printer information files for foomatic-db-engine to generate ppds"
+HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
+SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(replace_version_separator 2 -).tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	net-print/foomatic-db-engine
+	!net-print/foo2zjs[hp2600n]"
+
+S="${WORKDIR}/${PN}-$(get_version_component_range 3 ${PV})"
+
+src_prepare() {
+	# ppd files do not belong to this package
+	rm -r "${S}"/db/source/PPD
+}
+
+src_configure() {
+	econf \
+		--disable-gzip-ppds \
+		--disable-ppds-to-cups
+}
+
+src_install() {
+	default
+
+	# Avoid collision with foo2zjs, bug 185486
+	rm "${ED}"/usr/share/foomatic/db/source/{driver/foo2{hp,lava,xqx,zjs}.xml,printer/{Generic-ZjStream_Printer,HP-{Color_LaserJet_{1500,1600,2600n},LaserJet_{10{00,05,18,20,22},M1005_MFP}},Minolta-{Color_PageWorks_Pro_L,magicolor_2{20,30,43}0_DL},Samsung-CLP-{3,6}00}.xml}
+}
diff --git a/net-print/foomatic-db/metadata.xml b/net-print/foomatic-db/metadata.xml
index 1fa0ca569505..e450ba260ec9 100644
--- a/net-print/foomatic-db/metadata.xml
+++ b/net-print/foomatic-db/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
+	<herd>printing</herd>
 </pkgmetadata>
diff --git a/net-print/foomatic-filters/Manifest b/net-print/foomatic-filters/Manifest
index 906e56afbd5a..2dcda69991c3 100644
--- a/net-print/foomatic-filters/Manifest
+++ b/net-print/foomatic-filters/Manifest
@@ -2,3 +2,4 @@ DIST foomatic-filters-3.0-20060720.tar.gz 165214 RMD160 709d1c6717d84620faa129a1
 DIST foomatic-filters-3.0-20080507.tar.gz 170572 RMD160 7d594d4553a971777ab2da908e7e88d5cc962a61 SHA1 e72b22f5ea7ff4804778b5d9b279581bdb71c577 SHA256 18e0c7f105fef12f15a2c4fb7fa722809e25e08911cbb64acecd4e946f487e92
 DIST foomatic-filters-4.0.5.tar.gz 243239 RMD160 7065de37e38af8b52dbdf1ea404b620d386e01b5 SHA1 1345880f3b89242b0ac7fae1e3750bf2154130f4 SHA256 dafa39cd5a9de94db59aacd05f0ccbc4eba362d1633419f3dc3c7126c83c1036
 DIST foomatic-filters-4.0.7.tar.gz 244678 RMD160 5b36d00efb447d28d4a5524d99a488b4df82cf87 SHA1 1d5a555e6b4a1ced073d26d1a74eb1b63479b2fa SHA256 090313fae40b177f505d9c9b93d7a4d7188b6d5d18b6ae41ab24903ac983478d
+DIST foomatic-filters-4.0.9.tar.gz 254831 RMD160 456230e48494a2f0f2161d0af3d45e1a5db26192 SHA1 8cf45fc32becbd7bc25ba72dc23032a019eaa29a SHA256 5819d357889db297bb26da8c09af49a101af2dd6cde257dd977aa021b91663a0
diff --git a/net-print/foomatic-filters/files/foomatic-filters-4.0.9-multilib.patch b/net-print/foomatic-filters/files/foomatic-filters-4.0.9-multilib.patch
new file mode 100644
index 000000000000..0659e0818055
--- /dev/null
+++ b/net-print/foomatic-filters/files/foomatic-filters-4.0.9-multilib.patch
@@ -0,0 +1,41 @@
+diff --git a/configure.ac b/configure.ac
+index acd2f0c..9b333b9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -81,24 +81,24 @@ if test -n "$CUPS_SERVERBIN"; then
+ 	AC_SUBST(CUPS_FILTERS)
+ 	AC_SUBST(CUPS_BACKENDS)
+ else
+-	# Check for /usr/lib/cups
+-	FM_PATH_DIR(CUPS,cups,/usr/lib/cups,$SERVERBIB$LIBSEARCHPATH)
++	# Check for ${libdir}/cups
++	FM_PATH_DIR(CUPS,cups,${libdir}/cups,$SERVERBIB$LIBSEARCHPATH)
+ 
+-	# Check for /usr/lib/cups/filter
+-	FM_PATH_DIR(CUPS_FILTERS,cups/filter,/usr/lib/cups/filter,$FILTERS$LIBSEARCHPATH)
++	# Check for ${libdir}/cups/filter
++	FM_PATH_DIR(CUPS_FILTERS,cups/filter,${libdir}/cups/filter,$FILTERS$LIBSEARCHPATH)
+ 
+-	# Check for /usr/lib/cups/backend
+-	FM_PATH_DIR(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$BACKENDS$LIBSEARCHPATH)
++	# Check for ${libdir}/cups/backend
++	FM_PATH_DIR(CUPS_BACKENDS,cups/backend,${libdir}/cups/backend,$BACKENDS$LIBSEARCHPATH)
+ fi
+ 
+-# Check for /usr/lib/ppr
+-FM_PATH_DIR(PPR,ppr,/usr/lib/ppr,$LIBSEARCHPATH)
++# Check for ${libdir}/ppr
++FM_PATH_DIR(PPR,ppr,${libdir}/ppr,$LIBSEARCHPATH)
+ 
+-# Check for /usr/lib/ppr/interfaces
+-FM_PATH_DIR(PPR_INTERFACES,ppr/interfaces,/usr/lib/ppr/interfaces,$LIBSEARCHPATH)
++# Check for ${libdir}/ppr/interfaces
++FM_PATH_DIR(PPR_INTERFACES,ppr/interfaces,${libdir}/ppr/interfaces,$LIBSEARCHPATH)
+ 
+-# Check for /usr/lib/ppr/lib
+-FM_PATH_DIR(PPR_LIB,ppr/lib,/usr/lib/ppr/lib,$LIBSEARCHPATH)
++# Check for ${libdir}/ppr/lib
++FM_PATH_DIR(PPR_LIB,ppr/lib,${libdir}/ppr/lib,$LIBSEARCHPATH)
+ 
+ AC_CHECK_HEADERS([ghostscript/ierrors.h ghostscript/iapi.h])
+ AC_CHECK_LIB(gs, gsapi_new_instance)
diff --git a/net-print/foomatic-filters/foomatic-filters-4.0.9.ebuild b/net-print/foomatic-filters/foomatic-filters-4.0.9.ebuild
new file mode 100644
index 000000000000..b0d480111acc
--- /dev/null
+++ b/net-print/foomatic-filters/foomatic-filters-4.0.9.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/foomatic-filters-4.0.9.ebuild,v 1.1 2012/01/17 13:28:43 jlec Exp $
+
+EAPI=4
+
+inherit autotools eutils versionator
+
+DESCRIPTION="Foomatic wrapper scripts"
+HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
+SRC_URI="http://www.openprinting.org/download/foomatic/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="cups dbus"
+
+RDEPEND="
+		dev-lang/perl
+	app-text/ghostscript-gpl
+	cups? ( >=net-print/cups-1.1.19 )
+	!cups? (
+		|| (
+			app-text/enscript
+			app-text/a2ps
+			app-text/mpage
+		)
+	)
+	dbus? ( sys-apps/dbus )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	if use cups; then
+		CUPS_SERVERBIN="$(cups-config --serverbin)"
+	else
+		CUPS_SERVERBIN=""
+	fi
+
+	# Search for libs in ${libdir}, not just /usr/lib
+	epatch "${FILESDIR}"/${P}-multilib.patch
+	eautoreconf
+
+	export CUPS_BACKENDS=${CUPS_SERVERBIN}/backend \
+		CUPS_FILTERS=${CUPS_SERVERBIN}/filter CUPS=${CUPS_SERVERBIN}/
+}
+
+src_configure() {
+	econf $(use_enable dbus)
+}
+
+src_install() {
+	default
+
+	dosym /usr/bin/foomatic-rip /usr/bin/lpdomatic
+
+	if use cups; then
+		dosym /usr/bin/foomatic-gswrapper "${CUPS_SERVERBIN}/filter/foomatic-gswrapper"
+		dosym /usr/bin/foomatic-rip "${CUPS_SERVERBIN}/filter/cupsomatic"
+	else
+		rm -r "${D}"/${CUPS_SERVERBIN}/filter
+		rm -r "${D}"/${CUPS_SERVERBIN}/backend
+	fi
+}
diff --git a/net-print/foomatic-filters/metadata.xml b/net-print/foomatic-filters/metadata.xml
index 1fa0ca569505..e450ba260ec9 100644
--- a/net-print/foomatic-filters/metadata.xml
+++ b/net-print/foomatic-filters/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
+	<herd>printing</herd>
 </pkgmetadata>
diff --git a/net-print/foomatic-gui/Manifest b/net-print/foomatic-gui/Manifest
index 97ae1b4b4b54..7ac3d0244357 100644
--- a/net-print/foomatic-gui/Manifest
+++ b/net-print/foomatic-gui/Manifest
@@ -1 +1 @@
-DIST foomatic-gui_0.7.9.4.tar.gz 123801 RMD160 fd5657d8366f3aedcf0f3a49d92c2596fb0b7ac0 SHA1 377e17c611f2995f03dd4c49f4f2dc229e49eb16 SHA256 6e64916d153d2c2f67ee4225dbc69cfbf2dd2d6b5ff578d6bc44b15df688ecef
+DIST foomatic-gui_0.7.9.5.tar.gz 122249 RMD160 cd2a67fd51d00a106215f4dd8e28f20e8984039b SHA1 052046bce09b00435dc9688d85625794805cd424 SHA256 e0ae4afa43a39bbcc74510ad22796a95eefd898f780fb392cf39afd3318931ff
diff --git a/net-print/foomatic-gui/foomatic-gui-0.7.9.4.ebuild b/net-print/foomatic-gui/foomatic-gui-0.7.9.5.ebuild
similarity index 88%
rename from net-print/foomatic-gui/foomatic-gui-0.7.9.4.ebuild
rename to net-print/foomatic-gui/foomatic-gui-0.7.9.5.ebuild
index 30ac0d66dea0..bc31bdd18083 100644
--- a/net-print/foomatic-gui/foomatic-gui-0.7.9.4.ebuild
+++ b/net-print/foomatic-gui/foomatic-gui-0.7.9.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-gui/foomatic-gui-0.7.9.4.ebuild,v 1.2 2011/06/13 15:04:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-gui/foomatic-gui-0.7.9.5.ebuild,v 1.1 2012/01/17 14:08:47 jlec Exp $
 
 EAPI="3"
 
diff --git a/net-print/foomatic-gui/metadata.xml b/net-print/foomatic-gui/metadata.xml
index 1fa0ca569505..e450ba260ec9 100644
--- a/net-print/foomatic-gui/metadata.xml
+++ b/net-print/foomatic-gui/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
+	<herd>printing</herd>
 </pkgmetadata>
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index eb374e91f47a..757348f343f0 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,9 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.75 2012/01/09 04:36:34 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.76 2012/01/17 20:25:30 cardoe Exp $
 
 # This file requires >=portage-2.1.1
 
+# Doug Goldstein <cardoe@gentoo.org> (17 Jan 2012)
+# The SPICE server is only supported on 64-bit platforms and not on 32-bit
+app-emulation/qemu-kvm spice
+
 # Alexandre Rostovtsev <tetromono@gentoo.org> (09 Jan 2012)
 # jsc JIT compilation is supported only on amd64/arm/x86 and their prefixes, so
 # it's masked in base profile and unmasked here (bug #396313).
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 1f5e0edf78e6..d9eba66ce4e5 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.132 2012/01/04 01:18:40 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.133 2012/01/17 12:26:07 johu Exp $
 
 # esd is finally being purged from the tree
 esd
@@ -33,12 +33,6 @@ sane_backends_qcam
 # Gluon still don't have release.
 gluon
 
-# KDE4 specific enablefinal flag
-# Uses huge amounts of ram, and those ricers would be spamming bugzilla.
-# By huge i mean around 8Gigs at least.
-# Most applications also fail with this approach now
-kdeenablefinal
-
 # profile specific USE flags
 # Don't put hardened in here.
 selinux
diff --git a/profiles/package.mask b/profiles/package.mask
index ede88af40b60..f7c87d79cb69 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13402 2012/01/16 23:17:29 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13405 2012/01/17 23:33:20 mabi 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,21 @@
 
 #--- END OF EXAMPLES ---
 
+# Matti Bickel <mabi@gentoo.org> (17 Jan 2012)
+# Reverse RDEPEND of dev-php/PEAR-I18N, which is going away
+# The package is unmaintained upstream, removal in 30 days
+dev-php/PEAR-HTML_Select_Common
+
+# Johannes Huber <johu@gentoo.org> (17 Jan 2012)
+# Masking until release announcement is done.
+# Tarball already available.
+~media-libs/opengtl-0.9.16
+
+# Pawel Hajdan jr <phajdan.jr@gentoo.org> (17 Jan 2012)
+# Determined by the maintaining team to be no longer useful.
+# Removal in 30 days (02/16/2012).
+dev-util/chromium-tools
+
 # Matti Bickel <mabi@gentoo.org> (16 Jan 2012)
 # Now part of dev-lang/php; merge it with USE="intl"
 # Removal in 30 days, bug #396975
diff --git a/profiles/use.desc b/profiles/use.desc
index d6b53b45322a..122003e0b5c4 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -1,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/use.desc,v 1.472 2012/01/14 17:20:45 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/use.desc,v 1.473 2012/01/17 12:26:07 johu Exp $
 
 # Keep them sorted
 
@@ -175,7 +175,6 @@ joystick - Add support for joysticks in all packages
 jpeg - Adds JPEG image support
 jpeg2k - Support for JPEG 2000, a wavelet-based image compression format
 kde - Adds support for kde-base/kde (K Desktop Enviroment)
-kdeenablefinal - EXPERIMENTAL: KDE ebuilds will use the enable-final flag, yielding compilation speedups at the cost of heavy mem usage and potentially causing problems. We strongly discourage setting this
 kdeprefix - Makes a KDE prefixed install into /usr/kde/${SLOT} if enabled or into /usr (FHS compatible) otherwise
 kerberos - Adds kerberos support
 kolab - Adds support for the Kolab groupware server
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 7926f9e68781..48aefd72ffb6 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2476,8 +2476,9 @@ media-libs/phonon-xine:xcb - Enable video support in Xine backend, via x11-libs/
 media-libs/raptor:json - Enable support for JSON parsing
 media-libs/sdif:ftruncate - Enables usage of ftruncate v. truncate
 media-libs/sdl-image:webp - support loading WEBP images
+media-libs/sdl-mixer:fluidsynth - Use media-sound/fluidsynth for MIDI support
 media-libs/sdl-mixer:midi - basic support for MIDI files
-media-libs/sdl-mixer:playtools - Install playwave and playmus tools (usefull for testing)
+media-libs/sdl-mixer:playtools - Install playwave and playmus tools (useful for testing)
 media-libs/sdl-mixer:wav - support WAVE files
 media-libs/sdl-sound:physfs - Enable physfs support
 media-libs/sge:image - enable sdl-image support
diff --git a/sci-chemistry/votca-csg/votca-csg-1.2.2.ebuild b/sci-chemistry/votca-csg/votca-csg-1.2.2.ebuild
index 3915ca59e17c..80ccd275075f 100644
--- a/sci-chemistry/votca-csg/votca-csg-1.2.2.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-1.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/sci-chemistry/votca-csg/votca-csg-1.2.2.ebuild,v 1.2 2012/01/13 01:30:08 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/votca-csg/votca-csg-1.2.2.ebuild,v 1.3 2012/01/17 13:52:07 ago Exp $
 
 EAPI=4
 
@@ -28,7 +28,7 @@ HOMEPAGE="http://www.votca.org"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux"
 
 RDEPEND="=sci-libs/votca-tools-${PV}[system-boost=]
 	gromacs? ( sci-chemistry/gromacs )
diff --git a/sci-chemistry/votca-csgapps/votca-csgapps-1.2.2.ebuild b/sci-chemistry/votca-csgapps/votca-csgapps-1.2.2.ebuild
index 983f5e1a1668..377aeb01fb61 100644
--- a/sci-chemistry/votca-csgapps/votca-csgapps-1.2.2.ebuild
+++ b/sci-chemistry/votca-csgapps/votca-csgapps-1.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/sci-chemistry/votca-csgapps/votca-csgapps-1.2.2.ebuild,v 1.3 2012/01/14 04:32:54 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/votca-csgapps/votca-csgapps-1.2.2.ebuild,v 1.4 2012/01/17 13:52:51 ago Exp $
 
 EAPI=4
 
@@ -20,7 +20,7 @@ HOMEPAGE="http://www.votca.org"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND="=sci-chemistry/${PN%apps}-${PV}"
diff --git a/sci-libs/dsdp/dsdp-5.8.ebuild b/sci-libs/dsdp/dsdp-5.8-r1.ebuild
similarity index 85%
rename from sci-libs/dsdp/dsdp-5.8.ebuild
rename to sci-libs/dsdp/dsdp-5.8-r1.ebuild
index f80607af4afd..efbf8e442c24 100644
--- a/sci-libs/dsdp/dsdp-5.8.ebuild
+++ b/sci-libs/dsdp/dsdp-5.8-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/sci-libs/dsdp/dsdp-5.8.ebuild,v 1.4 2011/06/28 18:12:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/dsdp/dsdp-5.8-r1.ebuild,v 1.1 2012/01/17 17:36:56 bicatali Exp $
 
 EAPI=4
 
@@ -62,7 +62,14 @@ src_test() {
 src_install() {
 	dolib.so lib/lib${PN}.so.$(get_major_version)
 	dosym lib${PN}.so.$(get_major_version) /usr/$(get_libdir)/lib${PN}.so
-	insinto /usr/share/doc/${PF}
+
+	insinto /usr/include
+	doins include/*.h src/sdp/*.h
+
 	use doc && dodoc docs/*.pdf
-	use examples && doins -r examples
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
 }
diff --git a/sci-libs/votca-tools/votca-tools-1.2.2.ebuild b/sci-libs/votca-tools/votca-tools-1.2.2.ebuild
index c4d00f4155a0..5ec36d9078e0 100644
--- a/sci-libs/votca-tools/votca-tools-1.2.2.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.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/sci-libs/votca-tools/votca-tools-1.2.2.ebuild,v 1.1 2012/01/11 03:55:11 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/votca-tools/votca-tools-1.2.2.ebuild,v 1.2 2012/01/17 13:52:34 ago Exp $
 
 EAPI="3"
 
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.votca.org"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-macos"
 IUSE="doc +fftw +gsl sqlite +system-boost"
 
 RDEPEND="fftw? ( sci-libs/fftw:3.0 )
diff --git a/sci-mathematics/octave/octave-3.4.3-r1.ebuild b/sci-mathematics/octave/octave-3.4.3-r1.ebuild
index b53bbc734df3..559671233f4b 100644
--- a/sci-mathematics/octave/octave-3.4.3-r1.ebuild
+++ b/sci-mathematics/octave/octave-3.4.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/sci-mathematics/octave/octave-3.4.3-r1.ebuild,v 1.1 2012/01/03 02:24:04 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.4.3-r1.ebuild,v 1.2 2012/01/17 17:17:12 xarthisius Exp $
 
 EAPI=4
 inherit eutils base autotools
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 IUSE="curl doc fftw +glpk +imagemagick opengl +qhull +qrupdate readline +sparse X zlib"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-libs/libpcre
 	app-text/ghostscript-gpl
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.4.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.4.ebuild
deleted file mode 100644
index 5c82dce23982..000000000000
--- a/sci-visualization/gnuplot/gnuplot-4.4.4.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.4.ebuild,v 1.1 2011/11/28 05:22:38 ottxor Exp $
-
-EAPI=3
-
-inherit elisp-common multilib wxwidgets
-
-DESCRIPTION="Command-line driven interactive plotting program"
-HOMEPAGE="http://www.gnuplot.info/"
-
-if [[ -z ${PV%%*9999} ]]; then
-	inherit autotools cvs
-	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
-	ECVS_MODULE="gnuplot"
-	ECVS_BRANCH="branch-4-4-stable"
-	ECVS_USER="anonymous"
-	ECVS_CVS_OPTIONS="-dP"
-	MY_P="${PN}"
-	SRC_URI=""
-else
-	MY_P="${P/_/-}"
-	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-fi
-
-LICENSE="gnuplot GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cairo doc emacs examples +gd ggi latex lua plotutils readline svga thin-splines wxwidgets X xemacs"
-
-RDEPEND="
-	cairo? (
-		x11-libs/cairo
-		x11-libs/pango )
-	emacs? ( virtual/emacs )
-	gd? ( media-libs/gd[png] )
-	ggi? ( media-libs/libggi )
-	latex? (
-		virtual/latex-base
-		lua? (
-			dev-tex/pgf
-			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
-	lua? ( dev-lang/lua )
-	plotutils? ( media-libs/plotutils )
-	readline? ( sys-libs/readline )
-	svga? ( media-libs/svgalib )
-	wxwidgets? (
-		x11-libs/wxGTK:2.8[X]
-		x11-libs/cairo
-		x11-libs/pango
-		x11-libs/gtk+:2 )
-	X? ( x11-libs/libXaw )
-	xemacs? (
-		app-editors/xemacs
-		app-xemacs/xemacs-base )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-		app-text/ghostscript-gpl )
-	!emacs? ( xemacs? ( app-xemacs/texinfo ) )"
-
-RESTRICT="wxwidgets? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-GP_VERSION="${PV%.*}"
-E_SITEFILE="50${PN}-gentoo.el"
-TEXMF="${EPREFIX}/usr/share/texmf-site"
-
-src_prepare() {
-	if [[ -z ${PV%%*9999} ]]; then
-		local dir
-		for dir in config demo m4 term tutorial; do
-			emake -C "$dir" -f Makefile.am.in Makefile.am || \
-				die "make -f Makefile.am.in Makefile.am in $dir failed"
-		done
-		eautoreconf
-	fi
-
-	# Add special version identification as required by provision 2
-	# of the gnuplot license
-	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
-}
-
-src_configure() {
-	if ! use latex; then
-		sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
-	fi
-
-	if use wxwidgets; then
-		WX_GTK_VER="2.8"
-		need-wxwidgets unicode
-	fi
-
-	local myconf
-	myconf="${myconf} --without-lisp-files"
-	myconf="${myconf} --without-pdf"
-	myconf="${myconf} --with-texdir=${TEXMF}/tex/latex/${PN}"
-	myconf="${myconf} $(use_with cairo)"
-	myconf="${myconf} $(use_with doc tutorial)"
-	myconf="${myconf} $(use_with gd)"
-	myconf="${myconf} $(use_with ggi ggi ${EPREFIX}/usr/$(get_libdir))"
-	myconf="${myconf} $(use_with ggi xmi ${EPREFIX}/usr/$(get_libdir))"
-	myconf="${myconf} $(use_with lua)"
-	myconf="${myconf} $(use_with plotutils plot "${EPREFIX}"/usr/$(get_libdir))"
-	myconf="${myconf} $(use_with svga linux-vga)"
-	myconf="${myconf} $(use_enable thin-splines)"
-	myconf="${myconf} $(use_enable wxwidgets)"
-	myconf="${myconf} $(use_with X x)"
-	use readline \
-		&& myconf="${myconf} --with-readline=gnu" \
-		|| myconf="${myconf} --with-readline=builtin"
-
-	econf ${myconf} \
-		DIST_CONTACT="http://bugs.gentoo.org/" \
-		EMACS=$(usev emacs || usev xemacs || echo no)
-
-	if use xemacs; then
-		einfo "Configuring gnuplot-mode for XEmacs ..."
-		use emacs && cp -Rp lisp lisp-xemacs || ln -s lisp lisp-xemacs
-		cd "${S}/lisp-xemacs"
-		econf --with-lispdir="${EPREFIX}/usr/lib/xemacs/site-packages/${PN}" EMACS=xemacs
-	fi
-
-	if use emacs; then
-		einfo "Configuring gnuplot-mode for GNU Emacs ..."
-		cd "${S}/lisp"
-		econf --with-lispdir="${EPREFIX}${SITELISP}/${PN}" EMACS=emacs
-	fi
-}
-
-src_compile() {
-	# Prevent access violations, see bug 201871
-	VARTEXFONTS="${T}/fonts"
-
-	# This is a hack to avoid sandbox violations when using the Linux console.
-	# Creating the DVI and PDF tutorials require /dev/svga to build the
-	# example plots.
-	addwrite /dev/svga:/dev/mouse:/dev/tts/0
-
-	emake all info || die
-
-	if use xemacs; then
-		cd "${S}/lisp-xemacs"
-		emake || die
-	fi
-
-	if use emacs; then
-		cd "${S}/lisp"
-		emake || die
-	fi
-
-	if use doc; then
-		# Avoid sandbox violation in epstopdf/ghostscript
-		addpredict /var/cache/fontconfig
-		cd "${S}/docs"
-		emake pdf || die
-		cd "${S}/tutorial"
-		emake pdf || die
-
-		if use emacs || use xemacs; then
-			cd "${S}/lisp"
-			emake pdf || die
-		fi
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-
-	if use xemacs; then
-		cd "${S}/lisp-xemacs"
-		emake DESTDIR="${D}" install || die
-	fi
-
-	if use emacs; then
-		cd "${S}/lisp"
-		emake DESTDIR="${D}" install || die
-		# info-look* is included with >=emacs-21
-		rm -f "${ED}${SITELISP}/${PN}"/info-look*
-
-		# Gentoo emacs site-lisp configuration
-		echo "(add-to-list 'load-path \"@SITELISP@\")" > ${E_SITEFILE}
-		sed '/^;; move/,+3 d' dotemacs >> ${E_SITEFILE} || die
-		elisp-site-file-install ${E_SITEFILE} || die
-	fi
-
-	cd "${S}"
-	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README* TODO
-	newdoc term/PostScript/README README-ps
-	newdoc term/js/README README-js
-	use lua && newdoc term/lua/README README-lua
-
-	if use examples; then
-		# Demo files
-		insinto /usr/share/${PN}/${GP_VERSION}
-		doins -r demo || die
-		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
-		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
-	fi
-	if use doc; then
-		# Manual
-		dodoc docs/gnuplot.pdf
-		# Tutorial
-		dodoc tutorial/{tutorial.dvi,tutorial.pdf}
-		# FAQ
-		dodoc FAQ.pdf
-		# Documentation for making PostScript files
-		docinto psdoc
-		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
-	fi
-
-	if use emacs || use xemacs; then
-		docinto emacs
-		dodoc lisp/ChangeLog lisp/README
-		use doc && dodoc lisp/gpelcard.pdf
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	use latex && texmf-update
-
-	elog "Gnuplot no longer links against pdflib, see the ChangeLog for"
-	elog "details. You can use the \"pdfcairo\" terminal for PDF output."
-	use cairo || elog "It is available with USE=\"cairo\"."
-
-	if use svga; then
-		echo
-		elog "In order to enable ordinary users to use SVGA console graphics"
-		elog "gnuplot needs to be set up as setuid root. Please note that"
-		elog "this is usually considered to be a security hazard."
-		elog "As root, manually \"chmod u+s /usr/bin/gnuplot\"."
-	fi
-	if use gd; then
-		echo
-		elog "For font support in png/jpeg/gif output, you may have to"
-		elog "set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT environment"
-		elog "variables. See the FAQ file in /usr/share/doc/${PF}/"
-		elog "for more information."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use latex && texmf-update
-}
diff --git a/sci-visualization/mayavi/Manifest b/sci-visualization/mayavi/Manifest
index 8cc803cee39f..ed41f61ba213 100644
--- a/sci-visualization/mayavi/Manifest
+++ b/sci-visualization/mayavi/Manifest
@@ -1,2 +1,3 @@
 DIST Mayavi-3.4.1.tar.gz 9343848 RMD160 669d9c90bcc9bd67a1bd7b90bbafd314b849c20c SHA1 b4bf2e03bcea73dfb32a5e1052ff2df0ea618ab6 SHA256 9eeb26f94fbfc7ca6694a3c82ff92a8fa310c127c2d538144da7d01193995aab
 DIST mayavi-4.0.0.tar.gz 7670159 RMD160 45c69fffb7dd27acf4f8e076da798bcc85b65850 SHA1 58466f3111b441475d1bd97d3e71c46e37fad993 SHA256 c17dfb1ba1cdad536a1e2c23fe3d073d48a9d7b7879d86adacda30be272f15ad
+DIST mayavi-4.1.0.tar.gz 7764207 RMD160 db9a6bf5af9778f11ebf5c22e5c2c7f1b8dc6557 SHA1 22331a479560a2c4db6248336d60838f24f18150 SHA256 53d44cf4dcd7ebf57e197e0a72002db30a74f23e5642e34b3b8f2ebe7a71bbf9
diff --git a/sci-visualization/mayavi/mayavi-4.1.0.ebuild b/sci-visualization/mayavi/mayavi-4.1.0.ebuild
new file mode 100644
index 000000000000..ff9cf818e250
--- /dev/null
+++ b/sci-visualization/mayavi/mayavi-4.1.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/mayavi-4.1.0.ebuild,v 1.1 2012/01/17 06:26:54 bicatali Exp $
+
+EAPI=4
+
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+DISTUTILS_SRC_TEST="nosetests"
+
+inherit distutils eutils virtualx
+
+DESCRIPTION="Enthought Tool Suite: Scientific data 3-dimensional visualizer"
+HOMEPAGE="http://code.enthought.com/projects/mayavi/ http://pypi.python.org/pypi/mayavi"
+SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="dev-python/configobj
+	dev-python/ipython
+	>=dev-python/pyface-4
+	>=dev-python/traitsui-4
+	>=dev-python/envisage-4
+	>=dev-python/apptools-4
+	>=dev-python/traitsui-4
+	dev-python/numpy
+	>=sci-libs/vtk-5[python]"
+
+DEPEND="dev-python/setuptools
+	test? (
+		${RDEPEND}
+		dev-python/wxpython[opengl]
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+	)"
+
+DOCS="docs/*.txt"
+
+src_compile() {
+	distutils_src_compile
+	use doc && virtualmake -C docs html
+}
+
+src_test() {
+	VIRTUALX_COMMAND="distutils_src_test" virtualmake
+}
+
+src_install() {
+	find -name "*LICENSE*.txt" -delete
+	distutils_src_install
+
+	use doc && dohtml -r docs/build/mayavi/html/*
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+
+	newicon mayavi/core/ui/images/m2.png mayavi2.png
+	make_desktop_entry mayavi2 "Mayavi2 2D/3D Scientific Visualization" mayavi2
+}
diff --git a/sys-apps/coreutils/coreutils-8.14.ebuild b/sys-apps/coreutils/coreutils-8.14.ebuild
index 08742c0343e5..b4c2e6bca001 100644
--- a/sys-apps/coreutils/coreutils-8.14.ebuild
+++ b/sys-apps/coreutils/coreutils-8.14.ebuild
@@ -1,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/coreutils/coreutils-8.14.ebuild,v 1.3 2012/01/07 17:40:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-8.14.ebuild,v 1.4 2012/01/17 16:41:06 jer Exp $
 
 EAPI="3"
 
@@ -17,7 +17,7 @@ SRC_URI="ftp://alpha.gnu.org/gnu/coreutils/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="acl caps gmp nls selinux static unicode vanilla xattr"
 
 RDEPEND="caps? ( sys-libs/libcap )
diff --git a/sys-apps/grep/grep-2.9.ebuild b/sys-apps/grep/grep-2.9.ebuild
index a827987e4dbc..e0ac0fd644ff 100644
--- a/sys-apps/grep/grep-2.9.ebuild
+++ b/sys-apps/grep/grep-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/sys-apps/grep/grep-2.9.ebuild,v 1.4 2012/01/13 22:16:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.9.ebuild,v 1.5 2012/01/17 21:21:32 jer Exp $
 
 EAPI="3"
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls pcre"
 
 RDEPEND="nls? ( virtual/libintl )
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index 4559767d6d7b..8b28a979b54b 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -1,3 +1,4 @@
 DIST hdparm-9.28.tar.gz 114144 RMD160 5adfc32e4310d734816d05c0f8b5af9583775ebf SHA1 b320997655788e5cb658e643d82ddc2e30e187d4 SHA256 693964d587be8726d930684defc7005735310f51a65614c05f1cabd6b7b55096
 DIST hdparm-9.36.tar.gz 121153 RMD160 9fa1ca95a4d794aea57fc65cd6f92a421186a73e SHA1 8bd52fdccd650c9dd1968af7320463f04a4ccf40 SHA256 88cdf28eae3af8d490f48427150c8ffb436cf2176f8bc5a0863d837eee4f6c43
 DIST hdparm-9.37.tar.gz 122062 RMD160 76b46f39c2ec219d8d4e5f75a6bced18ad7eca1c SHA1 8680bb7dd9df1c9cc96ab5e0eb6a821a95ccc76a SHA256 87ede0a7cb5b4de500748232e9d251b75acfccce078e1d42c8d125b9e5b4ccd3
+DIST hdparm-9.38.tar.gz 131175 RMD160 12216d40410b2f399e97eec7714280de257e56ca SHA1 2c2d33d4d64a7a135291cd45ec4952392a5d36d8 SHA256 04a96f01c44ae17f2428b3d98d867a4778de4b69be2ca84f2e7e3c31dfd37e56
diff --git a/sys-apps/hdparm/hdparm-9.38.ebuild b/sys-apps/hdparm/hdparm-9.38.ebuild
new file mode 100644
index 000000000000..6f05faa35e1e
--- /dev/null
+++ b/sys-apps/hdparm/hdparm-9.38.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-9.38.ebuild,v 1.1 2012/01/17 04:45:39 vapier Exp $
+
+inherit toolchain-funcs
+
+DESCRIPTION="Utility to change hard drive performance parameters"
+HOMEPAGE="http://sourceforge.net/projects/hdparm/"
+SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e "/^CFLAGS/ s:-O2:${CFLAGS}:" \
+		-e "/^LDFLAGS/ s:-s:${LDFLAGS}:" \
+		Makefile || die "sed"
+}
+
+src_compile() {
+	emake STRIP=: CC="$(tc-getCC)" || die "compile error"
+}
+
+src_install() {
+	into /
+	dosbin hdparm contrib/idectl || die "dosbin"
+
+	newinitd "${FILESDIR}"/hdparm-init-8 hdparm
+	newconfd "${FILESDIR}"/hdparm-conf.d.3 hdparm
+
+	doman hdparm.8
+	dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig
+}
diff --git a/sys-apps/lm_sensors/lm_sensors-3.3.1.ebuild b/sys-apps/lm_sensors/lm_sensors-3.3.1.ebuild
index 91837e16909a..7c2fb44e8be4 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.3.1.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-3.3.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-apps/lm_sensors/lm_sensors-3.3.1.ebuild,v 1.3 2012/01/16 23:08:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-3.3.1.ebuild,v 1.4 2012/01/17 12:59:39 ago Exp $
 
 EAPI=3
 inherit eutils linux-info toolchain-funcs multilib
@@ -11,7 +11,7 @@ SRC_URI="http://dl.lm-sensors.org/lm-sensors/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~mips ~ppc ~sparc ~x86 ~x86-linux"
 IUSE="sensord static-libs"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/man/man-1.6g.ebuild b/sys-apps/man/man-1.6g.ebuild
index ead60778f09b..fddaa19c096c 100644
--- a/sys-apps/man/man-1.6g.ebuild
+++ b/sys-apps/man/man-1.6g.ebuild
@@ -1,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/man/man-1.6g.ebuild,v 1.4 2012/01/14 10:12:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6g.ebuild,v 1.5 2012/01/17 16:45:00 jer Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="http://primates.ximian.com/~flucifredi/man/${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"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="+lzma nls"
 
 DEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-apps/seabios/seabios-0.6.3_pre20110817.ebuild b/sys-apps/seabios/seabios-0.6.3_pre20110817.ebuild
deleted file mode 100644
index 3f6244f636f0..000000000000
--- a/sys-apps/seabios/seabios-0.6.3_pre20110817.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/seabios/seabios-0.6.3_pre20110817.ebuild,v 1.1 2011/10/24 21:13:30 cardoe Exp $
-
-EAPI=4
-
-#BACKPORTS=1
-EGIT_COMMIT="8e301472e324b6d6496d8b4ffc66863e99d7a505"
-
-if [[ ${PV} = *9999* || ! -z "${EGIT_COMMIT}" ]]; then
-	EGIT_REPO_URI="git://git.seabios.org/seabios.git"
-	GIT_ECLASS="git-2"
-	SRC_URI=""
-else
-	SRC_URI="http://www.linuxtogo.org/~kevin/SeaBIOS/${P}.tar.gz
-	${BACKPORTS:+http://dev.gentoo.org/~cardoe/distfiles/${P}-bp-${BACKPORTS}.tar.bz2}"
-fi
-
-inherit ${GIT_ECLASS} python
-
-if [[ ${PV} = *9999* ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
-HOMEPAGE="http://www.seabios.org"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	!app-emulation/qemu
-	!<=app-emulation/qemu-kvm-0.15.0"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	if [[ -z "${EGIT_COMMIT}" ]]; then
-		sed -e "s/VERSION=.*/VERSION=${PV}/" \
-			-i "${S}/Makefile"
-	else
-		sed -e "s/VERSION=.*/VERSION=${PV}_pre${EGIT_COMMIT}/" \
-			-i "${S}/Makefile"
-	fi
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	emake out/bios.bin
-#	emake out/vgabios.bin
-}
-
-src_install() {
-	insinto /usr/share/seabios
-	doins out/bios.bin
-#	doins out/vgabios.bin
-}
diff --git a/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild b/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild
index f70e4e9dddf7..29470526ba13 100644
--- a/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild
+++ b/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild,v 1.2 2011/04/30 20:28:32 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild,v 1.3 2012/01/17 13:51:03 ago Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.openwall.com/pam/modules/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2" # LICENSE file says "heavily cut-down 'BSD license'"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="selinux +prevent-removal"
 
 DEPEND="virtual/pam
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index e37eef19c331..fcae1956ea17 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -1 +1,2 @@
 DIST ceph-0.38.tar.gz 2900293 RMD160 ac912f56348fdcbd3d71f81324c847f3b2613c86 SHA1 0b62f8e30501f20f1c125e2c698c136ee4993545 SHA256 df98be68f32a64860761ccdb02572de1c98ab3f2a54be57fcb846a0686fef72d
+DIST ceph-0.40.tar.gz 2925781 RMD160 bf512355cf7564e8f599ed2e466cc82cbb1122d2 SHA1 7d10523c68eefa9f83ba2d4a459e9de46f02bf9f SHA256 5c337312689b91c57c30037783c09b678daa70884115d56ab34fb3157a7047c1
diff --git a/sys-cluster/ceph/ceph-0.40.ebuild b/sys-cluster/ceph/ceph-0.40.ebuild
new file mode 100644
index 000000000000..ead4a2c4c691
--- /dev/null
+++ b/sys-cluster/ceph/ceph-0.40.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.40.ebuild,v 1.1 2012/01/17 17:53:08 xarthisius Exp $
+
+EAPI=4
+
+inherit autotools eutils multilib
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="http://ceph.newdream.net/"
+SRC_URI="http://ceph.newdream.net/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug fuse gtk libatomic radosgw static-libs tcmalloc"
+
+CDEPEND="
+	dev-libs/boost
+	dev-libs/libedit
+	dev-libs/crypto++
+	sys-apps/keyutils
+	fuse? ( sys-fs/fuse )
+	libatomic? ( dev-libs/libatomic_ops )
+	gtk? (
+			x11-libs/gtk+:2
+			dev-cpp/gtkmm:2.4
+			gnome-base/librsvg
+		)
+	radosgw? (
+				dev-libs/fcgi
+				dev-libs/expat
+			)
+	tcmalloc? ( dev-util/google-perftools )
+	"
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+RDEPEND="${CDEPEND}
+	sys-fs/btrfs-progs"
+
+STRIP_MASK="/usr/lib*/rados-classes/*"
+
+src_prepare() {
+	sed -e 's:invoke-rc\.d.*:/etc/init.d/ceph reload >/dev/null:' \
+		-i src/logrotate.conf || die
+	sed -i "/^docdir =/d" src/Makefile.am || die #fix doc path
+	# disable testsnaps
+	sed -e '/testsnaps/d' -i src/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-hadoop \
+		--docdir=/usr/share/doc/${PF} \
+		--includedir=/usr/include \
+		$(use_with debug) \
+		$(use_with fuse) \
+		$(use_with libatomic libatomic-ops) \
+		$(use_with radosgw) \
+		$(use_with gtk gtk2) \
+		$(use_enable static-libs static) \
+		$(use_with tcmalloc)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -type f -name "*.la" -exec rm -f {} \;
+
+	rmdir "${D}/usr/sbin"
+
+	exeinto /usr/$(get_libdir)/ceph
+	newexe src/init-ceph ceph_init.sh
+
+	insinto /etc/logrotate.d/
+	newins src/logrotate.conf ${PN}
+
+	chmod 644 "${D}"/usr/share/doc/${PF}/sample.*
+
+	keepdir /var/lib/${PN}
+	keepdir /var/lib/${PN}/tmp
+	keepdir /var/log/${PN}/stat
+	keepdir /var/run/${PN}
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+}
diff --git a/sys-kernel/amd-ucode/Manifest b/sys-kernel/amd-ucode/Manifest
index e0e599791680..b996d879657f 100644
--- a/sys-kernel/amd-ucode/Manifest
+++ b/sys-kernel/amd-ucode/Manifest
@@ -1 +1,2 @@
 DIST amd-ucode-2011-01-11.tar 30720 RMD160 2efef269441d3232005700d966ab0abfbcbddfb7 SHA1 942b1ff9802aeec8ee9d28c0ece459648442fc8d SHA256 60c42629f3c91f97a350bc6a3ad0a256f7b794bfab1f143d7f1924a70728f4ec
+DIST amd-ucode-2012-01-17.tar 61440 RMD160 321c2bcaae4d4ca62c29aee0dd9a08885f745825 SHA1 8de27738d8da1969182935b461c7f06787a36582 SHA256 87589ad8e61532c2e0f7f418cd452aec9188964dce2f460eba66c379905e1657
diff --git a/sys-kernel/amd-ucode/amd-ucode-2012.01.17.ebuild b/sys-kernel/amd-ucode/amd-ucode-2012.01.17.ebuild
new file mode 100644
index 000000000000..474b1ac31537
--- /dev/null
+++ b/sys-kernel/amd-ucode/amd-ucode-2012.01.17.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/amd-ucode/amd-ucode-2012.01.17.ebuild,v 1.1 2012/01/17 18:54:13 flameeyes Exp $
+
+EAPI=4
+
+inherit versionator linux-info
+
+MY_P="${PN}-$(replace_all_version_separators -)"
+
+DESCRIPTION="AMD Family 10h, 11h and 14h microcode patch data"
+HOMEPAGE="http://www.amd64.org/support/microcode.html"
+SRC_URI="http://www.amd64.org/pub/microcode/${MY_P}.tar"
+
+LICENSE="amd-ucode"
+SLOT="0"
+IUSE=""
+
+# only meaningful for x86 and x86-64
+KEYWORDS="-* ~amd64 ~x86"
+
+# The license does not allow us to mirror the content.
+RESTRICT="mirror"
+
+S="${WORKDIR}/${MY_P}"
+
+CONFIG_CHECK="~MICROCODE_AMD"
+ERROR_MICROCODE_AMD="Your kernel needs to support AMD microcode loading. You're suggested to build it as a module as it doesn't require a reboot to reload the microcode, that way."
+
+src_install() {
+	insinto /lib/firmware/amd-ucode
+	doins microcode_amd.bin microcode_amd_fam15h.bin
+
+	# INSTALL file also has instructions to load it, so install it as
+	# part of the documentation.
+	dodoc README INSTALL
+}
+
+pkg_postinst() {
+	local show_modules_info=yes
+	local show_builtin_info=yes
+
+	if linux_config_exists; then
+		if linux_chkconfig_builtin MICROCODE; then
+			show_modules_info=no
+		elif linux_chkconfig_module MICROCODE; then
+			show_builtin_info=no
+		fi
+	fi
+
+	elog "You have installed the microcode for AMD CPUs. The kernel will load"
+	elog "it the next time the microcode driver will be executed."
+	elog ""
+
+	if test $show_modules_info = yes; then
+		elog "If you built the microcode driver as a module, you can issue the"
+		elog "following command to force a reload:"
+		elog ""
+		elog "    modprobe -r microcode && modprobe microcode"
+		elog ""
+	fi
+
+	if test $show_builtin_info = yes; then
+		elog "If you built the microcode driver in the kernel, it won't load"
+		elog "the file as is. To update the microcode you'll have to set the"
+		elog "following configuration in the kernel:"
+		elog ""
+		elog "    CONFIG_EXTRA_FIRMWARE=\"amd-ucode/microcode_amd.bin amd-ucode/microcode_amd_fam15h.bin\""
+		elog "    CONFIG_EXTRA_FIRMWARE_DIR=/lib/firmware"
+		elog ""
+		elog "Please note that this will build the firmware within the kernel"
+		elog "image, so you'll have to rebuild the kernel after an upgrade"
+		elog "of the ${CATEGORY}/${PN} package."
+		elog ""
+	fi
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 846c74d1fe25..9669d75f175f 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -26,6 +26,8 @@ DIST genpatches-3.0-14.base.tar.bz2 379202 RMD160 e5ab9095e56470eb9dd05d19e76ad5
 DIST genpatches-3.0-14.extras.tar.bz2 17207 RMD160 0f04fef1fe76c9b9cbe7c497faae19b015caff72 SHA1 89935647c22c0a8b98dd568e97312ca64378a263 SHA256 ec88ca4408c668a2c4d2d25c3d4a8c67fad4bb08133db91bbb929c0053305fda
 DIST genpatches-3.0-15.base.tar.bz2 379491 RMD160 68faf9df714a8606887f232bf30819f4c3e9bca7 SHA1 dd3cde41b678f1a0a6686881a78e9ab021a9e1fc SHA256 616b016b97bc079fff0a294e416b697b41b66ed85c2a68fd3066a5b4cfcdbfe5
 DIST genpatches-3.0-15.extras.tar.bz2 17207 RMD160 0f04fef1fe76c9b9cbe7c497faae19b015caff72 SHA1 89935647c22c0a8b98dd568e97312ca64378a263 SHA256 ec88ca4408c668a2c4d2d25c3d4a8c67fad4bb08133db91bbb929c0053305fda
+DIST genpatches-3.0-16.base.tar.bz2 417229 RMD160 427655927084f007cee2887d46fea61a4571887d SHA1 ebb21e11369a47cf2b12d3d4b09b53cedeae754e SHA256 b6431515743f695a78ccab7376a236b0b7c534ae1bb9c0e4b8125a83826236b5
+DIST genpatches-3.0-16.extras.tar.bz2 17193 RMD160 8eac4d558555912c08748a224b0bee04f9abd93f SHA1 542b36e0b8c712dfe06951f08e4c5fd83f3cf5fa SHA256 86c7a9d4ee419f21b63bfa23b52feb9c4b547a1b29498a752620336776aaff91
 DIST genpatches-3.0-8.base.tar.bz2 216509 RMD160 4ca8618b482a013adea3b5a66222975288c3f589 SHA1 68caec5b7080ab7140ad09ec7caa3414f185e5f8 SHA256 857d6ccd8bf965ec82c944c229218fb71a37c0c13f26228dc69c4e556dbfa17d
 DIST genpatches-3.0-8.extras.tar.bz2 17207 RMD160 0f04fef1fe76c9b9cbe7c497faae19b015caff72 SHA1 89935647c22c0a8b98dd568e97312ca64378a263 SHA256 ec88ca4408c668a2c4d2d25c3d4a8c67fad4bb08133db91bbb929c0053305fda
 DIST genpatches-3.1-10.base.tar.bz2 180217 RMD160 2817a9d111441d2584e4e1b1b8e7d669e96acc63 SHA1 b77f380a2d0007876d83389cbabef213bbbf09fc SHA256 d5d0b9e2689a5326028e27ef75f93253762c20e157de73d3ad856d44b6295c76
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.0.17.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.0.17.ebuild
new file mode 100644
index 000000000000..3d1f3c5a72e0
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.0.17.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/sys-kernel/gentoo-sources/gentoo-sources-3.0.17.ebuild,v 1.1 2012/01/17 23:45:15 mpagano Exp $
+
+EAPI="2"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="16"
+K_DEBLOB_AVAILABLE="1"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
+IUSE="deblob"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 4fe574a1ca6e..c9f70ea05184 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -26,6 +26,7 @@ DIST linux-2.6.38.tar.bz2 74739098 RMD160 d1179be93f1309303b9aa6008a25b6247726e7
 DIST linux-2.6.39.tar.bz2 76096559 RMD160 feddc516bc15e78f12f611ff184d38baa4eac4ee SHA1 68518112821e55f4ac1df64f2e0e809cedfcc5ef SHA256 584d17f2a3ee18a9501d7ff36907639e538cfdba4529978b8550c461d45c61f6
 DIST linux-3.0.tar.bz2 76753134 RMD160 e20c9564ec0c8128e28a4c038986d4d93bbe34bb SHA1 45b64bffc860f70ab7956da4493c488010714650 SHA256 64b0228b54ce39b0b2df086109a7b737cde58e3df4f779506ddcaccee90356a0
 DIST linux-3.1.tar.bz2 77190238 RMD160 f9a3ce57b9f20a1402ef340792d3c223140ce1d2 SHA1 ac792701561b1cd4279302b8bb8f474731762ad1 SHA256 2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359
+DIST linux-3.2.tar.bz2 78147838 RMD160 15eb022305dfc8b0e1d59e396911fa86eb9c3bdf SHA1 3460afa971049aa79b8f914e1bfd619eedd19f55 SHA256 c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463
 DIST patch-2.6.31-pf9.bz2 358306 RMD160 125e81be6cc3eff4b2a52317978b713901968cb3 SHA1 55796d40ab58654914738af1544c334ba80b7cb9 SHA256 55106f8f17d7987e8789254d52f44e093a2ab520292d0106288d14ea4f3a1e9c
 DIST patch-2.6.32-pf16.bz2 445921 RMD160 b5116075a5fb12eaf6d8f67535e20b5b566c7eed SHA1 04f99492c102aa69918d3f1ae61328d8de78c7a9 SHA256 72ba0a9eb0c0dda1e553b9d0d7e450eec96cbfa625f3a3c2a8397d1ce12f7f20
 DIST patch-2.6.33-pf4.bz2 378325 RMD160 77d9df1f077777f0e94297c5374db86e14d1bf0d SHA1 0072e34e5b9624b636e01c70eda20f4f6017df6c SHA256 4b6b641746e30983ac51a20b3098053f69591861bdf0b43e3bed9df8ccf6ff70
@@ -43,3 +44,4 @@ DIST patch-3.1.3-pf.bz2 374334 RMD160 55b7c589c39aacecb985e233562811d2d2897a0d S
 DIST patch-3.1.4-pf.bz2 373968 RMD160 f610442b47003be9cbbd42a10f373105c601ff01 SHA1 0a617f9f6e609de9478ea96971e56ff255e48c5d SHA256 4ee5ae7dc72d9a85bb8d6bd1fc68af2a6692252d43d5e2090677d4bbba744878
 DIST patch-3.1.5-pf.bz2 408281 RMD160 f6d7087470bb7a400710ad0627aee4bdab1d1c53 SHA1 40090b5fa0ae2ebb2f40d2d59d3cfba984da0bd5 SHA256 50303bcf1819d8f34f49b914186579eb311f3e8f48015b1cde3e875cff77010b
 DIST patch-3.1.6-pf.bz2 424384 RMD160 6dd142e08612eed7918a2db63649d7d4cb2f182e SHA1 31712f46812cb95ba3f129e322bfb174aec5ca44 SHA256 bc7d0bcfa1a2fc6951dea5fa20f654e4f707cde0748e2d48a0b7b347e71e9faf
+DIST patch-3.2.1-pf.bz2 267242 RMD160 c0e419aff2e3f23365455f48d236497b16389b70 SHA1 8febf68d89df009c4cc1362e1f18c3d2a60c9392 SHA256 847981649407470de69dc989e8a1a5b44eae75c5403d46e863ce6bacd47c25fb
diff --git a/sys-kernel/pf-sources/pf-sources-3.2.1.ebuild b/sys-kernel/pf-sources/pf-sources-3.2.1.ebuild
new file mode 100644
index 000000000000..817618b3c2fe
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-3.2.1.ebuild
@@ -0,0 +1,62 @@
+# 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.2.1.ebuild,v 1.1 2012/01/17 12:23:35 wired Exp $
+
+EAPI="2"
+
+inherit versionator
+
+COMPRESSTYPE=".bz2"
+K_USEPV="yes"
+UNIPATCH_STRICTORDER="yes"
+K_SECURITY_UNSUPPORTED="1"
+
+CKV="$(get_version_component_range 1-2)"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+K_NOSETEXTRAVERSION="don't_set_it"
+
+DESCRIPTION="Linux kernel fork with new features, including the -ck patchset (BFS), BFQ, TuxOnIce and LinuxIMQ"
+HOMEPAGE="http://pf.natalenko.name/"
+
+PF_FILE="patch-${PV}-pf${COMPRESSTYPE}"
+PF_URI="http://pf.natalenko.name/sources/$(get_version_component_range 1-2)/${PF_FILE}"
+EXPERIMENTAL_PATCHES=(
+	# http://ck-hack.blogspot.com/2010/11/create-task-groups-by-tty-comment.html
+	# http://ck.kolivas.org/patches/bfs/bfs357-penalise_fork_depth_account_threads.patch
+)
+EXPERIMENTAL_URI="
+	experimental? (
+		${EXPERIMENTAL_PATCHES[@]}
+	)
+"
+SRC_URI="${KERNEL_URI} ${PF_URI}" # \${EXPERIMENTAL_URI}
+
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="" # experimental
+
+KV_FULL="${PVR}-pf"
+S="${WORKDIR}"/linux-"${KV_FULL}"
+
+pkg_setup(){
+	ewarn
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the pf developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn
+	kernel-2_pkg_setup
+}
+
+src_prepare(){
+	epatch "${DISTDIR}"/"${PF_FILE}"
+	#if use experimental; then
+		#for patch in ${EXPERIMENTAL_PATCHES[@]}; do
+			#epatch "${DISTDIR}"/"${patch/*\/}"
+		#done
+	#fi
+}
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 6b317267e228..724500f79551 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -24,8 +24,6 @@ DIST patch-2.6.38.7.bz2 149203 RMD160 50b58a9220d34e011e731f9d08b0ef273ada2f8e S
 DIST patch-2.6.38.8.bz2 186457 RMD160 cdac809f383e251197e56ea724bee7c0463aeaa9 SHA1 5fdbab04b6394291816c83d845c3c13762926169 SHA256 9fef9c3ce27e88962367e1bfea3f28844eadf229b56737925921b09b01024dc7
 DIST patch-2.6.39.3.bz2 105939 RMD160 27f1b980caad484ed863175e4add5efb076d2d2c SHA1 46070e93d3a7d97ae1f175089d2086fe7f6086ed SHA256 244d18d076c06e3cd627128000fd18ebdfb3a8dae907e653fb6a6648c7dcbf5e
 DIST patch-2.6.39.4.bz2 117313 RMD160 d0a774e23f9da13a501e26d4a7909a4774a2cfb2 SHA1 b89d84d28e0993d32e8b74b18590d2e5992d7942 SHA256 132ba590e92d5c9a1bb0dc0885795a095d48e7db2552f1c9e3c26ce946a70a40
-DIST patch-3.0.14.bz2 334367 RMD160 65eb40920dae92d9cd11deb73851f9d387e60b44 SHA1 3603c6d001b7fe02972b618eecb874190ea1b830 SHA256 05699787bd3cb9dc9de2f900d30b175d9f7fb165330e479145aafb343351be94
-DIST patch-3.0.15.bz2 333859 RMD160 cbc70e66dedf85b97e47e3822237736bc71f6a3e SHA1 10d9915b8aa74513fc1cd83c46e74392f6d271f0 SHA256 a7060bcf6159e5ed5f6241ca659d70d053969833533dac5519e50e8554a82549
 DIST patch-3.0.16.bz2 355511 RMD160 5ec8ccf59209b4d0c56cae763cff7720c064b38e SHA1 ed27cba6802939253cc174b18046f6edf42b6834 SHA256 8005abf6e1db4c2f57352a75ddf37b308db55077408cf27e3dae462444057ec5
 DIST patch-3.0.17.bz2 364768 RMD160 5b98362dbf213bf2ba8b17f6c1f12405ce948502 SHA1 a77a681af8563370ce3e831b2462b2bafa608940 SHA256 4e54083019c6b21b2074f56ec40b6b38a0a32635d48cea7ac99d772c0f6f23b1
 DIST patch-3.0.6.bz2 183237 RMD160 f20e958095d3be6fba00f3718d5e44da958f8919 SHA1 b62686d35fff3c05aca4789c444ea085c2eeb47c SHA256 0d9b70adfe4b2d2370dd6b2c9e2e330c8a5a76f3a0ba12c36a07fedbeb07b56e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.0.14.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.0.14.ebuild
deleted file mode 100644
index 4d9d6e3a6257..000000000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.0.14.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.0.14.ebuild,v 1.1 2011/12/22 10:02:28 psomas Exp $
-
-EAPI="2"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for the Linux kernel"
-HOMEPAGE="http://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="deblob"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.0.15.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.0.15.ebuild
deleted file mode 100644
index bebbdd68f7fa..000000000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.0.15.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/sys-kernel/vanilla-sources/vanilla-sources-3.0.15.ebuild,v 1.1 2012/01/03 20:17:48 psomas Exp $
-
-EAPI="2"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for the Linux kernel"
-HOMEPAGE="http://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="deblob"
diff --git a/sys-libs/glibc/files/eblits/src_compile.eblit b/sys-libs/glibc/files/eblits/src_compile.eblit
index 0c637bbb0c98..178adbab89c4 100644
--- a/sys-libs/glibc/files/eblits/src_compile.eblit
+++ b/sys-libs/glibc/files/eblits/src_compile.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.22 2012/01/13 22:45:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.23 2012/01/17 23:51:59 vapier Exp $
 
 glibc_do_configure() {
 	local myconf
@@ -19,7 +19,6 @@ glibc_do_configure() {
 	[[ -d ports ]] && ADDONS="${ADDONS},ports"
 	popd > /dev/null
 
-	use nls || myconf="${myconf} --disable-nls"
 	myconf="${myconf} $(use_enable hardened stackguard-randomization)"
 	if has_version '<sys-libs/glibc-2.13' ; then
 		myconf="${myconf} --enable-old-ssp-compat"
diff --git a/sys-libs/glibc/glibc-2.10.1-r1.ebuild b/sys-libs/glibc/glibc-2.10.1-r1.ebuild
index 46ed0cfa56ff..a0088c209198 100644
--- a/sys-libs/glibc/glibc-2.10.1-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.10.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.10.1-r1.ebuild,v 1.19 2011/11/16 16:07:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.10.1-r1.ebuild,v 1.20 2012/01/17 23:51:59 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -32,7 +32,7 @@ LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
 #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
 
-IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
+IUSE="debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
 S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
 
 # Here's how the cross-compile logic breaks down ...
@@ -88,12 +88,10 @@ DEPEND=">=sys-devel/gcc-3.4.4
 	${LT_VER:+nptl? (} >=sys-kernel/linux-headers-${NPTL_KERN_VER} ${LT_VER:+)}
 	>=app-misc/pax-utils-0.1.10
 	virtual/os-headers
-	nls? ( sys-devel/gettext )
 	!<sys-apps/sandbox-1.2.18.1-r2
 	!<sys-apps/portage-2.1.2
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="!sys-kernel/ps3-sources
-	nls? ( sys-devel/gettext )
 	selinux? ( sys-libs/libselinux )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
diff --git a/sys-libs/glibc/glibc-2.11.3.ebuild b/sys-libs/glibc/glibc-2.11.3.ebuild
index 05115b3f7634..733ddd95326f 100644
--- a/sys-libs/glibc/glibc-2.11.3.ebuild
+++ b/sys-libs/glibc/glibc-2.11.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.11.3.ebuild,v 1.10 2011/11/16 16:07:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.11.3.ebuild,v 1.11 2012/01/17 23:51:59 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -31,7 +31,7 @@ LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
 #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
 
-IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
+IUSE="debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
 S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
 
 # Here's how the cross-compile logic breaks down ...
@@ -89,12 +89,10 @@ DEPEND=">=sys-devel/gcc-3.4.4
 	${LT_VER:+nptl? (} >=sys-kernel/linux-headers-${NPTL_KERN_VER} ${LT_VER:+)}
 	>=app-misc/pax-utils-0.1.10
 	virtual/os-headers
-	nls? ( sys-devel/gettext )
 	!<sys-apps/sandbox-1.2.18.1-r2
 	!<sys-apps/portage-2.1.2
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="!sys-kernel/ps3-sources
-	nls? ( sys-devel/gettext )
 	selinux? ( sys-libs/libselinux )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
diff --git a/sys-libs/glibc/glibc-2.12.1-r3.ebuild b/sys-libs/glibc/glibc-2.12.1-r3.ebuild
index 4178077d2021..0e3c51f3c9c5 100644
--- a/sys-libs/glibc/glibc-2.12.1-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.12.1-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/sys-libs/glibc/glibc-2.12.1-r3.ebuild,v 1.8 2011/11/16 16:07:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.12.1-r3.ebuild,v 1.9 2012/01/17 23:51:59 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -31,7 +31,7 @@ LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
 #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
 
-IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
+IUSE="debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
 S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
 
 # Here's how the cross-compile logic breaks down ...
@@ -89,12 +89,10 @@ DEPEND=">=sys-devel/gcc-3.4.4
 	${LT_VER:+nptl? (} >=sys-kernel/linux-headers-${NPTL_KERN_VER} ${LT_VER:+)}
 	>=app-misc/pax-utils-0.1.10
 	virtual/os-headers
-	nls? ( sys-devel/gettext )
 	!<sys-apps/sandbox-1.2.18.1-r2
 	!<sys-apps/portage-2.1.2
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="!sys-kernel/ps3-sources
-	nls? ( sys-devel/gettext )
 	selinux? ( sys-libs/libselinux )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
diff --git a/sys-libs/glibc/glibc-2.12.2.ebuild b/sys-libs/glibc/glibc-2.12.2.ebuild
index bfa6ad6149fe..e8218df10e8b 100644
--- a/sys-libs/glibc/glibc-2.12.2.ebuild
+++ b/sys-libs/glibc/glibc-2.12.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.12.2.ebuild,v 1.13 2011/11/19 21:14:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.12.2.ebuild,v 1.14 2012/01/17 23:51:59 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -31,7 +31,7 @@ LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
 #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
 
-IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
+IUSE="debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
 S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
 
 # Here's how the cross-compile logic breaks down ...
@@ -89,12 +89,10 @@ DEPEND=">=sys-devel/gcc-3.4.4
 	${LT_VER:+nptl? (} >=sys-kernel/linux-headers-${NPTL_KERN_VER} ${LT_VER:+)}
 	>=app-misc/pax-utils-0.1.10
 	virtual/os-headers
-	nls? ( sys-devel/gettext )
 	!<sys-apps/sandbox-1.2.18.1-r2
 	!<sys-apps/portage-2.1.2
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="!sys-kernel/ps3-sources
-	nls? ( sys-devel/gettext )
 	selinux? ( sys-libs/libselinux )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
diff --git a/sys-libs/glibc/glibc-2.13-r2.ebuild b/sys-libs/glibc/glibc-2.13-r2.ebuild
index 55625ec30dfb..f09e6e6585cb 100644
--- a/sys-libs/glibc/glibc-2.13-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.13-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13-r2.ebuild,v 1.9 2012/01/03 20:09:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13-r2.ebuild,v 1.10 2012/01/17 23:51:59 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -31,7 +31,7 @@ LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
 #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
 
-IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
+IUSE="debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
 S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
 
 # Here's how the cross-compile logic breaks down ...
@@ -89,13 +89,11 @@ DEPEND=">=sys-devel/gcc-3.4.4
 	${LT_VER:+nptl? (} >=sys-kernel/linux-headers-${NPTL_KERN_VER} ${LT_VER:+)}
 	>=app-misc/pax-utils-0.1.10
 	virtual/os-headers
-	nls? ( sys-devel/gettext )
 	!<sys-apps/sandbox-1.2.18.1-r2
 	!<sys-apps/portage-2.1.2
 	!<sys-devel/patch-2.6
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="!sys-kernel/ps3-sources
-	nls? ( sys-devel/gettext )
 	selinux? ( sys-libs/libselinux )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
diff --git a/sys-libs/glibc/glibc-2.13-r4.ebuild b/sys-libs/glibc/glibc-2.13-r4.ebuild
index f76bf2ccb134..1330123dcd4f 100644
--- a/sys-libs/glibc/glibc-2.13-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.13-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13-r4.ebuild,v 1.10 2012/01/03 20:09:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13-r4.ebuild,v 1.11 2012/01/17 23:51:59 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -31,7 +31,7 @@ LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
 #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
 
-IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
+IUSE="debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
 S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
 
 # Here's how the cross-compile logic breaks down ...
@@ -89,13 +89,11 @@ DEPEND=">=sys-devel/gcc-3.4.4
 	${LT_VER:+nptl? (} >=sys-kernel/linux-headers-${NPTL_KERN_VER} ${LT_VER:+)}
 	>=app-misc/pax-utils-0.1.10
 	virtual/os-headers
-	nls? ( sys-devel/gettext )
 	!<sys-apps/sandbox-1.2.18.1-r2
 	!<sys-apps/portage-2.1.2
 	!<sys-devel/patch-2.6
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="!sys-kernel/ps3-sources
-	nls? ( sys-devel/gettext )
 	selinux? ( sys-libs/libselinux )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
diff --git a/sys-libs/glibc/glibc-2.14.1-r1.ebuild b/sys-libs/glibc/glibc-2.14.1-r1.ebuild
index ec7e255aba9b..31ef5606dadf 100644
--- a/sys-libs/glibc/glibc-2.14.1-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.14.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/sys-libs/glibc/glibc-2.14.1-r1.ebuild,v 1.2 2012/01/03 20:09:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1-r1.ebuild,v 1.3 2012/01/17 23:51:59 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -39,7 +39,7 @@ LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
 #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
 
-IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
+IUSE="debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
 [[ -n ${RELEASE_VER} ]] && S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
 
 # Here's how the cross-compile logic breaks down ...
@@ -97,13 +97,11 @@ DEPEND=">=sys-devel/gcc-3.4.4
 	${LT_VER:+nptl? (} >=sys-kernel/linux-headers-${NPTL_KERN_VER} ${LT_VER:+)}
 	>=app-misc/pax-utils-0.1.10
 	virtual/os-headers
-	nls? ( sys-devel/gettext )
 	!<sys-apps/sandbox-1.2.18.1-r2
 	!<sys-apps/portage-2.1.2
 	!<sys-devel/patch-2.6
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="!sys-kernel/ps3-sources
-	nls? ( sys-devel/gettext )
 	selinux? ( sys-libs/libselinux )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
diff --git a/sys-libs/glibc/glibc-2.14.1-r2.ebuild b/sys-libs/glibc/glibc-2.14.1-r2.ebuild
index 451ef3eabf0e..9b1c77740b14 100644
--- a/sys-libs/glibc/glibc-2.14.1-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.14.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/sys-libs/glibc/glibc-2.14.1-r2.ebuild,v 1.2 2012/01/03 20:09:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1-r2.ebuild,v 1.3 2012/01/17 23:51:59 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -39,7 +39,7 @@ LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
 #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
 
-IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
+IUSE="debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
 [[ -n ${RELEASE_VER} ]] && S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
 
 # Here's how the cross-compile logic breaks down ...
@@ -97,13 +97,11 @@ DEPEND=">=sys-devel/gcc-3.4.4
 	${LT_VER:+nptl? (} >=sys-kernel/linux-headers-${NPTL_KERN_VER} ${LT_VER:+)}
 	>=app-misc/pax-utils-0.1.10
 	virtual/os-headers
-	nls? ( sys-devel/gettext )
 	!<sys-apps/sandbox-1.2.18.1-r2
 	!<sys-apps/portage-2.1.2
 	!<sys-devel/patch-2.6
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="!sys-kernel/ps3-sources
-	nls? ( sys-devel/gettext )
 	selinux? ( sys-libs/libselinux )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
diff --git a/sys-libs/glibc/glibc-2.14.1.ebuild b/sys-libs/glibc/glibc-2.14.1.ebuild
index aca49b3c047c..0228ea73f756 100644
--- a/sys-libs/glibc/glibc-2.14.1.ebuild
+++ b/sys-libs/glibc/glibc-2.14.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-libs/glibc/glibc-2.14.1.ebuild,v 1.4 2012/01/03 20:09:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1.ebuild,v 1.5 2012/01/17 23:51:59 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -39,7 +39,7 @@ LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
 #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
 
-IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
+IUSE="debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
 [[ -n ${RELEASE_VER} ]] && S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
 
 # Here's how the cross-compile logic breaks down ...
@@ -97,13 +97,11 @@ DEPEND=">=sys-devel/gcc-3.4.4
 	${LT_VER:+nptl? (} >=sys-kernel/linux-headers-${NPTL_KERN_VER} ${LT_VER:+)}
 	>=app-misc/pax-utils-0.1.10
 	virtual/os-headers
-	nls? ( sys-devel/gettext )
 	!<sys-apps/sandbox-1.2.18.1-r2
 	!<sys-apps/portage-2.1.2
 	!<sys-devel/patch-2.6
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="!sys-kernel/ps3-sources
-	nls? ( sys-devel/gettext )
 	selinux? ( sys-libs/libselinux )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
diff --git a/sys-libs/glibc/glibc-2.14.ebuild b/sys-libs/glibc/glibc-2.14.ebuild
index f13a07fcdfc8..7652b5c6a91a 100644
--- a/sys-libs/glibc/glibc-2.14.ebuild
+++ b/sys-libs/glibc/glibc-2.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.ebuild,v 1.13 2012/01/03 20:09:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.ebuild,v 1.14 2012/01/17 23:51:59 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -39,7 +39,7 @@ LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
 #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
 
-IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
+IUSE="debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
 [[ -n ${RELEASE_VER} ]] && S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
 
 # Here's how the cross-compile logic breaks down ...
@@ -97,13 +97,11 @@ DEPEND=">=sys-devel/gcc-3.4.4
 	${LT_VER:+nptl? (} >=sys-kernel/linux-headers-${NPTL_KERN_VER} ${LT_VER:+)}
 	>=app-misc/pax-utils-0.1.10
 	virtual/os-headers
-	nls? ( sys-devel/gettext )
 	!<sys-apps/sandbox-1.2.18.1-r2
 	!<sys-apps/portage-2.1.2
 	!<sys-devel/patch-2.6
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="!sys-kernel/ps3-sources
-	nls? ( sys-devel/gettext )
 	selinux? ( sys-libs/libselinux )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
diff --git a/sys-libs/glibc/glibc-2.15.ebuild b/sys-libs/glibc/glibc-2.15.ebuild
index be463a2d90bf..ef739b6b7c2f 100644
--- a/sys-libs/glibc/glibc-2.15.ebuild
+++ b/sys-libs/glibc/glibc-2.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15.ebuild,v 1.3 2012/01/16 07:56:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15.ebuild,v 1.4 2012/01/17 23:51:59 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -39,7 +39,7 @@ LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
 #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
 
-IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
+IUSE="debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
 [[ -n ${RELEASE_VER} ]] && S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
 
 # Here's how the cross-compile logic breaks down ...
@@ -97,13 +97,11 @@ DEPEND=">=sys-devel/gcc-3.4.4
 	${LT_VER:+nptl? (} >=sys-kernel/linux-headers-${NPTL_KERN_VER} ${LT_VER:+)}
 	>=app-misc/pax-utils-0.1.10
 	virtual/os-headers
-	nls? ( sys-devel/gettext )
 	!<sys-apps/sandbox-1.2.18.1-r2
 	!<sys-apps/portage-2.1.2
 	!<sys-devel/patch-2.6
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="!sys-kernel/ps3-sources
-	nls? ( sys-devel/gettext )
 	selinux? ( sys-libs/libselinux )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
diff --git a/sys-libs/glibc/glibc-2.9_p20081201-r3.ebuild b/sys-libs/glibc/glibc-2.9_p20081201-r3.ebuild
index 6e61c80e5dfa..bb83650a1ba8 100644
--- a/sys-libs/glibc/glibc-2.9_p20081201-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.9_p20081201-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/sys-libs/glibc/glibc-2.9_p20081201-r3.ebuild,v 1.12 2012/01/03 00:35:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.9_p20081201-r3.ebuild,v 1.13 2012/01/17 23:51:59 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -31,7 +31,7 @@ LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
 #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
 
-IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
+IUSE="debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
 S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER+-${SNAP_VER}}
 
 # Here's how the cross-compile logic breaks down ...
@@ -87,12 +87,10 @@ DEPEND=">=sys-devel/gcc-3.4.4
 	${LT_VER:+nptl? (} >=sys-kernel/linux-headers-${NPTL_KERN_VER} ${LT_VER:+)}
 	>=app-misc/pax-utils-0.1.10
 	virtual/os-headers
-	nls? ( sys-devel/gettext )
 	!<sys-apps/sandbox-1.2.18.1-r2
 	!<sys-apps/portage-2.1.2
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="!sys-kernel/ps3-sources
-	nls? ( sys-devel/gettext )
 	selinux? ( sys-libs/libselinux )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index e181933cb315..f5019e4d2598 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.4 2012/01/13 21:18:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.5 2012/01/17 23:51:59 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -39,7 +39,7 @@ LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
 #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
 
-IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
+IUSE="debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
 [[ -n ${RELEASE_VER} ]] && S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
 
 # Here's how the cross-compile logic breaks down ...
@@ -97,12 +97,10 @@ DEPEND=">=sys-devel/gcc-3.4.4
 	${LT_VER:+nptl? (} >=sys-kernel/linux-headers-${NPTL_KERN_VER} ${LT_VER:+)}
 	>=app-misc/pax-utils-0.1.10
 	virtual/os-headers
-	nls? ( sys-devel/gettext )
 	!<sys-apps/sandbox-1.2.18.1-r2
 	!<sys-apps/portage-2.1.2
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="!sys-kernel/ps3-sources
-	nls? ( sys-devel/gettext )
 	selinux? ( sys-libs/libselinux )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
diff --git a/sys-libs/gwenhywfar/gwenhywfar-4.2.1.ebuild b/sys-libs/gwenhywfar/gwenhywfar-4.2.1.ebuild
index 306448e3dca6..4cdf1aa31635 100644
--- a/sys-libs/gwenhywfar/gwenhywfar-4.2.1.ebuild
+++ b/sys-libs/gwenhywfar/gwenhywfar-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gwenhywfar/gwenhywfar-4.2.1.ebuild,v 1.3 2012/01/09 21:41:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gwenhywfar/gwenhywfar-4.2.1.ebuild,v 1.4 2012/01/17 21:30:18 jer Exp $
 
 EAPI=2
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.aquamaniac.de/sites/download/download.php?package=01&release
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 hppa ppc ~ppc64 ~sparc ~x86"
 IUSE="debug doc fox gtk qt4"
 
 RDEPEND="dev-libs/libgpg-error
diff --git a/www-client/phantomjs/Manifest b/www-client/phantomjs/Manifest
index 0b971e48729e..5cb4e6924295 100644
--- a/www-client/phantomjs/Manifest
+++ b/www-client/phantomjs/Manifest
@@ -1 +1,2 @@
 DIST phantomjs-1.3.0-source.tar.gz 409428 RMD160 a5519607938b784db6c7d40cee36955589b4aa58 SHA1 76902ad0956cf212cc9bb845f290690f53eca576 SHA256 1402aed67db7298f1dad54755e16c49e12201b5dbbb8bc895d966c4a648ee25f
+DIST phantomjs-1.4.1-source.tar.gz 497856 RMD160 a4eb71436c014903b8312006daa3b1e7b0294550 SHA1 d9386aa3e36bdd31f069f5301e315a9c5d91f06a SHA256 93df6e2125d560c10519a79b5502833b37a4986a2bc9fc42cc6d65e3536d20a4
diff --git a/www-client/phantomjs/phantomjs-1.4.1.ebuild b/www-client/phantomjs/phantomjs-1.4.1.ebuild
new file mode 100644
index 000000000000..2126fc20777d
--- /dev/null
+++ b/www-client/phantomjs/phantomjs-1.4.1.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/www-client/phantomjs/phantomjs-1.4.1.ebuild,v 1.1 2012/01/17 16:11:50 vapier Exp $
+
+EAPI="2"
+
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils qt4-r2
+
+DESCRIPTION="headless WebKit with JavaScript API"
+HOMEPAGE="http://www.phantomjs.org/"
+SRC_URI="http://phantomjs.googlecode.com/files/${P}-source.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples python"
+
+RDEPEND="x11-libs/qt-webkit
+	python? ( dev-python/PyQt4 )"
+DEPEND="${RDEPEND}"
+
+# Call all the parent eclasses without having to worry
+# about what funcs they actually export.
+maybe() { set -- $(declare -F $1); $1; }
+multi_eclass() {
+	maybe qt4-r2_$1
+	if use python ; then
+		[[ -d python ]] && cd python
+		maybe distutils_$1
+	fi
+}
+pkg_setup()     { multi_eclass ${FUNCNAME} ; }
+pkg_preinst()   { multi_eclass ${FUNCNAME} ; }
+pkg_postinst()  { multi_eclass ${FUNCNAME} ; }
+pkg_prerm()     { multi_eclass ${FUNCNAME} ; }
+pkg_postrm()    { multi_eclass ${FUNCNAME} ; }
+src_prepare()   { multi_eclass ${FUNCNAME} ; }
+src_configure() { multi_eclass ${FUNCNAME} ; }
+src_compile()   { multi_eclass ${FUNCNAME} ; }
+
+src_test() {
+	./bin/phantomjs test/run-tests.js || die
+}
+
+src_install() {
+	dobin bin/phantomjs || die
+	dodoc ChangeLog README.md
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/* || die
+	fi
+
+	multi_eclass ${FUNCNAME}
+}
diff --git a/www-servers/lighttpd/lighttpd-1.4.30-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.30-r1.ebuild
index 51aba6f247fb..0ff4392e14b5 100644
--- a/www-servers/lighttpd/lighttpd-1.4.30-r1.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.30-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.30-r1.ebuild,v 1.2 2012/01/01 14:58:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.30-r1.ebuild,v 1.3 2012/01/17 22:32:05 ago Exp $
 
 EAPI="4"
 
@@ -126,12 +126,12 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake
 
 	if use doc ; then
 		einfo "Building HTML documentation"
-		cd doc
-		emake html || die "failed to build HTML documentation"
+		cd doc || die
+		emake html
 	fi
 }
 
@@ -144,13 +144,13 @@ src_test() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install
 
 	# init script stuff
-	newinitd "${FILESDIR}"/lighttpd.initd lighttpd || die
-	newconfd "${FILESDIR}"/lighttpd.confd lighttpd || die
+	newinitd "${FILESDIR}"/lighttpd.initd lighttpd
+	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
 	use fam && has_version app-admin/fam && \
-		sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd
+		{ sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; }
 
 	# configs
 	insinto /etc/lighttpd
@@ -173,11 +173,11 @@ src_install() {
 	use doc && dohtml -r doc/*
 
 	docinto txt
-	dodoc doc/outdated/*.txt || die
+	dodoc doc/outdated/*.txt
 
 	# logrotate
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/lighttpd.logrotate lighttpd || die
+	newins "${FILESDIR}"/lighttpd.logrotate lighttpd
 
 	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
 	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
diff --git a/x11-misc/redshift/redshift-1.7.ebuild b/x11-misc/redshift/redshift-1.7.ebuild
index 8063a5c9e0b1..41e3779625bf 100644
--- a/x11-misc/redshift/redshift-1.7.ebuild
+++ b/x11-misc/redshift/redshift-1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/redshift/redshift-1.7.ebuild,v 1.3 2012/01/14 18:28:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/redshift/redshift-1.7.ebuild,v 1.4 2012/01/17 13:53:49 ago Exp $
 
 EAPI=3
 
@@ -14,7 +14,7 @@ SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="geoclue gnome gtk nls"
 
 COMMON_DEPEND=">=x11-libs/libX11-1.4
diff --git a/x11-themes/oxygen-gtk/Manifest b/x11-themes/oxygen-gtk/Manifest
index 69a2cf7464e3..0ab02c27ced1 100644
--- a/x11-themes/oxygen-gtk/Manifest
+++ b/x11-themes/oxygen-gtk/Manifest
@@ -1 +1,3 @@
 DIST oxygen-gtk-1.1.6.tar.bz2 191531 RMD160 ad3ac6bc943613803d27a7497e6d2ec1327f2847 SHA1 9a466484743a56d5a2da62d71400ef7429d51551 SHA256 197c0b505fe7a0dbb15ff951bd3bf29f0c8322cac4aa99434cfd09d26b0ce260
+DIST oxygen-gtk2-1.2.0.tar.bz2 191654 RMD160 d8221cb14f7882a64430fe4e729542a77d44d937 SHA1 d9720b9d95f2e1dc05de34c41539935a0e87abe4 SHA256 3742fb5bd65dad1a26e973fcf0488f35f824f92660b67066536ba480b6b4ad8f
+DIST oxygen-gtk3-1.0.0.tar.bz2 185889 RMD160 34ecbde5ef6581e410f9b10fe6411e26003cec35 SHA1 247a7b28ea189070f82dfafa997481c5b6b73ced SHA256 9a89e4767d0afedb7a7b6b580cba74dcc14c72ab898c1d70376619d9675f2642
diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-1.0.0-r1.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..90ade9a93dd6
--- /dev/null
+++ b/x11-themes/oxygen-gtk/oxygen-gtk-1.0.0-r1.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/x11-themes/oxygen-gtk/oxygen-gtk-1.0.0-r1.ebuild,v 1.1 2012/01/17 12:57:38 scarabeus Exp $
+
+EAPI=4
+
+MY_PN=${PN}3
+MY_P=${MY_PN}-${PV}
+
+inherit cmake-utils
+
+DESCRIPTION="Official GTK+:2 port of KDE's Oxygen widget style"
+HOMEPAGE="https://projects.kde.org/projects/playground/artwork/oxygen-gtk"
+SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/src/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+SLOT="3"
+IUSE="debug doc"
+
+RDEPEND="
+	dev-libs/dbus-glib
+	dev-libs/glib
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	!x11-themes/oxygen-gtk:0
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+DOCS=(AUTHORS README)
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	if use doc; then
+		{ cd "${S}" && doxygen Doxyfile; } || die "Generating documentation failed"
+		HTML_DOCS=( "${S}/doc/html/" )
+	fi
+
+	cmake-utils_src_install
+
+	cat <<-EOF > 99oxygen-gtk3
+CONFIG_PROTECT="${EPREFIX}/usr/share/themes/oxygen-gtk/gtk-3.0"
+EOF
+	doenvd 99oxygen-gtk3
+}
diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-1.2.0-r1.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..58ed2c75a13f
--- /dev/null
+++ b/x11-themes/oxygen-gtk/oxygen-gtk-1.2.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/oxygen-gtk/oxygen-gtk-1.2.0-r1.ebuild,v 1.1 2012/01/17 12:57:38 scarabeus Exp $
+
+EAPI=4
+
+MY_PN=${PN}2
+MY_P=${MY_PN}-${PV}
+
+inherit cmake-utils
+
+DESCRIPTION="Official GTK+:2 port of KDE's Oxygen widget style"
+HOMEPAGE="https://projects.kde.org/projects/playground/artwork/oxygen-gtk"
+SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/src/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+SLOT="2"
+IUSE="debug doc"
+
+RDEPEND="
+	dev-libs/dbus-glib
+	dev-libs/glib
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.24.2:2
+	x11-libs/libX11
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}
+	!x11-themes/oxygen-gtk:0
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+DOCS=(AUTHORS README)
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	if use doc; then
+		{ cd "${S}" && doxygen Doxyfile; } || die "Generating documentation failed"
+		HTML_DOCS=( "${S}/doc/html/" )
+	fi
+
+	cmake-utils_src_install
+
+	cat <<-EOF > 99oxygen-gtk2
+CONFIG_PROTECT="${EPREFIX}/usr/share/themes/oxygen-gtk/gtk-2.0"
+EOF
+	doenvd 99oxygen-gtk2
+}