diff --git a/app-admin/stow/Manifest b/app-admin/stow/Manifest
index cd8e3629cb89..85da23a91e7d 100644
--- a/app-admin/stow/Manifest
+++ b/app-admin/stow/Manifest
@@ -1 +1,2 @@
 DIST stow-1.3.3.tar.gz 139417 RMD160 ab192c3c709c11e0a7d39ec8de268ee6be3265f3 SHA1 570c501f8663feb26360db25df0be342278b7b99 SHA256 0cdc7fb7861e83785edd2de127268f8a72ed9ae524ddc4beca236cfd63d1f8b0
+DIST stow-2.1.1.tar.gz 458329 RMD160 1665e6f24b1c1e926e5afe8c80c65f22055dd739 SHA1 9db6f3ad6a181509db3f599adf52dbfaeafe210f SHA256 d88e1b022383ea58147f05587561b3052cadd6dc369f806c16492c159cc06c8e
diff --git a/app-admin/stow/files/99stow b/app-admin/stow/files/99stow
new file mode 100644
index 000000000000..2edcda2d8519
--- /dev/null
+++ b/app-admin/stow/files/99stow
@@ -0,0 +1,2 @@
+LDPATH=/var/lib/lib
+PATH=/var/lib/bin
diff --git a/app-admin/stow/stow-1.3.3-r1.ebuild b/app-admin/stow/stow-1.3.3-r1.ebuild
new file mode 100644
index 000000000000..fa4f680c4fc9
--- /dev/null
+++ b/app-admin/stow/stow-1.3.3-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/stow/stow-1.3.3-r1.ebuild,v 1.1 2011/12/07 19:04:39 maksbotan Exp $
+
+DESCRIPTION="Manage installation of software in /var/lib/"
+HOMEPAGE="http://www.gnu.org/software/stow/"
+SRC_URI="mirror://gnu/stow/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+
+	# create new STOWDIR
+	dodir /var/lib/stow
+
+	# install env.d file to add STOWDIR to PATH and LDPATH
+	doenvd "${FILESDIR}"/99stow || die "doenvd failed"
+}
+
+pkg_postinst() {
+	elog "We now recommend that you use /var/lib/stow as your STOWDIR"
+	elog "instead of /usr/local in order to avoid conflicts with the"
+	elog "symlink from /usr/lib64 -> /usr/lib.  See Bug 246264 for"
+	elog "more details on this change."
+	elog "For your convenience, PATH has been updated to include"
+	elog "/var/lib/stow/bin."
+}
diff --git a/app-admin/stow/stow-1.3.3.ebuild b/app-admin/stow/stow-1.3.3.ebuild
deleted file mode 100644
index 0ea08871be9d..000000000000
--- a/app-admin/stow/stow-1.3.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/stow/stow-1.3.3.ebuild,v 1.27 2010/01/01 19:23:11 fauli Exp $
-
-DESCRIPTION="manage installation of software in /usr/local"
-HOMEPAGE="http://www.gnu.org/software/stow/"
-SRC_URI="mirror://gnu/stow/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-}
diff --git a/app-admin/stow/stow-2.1.1.ebuild b/app-admin/stow/stow-2.1.1.ebuild
new file mode 100644
index 000000000000..4e18a86d170d
--- /dev/null
+++ b/app-admin/stow/stow-2.1.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/stow/stow-2.1.1.ebuild,v 1.1 2011/12/07 19:04:40 maksbotan Exp $
+
+EAPI="2"
+
+DESCRIPTION="Manage installation of software in /var/lib/"
+HOMEPAGE="http://www.gnu.org/software/stow/"
+SRC_URI="mirror://gnu/stow/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+
+	# create new STOWDIR
+	dodir /var/lib/stow
+
+	# install env.d file to add STOWDIR to PATH and LDPATH
+	doenvd "${FILESDIR}"/99stow || die "doenvd failed"
+}
+
+pkg_postinst() {
+	elog "We now recommend that you use /var/lib/stow as your STOWDIR"
+	elog "instead of /usr/local in order to avoid conflicts with the"
+	elog "symlink from /usr/lib64 -> /usr/lib.  See Bug 246264 for"
+	elog "more details on this change."
+	elog "For your convenience, PATH has been updated to include"
+	elog "/var/lib/stow/bin."
+}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.9.2-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.9.2-r1.ebuild
index a341069c5cae..d4eadfedd62e 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.9.2-r1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.9.2-r1.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/app-crypt/mit-krb5/mit-krb5-1.9.2-r1.ebuild,v 1.1 2011/12/07 08:05:41 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.9.2-r1.ebuild,v 1.2 2011/12/07 18:06:01 jer Exp $
 
 EAPI=3
 
@@ -14,7 +14,7 @@ SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc +keyutils openldap +pkinit +threads test xinetd"
 
 RDEPEND="!!app-crypt/heimdal
diff --git a/app-crypt/truecrypt/Manifest b/app-crypt/truecrypt/Manifest
index 242f457dc573..704ca7ece2ea 100644
--- a/app-crypt/truecrypt/Manifest
+++ b/app-crypt/truecrypt/Manifest
@@ -1,2 +1,2 @@
-DIST truecrypt-7.0a.tar.gz 1996312 RMD160 92b01f87c725feb43aded666ba44fcbd3e3ac740 SHA1 42be0f333e6791e7a122b3e1183e014cd3860198 SHA256 6c845153ee868429e2a531407383e9349754d1579cf66fc838632c44baaba021
+DIST truecrypt-7.1.tar.gz 1950519 RMD160 b01cbbd764c403dbd6d2e7f30044894c233c01f7 SHA1 b46c0fa5e1cbad25197b02d5232f5355b7abb1c9 SHA256 94815d6c72f36fb194fc53d2527088f3bf7060797530f7eafd63d1b9596fd9f4
 DIST truecrypt-pkcs11.h.bz2 8286 RMD160 15c22390f81a1cb0bfd6699b08acd84cffad9bae SHA1 59d02f97c565f006f2265ff0f4c9a23c3323bff8 SHA256 9e7782dd93f7e37fc0eaa118f9fbce7c643555e134fd39f2076e0fc541ac3494
diff --git a/app-crypt/truecrypt/truecrypt-7.0a-r2.ebuild b/app-crypt/truecrypt/truecrypt-7.0a-r2.ebuild
deleted file mode 100644
index 8ad970e51bb9..000000000000
--- a/app-crypt/truecrypt/truecrypt-7.0a-r2.ebuild
+++ /dev/null
@@ -1,121 +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/truecrypt/truecrypt-7.0a-r2.ebuild,v 1.3 2011/04/25 14:15:37 c1pher Exp $
-
-EAPI="2"
-
-inherit flag-o-matic linux-info multilib toolchain-funcs wxwidgets eutils
-
-DESCRIPTION="Free open-source disk encryption software"
-HOMEPAGE="http://www.truecrypt.org/"
-SRC_URI="${P}.tar.gz"
-
-LICENSE="truecrypt-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="X"
-RESTRICT="mirror fetch bindist"
-
-RDEPEND="|| ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper )
-	sys-fs/fuse
-	x11-libs/wxGTK:2.8[X?]"
-DEPEND="${RDEPEND}
-	|| ( dev-libs/pkcs11-helper dev-libs/opensc )"
-RDEPEND="${RDEPEND}
-	app-admin/sudo"
-
-S="${WORKDIR}/${P}-source"
-
-#See bug 241650.
-pkg_nofetch() {
-	elog "Please download ${P}-linux-{86,64}.tar.gz source from:"
-	elog "http://www.truecrypt.org/downloads2"
-	elog "Then put the file in ${DISTDIR}/${P}.tar.gz"
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~BLK_DEV_DM ~DM_CRYPT ~FUSE_FS ~CRYPTO ~CRYPTO_XTS"
-	linux-info_pkg_setup
-
-	local WX_GTK_VER="2.8"
-	if use X; then
-		need-wxwidgets unicode
-	else
-		need-wxwidgets base-unicode
-	fi
-}
-
-src_prepare() {
-	if has_version x11-libs/wxGTK[X]; then
-		# Fix linking when NOGUI=1
-		sed -e "s/WX_CONFIG_LIBS := base/&,core/" -i Main/Main.make || die "sed Main/Main.make failed"
-	fi
-}
-
-src_compile() {
-	local EXTRA pkcs11_include_directory
-
-	use X || EXTRA+=" NOGUI=1"
-
-	if has_version dev-libs/pkcs11-helper; then
-		pkcs11_include_directory="/usr/include/pkcs11-helper-1.0"
-	else
-		pkcs11_include_directory="/usr/include/opensc"
-	fi
-	append-flags -DCKR_NEW_PIN_MODE=0x000001B0 -DCKR_NEXT_OTP=0x000001B1
-
-	emake \
-		${EXTRA} \
-		NOSTRIP=1 \
-		NOTEST=1 \
-		VERBOSE=1 \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		TC_EXTRA_CFLAGS="${CFLAGS}" \
-		TC_EXTRA_CXXFLAGS="${CXXFLAGS}" \
-		TC_EXTRA_LFLAGS="${LDFLAGS}" \
-		WX_CONFIG="${WX_CONFIG}" \
-		PKCS11_INC="${pkcs11_include_directory}" \
-		|| die "emake failed"
-}
-
-src_test() {
-	"${S}/Main/truecrypt" --text --test || die "tests failed"
-}
-
-src_install() {
-	dobin Main/truecrypt || die
-	dodoc Readme.txt "Release/Setup Files/TrueCrypt User Guide.pdf" || die
-	exeinto "/$(get_libdir)/rcscripts/addons"
-	newexe "${FILESDIR}/${PN}-stop.sh" "${PN}-stop.sh" || die
-
-	newinitd "${FILESDIR}/${PN}.init" ${PN} || die
-
-	if use X; then
-		newicon Resources/Icons/TrueCrypt-48x48.xpm truecrypt.xpm || die
-		make_desktop_entry ${PN} "TrueCrypt" ${PN} "System" || die
-	fi
-}
-
-pkg_postinst() {
-	elog "There is now an init script for TrueCrypt for Baselayout-2."
-	elog "If you are a baselayout-2 user and you would like the TrueCrypt"
-	elog "mappings removed on shutdown in order to prevent other file systems"
-	elog "from unmounting then run:"
-	elog "rc-update add truecrypt boot"
-	elog ""
-
-	ewarn "If you're getting errors about DISPLAY while using the terminal"
-	ewarn "it's a known upstream bug. To use TrueCrypt from the terminal"
-	ewarn "all that's necessary is to run: unset DISPLAY"
-	ewarn "This will make the display unaccessable from that terminal "
-	ewarn "but at least you will be able to access your volumes."
-	ewarn ""
-
-	ewarn "TrueCrypt has very restrictive license."
-	ewarn "Please read the ${LICENSE} license in ${PORTDIR}/licenses"
-	ewarn "directory before using TrueCrypt. Please be explicitly aware of"
-	ewarn "the limitations on redistribution of binaries or modified source."
-}
diff --git a/app-crypt/truecrypt/truecrypt-7.0a-r5.ebuild b/app-crypt/truecrypt/truecrypt-7.0a-r5.ebuild
deleted file mode 100644
index 492137cda58f..000000000000
--- a/app-crypt/truecrypt/truecrypt-7.0a-r5.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/truecrypt/truecrypt-7.0a-r5.ebuild,v 1.2 2011/07/15 13:10:37 c1pher Exp $
-
-EAPI="2"
-
-inherit flag-o-matic linux-info multilib toolchain-funcs wxwidgets eutils \
-	pax-utils
-
-DESCRIPTION="Free open-source disk encryption software"
-HOMEPAGE="http://www.truecrypt.org/"
-SRC_URI="${P}.tar.gz\
-	mirror://gentoo/${PN}-pkcs11.h.bz2"
-
-LICENSE="truecrypt-3.0"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~ppc ~x86"
-IUSE="X"
-RESTRICT="mirror fetch bindist"
-
-RDEPEND="|| ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper )
-	sys-fs/fuse
-	x11-libs/wxGTK:2.8[X?]
-	app-admin/sudo"
-DEPEND="${RDEPEND}
-	|| ( dev-libs/pkcs11-helper dev-libs/opensc )
-	!ppc? ( dev-lang/nasm )"
-
-S="${WORKDIR}/${P}-source"
-
-#See bug 241650.
-pkg_nofetch() {
-	elog "Please download ${P}-linux-{86,64}.tar.gz source from:"
-	elog "http://www.truecrypt.org/downloads2"
-	elog "Then put the file in ${DISTDIR}/${P}.tar.gz"
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~BLK_DEV_DM ~DM_CRYPT ~FUSE_FS ~CRYPTO ~CRYPTO_XTS"
-	linux-info_pkg_setup
-
-	local WX_GTK_VER="2.8"
-	if use X; then
-		need-wxwidgets unicode
-	else
-		need-wxwidgets base-unicode
-	fi
-}
-
-src_prepare() {
-	if has_version x11-libs/wxGTK[X]; then
-		# Fix linking when NOGUI=1
-		sed -e "s/WX_CONFIG_LIBS := base/&,core/" -i Main/Main.make || die "sed Main/Main.make failed"
-	fi
-
-	epatch "${FILESDIR}/makefile-archdetect.diff"
-	epatch "${FILESDIR}/execstack-fix.diff"
-	if ! has_version dev-libs/pkcs11-helper && \
-		has_version "=dev-libs/opensc-0.12*"; then
-		mkdir pkcs11 || die
-		cp "${WORKDIR}"/truecrypt-pkcs11.h pkcs11/pkcs11.h || die
-	fi
-}
-
-src_compile() {
-	local EXTRA pkcs11_include_directory
-
-	use X || EXTRA+=" NOGUI=1"
-
-	if has_version dev-libs/pkcs11-helper; then
-		pkcs11_include_directory="/usr/include/pkcs11-helper-1.0"
-	elif has_version "=dev-libs/opensc-0.12*"; then
-		pkcs11_include_directory="/usr/include/opensc"
-		append-flags -I"${S}"/pkcs11
-	else
-		pkcs11_include_directory="/usr/include/opensc"
-	fi
-	append-flags -DCKR_NEW_PIN_MODE=0x000001B0 -DCKR_NEXT_OTP=0x000001B1
-
-	emake \
-		${EXTRA} \
-		NOSTRIP=1 \
-		NOTEST=1 \
-		VERBOSE=1 \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		TC_EXTRA_CFLAGS="${CFLAGS}" \
-		TC_EXTRA_CXXFLAGS="${CXXFLAGS}" \
-		TC_EXTRA_LFLAGS="${LDFLAGS}" \
-		WX_CONFIG="${WX_CONFIG}" \
-		PKCS11_INC="${pkcs11_include_directory}" \
-		|| die "emake failed"
-}
-
-src_test() {
-	"${S}/Main/truecrypt" --text --test || die "tests failed"
-}
-
-src_install() {
-	dobin Main/truecrypt || die
-	dodoc Readme.txt "Release/Setup Files/TrueCrypt User Guide.pdf" || die
-	exeinto "/$(get_libdir)/rcscripts/addons"
-	newexe "${FILESDIR}/${PN}-stop.sh" "${PN}-stop.sh" || die
-
-	newinitd "${FILESDIR}/${PN}.init" ${PN} || die
-
-	if use X; then
-		newicon Resources/Icons/TrueCrypt-48x48.xpm truecrypt.xpm || die
-		make_desktop_entry ${PN} "TrueCrypt" ${PN} "System" || die
-	fi
-
-	pax-mark -m "${D}/usr/bin/truecrypt" || die
-}
-
-pkg_postinst() {
-	elog "There is now an init script for TrueCrypt for Baselayout-2."
-	elog "If you are a baselayout-2 user and you would like the TrueCrypt"
-	elog "mappings removed on shutdown in order to prevent other file systems"
-	elog "from unmounting then run:"
-	elog "rc-update add truecrypt boot"
-	elog ""
-
-	ewarn "If you're getting errors about DISPLAY while using the terminal"
-	ewarn "it's a known upstream bug. To use TrueCrypt from the terminal"
-	ewarn "all that's necessary is to run: unset DISPLAY"
-	ewarn "This will make the display unaccessable from that terminal "
-	ewarn "but at least you will be able to access your volumes."
-	ewarn ""
-
-	ewarn "TrueCrypt has very restrictive license."
-	ewarn "Please read the ${LICENSE} license in ${PORTDIR}/licenses"
-	ewarn "directory before using TrueCrypt. Please be explicitly aware of"
-	ewarn "the limitations on redistribution of binaries or modified source."
-}
diff --git a/app-crypt/truecrypt/truecrypt-7.0a-r6.ebuild b/app-crypt/truecrypt/truecrypt-7.1.ebuild
similarity index 98%
rename from app-crypt/truecrypt/truecrypt-7.0a-r6.ebuild
rename to app-crypt/truecrypt/truecrypt-7.1.ebuild
index f991dbd8e7d2..eea6dca30c4a 100644
--- a/app-crypt/truecrypt/truecrypt-7.0a-r6.ebuild
+++ b/app-crypt/truecrypt/truecrypt-7.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/app-crypt/truecrypt/truecrypt-7.0a-r6.ebuild,v 1.1 2011/07/15 17:53:07 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-7.1.ebuild,v 1.1 2011/12/07 17:06:56 c1pher Exp $
 
 EAPI="4"
 
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.4.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-4.1.4.ebuild
index ac230d5418a7..cd281da51daf 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.4.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.1.4.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/app-emulation/virtualbox-additions/virtualbox-additions-4.1.4.ebuild,v 1.2 2011/11/01 10:57:40 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.1.4.ebuild,v 1.3 2011/12/07 17:28:33 phajdan.jr Exp $
 
 EAPI=2
 
@@ -15,7 +15,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"
 
 LICENSE="PUEL"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild
index 1a6e6ab1ad87..09c22b174279 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.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/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild,v 1.2 2011/11/01 10:55:25 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild,v 1.3 2011/12/07 17:27:51 phajdan.jr Exp $
 
 EAPI=2
 
@@ -21,7 +21,7 @@ SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_amd64.
 
 LICENSE="GPL-2 PUEL"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+additions +chm headless python sdk vboxwebsrv rdesktop-vrdp"
 RESTRICT="mirror"
 
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.4.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.4.ebuild
index 3fb02483427b..78a23a600d58 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.4.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.4.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/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.4.ebuild,v 1.2 2011/11/01 10:58:42 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.4.ebuild,v 1.3 2011/12/07 17:28:48 phajdan.jr Exp $
 
 EAPI=2
 
@@ -16,7 +16,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.vbox-extpack ->
 
 LICENSE="PUEL"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="mirror strip"
 
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.4-r1.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.4-r1.ebuild
index 459d36468d9d..9889bb15d4d1 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.4-r1.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.4-r1.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/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.4-r1.ebuild,v 1.2 2011/11/01 11:05:25 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.4-r1.ebuild,v 1.3 2011/12/07 17:29:29 phajdan.jr Exp $
 
 EAPI=2
 
@@ -13,7 +13,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X"
 
 RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild
index c22004db9908..e9f0fedbed48 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.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/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild,v 1.4 2011/11/06 13:16:19 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild,v 1.5 2011/12/07 17:26:06 phajdan.jr Exp $
 
 # XXX: the tarball here is just the kernel modules split out of the binary
 #      package that comes from virtualbox-bin
@@ -16,7 +16,7 @@ SRC_URI="http://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="pax_kernel"
 
 RDEPEND="!=app-emulation/virtualbox-9999"
diff --git a/app-emulation/virtualbox/virtualbox-4.1.4.ebuild b/app-emulation/virtualbox/virtualbox-4.1.4.ebuild
index 0e037fd213ad..3d54ba12e50d 100644
--- a/app-emulation/virtualbox/virtualbox-4.1.4.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.4.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/app-emulation/virtualbox/virtualbox-4.1.4.ebuild,v 1.3 2011/11/01 11:01:49 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.4.ebuild,v 1.4 2011/12/07 17:28:17 phajdan.jr Exp $
 
 EAPI=4
 
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.virtualbox.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
 
 RDEPEND="!app-emulation/virtualbox-bin
diff --git a/app-emulation/vmware-player/vmware-player-4.0.1.528992-r1.ebuild b/app-emulation/vmware-player/vmware-player-4.0.1.528992-r2.ebuild
similarity index 94%
rename from app-emulation/vmware-player/vmware-player-4.0.1.528992-r1.ebuild
rename to app-emulation/vmware-player/vmware-player-4.0.1.528992-r2.ebuild
index 21d3cbd5a2d1..30da23644799 100644
--- a/app-emulation/vmware-player/vmware-player-4.0.1.528992-r1.ebuild
+++ b/app-emulation/vmware-player/vmware-player-4.0.1.528992-r2.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/app-emulation/vmware-player/vmware-player-4.0.1.528992-r1.ebuild,v 1.1 2011/12/03 20:07:45 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-4.0.1.528992-r2.ebuild,v 1.1 2011/12/07 16:33:04 vadimk Exp $
 
 EAPI="4"
 
@@ -168,9 +168,10 @@ src_install() {
 	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
 	dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
 
-	# fix up permissions
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/{bin/*,lib/wrapper-gtk24.sh,lib/libgksu2.so.0/gksu-run-helper}
-	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx*
+	# fix permissions
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper}
+	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
 
 	# create the environment
 	local envd="${T}/90vmware"
diff --git a/app-emulation/vmware-workstation/vmware-workstation-8.0.1.528992-r1.ebuild b/app-emulation/vmware-workstation/vmware-workstation-8.0.1.528992-r2.ebuild
similarity index 95%
rename from app-emulation/vmware-workstation/vmware-workstation-8.0.1.528992-r1.ebuild
rename to app-emulation/vmware-workstation/vmware-workstation-8.0.1.528992-r2.ebuild
index 507ccf6aa247..3d203eb37002 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-8.0.1.528992-r1.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-8.0.1.528992-r2.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/app-emulation/vmware-workstation/vmware-workstation-8.0.1.528992-r1.ebuild,v 1.1 2011/12/04 13:30:14 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-8.0.1.528992-r2.ebuild,v 1.1 2011/12/07 15:26:02 vadimk Exp $
 
 EAPI="4"
 
@@ -294,16 +294,18 @@ src_install() {
 		dosym /usr/bin/kdesu "${VM_INSTALL_DIR}"/bin/vmware-gksu
 	fi
 
-	# fix up permissions
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/{bin/*,lib/wrapper-gtk24.sh,lib/libgksu2.so.0/gksu-run-helper,setup/*}
+	# fix permissions
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper}
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config
 	fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount
+	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
 	if use server; then
+		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-{hostd,vim-cmd,wssc-adminTool}
 		fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd
 	fi
-	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx*
-
 	if use vix; then
-		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/*
+		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config
 	fi
 
 	# create the environment
diff --git a/app-forensics/cmospwd/Manifest b/app-forensics/cmospwd/Manifest
index 217a79f561e9..45a0e1ec072e 100644
--- a/app-forensics/cmospwd/Manifest
+++ b/app-forensics/cmospwd/Manifest
@@ -1,2 +1 @@
-DIST cmospwd-4.6.tar.gz 37443 RMD160 a543c00a41c0905811ffb36c5cae3cf7d21a9215 SHA1 caeb796c215a189d488ad82047ba72a8f7cfa52c SHA256 03104923004ef4aafb8fe2d78897c13a903b72b469a70fe65eb0837dd2842c49
 DIST cmospwd-5.1.tar.bz2 36792 RMD160 087e9ef21ea9b229d3085e52e6178a8353aae9db SHA1 8b691bb1dda26471dfef445549c3a0891c401d1f SHA256 f296d2979794b0a6b726b80afc92e4d059c65dc2612a4b09377c168833d862f4
diff --git a/app-forensics/cmospwd/cmospwd-4.6.ebuild b/app-forensics/cmospwd/cmospwd-4.6.ebuild
deleted file mode 100644
index d922ac7d3085..000000000000
--- a/app-forensics/cmospwd/cmospwd-4.6.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/app-forensics/cmospwd/cmospwd-4.6.ebuild,v 1.6 2011/06/26 06:15:22 radhermit Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="CmosPwd decrypts password stored in cmos used to access BIOS SETUP"
-HOMEPAGE="http://www.cgsecurity.org/index.html?cmospwd.html"
-SRC_URI="http://www.cgsecurity.org/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-src_compile() {
-	cd src
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} cmospwd.c -o cmospwd || die
-}
-
-src_install() {
-	dosbin src/cmospwd || die
-	dodoc cmospwd.txt || die
-}
diff --git a/app-i18n/libtomoe-gtk/files/libtomoe-gtk-0.6.0-underlinking.patch b/app-i18n/libtomoe-gtk/files/libtomoe-gtk-0.6.0-underlinking.patch
new file mode 100644
index 000000000000..755b50a68eb0
--- /dev/null
+++ b/app-i18n/libtomoe-gtk/files/libtomoe-gtk-0.6.0-underlinking.patch
@@ -0,0 +1,15 @@
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 4f4206e..4a21629 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -42,8 +42,8 @@ LDADDS =							\
+ 
+ noinst_PROGRAMS = testtomoegtk testtomoegtkedit
+ 
+-testtomoegtk_LDADD = $(LDADDS)
++testtomoegtk_LDADD = $(LDADDS) -lm
+ testtomoegtk_SOURCES = testtomoegtk.c
+ 
+-testtomoegtkedit_LDADD = $(LDADDS)
++testtomoegtkedit_LDADD = $(LDADDS) -lm
+ testtomoegtkedit_SOURCES = testtomoegtkedit.c
diff --git a/app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r2.ebuild b/app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r2.ebuild
index 781268dd9f60..3a7db2383b8e 100644
--- a/app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r2.ebuild
+++ b/app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r2.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/app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r2.ebuild,v 1.1 2011/05/26 23:12:30 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r2.ebuild,v 1.2 2011/12/07 14:19:27 naota Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -22,8 +22,9 @@ RDEPEND=">=app-i18n/tomoe-0.6.0[python?]
 		dev-python/pygtk:2
 		dev-python/pygobject:2
 	)
-	gucharmap? ( >=gnome-extra/gucharmap-1.4.0 )"
+	gucharmap? ( gnome-extra/gucharmap:0 )"
 DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
 	dev-util/pkgconfig
 	sys-devel/gettext
 	doc? ( >=dev-util/gtk-doc-1.4 )"
@@ -39,6 +40,7 @@ pkg_setup() {
 src_prepare() {
 	# Fix compilation with gucharmap-2.24, bug #243160
 	epatch "${FILESDIR}/${P}-gucharmap2.patch"
+	epatch "${FILESDIR}/${P}-underlinking.patch"
 
 	eautoreconf
 }
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r1.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r1.ebuild
index c0b08004cd6d..e889ab7c26f8 100644
--- a/app-i18n/tomoe/tomoe-0.6.0-r1.ebuild
+++ b/app-i18n/tomoe/tomoe-0.6.0-r1.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/app-i18n/tomoe/tomoe-0.6.0-r1.ebuild,v 1.1 2011/05/26 22:44:21 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/tomoe/tomoe-0.6.0-r1.ebuild,v 1.2 2011/12/07 13:57:00 naota Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -30,6 +30,8 @@ RDEPEND=">=dev-libs/glib-2.4
 #	test? ( app-dicts/uconv )
 
 DEPEND="${DEPEND}
+	dev-util/gtk-doc-am
+	dev-util/intltool
 	dev-util/pkgconfig
 	doc? ( dev-util/gtk-doc )"
 
diff --git a/app-misc/strigi/strigi-0.7.6-r1.ebuild b/app-misc/strigi/strigi-0.7.6-r1.ebuild
index e90afaf1738c..7d626bd80619 100644
--- a/app-misc/strigi/strigi-0.7.6-r1.ebuild
+++ b/app-misc/strigi/strigi-0.7.6-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.6-r1.ebuild,v 1.1 2011/10/18 22:22:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.6-r1.ebuild,v 1.3 2011/12/07 22:01:26 hwoarang Exp $
 
 EAPI=4
 
 if [[ "${PV}" != "9999" ]]; then
 	SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 else
 	EGIT_REPO_URI="git://anongit.kde.org/strigi"
 	GIT_ECLASS="git-2"
diff --git a/app-office/akonadi-server/akonadi-server-1.6.2.ebuild b/app-office/akonadi-server/akonadi-server-1.6.2.ebuild
index 426ffb4f718f..c876fd1eb19a 100644
--- a/app-office/akonadi-server/akonadi-server-1.6.2.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.6.2.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/app-office/akonadi-server/akonadi-server-1.6.2.ebuild,v 1.2 2011/10/17 17:08:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.6.2.ebuild,v 1.4 2011/12/07 22:06:37 hwoarang Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://pim.kde.org/akonadi"
 SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="mysql postgres +sqlite test"
 
diff --git a/app-portage/eclean-kernel/eclean-kernel-0.2.1.ebuild b/app-portage/eclean-kernel/eclean-kernel-0.2.1.ebuild
index 26ad8464e541..75ae9e189509 100644
--- a/app-portage/eclean-kernel/eclean-kernel-0.2.1.ebuild
+++ b/app-portage/eclean-kernel/eclean-kernel-0.2.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/app-portage/eclean-kernel/eclean-kernel-0.2.1.ebuild,v 1.1 2011/11/30 08:27:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eclean-kernel/eclean-kernel-0.2.1.ebuild,v 1.2 2011/12/07 17:03:31 naota Exp $
 
 EAPI=4
 PYTHON_DEPEND='2:2.6'
@@ -15,7 +15,7 @@ SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 PYTHON_MODNAME=ecleankernel
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 780a452bee5b..81c21a2c4f22 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -6,4 +6,6 @@ DIST zsh-4.3.12-doc.tar.bz2 2698428 RMD160 502b6c39c1d58d92d6df485f9298b184a808f
 DIST zsh-4.3.12.tar.bz2 2917959 RMD160 83f2a0f3e590722262e5725df97d924b1fd4ee84 SHA1 8fd7a6d841770c8b12cf3ae8229dd857ecdbad93 SHA256 4a9fd2dac76fc08fd1dc400deba854fcefa12ad76226d93fb6c01a801324f106
 DIST zsh-4.3.13-doc.tar.bz2 2709769 RMD160 5fea5f918e388f8d8ea2296eb0fe607b82f51624 SHA1 f10ab73ddb692e0fcd6915396a8d3aa934f0e863 SHA256 23a900d630b88997bf451620cb858666f36e632440264276aa14ea1173044c9a
 DIST zsh-4.3.13.tar.bz2 2964918 RMD160 6fc4c9667f52e77a7151038a652bb8ececee57f8 SHA1 c1f447090101359f20d7f725132827c2ca7060c1 SHA256 173bafa9f363050de40c50492eccbd8c55d85401a42b076b2178c2d9d5355d9c
+DIST zsh-4.3.14-doc.tar.bz2 2709354 RMD160 e052f60d4b2abb55bfa91fd8853b3f0f0ab207c1 SHA1 4a23aa1c86aeda43d04d5b613371986ef8037fca SHA256 45ace79194440afb7dbfebb20435ffa9c672cd8825210dd9784b7da94c042142
+DIST zsh-4.3.14.tar.bz2 2965367 RMD160 24ccf42c0a42fc5da9fd18cac3fa2301888d53e3 SHA1 9de3d1e96a26419e0a8863c9da31e068411d3257 SHA256 a85a31e243c10106b159923b164935b11bc282d1388bbabe1c77408c93f6b2b8
 DIST zsh-lovers_0.8.3.tar.gz 875976 RMD160 f8482d61d700cc79530b4839de5a86aed6783e99 SHA1 f4905d8825c982371e72053a58cb9679329249a8 SHA256 c786724ac9526e2504142c6d607bc6f3703a35b3db804123f0ffe4214b399ea9
diff --git a/app-shells/zsh/zsh-4.3.14.ebuild b/app-shells/zsh/zsh-4.3.14.ebuild
new file mode 100644
index 000000000000..f9bd0bc28dd6
--- /dev/null
+++ b/app-shells/zsh/zsh-4.3.14.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.14.ebuild,v 1.1 2011/12/07 16:20:53 radhermit Exp $
+
+EAPI=4
+
+# doc package for -dev version exists?
+doc_available=true
+
+inherit eutils flag-o-matic multilib prefix
+
+MY_PV=${PV/_p/-dev-}
+S=${WORKDIR}/${PN}-${MY_PV}
+
+zsh_ftp="ftp://ftp.zsh.org/pub"
+
+if [[ ${PV} != "${MY_PV}" ]] ; then
+	ZSH_URI="${zsh_ftp}/development/${PN}-${MY_PV}.tar.bz2"
+	if ${doc_available} ; then
+		ZSH_DOC_URI="${zsh_ftp}/development/${PN}-${MY_PV}-doc.tar.bz2"
+	else
+		ZSH_DOC_URI="${zsh_ftp}/${PN}-${PV%_*}-doc.tar.bz2"
+	fi
+else
+	ZSH_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+		${zsh_ftp}/${P}.tar.bz2"
+	ZSH_DOC_URI="${zsh_ftp}/${PN}-${PV%_*}-doc.tar.bz2"
+fi
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="http://www.zsh.org/"
+SRC_URI="${ZSH_URI}
+	doc? ( ${ZSH_DOC_URI} )"
+
+LICENSE="ZSH gdbm? ( GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="caps debug doc examples gdbm maildir pcre static unicode"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.1
+	static? ( >=sys-libs/ncurses-5.7-r4[static-libs] )
+	caps? ( sys-libs/libcap )
+	pcre? ( >=dev-libs/libpcre-3.9
+		static? ( >=dev-libs/libpcre-3.9[static-libs] ) )
+	gdbm? ( sys-libs/gdbm )
+"
+DEPEND="sys-apps/groff
+	${RDEPEND}"
+PDEPEND="
+	examples? ( app-doc/zsh-lovers )
+"
+
+src_prepare() {
+	# fix zshall problem with soelim
+	ln -s Doc man1
+	mv Doc/zshall.1 Doc/zshall.1.soelim
+	soelim Doc/zshall.1.soelim > Doc/zshall.1
+
+	epatch "${FILESDIR}/${PN}"-init.d-gentoo-r1.diff
+
+	cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die
+	eprefixify "${T}"/zprofile || die
+	if use prefix ; then
+		sed -i -e 's|@ZSH_PREFIX@||' -e '/@ZSH_NOPREFIX@/d' "${T}"/zprofile || die
+	else
+		sed -i -e 's|@ZSH_NOPREFIX@||' -e '/@ZSH_PREFIX@/d' -e 's|""||' "${T}"/zprofile || die
+	fi
+}
+
+src_configure() {
+	local myconf=
+
+	if use static ; then
+		myconf+=" --disable-dynamic"
+		append-ldflags -static
+	fi
+	if use debug ; then
+		myconf+=" \
+			--enable-zsh-debug \
+			--enable-zsh-mem-debug \
+			--enable-zsh-mem-warning \
+			--enable-zsh-secure-free \
+			--enable-zsh-hash-debug"
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		myconf+=" --enable-libs=-liconv"
+		append-ldflags -Wl,-x
+	fi
+
+	econf \
+		--bindir="${EPREFIX}"/bin \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--enable-etcdir="${EPREFIX}"/etc/zsh \
+		--enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions \
+		--enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions \
+		--enable-function-subdirs \
+		--with-term-lib="ncursesw ncurses" \
+		--with-tcsetpgrp \
+		$(use_enable maildir maildir-support) \
+		$(use_enable pcre) \
+		$(use_enable caps cap) \
+		$(use_enable unicode multibyte) \
+		$(use_enable gdbm ) \
+		${myconf}
+
+	if use static ; then
+		# compile all modules statically, see Bug #27392
+		# removed cap and curses because linking failes
+		sed -i \
+			-e "s,link=no,link=static,g" \
+			-e "/^name=zsh\/cap/s,link=static,link=no," \
+			-e "/^name=zsh\/curses/s,link=static,link=no," \
+			"${S}"/config.modules || die
+		if ! use gdbm ; then
+			sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
+				"${S}"/config.modules || die
+		fi
+#	else
+#		sed -i -e "/LIBS/s%-lpcre%${EPREFIX}/usr/$(get_libdir)/libpcre.a%" Makefile
+	fi
+}
+
+src_test() {
+	local i
+	addpredict /dev/ptmx
+	for i in C02cond.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
+		rm "${S}"/Test/${i} || die
+	done
+	emake check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install.info
+
+	insinto /etc/zsh
+	doins "${T}"/zprofile
+
+	keepdir /usr/share/zsh/site-functions
+	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
+	newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
+
+	# install miscellaneous scripts; bug #54520
+	local i
+	sed -i -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
+		-e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" "${S}"/{Util,Misc}/* || die
+	for i in Util Misc ; do
+		insinto /usr/share/zsh/${PV%_*}/${i}
+		doins ${i}/*
+	done
+
+	dodoc ChangeLog* META-FAQ NEWS README config.modules
+
+	if use doc ; then
+		pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
+		dohtml -r Doc/*
+		insinto /usr/share/doc/${PF}
+		doins Doc/zsh.{dvi,pdf}
+		popd >/dev/null
+	fi
+
+	docinto StartupFiles
+	dodoc StartupFiles/z*
+}
+
+pkg_postinst() {
+	# should link to http://www.gentoo.org/doc/en/zsh.xml
+	elog
+	elog "If you want to enable Portage completions and Gentoo prompt,"
+	elog "emerge app-shells/zsh-completion and add"
+	elog "	autoload -U compinit promptinit"
+	elog "	compinit"
+	elog "	promptinit; prompt gentoo"
+	elog "to your ~/.zshrc"
+	elog
+	elog "Also, if you want to enable cache for the completions, add"
+	elog "	zstyle ':completion::complete:*' use-cache 1"
+	elog "to your ~/.zshrc"
+	elog
+}
diff --git a/app-text/tree/tree-1.6.0.ebuild b/app-text/tree/tree-1.6.0.ebuild
index 83579f87e9b6..70dd5925be73 100644
--- a/app-text/tree/tree-1.6.0.ebuild
+++ b/app-text/tree/tree-1.6.0.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/app-text/tree/tree-1.6.0.ebuild,v 1.8 2011/11/17 22:23:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tree/tree-1.6.0.ebuild,v 1.9 2011/12/07 16:00:03 vapier Exp $
 
 EAPI=4
 inherit toolchain-funcs flag-o-matic bash-completion-r1
@@ -22,10 +22,10 @@ src_prepare() {
 }
 
 src_compile() {
-	append-cflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+	append-lfs-flags
 	emake \
 		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
 		XOBJS="$(use elibc_uclibc && echo strverscmp.o)"
 }
diff --git a/app-text/xournal/Manifest b/app-text/xournal/Manifest
index f40890fe6715..c9653e707c05 100644
--- a/app-text/xournal/Manifest
+++ b/app-text/xournal/Manifest
@@ -1,4 +1,3 @@
-DIST xournal-0.4.5-sjg-image-rev7.patch.gz 24137 RMD160 9a389ecf98dfc2b709555b8efc0c0f440fe4fa00 SHA1 96a2d88e5ff2b9452a1acf46592e650eb5088c8d SHA256 ac89ceb35941d9a13804fd6650f1a6b84474b3f50c89682611f2f9e66af96705
-DIST xournal-0.4.5.tar.gz 425062 RMD160 a4228e6874482bd381c59cd8e3db1100361c1d40 SHA1 390cb275774469ed1b04b7268dd625bd456c895e SHA256 a7d7c2cb544451939779276e6e5ee5acc756bd0efb5253de15dc00bfe07755d1
+DIST xournal-0.4.5_p20111022-r2-patchset.tar.xz 35776 RMD160 a166eb7d6ba7aecce8161d3c9c5d7566d9c3dede SHA1 29cab6debcd2228a70adcffa4c920db50c8ba9db SHA256 4375f116ff82cae1e9497f1b76797a519319bf4012d4aa1262caee75406aeea4
 DIST xournal-0.4.5_p20111022-sjg-image-rev7.patch.gz 21551 RMD160 6048a996fdb7b43e05beff67cf5ae0da53cff840 SHA1 0ff950726a7ad5b0012421c158406d6d49d2c38d SHA256 88b050483fc27f37f307adb358b3e5c4bfc0b600b7d3427599dea4c1ffe87fc2
 DIST xournal-0.4.5_p20111022.tar.xz 332700 RMD160 6578c037ad536c0173c533758c5f86ffc046dfbe SHA1 69f66e1125ba3de3deea14be1eb6d7e8f07abe61 SHA256 46573706645a78f1cbdd9e3eed0b2409ab61947eb5f78be9c1b7d7e4535f721f
diff --git a/app-text/xournal/files/xournal-0.4.5-xoprint-len.patch b/app-text/xournal/files/xournal-0.4.5-xoprint-len.patch
deleted file mode 100644
index 56105af6cf4b..000000000000
--- a/app-text/xournal/files/xournal-0.4.5-xoprint-len.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- a/src/xo-print.c
-+++ b/src/xo-print.c
-@@ -761,7 +761,7 @@ int pdf_draw_bitmap_background(struct Page *pg, GString *str,
- 
-   make_xref(xref, xref->last+1, pdfbuf->len);
-   g_string_append_printf(pdfbuf, 
--    "%d 0 obj\n<< /Length %d /Filter /FlateDecode /Type /Xobject "
-+    "%d 0 obj\n<< /Length %zu /Filter /FlateDecode /Type /Xobject "
-     "/Subtype /Image /Width %d /Height %d /ColorSpace /DeviceRGB "
-     "/BitsPerComponent 8 >> stream\n",
-     xref->last, zpix->len, width, height);
-@@ -840,8 +840,10 @@ void embed_pdffont(GString *pdfbuf, struct XrefTable *xref, struct PdfFont *font
-   gboolean fallback, is_binary;
-   guchar encoding[256];
-   gushort glyphs[256];
--  int i, j, num, len1, len2;
--  gsize len;
-+  int i, j, num;
-+  guint32 len1, len2;
-+  guint32 tt_len;
-+  gsize t1_len;
-   TrueTypeFont *ttfnt;
-   char *seg1, *seg2;
-   char *fontdata, *p;
-@@ -862,14 +864,14 @@ void embed_pdffont(GString *pdfbuf, struct XrefTable *xref, struct PdfFont *font
-       }
-     font->num_glyphs_used = num-1;
-     if (OpenTTFont(font->filename, 0, &ttfnt) == SF_OK) {
--      if (CreateTTFromTTGlyphs_tomemory(ttfnt, (guint8**)&fontdata, &len, glyphs, encoding, num, 
-+      if (CreateTTFromTTGlyphs_tomemory(ttfnt, (guint8**)&fontdata, &tt_len, glyphs, encoding, num, 
-                    0, NULL, TTCF_AutoName | TTCF_IncludeOS2) == SF_OK) {
-         make_xref(xref, xref->last+1, pdfbuf->len);
-         nobj_fontprog = xref->last;
-         g_string_append_printf(pdfbuf, 
--          "%d 0 obj\n<< /Length %d /Length1 %d >> stream\n",
--          nobj_fontprog, (int)len, (int)len);
--        g_string_append_len(pdfbuf, fontdata, len);
-+          "%d 0 obj\n<< /Length %u /Length1 %u >> stream\n",
-+          nobj_fontprog, tt_len, tt_len);
-+        g_string_append_len(pdfbuf, fontdata, tt_len);
-         g_string_append(pdfbuf, "endstream\nendobj\n");
-         g_free(fontdata);
-       }
-@@ -879,7 +881,7 @@ void embed_pdffont(GString *pdfbuf, struct XrefTable *xref, struct PdfFont *font
-     else fallback = TRUE;
-   } else {
-   // embed the font file: Type1 case
--    if (g_file_get_contents(font->filename, &fontdata, &len, NULL) && len>=8) {
-+    if (g_file_get_contents(font->filename, &fontdata, &t1_len, NULL) && t1_len>=8) {
-       if (fontdata[0]==(char)0x80 && fontdata[1]==(char)0x01) {
-         is_binary = TRUE;
-         len1 = pfb_get_length((unsigned char *)fontdata+2);
-@@ -898,7 +900,7 @@ void embed_pdffont(GString *pdfbuf, struct XrefTable *xref, struct PdfFont *font
-           if (*p=='\n' || *p=='\r') p++;
-           if (*p=='\n' || *p=='\r') p++;
-           len1 = p-fontdata;
--          p = g_strrstr_len(fontdata, len, T1_SEGMENT_3_END);
-+          p = g_strrstr_len(fontdata, t1_len, T1_SEGMENT_3_END);
-           if (p==NULL) fallback = TRUE;
-           else {
-             // rewind 512 zeros
-@@ -936,7 +938,7 @@ void embed_pdffont(GString *pdfbuf, struct XrefTable *xref, struct PdfFont *font
-         make_xref(xref, xref->last+1, pdfbuf->len);
-         nobj_fontprog = xref->last;
-         g_string_append_printf(pdfbuf, 
--          "%d 0 obj\n<< /Length %d /Length1 %d /Length2 %d /Length3 0 >> stream\n",
-+          "%d 0 obj\n<< /Length %u /Length1 %u /Length2 %u /Length3 0 >> stream\n",
-           nobj_fontprog, len1+len2, len1, len2);
-         g_string_append_len(pdfbuf, seg1, len1);
-         g_string_append_len(pdfbuf, seg2, len2);
-@@ -1258,7 +1260,7 @@ gboolean print_to_pdf(char *filename)
-       tmpstr = make_pdfprefix(pdfinfo.pages+(pg->bg->file_page_seq-1),
-                               pg->width, pg->height);
-       g_string_append_printf(pdfbuf,
--        "%d 0 obj\n<< /Length %d >> stream\n%s\nendstream\nendobj\n",
-+        "%d 0 obj\n<< /Length %zu >> stream\n%s\nendstream\nendobj\n",
-         n_obj_prefix, tmpstr->len, tmpstr->str);
-       g_string_free(tmpstr, TRUE);
-       g_string_prepend(pgstrm, "Q Q Q ");
-@@ -1276,7 +1278,7 @@ gboolean print_to_pdf(char *filename)
-     
-     make_xref(&xref, xref.last+1, pdfbuf->len);
-     g_string_append_printf(pdfbuf, 
--      "%d 0 obj\n<< /Length %d /Filter /FlateDecode>> stream\n",
-+      "%d 0 obj\n<< /Length %zu /Filter /FlateDecode>> stream\n",
-       xref.last, zpgstrm->len);
-     g_string_append_len(pdfbuf, zpgstrm->str, zpgstrm->len);
-     g_string_free(zpgstrm, TRUE);
diff --git a/app-text/xournal/xournal-0.4.5-r2.ebuild b/app-text/xournal/xournal-0.4.5_p20111022-r2.ebuild
similarity index 65%
rename from app-text/xournal/xournal-0.4.5-r2.ebuild
rename to app-text/xournal/xournal-0.4.5_p20111022-r2.ebuild
index 549821768ea8..9580ba723bb8 100644
--- a/app-text/xournal/xournal-0.4.5-r2.ebuild
+++ b/app-text/xournal/xournal-0.4.5_p20111022-r2.ebuild
@@ -1,19 +1,22 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5-r2.ebuild,v 1.4 2011/09/20 14:43:13 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5_p20111022-r2.ebuild,v 1.1 2011/12/07 21:09:49 dilfridge Exp $
 
 EAPI=4
-inherit gnome2 eutils
+
+GCONF_DEBUG=no
+
+inherit gnome2 autotools
 
 DESCRIPTION="Xournal is an application for notetaking, sketching, and keeping a journal using a stylus."
 HOMEPAGE="http://xournal.sourceforge.net/"
 
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz http://dev.gentoo.org/~dilfridge/distfiles/${P}-sjg-image-rev7.patch.gz"
+SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz http://dev.gentoo.org/~dilfridge/distfiles/${PN}-${PVR}-patchset.tar.xz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+pdf doc"
+KEYWORDS="~amd64 ~x86"
+IUSE="+pdf"
 
 COMMONDEPEND="
 	app-text/poppler[cairo]
@@ -36,20 +39,15 @@ DEPEND="${COMMONDEPEND}
 "
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-xoprint-len.patch #bug 287701
-	epatch "${DISTDIR}"/${P}-sjg-image-rev7.patch.gz   # the image patch
+	epatch "${WORKDIR}"/0*.patch
+	sed -e "s:n       http:n       Gentoo release ${PVR}\\\\n       http:" -i "${S}"/src/xo-interface.c
+	eautoreconf
 }
 
-#src_configure() {
-#	default
-#}
-
 src_install() {
 	emake DESTDIR="${D}" install
 	emake DESTDIR="${D}" desktop-install
 
 	dodoc ChangeLog AUTHORS README
-	if use doc ; then
-		dohtml -r html-doc/*
-	fi
+	dohtml -r html-doc/*
 }
diff --git a/dev-embedded/gnusim8085/Manifest b/dev-embedded/gnusim8085/Manifest
index 8e1431362ba0..b941aa41588c 100644
--- a/dev-embedded/gnusim8085/Manifest
+++ b/dev-embedded/gnusim8085/Manifest
@@ -1,3 +1 @@
-DIST gnusim8085-1.3.5.tar.gz 283927 RMD160 f5aa9c8caecd1f4b8889cf1b957a952218519560 SHA1 106481dcbafdc93da93e12ff46b27a406ddacd09 SHA256 ad5ef31234e14cdaa7795c7e76663d5dd787f6dcf72636098f8448f2f036fc3d
-DIST gnusim8085-1.3.6.tar.gz 340746 RMD160 c6711f6e19e90b6b40bd14d8ee2e06efeff3dfee SHA1 6ef1d1165fbb9aecfc9c87696f9e08ea4ba735c6 SHA256 988dba060949d230a17c6c1af5c4dae250974483f71de8f4c53ec046c3faca61
 DIST gnusim8085-1.3.7.tar.gz 365127 RMD160 cd3e82868d13e7db4f95a89306ad156e292edacc SHA1 348412fa8475aa77790c5862d6e7c0bf2879afe4 SHA256 e09b56089276eed91fb9df3c1e7e2aa4bf091859cfc62612521b45617167d525
diff --git a/dev-embedded/gnusim8085/files/gnusim8085-1.3.6-makefile.patch b/dev-embedded/gnusim8085/files/gnusim8085-1.3.6-makefile.patch
deleted file mode 100644
index ad4db47111ea..000000000000
--- a/dev-embedded/gnusim8085/files/gnusim8085-1.3.6-makefile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- gnusim8085-1.3.6/Makefile.am.orig
-+++ gnusim8085-1.3.6/Makefile.am
-@@ -3,18 +3,9 @@
- ## If you don't want it to overwrite it,
- ## 	Please disable it in the Anjuta project configuration
- 
--SUBDIRS = po src pixmaps doc data
-+SUBDIRS = po src pixmaps data
- 
--gnusim8085_docdir = $(docdir)
--gnusim8085_doc_DATA = \
--	README\
--	AUTHORS\
--	ChangeLog\
--	NEWS\
--	TODO\
--	ABOUT-NLS
--
--EXTRA_DIST = config.rpath m4/ChangeLog  $(gnusim8085doc_DATA)
-+EXTRA_DIST = config.rpath m4/ChangeLog
- 
- DISTCLEANFILES = *.exe *.gz
- 
diff --git a/dev-embedded/gnusim8085/gnusim8085-1.3.5.ebuild b/dev-embedded/gnusim8085/gnusim8085-1.3.5.ebuild
deleted file mode 100644
index a23eeb477ec5..000000000000
--- a/dev-embedded/gnusim8085/gnusim8085-1.3.5.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-embedded/gnusim8085/gnusim8085-1.3.5.ebuild,v 1.3 2011/04/10 17:36:48 tomka Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="A GTK2 8085 Simulator"
-HOMEPAGE="http://sourceforge.net/projects/gnusim8085"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="nls doc"
-
-RDEPEND=">=x11-libs/gtk+-2.12:2
-	>=gnome-base/libgnomeui-2.0
-	x11-libs/gtksourceview:2.0"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	# We'll install data properly
-	sed -i \
-		-e "s:install-exec-am install-data-am:install-exec-am:" \
-		-e "s:SUBDIRS = intl po macros src pixmaps doc:SUBDIRS = intl po macros src pixmaps:" \
-		"${S}"/Makefile.in \
-		|| die "Patch failed"
-	sed -i -e "s:share/pixmaps/\${PACKAGE}:share/pixmaps/:" "${S}"/configure || die "Patch failed"
-}
-
-src_configure() {
-	myconf="${myconf} --prefix=${D}/usr $(use_enable nls)"
-	econf ${myconf} || die "Configuration failed"
-}
-
-src_install() {
-	emake install || die "Installation Failed!"
-
-	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
-	doman doc/gnusim8085.1 || die "domain failed"
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}/examples
-		doins doc/examples/*.asm || die "doins examples failed"
-		dodoc doc/asm-guide.txt || die "dodoc asm-guide failed"
-	fi
-	make_desktop_entry gnusim8085 GNUSim8085 gnusim8085_icon Development
-}
diff --git a/dev-embedded/gnusim8085/gnusim8085-1.3.6.ebuild b/dev-embedded/gnusim8085/gnusim8085-1.3.6.ebuild
deleted file mode 100644
index c8488f9cae76..000000000000
--- a/dev-embedded/gnusim8085/gnusim8085-1.3.6.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/dev-embedded/gnusim8085/gnusim8085-1.3.6.ebuild,v 1.2 2011/03/01 06:05:17 radhermit Exp $
-
-EAPI=4
-
-inherit eutils autotools
-
-DESCRIPTION="A GTK2 8085 Simulator"
-HOMEPAGE="http://gnusim8085.org"
-SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls examples"
-
-RDEPEND=">=x11-libs/gtk+-2.12:2
-	x11-libs/gtksourceview:2.0"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	default_src_install
-
-	doman doc/gnusim8085.1
-
-	if use examples ; then
-		docompress -x /usr/share/doc/${PF}/examples
-		insinto /usr/share/doc/${PF}/examples
-		doins doc/examples/*.asm doc/asm-guide.txt
-	fi
-}
diff --git a/dev-java/sun-javamail/sun-javamail-1.4.3.ebuild b/dev-java/sun-javamail/sun-javamail-1.4.3.ebuild
index d6fe4256713c..41c937ff11fe 100644
--- a/dev-java/sun-javamail/sun-javamail-1.4.3.ebuild
+++ b/dev-java/sun-javamail/sun-javamail-1.4.3.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/dev-java/sun-javamail/sun-javamail-1.4.3.ebuild,v 1.7 2011/10/28 07:19:46 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-javamail/sun-javamail-1.4.3.ebuild,v 1.8 2011/12/07 14:19:41 grobian Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="doc source"
@@ -15,7 +15,7 @@ SRC_URI="http://kenai.com/projects/javamail/downloads/download//javamail-${PV}-s
 # either of these
 LICENSE="CDDL GPL-2 BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 COMMON_DEP="java-virtuals/jaf"
diff --git a/dev-lang/erlang/erlang-13.2.4.ebuild b/dev-lang/erlang/erlang-13.2.4.ebuild
index e9c5ecd63cb3..7ea25652e40b 100644
--- a/dev-lang/erlang/erlang-13.2.4.ebuild
+++ b/dev-lang/erlang/erlang-13.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-13.2.4.ebuild,v 1.13 2010/09/30 19:29:19 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-13.2.4.ebuild,v 1.14 2011/12/07 17:44:39 ulm Exp $
 
 EAPI=3
 WX_GTK_VER="2.8"
@@ -27,7 +27,7 @@ SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz
 	http://erlang.org/download/otp_doc_man_${MY_PV}.tar.gz
 	doc? ( http://erlang.org/download/otp_doc_html_${MY_PV}.tar.gz )"
 
-LICENSE="EPL"
+LICENSE="ErlPL-1.1"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
 IUSE="doc emacs hipe java kpoll odbc smp sctp ssl tk wxwidgets"
diff --git a/dev-lang/erlang/erlang-14.2.2-r1.ebuild b/dev-lang/erlang/erlang-14.2.2-r1.ebuild
index e94ae72b5afb..54b804d76b91 100644
--- a/dev-lang/erlang/erlang-14.2.2-r1.ebuild
+++ b/dev-lang/erlang/erlang-14.2.2-r1.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/dev-lang/erlang/erlang-14.2.2-r1.ebuild,v 1.2 2011/11/30 15:50:14 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-14.2.2-r1.ebuild,v 1.3 2011/12/07 17:44:39 ulm Exp $
 
 EAPI=3
 WX_GTK_VER="2.8"
@@ -27,7 +27,7 @@ SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz
 	http://erlang.org/download/otp_doc_man_${MY_PV}.tar.gz
 	doc? ( http://erlang.org/download/otp_doc_html_${MY_PV}.tar.gz )"
 
-LICENSE="EPL"
+LICENSE="ErlPL-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
 IUSE="doc emacs halfword hipe java kpoll odbc smp sctp ssl tk wxwidgets"
diff --git a/dev-lang/erlang/erlang-14.2.3.ebuild b/dev-lang/erlang/erlang-14.2.3.ebuild
index f8d7ff2c2a8b..737ab9a6e96b 100644
--- a/dev-lang/erlang/erlang-14.2.3.ebuild
+++ b/dev-lang/erlang/erlang-14.2.3.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/dev-lang/erlang/erlang-14.2.3.ebuild,v 1.2 2011/11/30 15:50:14 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-14.2.3.ebuild,v 1.3 2011/12/07 17:44:39 ulm Exp $
 
 EAPI=3
 WX_GTK_VER="2.8"
@@ -27,7 +27,7 @@ SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz
 	http://erlang.org/download/otp_doc_man_${MY_PV}.tar.gz
 	doc? ( http://erlang.org/download/otp_doc_html_${MY_PV}.tar.gz )"
 
-LICENSE="EPL"
+LICENSE="ErlPL-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
 IUSE="doc emacs halfword hipe java kpoll odbc smp sctp ssl tk wxwidgets"
diff --git a/dev-lang/erlang/erlang-14.2.4.ebuild b/dev-lang/erlang/erlang-14.2.4.ebuild
index a535bcc4600c..81a3cf68ef8a 100644
--- a/dev-lang/erlang/erlang-14.2.4.ebuild
+++ b/dev-lang/erlang/erlang-14.2.4.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/dev-lang/erlang/erlang-14.2.4.ebuild,v 1.1 2011/11/30 15:50:14 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-14.2.4.ebuild,v 1.2 2011/12/07 17:44:39 ulm Exp $
 
 EAPI=3
 WX_GTK_VER="2.8"
@@ -27,7 +27,7 @@ SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz
 	http://erlang.org/download/otp_doc_man_${MY_PV}.tar.gz
 	doc? ( http://erlang.org/download/otp_doc_html_${MY_PV}.tar.gz )"
 
-LICENSE="EPL"
+LICENSE="ErlPL-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
 IUSE="doc emacs halfword hipe java kpoll odbc smp sctp ssl tk wxwidgets"
diff --git a/dev-libs/grantlee/grantlee-0.1.8.ebuild b/dev-libs/grantlee/grantlee-0.1.8.ebuild
index 22a3dd78a6bd..a7055324abc8 100644
--- a/dev-libs/grantlee/grantlee-0.1.8.ebuild
+++ b/dev-libs/grantlee/grantlee-0.1.8.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/dev-libs/grantlee/grantlee-0.1.8.ebuild,v 1.3 2011/11/05 19:32:07 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/grantlee/grantlee-0.1.8.ebuild,v 1.5 2011/12/07 22:06:52 hwoarang Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gitorious.org/grantlee/pages/Home"
 SRC_URI="http://www.loegria.net/grantlee/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 SLOT="0"
 IUSE="debug doc test"
 
diff --git a/dev-libs/libaio/files/libaio-0.3.109-x32.patch b/dev-libs/libaio/files/libaio-0.3.109-x32.patch
new file mode 100644
index 000000000000..1d2c2a9050fa
--- /dev/null
+++ b/dev-libs/libaio/files/libaio-0.3.109-x32.patch
@@ -0,0 +1,63 @@
+http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=f5c071d93c9e6f57930bce56b1e4f009c160a826
+
+Upstream-Status: Pending
+
+Properly load arguments 5 an 6 for x86-64 syscall
+Use asm ("r10") and asm ("r8") to load arguments 5 an 6 for x86-64
+syscall so that it works with both x32 and x86-64.
+
+Received this patch from H.J. Lu <hjl.tools@gmail.com>
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+2011/12/02
+
+--- libaio-0.3.109/src/syscall-x86_64.h.x32	2009-10-09 11:17:02.000000000 -0700
++++ libaio-0.3.109/src/syscall-x86_64.h	2011-12-02 09:09:07.537603224 -0800
+@@ -1,8 +1,18 @@
++#ifndef __NR_io_setup
+ #define __NR_io_setup		206
++#endif
++#ifndef __NR_io_destroy
+ #define __NR_io_destroy		207
++#endif
++#ifndef __NR_io_getevents
+ #define __NR_io_getevents	208
++#endif
++#ifndef __NR_io_submit
+ #define __NR_io_submit		209
++#endif
++#ifndef __NR_io_cancel
+ #define __NR_io_cancel		210
++#endif
+ 
+ #define __syscall_clobber "r11","rcx","memory" 
+ #define __syscall "syscall"
+@@ -42,10 +52,11 @@ return __res;								\
+ type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4)		\
+ {									\
+ long __res;								\
+-__asm__ volatile ("movq %5,%%r10 ;" __syscall				\
++register long __a4 asm ("r10") = (long) arg4;				\
++__asm__ volatile (__syscall						\
+ 	: "=a" (__res)							\
+ 	: "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)),	\
+-	  "d" ((long)(arg3)),"g" ((long)(arg4)) : __syscall_clobber,"r10" ); \
++	  "d" ((long)(arg3)),"r" (__a4)); \
+ return __res;								\
+ } 
+ 
+@@ -54,10 +65,11 @@ return __res;								\
+ type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5)	\
+ {									\
+ long __res;								\
+-__asm__ volatile ("movq %5,%%r10 ; movq %6,%%r8 ; " __syscall		\
++register long __a4 asm ("r10") = (long) arg4;				\
++register long __a5 asm ("r8") = (long) arg5;				\
++__asm__ volatile ( __syscall						\
+ 	: "=a" (__res)							\
+ 	: "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)),	\
+-	  "d" ((long)(arg3)),"g" ((long)(arg4)),"g" ((long)(arg5)) :	\
+-	__syscall_clobber,"r8","r10" );					\
++	  "d" ((long)(arg3)),"r" (__a4),"r" (__a5));			\
+ return __res;								\
+ }
diff --git a/dev-libs/libaio/libaio-0.3.109-r2.ebuild b/dev-libs/libaio/libaio-0.3.109-r2.ebuild
index a30499a4f962..b210dceb3fdd 100644
--- a/dev-libs/libaio/libaio-0.3.109-r2.ebuild
+++ b/dev-libs/libaio/libaio-0.3.109-r2.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/dev-libs/libaio/libaio-0.3.109-r2.ebuild,v 1.8 2011/10/03 16:55:29 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/libaio-0.3.109-r2.ebuild,v 1.9 2011/12/07 15:45:57 vapier Exp $
 
 EAPI="3"
 
@@ -23,6 +23,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.3.106-build.patch
 	epatch "${FILESDIR}"/${PN}-0.3.107-ar-ranlib.patch
 	epatch "${FILESDIR}"/${PN}-0.3.109-install.patch
+	epatch "${FILESDIR}"/${PN}-0.3.109-x32.patch
 	sed -i \
 		-e "/^libdir=/s:lib$:$(get_libdir):" \
 		-e "/^prefix=/s:/usr:${EPREFIX}/usr:" \
diff --git a/dev-libs/openssl/files/gentoo.config-1.0.0 b/dev-libs/openssl/files/gentoo.config-1.0.0
index 61cf89d84c1a..73f3a8839e2c 100755
--- a/dev-libs/openssl/files/gentoo.config-1.0.0
+++ b/dev-libs/openssl/files/gentoo.config-1.0.0
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/files/gentoo.config-1.0.0,v 1.3 2011/07/12 04:10:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/files/gentoo.config-1.0.0,v 1.4 2011/12/07 16:03:05 vapier Exp $
 #
 # Openssl doesn't play along nicely with cross-compiling 
 # like autotools based projects, so let's teach it new tricks.
@@ -79,7 +79,7 @@ machine=""
 chost_machine=${CHOST%%-*}
 case ${system} in
 linux)
-	case ${chost_machine} in
+	case ${chost_machine}:${ABI} in
 		alphaev56*)   machine=alpha+bwx-${compiler};;
 		alphaev[678]*)machine=alpha+bwx-${compiler};;
 		alpha*)       machine=alpha-${compiler};;
@@ -91,7 +91,8 @@ linux)
 		bfin*)        machine="generic32 -DL_ENDIAN";;
 	#	hppa64*)      machine=parisc64;;
 		hppa*)        machine="generic32 -DB_ENDIAN";;
-		i[0-9]86*)    machine=elf;;
+		i[0-9]86*|\
+		x86_64*:x86)  machine=elf;;
 		ia64*)        machine=ia64;;
 		m68*)         machine="generic32 -DB_ENDIAN";;
 		mips*el*)     machine="generic32 -DL_ENDIAN";;
@@ -106,6 +107,7 @@ linux)
 		sparc*)       machine=sparcv8;;
 		s390x*)       machine=s390x;;
 		s390*)        machine="generic32 -DB_ENDIAN";;
+		x86_64*:x32)  machine=x32;;
 		x86_64*)      machine=x86_64;;
 	esac
 	;;
diff --git a/dev-libs/openssl/files/openssl-1.0.0e-x32.patch b/dev-libs/openssl/files/openssl-1.0.0e-x32.patch
new file mode 100644
index 000000000000..d73a050ec928
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.0.0e-x32.patch
@@ -0,0 +1,92 @@
+http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=51bfed2e26fc13a66e8b5710aa2ce1d7a04af721
+
+UpstreamStatus: Pending
+
+Received from H J Liu @ Intel
+Make the assembly syntax compatible with x32 gcc. Othewise x32 gcc throws errors.
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/07/13
+
+ported the patch to the 1.0.0e version
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/01
+Index: openssl-1.0.0e/Configure
+===================================================================
+--- openssl-1.0.0e.orig/Configure
++++ openssl-1.0.0e/Configure
+@@ -393,6 +393,7 @@ my %table=(
+ "linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-x86_64",	"gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
++"linux-x32",	"gcc:-DL_ENDIAN 	-DTERMIO -O2 -pipe -g -feliminate-unused-debug-types -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-s390x",	"gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+ #### SPARC Linux setups
+ # Ray Miller <ray.miller@computing-services.oxford.ac.uk> has patiently
+Index: openssl-1.0.0e/crypto/bn/asm/x86_64-gcc.c
+===================================================================
+--- openssl-1.0.0e.orig/crypto/bn/asm/x86_64-gcc.c
++++ openssl-1.0.0e/crypto/bn/asm/x86_64-gcc.c
+@@ -55,7 +55,7 @@
+  *    machine.
+  */
+ 
+-#ifdef _WIN64
++#if defined _WIN64 || !defined __LP64__
+ #define BN_ULONG unsigned long long
+ #else
+ #define BN_ULONG unsigned long
+@@ -192,9 +192,9 @@ BN_ULONG bn_add_words (BN_ULONG *rp, con
+ 	asm (
+ 	"	subq	%2,%2		\n"
+ 	".p2align 4			\n"
+-	"1:	movq	(%4,%2,8),%0	\n"
+-	"	adcq	(%5,%2,8),%0	\n"
+-	"	movq	%0,(%3,%2,8)	\n"
++	"1:	movq	(%q4,%2,8),%0	\n"
++	"	adcq	(%q5,%2,8),%0	\n"
++	"	movq	%0,(%q3,%2,8)	\n"
+ 	"	leaq	1(%2),%2	\n"
+ 	"	loop	1b		\n"
+ 	"	sbbq	%0,%0		\n"
+@@ -215,9 +215,9 @@ BN_ULONG bn_sub_words (BN_ULONG *rp, con
+ 	asm (
+ 	"	subq	%2,%2		\n"
+ 	".p2align 4			\n"
+-	"1:	movq	(%4,%2,8),%0	\n"
+-	"	sbbq	(%5,%2,8),%0	\n"
+-	"	movq	%0,(%3,%2,8)	\n"
++	"1:	movq	(%q4,%2,8),%0	\n"
++	"	sbbq	(%q5,%2,8),%0	\n"
++	"	movq	%0,(%q3,%2,8)	\n"
+ 	"	leaq	1(%2),%2	\n"
+ 	"	loop	1b		\n"
+ 	"	sbbq	%0,%0		\n"
+Index: openssl-1.0.0e/crypto/bn/bn.h
+===================================================================
+--- openssl-1.0.0e.orig/crypto/bn/bn.h
++++ openssl-1.0.0e/crypto/bn/bn.h
+@@ -172,6 +172,13 @@ extern "C" {
+ # endif
+ #endif
+ 
++/* Address type.  */
++#ifdef _WIN64
++#define BN_ADDR unsigned long long
++#else
++#define BN_ADDR unsigned long
++#endif
++
+ /* assuming long is 64bit - this is the DEC Alpha
+  * unsigned long long is only 64 bits :-(, don't define
+  * BN_LLONG for the DEC Alpha */
+Index: openssl-1.0.0e/crypto/bn/bn_exp.c
+===================================================================
+--- openssl-1.0.0e.orig/crypto/bn/bn_exp.c
++++ openssl-1.0.0e/crypto/bn/bn_exp.c
+@@ -561,7 +561,7 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBU
+ 
+ /* Given a pointer value, compute the next address that is a cache line multiple. */
+ #define MOD_EXP_CTIME_ALIGN(x_) \
+-	((unsigned char*)(x_) + (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - (((BN_ULONG)(x_)) & (MOD_EXP_CTIME_MIN_CACHE_LINE_MASK))))
++	((unsigned char*)(x_) + (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - (((BN_ADDR)(x_)) & (MOD_EXP_CTIME_MIN_CACHE_LINE_MASK))))
+ 
+ /* This variant of BN_mod_exp_mont() uses fixed windows and the special
+  * precomputation memory layout to limit data-dependency to a minimum
diff --git a/dev-libs/openssl/openssl-1.0.0e-r1.ebuild b/dev-libs/openssl/openssl-1.0.0e-r1.ebuild
index 3eec44518f1f..823764bbcc6e 100644
--- a/dev-libs/openssl/openssl-1.0.0e-r1.ebuild
+++ b/dev-libs/openssl/openssl-1.0.0e-r1.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/dev-libs/openssl/openssl-1.0.0e-r1.ebuild,v 1.1 2011/12/01 05:35:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0e-r1.ebuild,v 1.2 2011/12/07 16:03:05 vapier Exp $
 
 EAPI="2"
 
@@ -45,6 +45,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743
 	epatch "${FILESDIR}"/${PN}-1.0.0e-pkg-config.patch
 	epatch "${FILESDIR}"/${PN}-1.0.0e-parallel-build.patch
+	epatch "${FILESDIR}"/${PN}-1.0.0e-x32.patch
 	epatch_user #332661
 
 	# disable fips in the build
diff --git a/dev-libs/qjson/qjson-0.7.1-r1.ebuild b/dev-libs/qjson/qjson-0.7.1-r1.ebuild
index 2fd07efc13e3..3c1a60925c5e 100644
--- a/dev-libs/qjson/qjson-0.7.1-r1.ebuild
+++ b/dev-libs/qjson/qjson-0.7.1-r1.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/dev-libs/qjson/qjson-0.7.1-r1.ebuild,v 1.4 2011/06/26 01:54:23 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qjson/qjson-0.7.1-r1.ebuild,v 1.6 2011/12/07 22:07:06 hwoarang Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="debug doc test"
 
 RDEPEND="x11-libs/qt-core:4"
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index d46572ae4c71..32930db92f31 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,2 +1 @@
-DIST serd-0.4.2.tar.bz2 278652 RMD160 c15d63682774f6c586032229ec77daea2daeff99 SHA1 5cbbf65012061fd02903773006c91c2bff3e0429 SHA256 97d8dcb1b81461985765194471e3beb17f00fdcd774af4bddd4ffab5dcf0002f
 DIST serd-0.5.0.tar.bz2 281802 RMD160 94dd990e9ac7a513b2dfa153753e2e3687e2f774 SHA1 2451de7d2a1f6bfbc90806a88b989ab4680da6bd SHA256 2b25033bca2ce903e3c901e5c2ceb500eebb1a56ca68a1018ec623aaeb7df8d0
diff --git a/dev-libs/serd/serd-0.4.2.ebuild b/dev-libs/serd/serd-0.4.2.ebuild
deleted file mode 100644
index c72ff4d4ad15..000000000000
--- a/dev-libs/serd/serd-0.4.2.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/dev-libs/serd/serd-0.4.2.ebuild,v 1.3 2011/05/27 05:46:02 aballier Exp $
-
-EAPI=3
-
-inherit base multilib toolchain-funcs
-
-DESCRIPTION="Library for RDF syntax which supports reading and writing Turtle and NTriples"
-HOMEPAGE="http://drobilla.net/software/serd/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-PATCHES=( "${FILESDIR}/ldconfig.patch" )
-
-src_configure() {
-	tc-export CC CXX CPP AR RANLIB
-	./waf configure \
-		--prefix=/usr \
-		--libdir="/usr/$(get_libdir)" \
-		--mandir=/usr/share/man \
-		--docdir=/usr/share/doc/${PF} \
-		$(use test && echo "--test") \
-		$(use doc && echo "--docs") \
-		|| die
-}
-
-src_compile() {
-	./waf || die
-}
-
-src_test() {
-	./waf test || die
-}
-
-src_install() {
-	./waf install --destdir="${D}" || die
-	dodoc AUTHORS README ChangeLog || die
-}
diff --git a/dev-libs/shared-desktop-ontologies/shared-desktop-ontologies-0.7.0.ebuild b/dev-libs/shared-desktop-ontologies/shared-desktop-ontologies-0.7.0.ebuild
index 99b7ea528e8d..4c43ae9bc65a 100644
--- a/dev-libs/shared-desktop-ontologies/shared-desktop-ontologies-0.7.0.ebuild
+++ b/dev-libs/shared-desktop-ontologies/shared-desktop-ontologies-0.7.0.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/dev-libs/shared-desktop-ontologies/shared-desktop-ontologies-0.7.0.ebuild,v 1.1 2011/07/27 13:39:30 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/shared-desktop-ontologies/shared-desktop-ontologies-0.7.0.ebuild,v 1.3 2011/12/07 22:08:05 hwoarang Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ DESCRIPTION="Shared OSCAF desktop ontologies"
 HOMEPAGE="http://sourceforge.net/projects/oscaf"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI="mirror://sourceforge/oscaf/${PN}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="|| ( BSD CCPL-Attribution-ShareAlike-3.0 )"
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index c15cd83ec47a..e9fc6fb798e2 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,2 +1 @@
-DIST sord-0.4.2.tar.bz2 271741 RMD160 3129486557763868e353a0c26c50a69a793a3b56 SHA1 961581f1b0592a7ad11ae664ca72a47940b009e4 SHA256 f0de2b6fe1a322e51f74f4957e2ba36165bde993891e9646aec2b063c8b5c0db
 DIST sord-0.5.0.tar.bz2 279917 RMD160 d1326a6571be032f8974e8457f889758ec87d567 SHA1 658ca68615218210dea519e3049c2b781cc53d4d SHA256 0f18879ed9d5c4d056cddb5af9057090d1de874d3f3996386cf716d8060625ef
diff --git a/dev-libs/sord/sord-0.4.2.ebuild b/dev-libs/sord/sord-0.4.2.ebuild
deleted file mode 100644
index 95eb62b74878..000000000000
--- a/dev-libs/sord/sord-0.4.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/sord/sord-0.4.2.ebuild,v 1.2 2011/05/27 05:48:46 aballier Exp $
-
-EAPI=3
-
-inherit base multilib toolchain-funcs
-
-DESCRIPTION="Library for storing RDF data in memory"
-HOMEPAGE="http://drobilla.net/software/sord/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/serd"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-util/pkgconfig"
-
-PATCHES=( "${FILESDIR}/ldconfig.patch" )
-
-src_configure() {
-	tc-export CC CXX CPP AR RANLIB
-	./waf configure \
-		--prefix=/usr \
-		--libdir="/usr/$(get_libdir)" \
-		--mandir=/usr/share/man \
-		--docdir=/usr/share/doc/${PF} \
-		$(use test && echo "--test") \
-		$(use doc && echo "--docs") \
-		|| die
-}
-
-src_compile() {
-	./waf || die
-}
-
-src_test() {
-	./waf test || die
-}
-
-src_install() {
-	./waf install --destdir="${D}" || die
-	dodoc AUTHORS README ChangeLog || die
-}
diff --git a/dev-ml/pcre-ocaml/Manifest b/dev-ml/pcre-ocaml/Manifest
index e7e9fbefae8c..f063c0a3d269 100644
--- a/dev-ml/pcre-ocaml/Manifest
+++ b/dev-ml/pcre-ocaml/Manifest
@@ -1,2 +1,3 @@
 DIST pcre-ocaml-6.1.1.tar.gz 60146 RMD160 6895b512490e48d3a0fbdae0a0504320aa8b372f SHA1 1ba1f9c0f5f0151caafdeb522a856e15c85dff30 SHA256 9c92c9db9a6a1b231e09d0ba75a59351204a47485cfff48c9bf0418f30181528
 DIST pcre-ocaml-6.2.2.tar.gz 60382 RMD160 836c495d291b7ca85f2c62f93ef78f08d54de310 SHA1 4d1844efbf1d20fb11a47b9b965b35176b40ebc7 SHA256 a0219044b20acb6f1c15ebf438cc780d814b72480c2d78511eadf6140ee8791a
+DIST pcre-ocaml-6.2.3.tar.gz 60490 RMD160 293a46988d2b5c43b678edd40cf5b4dce480fc69 SHA1 baa7659687daab09330b22561bfcc2f8fbefca4b SHA256 5c5f1648ae0135f52df1dc45b49588079b548e84d5937334d6291c121f66af36
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-6.2.3.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-6.2.3.ebuild
new file mode 100644
index 000000000000..ba1f0ef252a3
--- /dev/null
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-6.2.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pcre-ocaml/pcre-ocaml-6.2.3.ebuild,v 1.1 2011/12/07 13:20:42 aballier Exp $
+
+EAPI="2"
+
+inherit findlib eutils
+
+DESCRIPTION="Perl Compatibility Regular Expressions for O'Caml"
+HOMEPAGE="http://www.ocaml.info/home/ocaml_sources.html"
+SRC_URI="http://www.ocaml.info/ocaml_sources/${P}.tar.gz"
+LICENSE="LGPL-2.1"
+
+RDEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]
+	>=dev-libs/libpcre-4.5"
+DEPEND="${RDEPEND}"
+SLOT="0"
+IUSE="examples +ocamlopt"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-6.0.1-linkopts.patch"
+}
+
+src_compile() {
+	cd "${S}/lib"
+	emake byte-code-library || die "Failed to build byte code library"
+	if use ocamlopt; then
+		emake native-code-library || die "Failed to build native code library"
+	fi
+}
+
+src_install () {
+	export OCAMLFIND_INSTFLAGS="-optional"
+	findlib_src_install
+
+	# install documentation
+	dodoc README.txt Changelog
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/eyeD3/Manifest b/dev-python/eyeD3/Manifest
index 106121e50f31..0de6a93463e1 100644
--- a/dev-python/eyeD3/Manifest
+++ b/dev-python/eyeD3/Manifest
@@ -1 +1,2 @@
 DIST eyeD3-0.6.17.tar.gz 111425 RMD160 32891c885f175e7f2da1201359d73309366930e9 SHA1 a607ce4355f395ef137c265f8dad60ac67ba4e47 SHA256 a1f3410ee1803e4aaf6526cf5cca6a863990af02a43abb2cfbbd50595e103f3f
+DIST eyeD3-0.6.18.tar.gz 117002 RMD160 da94054d67d124f560d8fad2caaca88b4b71a408 SHA1 d8887f7b75306bd293e0b0d46a977e73225ae7b5 SHA256 ad871e252473f1db81b2574ae3a7d3e14128e28de0b54998b4ce1d62dc207406
diff --git a/dev-python/eyeD3/eyeD3-0.6.18.ebuild b/dev-python/eyeD3/eyeD3-0.6.18.ebuild
new file mode 100644
index 000000000000..dc9b8e312ae9
--- /dev/null
+++ b/dev-python/eyeD3/eyeD3-0.6.18.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/eyeD3/eyeD3-0.6.18.ebuild,v 1.1 2011/12/07 13:54:34 aballier Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils
+
+DESCRIPTION="Module for manipulating ID3 (v1 + v2) tags in Python"
+HOMEPAGE="http://eyed3.nicfit.net/"
+SRC_URI="http://eyed3.nicfit.net/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+RESTRICT_PYTHON_ABIS="2.4 3.*"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_configure() {
+	python_execute_function -d -f -q
+}
+
+src_install() {
+	dohtml *.html && rm -f *.html
+	distutils_src_install
+
+	install_script() {
+		mkdir -p "${T}/images/${PYTHON_ABI}${EPREFIX}/usr/bin"
+		cp bin/eyeD3 "${T}/images/${PYTHON_ABI}${EPREFIX}/usr/bin"
+	}
+	python_execute_function -q install_script
+	python_merge_intermediate_installation_images "${T}/images"
+
+	doman doc/*.1
+}
diff --git a/dev-ruby/slop/Manifest b/dev-ruby/slop/Manifest
index db4e0f623abe..bc4ef7778640 100644
--- a/dev-ruby/slop/Manifest
+++ b/dev-ruby/slop/Manifest
@@ -1 +1,2 @@
 DIST slop-2.1.0.tgz 18958 RMD160 d7822d9c7e3bcc960aca9fd634b85ff6467c03a5 SHA1 868aa749762583aab917d1c6e820e715538014d7 SHA256 fba2b5389b308a14fab6188088f1822e2ceb78bfd1dfcd83acf85d1e3c3b9267
+DIST slop-2.4.0.tgz 20067 RMD160 7902eabad16e9dbae969b4c74021d1578b2cdb28 SHA1 a53ee92426488b8b1059a10f54b8a9681449e42d SHA256 9b49196664699bc1e9dc7090c9c0d20f2e16270cc7e83af6577b949f78b336f8
diff --git a/dev-ruby/slop/slop-2.4.0.ebuild b/dev-ruby/slop/slop-2.4.0.ebuild
new file mode 100644
index 000000000000..87c063f07f6b
--- /dev/null
+++ b/dev-ruby/slop/slop-2.4.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/slop/slop-2.4.0.ebuild,v 1.1 2011/12/07 17:30:05 graaff Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19 ree18 jruby"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple option parser with an easy to remember syntax and friendly API."
+HOMEPAGE="https://github.com/injekt/slop"
+SRC_URI="https://github.com/injekt/slop/tarball/v${PV} -> ${P}.tgz"
+RUBY_S="injekt-slop-*"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/yard/Manifest b/dev-ruby/yard/Manifest
index 46e295fe6d12..079b28958360 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -2,3 +2,4 @@ DIST yard-0.6.8.gem 662528 RMD160 100c2a9e5a3a9ebd29e856bdfcb54b260b2656b9 SHA1
 DIST yard-0.7.1.gem 705024 RMD160 5791006a3f8edf1011af9c77c4412c0e5e9288d7 SHA1 21c4cb8ab189457d32ae90a056883f0c95aa1c20 SHA256 3022f5177b7c25871168a953480ef3ff8cc7cc8c0e7ab709d751aeac941fa653
 DIST yard-0.7.2.gem 709120 RMD160 7d4e574df5e27eb27b96587cd55a2caa56dcf80b SHA1 ff2dfd4d957ff5763d3b551c7c8f147265f68bfd SHA256 b81010493f88bc5c1d516fd2f9e4651a558eb3a398dd37465802056b9c280a01
 DIST yard-0.7.3.gem 713216 RMD160 56d32b024188c510201cdc48430f238ac22cf6e9 SHA1 70a5fb1fecacc4d2106598ccfe55f89c0426c258 SHA256 ddf63b320e70087048ee8df2f330f223b76fc822e1cb42ed849a85897fdcd538
+DIST yard-0.7.4.gem 716288 RMD160 83a920fa062e8def3bfbae39d861f34ffac985b2 SHA1 14921e576390c9e46a7b53da08c0ae6be1a3d1ea SHA256 9fa4b205990011a0844493af13aa48db527b02c6e43d3fca1f86c8826bf78e5c
diff --git a/dev-ruby/yard/yard-0.7.4.ebuild b/dev-ruby/yard/yard-0.7.4.ebuild
new file mode 100644
index 000000000000..6ab6f72d38f1
--- /dev/null
+++ b/dev-ruby/yard/yard-0.7.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/yard/yard-0.7.4.ebuild,v 1.1 2011/12/07 10:36:35 graaff Exp $
+
+EAPI=2
+
+USE_RUBY="ruby18 ree18 jruby"
+
+RUBY_FAKEGEM_TASK_TEST="specs"
+RUBY_FAKEGEM_TASK_DOC="yard"
+
+RUBY_FAKEGEM_EXTRADOC="README.md ChangeLog"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="templates"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Documentation generation tool for the Ruby programming language"
+HOMEPAGE="http://yardoc.org/"
+
+LICENSE="as-is" # truly
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "doc? ( || ( dev-ruby/bluecloth dev-ruby/maruku dev-ruby/rdiscount dev-ruby/kramdown ) )"
+ruby_add_bdepend "test? ( dev-ruby/rspec:2 )"
+
+all_ruby_prepare() {
+	# jruby crashes on this version of metadata, so install our stub.
+	rm ../metadata || die
+}
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*jruby)
+			# This spec requires rdiscount which is a C extension.
+			sed -i -e '145s/should/should_not/' spec/templates/helpers/html_helper_spec.rb || die
+			;;
+		*)
+			;;
+	esac
+}
diff --git a/dev-scheme/chicken/Manifest b/dev-scheme/chicken/Manifest
index faeae7cc3ac8..b665f5b5518c 100644
--- a/dev-scheme/chicken/Manifest
+++ b/dev-scheme/chicken/Manifest
@@ -1,3 +1,4 @@
 DIST chicken-3.3.0.tar.gz 4228441 RMD160 74035304164d5c8c2f2ed7571662452df86725f2 SHA1 3af69007f664ccdef988863f1c6ac24405c5500c SHA256 5ce2519bac9956de5700a5777b2bbc2cd89202ef2d2252a40a0d1e8c9854bec6
 DIST chicken-4.5.0.tar.gz 2914920 RMD160 03d511d4a78add4fb3505a3c8eea5594fe9bb705 SHA1 67c1d791b59dc77fe5f41f19dc70fa2d5b86e4c3 SHA256 95919725411268614022ffc2426c826290cbebb6d574c1f2ebcaee5ac3ef9fd9
 DIST chicken-4.6.0.tar.gz 3019126 RMD160 f279b39b8294496a6e22b39b56d3fcf108d55405 SHA1 a801383786908022223c32337fb1c5814e6c26a5 SHA256 c55d1dadf9941b3efbc7be9181d5c7cbc304a20c614625fbf710c0acaa1cd245
+DIST chicken-4.7.3.tar.gz 3316152 RMD160 150cdd093e3a375db99f83a90ee1305c70f8f88c SHA1 47b139f8c4c6fa10af891ce36db24744973321c3 SHA256 00c82bc2208d74463a69356d2a30a3771f87048ea87fb9c024d464b3c9d4e230
diff --git a/dev-scheme/chicken/chicken-4.7.3.ebuild b/dev-scheme/chicken/chicken-4.7.3.ebuild
new file mode 100644
index 000000000000..0e5c7551b3e3
--- /dev/null
+++ b/dev-scheme/chicken/chicken-4.7.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/chicken-4.7.3.ebuild,v 1.1 2011/12/07 19:31:03 maksbotan Exp $
+
+EAPI="3"
+
+inherit eutils multilib
+
+DESCRIPTION="Chicken is a Scheme interpreter and native Scheme to C compiler"
+HOMEPAGE="http://www.call-cc.org/"
+SRC_URI="http://code.call-cc.org/dev-snapshots/2011/08/17/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="emacs parallel-build"
+
+DEPEND="sys-apps/texinfo
+		emacs? ( virtual/emacs )"
+RDEPEND="emacs? ( virtual/emacs app-emacs/scheme-complete )"
+
+src_prepare() {
+	if use "parallel-build"
+	then
+		epatch "${FILESDIR}"/${P}-parallel-build.patch
+	fi
+
+	#Because chicken's Upstream is in the habit of using variables that
+	#portage also uses :( eg. $ARCH in this case
+	for f in defaults.make Makefile.bsd Makefile.cross-linux-mingw Makefile.cygwin \
+		Makefile.linux Makefile.macosx Makefile.mingw-msys Makefile.solaris \
+		rules.make
+		do
+			sed "s,ARCH,zARCH," -i ${f} || die "sed failed"
+		done
+
+	sed "s,\$(PREFIX)/lib,\$(PREFIX)/$(get_libdir)," -i defaults.make || die "sed failed"
+	sed "s,\$(DATADIR)/doc,\$(SHAREDIR)/doc/${P}," -i defaults.make || die "sed failed"
+}
+
+src_compile() {
+	OPTIONS="PLATFORM=linux PREFIX=/usr"
+	if use "parallel-build"
+	then
+		ewarn "You enabled parralel-build use flag. This future is still"
+		ewarn "in testing, try without it before filing bugs"
+		emake ${OPTIONS} C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" \
+			HOSTSYSTEM="${CBUILD}" || die "emake failed"
+	else
+		emake -j1 ${OPTIONS} C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" \
+			HOSTSYSTEM="${CBUILD}" || die "emake failed"
+	fi
+}
+
+# chicken's testsuite is not runnable before install
+# upstream has been notified of the issue
+RESTRICT=test
+
+src_install() {
+	# still can't run make in parallel for the install target
+	emake -j1 ${OPTIONS} DESTDIR="${D}" HOSTSYSTEM="${CBUILD}" install || die
+
+	rm "${D}"/usr/share/doc/${P}/LICENSE || die
+	dodoc NEWS || die
+}
diff --git a/dev-scheme/chicken/files/chicken-4.7.3-parallel-build.patch b/dev-scheme/chicken/files/chicken-4.7.3-parallel-build.patch
new file mode 100644
index 000000000000..6d9628701481
--- /dev/null
+++ b/dev-scheme/chicken/files/chicken-4.7.3-parallel-build.patch
@@ -0,0 +1,74 @@
+diff --git a/GNUmakefile b/GNUmakefile
+index 9bc40ca..c697f14 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -49,6 +49,9 @@ STANDARD_TARGETS \
+ 	  fullcheck libs install-target install-dev bench
+ 
+ .PHONY: $(STANDARD_TARGETS) dist boot-chicken
++# Build this file's targets sequentially.  This avoids executing overlapping
++# makes if the user specifies multiple targets.
++.NOTPARALLEL:
+ 
+ $(STANDARD_TARGETS):
+ 	$(MAKE) -f $(SRCDIR)/Makefile.$(PLATFORM) CONFIG=$(CONFIG) $@
+diff --git a/README b/README
+index 8d0d067..551b716 100644
+--- a/README
++++ b/README
+@@ -72,7 +72,7 @@
+         platforms.
+ 
+ 	Note that parallel builds (using the "-j" make(1) option) are
+-	*not* supported.
++	also supported. Beware that parallel install will not work though.
+ 
+         If you invoke "make" later with different configuration parameters,
+         it is advisable to run:
+diff --git a/rules.make b/rules.make
+index 929b0a3..a8cb9b0 100644
+--- a/rules.make
++++ b/rules.make
+@@ -243,8 +243,8 @@ lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(A): $(APPLY_HACK_OBJECT) $(LIBCHIC
+ 
+ # import libraries and extensions
+ 
+-%.so: %.o
+-	$(LINKER) $(LINKER_OPTIONS) $(LINKER_LINK_SHARED_DLOADABLE_OPTIONS) $^ $(LINKER_OUTPUT_OPTION) $@ \
++%.so: %.o $(PRIMARY_LIBCHICKEN)
++	$(LINKER) $(LINKER_OPTIONS) $(LINKER_LINK_SHARED_DLOADABLE_OPTIONS) $< $(LINKER_OUTPUT_OPTION) $@ \
+ 	  $(LINKER_LIBRARY_PREFIX)$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(LINKER_LIBRARY_SUFFIX) \
+ 	  $(LIBRARIES)
+ 
+@@ -578,9 +578,9 @@ chicken-profile.c: $(SRCDIR)chicken-profile.scm
+ 	$(CHICKEN) $< $(CHICKEN_PROGRAM_OPTIONS) -output-file $@ 
+ chicken-install.c: $(SRCDIR)chicken-install.scm setup-download.c setup-api.c
+ 	$(CHICKEN) $< $(CHICKEN_PROGRAM_OPTIONS) -output-file $@ 
+-chicken-uninstall.c: $(SRCDIR)chicken-uninstall.scm
++chicken-uninstall.c: $(SRCDIR)chicken-uninstall.scm setup-api.c
+ 	$(CHICKEN) $< $(CHICKEN_PROGRAM_OPTIONS) -output-file $@ 
+-chicken-status.c: $(SRCDIR)chicken-status.scm
++chicken-status.c: $(SRCDIR)chicken-status.scm setup-api.c
+ 	$(CHICKEN) $< $(CHICKEN_PROGRAM_OPTIONS) -output-file $@ 
+ csc.c: $(SRCDIR)csc.scm
+ 	$(CHICKEN) $< $(CHICKEN_PROGRAM_OPTIONS) -output-file $@ 
+@@ -671,14 +671,17 @@ bench: $(CHICKEN_SHARED_EXECUTABLE) $(CSI_SHARED_EXECUTABLE) $(CSC_PROGRAM)$(EXE
+ .PHONY: boot-chicken
+ 
+ boot-chicken:
++	$(MAKE) -f Makefile.$(PLATFORM) PLATFORM=$(PLATFORM) CONFIG= confclean
+ 	$(MAKE) -f Makefile.$(PLATFORM) PLATFORM=$(PLATFORM) PREFIX=/nowhere CONFIG= \
+ 	  SRCDIR=$(SRCDIR) CHICKEN=$(CHICKEN) PROGRAM_SUFFIX=-boot-stage1 STATICBUILD=1 \
+ 	  C_COMPILER_OPTIMIZATION_OPTIONS= C_HACKED_APPLY= \
+-	  confclean chicken-boot-stage1$(EXE)
++	  chicken-boot-stage1$(EXE)
++	$(MAKE) -f Makefile.$(PLATFORM) PLATFORM=$(PLATFORM) CONFIG= touchfiles
+ 	$(MAKE) -f Makefile.$(PLATFORM) PLATFORM=$(PLATFORM) PREFIX=/nowhere CONFIG= \
+ 	  SRCDIR=$(SRCDIR) CHICKEN=`pwd`/chicken-boot-stage1$(EXE) PROGRAM_SUFFIX=-boot \
+ 	  STATICBUILD=1 C_COMPILER_OPTIMIZATION_OPTIONS= \
+-	  touchfiles chicken-boot$(EXE) confclean
++	  chicken-boot$(EXE)
++	$(MAKE) -f Makefile.$(PLATFORM) PLATFORM=$(PLATFORM) CONFIG= confclean
+ 
+ .PHONY: touchfiles
+ 
diff --git a/dev-scheme/chicken/metadata.xml b/dev-scheme/chicken/metadata.xml
index b3cd8071226f..cc5af33bd39b 100644
--- a/dev-scheme/chicken/metadata.xml
+++ b/dev-scheme/chicken/metadata.xml
@@ -2,6 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>scheme</herd>
+<herd>proxy-maintainers</herd>
+<maintainer>
+	<email>ewfalor@gmail.com</email>
+	<name>Erik Falor</name>
+</maintainer>
+<maintainer>
+	<email>maksbotan@gentoo.org</email>
+	<name>Maxim Koltsov</name>
+</maintainer>
 <longdescription>
 CHICKEN is a compiler for the Scheme programming language. CHICKEN produces
 portable, efficient C, supports almost all of the current Scheme language
@@ -9,4 +18,8 @@ standard, the Revised5 Report on the Algorithmic Language Scheme (R5RS ), and
 includes many enhancements and extensions. CHICKEN runs on MacOS X, Windows, and
 many Unix flavours.
 </longdescription>
+<use>
+	<flag name="parallel-build">Enable testing parallel build mode added in 
+		4.7.3 version. Can still be not working</flag>
+</use>
 </pkgmetadata>
diff --git a/dev-util/bdelta/Manifest b/dev-util/bdelta/Manifest
index b75ae89ad495..6dfd2824c715 100644
--- a/dev-util/bdelta/Manifest
+++ b/dev-util/bdelta/Manifest
@@ -1 +1,2 @@
 DIST bdelta-0.1.0.tar.gz 7418 RMD160 5bc144bc8b40a667de4fe44611585f6241e38b79 SHA1 93ffce7de26deeaaa10a4c113101d874501f6767 SHA256 7222011d8e3d2955f1ed094a0cc3edde6c681dd82bad5edb829ed68df32cd78d
+DIST bdelta-0.2.3.tar.gz 11591 RMD160 e9e2a95601a5a9de0ca2bdb05929f767a2bc0cad SHA1 8b1bebf8c66e5a68eb0b3640df69a2fce3895a4f SHA256 331441bba7288399889e0e2d49fd469b7681b94b76682ef89dba867de4535073
diff --git a/dev-util/bdelta/bdelta-0.2.3.ebuild b/dev-util/bdelta/bdelta-0.2.3.ebuild
new file mode 100644
index 000000000000..e7b363d95eff
--- /dev/null
+++ b/dev-util/bdelta/bdelta-0.2.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bdelta/bdelta-0.2.3.ebuild,v 1.1 2011/12/07 19:07:39 slyfox Exp $
+
+EAPI="4"
+
+inherit multilib toolchain-funcs eutils
+
+DESCRIPTION="Binary Delta - Efficient difference algorithm and format"
+HOMEPAGE="http://deltup.sourceforge.net"
+SRC_URI="http://deltup.org/request.php?10 -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.2.3-makefile-restect-user-s-LDFLAGS-CXXFLAGS-and-other-v.patch
+	epatch "${FILESDIR}"/${PN}-0.2.3-bdelta.h-make-header-C-compatible.patch
+	epatch "${FILESDIR}"/${PN}-0.2.3-fix-stack-smash.patch #bug 338327
+	epatch "${FILESDIR}"/${PN}-0.2.3-libbdelta-rename-NDEBUG-to-DO_STATS_DEBUG.patch
+	epatch "${FILESDIR}"/${PN}-0.2.3-Makefile-add-make-clean-target.patch
+	epatch "${FILESDIR}"/${PN}-0.2.3-Makefile-fix-paralell-building-bdelta-depends-on-it-.patch
+	epatch "${FILESDIR}"/${PN}-0.2.3-Makefile-create-LIBDIR-as-well.patch
+}
+
+src_compile() {
+	# TODO: add soname versioning
+	emake -C src CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	make -C src DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" install || die "make install failed"
+	dodoc README
+}
diff --git a/dev-util/bdelta/files/bdelta-0.2.3-Makefile-add-make-clean-target.patch b/dev-util/bdelta/files/bdelta-0.2.3-Makefile-add-make-clean-target.patch
new file mode 100644
index 000000000000..21bde4a4fa4e
--- /dev/null
+++ b/dev-util/bdelta/files/bdelta-0.2.3-Makefile-add-make-clean-target.patch
@@ -0,0 +1,47 @@
+From 9bcf95e09d240280de0ba13767c85a9eb508ff4a Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Wed, 7 Dec 2011 21:01:20 +0300
+Subject: [PATCH 4/5] Makefile: add 'make clean' target
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ trunk/src/Makefile |   14 +++++++++++++-
+ 1 files changed, 13 insertions(+), 1 deletions(-)
+
+diff --git a/trunk/src/Makefile b/trunk/src/Makefile
+index db2026a..7dd5085 100644
+--- a/trunk/src/Makefile
++++ b/trunk/src/Makefile
+@@ -4,16 +4,28 @@ BINDIR   ?= $(PREFIX)/bin
+ LIBDIR   ?= ${PREFIX}/lib
+ CXXFLAGS += -O2
+ 
+-all: bpatch libbdelta.so bdelta
++ALL_TARGETS = bpatch libbdelta.so bdelta
++
++all: $(ALL_TARGETS)
++
+ libbdelta.so: libbdelta.cpp compatibility.h container.h checksum.h file.h
+ 	$(CXX) -shared -fPIC $(CXXFLAGS) $(LDFLAGS) $< -o $@
++
+ bdelta: bdelta.cpp bdelta.h compatibility.h container.h file.h
+ 	$(CXX) $< -o $@ $(CXXFLAGS) $(LDFLAGS) -L. -lbdelta
++
+ bpatch: bpatch.cpp compatibility.h bdelta.h file.h
++
+ % : %.cpp
+ 	$(CXX) $< -o $@ $(CXXFLAGS) $(LDFLAGS)
++
+ install: libbdelta.so bdelta bpatch
+ 	mkdir -p $(DESTDIR)$(BINDIR)
+ 	install -m 755 libbdelta.so $(DESTDIR)$(LIBDIR)
+ 	install -m 755 bdelta $(DESTDIR)$(BINDIR)
+ 	install -m 755 bpatch $(DESTDIR)$(BINDIR)
++
++clean:
++	-rm $(ALL_TARGETS)
++
++.PHONY: clean
+-- 
+1.7.8
+
diff --git a/dev-util/bdelta/files/bdelta-0.2.3-Makefile-create-LIBDIR-as-well.patch b/dev-util/bdelta/files/bdelta-0.2.3-Makefile-create-LIBDIR-as-well.patch
new file mode 100644
index 000000000000..3874a0e1d9ce
--- /dev/null
+++ b/dev-util/bdelta/files/bdelta-0.2.3-Makefile-create-LIBDIR-as-well.patch
@@ -0,0 +1,27 @@
+From aeecce25c8d6223d8f35a5000aa21ec807302c81 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Wed, 7 Dec 2011 21:52:00 +0300
+Subject: [PATCH] Makefile: create LIBDIR as well
+
+Useful when DISTDIR points to empty directory hierarchy
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ trunk/src/Makefile |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/trunk/src/Makefile b/trunk/src/Makefile
+index 1f4ff3e..f3a56f0 100644
+--- a/trunk/src/Makefile
++++ b/trunk/src/Makefile
+@@ -21,6 +21,7 @@ bpatch: bpatch.cpp compatibility.h bdelta.h file.h
+ 
+ install: libbdelta.so bdelta bpatch
+ 	mkdir -p $(DESTDIR)$(BINDIR)
++	mkdir -p $(DESTDIR)$(LIBDIR)
+ 	install -m 755 libbdelta.so $(DESTDIR)$(LIBDIR)
+ 	install -m 755 bdelta $(DESTDIR)$(BINDIR)
+ 	install -m 755 bpatch $(DESTDIR)$(BINDIR)
+-- 
+1.7.8
+
diff --git a/dev-util/bdelta/files/bdelta-0.2.3-Makefile-fix-paralell-building-bdelta-depends-on-it-.patch b/dev-util/bdelta/files/bdelta-0.2.3-Makefile-fix-paralell-building-bdelta-depends-on-it-.patch
new file mode 100644
index 000000000000..3978d3a651ea
--- /dev/null
+++ b/dev-util/bdelta/files/bdelta-0.2.3-Makefile-fix-paralell-building-bdelta-depends-on-it-.patch
@@ -0,0 +1,27 @@
+From b82cfae4954557f03a01f7b8c92cf1d59dea9033 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Wed, 7 Dec 2011 21:43:07 +0300
+Subject: [PATCH] Makefile: fix paralell building (bdelta depends on it's
+ shared library)
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ trunk/src/Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/trunk/src/Makefile b/trunk/src/Makefile
+index 7dd5085..1f4ff3e 100644
+--- a/trunk/src/Makefile
++++ b/trunk/src/Makefile
+@@ -11,7 +11,7 @@ all: $(ALL_TARGETS)
+ libbdelta.so: libbdelta.cpp compatibility.h container.h checksum.h file.h
+ 	$(CXX) -shared -fPIC $(CXXFLAGS) $(LDFLAGS) $< -o $@
+ 
+-bdelta: bdelta.cpp bdelta.h compatibility.h container.h file.h
++bdelta: bdelta.cpp bdelta.h compatibility.h container.h file.h libbdelta.so
+ 	$(CXX) $< -o $@ $(CXXFLAGS) $(LDFLAGS) -L. -lbdelta
+ 
+ bpatch: bpatch.cpp compatibility.h bdelta.h file.h
+-- 
+1.7.8
+
diff --git a/dev-util/bdelta/files/bdelta-0.2.3-bdelta.h-make-header-C-compatible.patch b/dev-util/bdelta/files/bdelta-0.2.3-bdelta.h-make-header-C-compatible.patch
new file mode 100644
index 000000000000..f62b9471cae8
--- /dev/null
+++ b/dev-util/bdelta/files/bdelta-0.2.3-bdelta.h-make-header-C-compatible.patch
@@ -0,0 +1,64 @@
+From eb4e8e74a27000c6965c5921f69823046e7fe2b6 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Wed, 7 Dec 2011 20:53:20 +0300
+Subject: [PATCH 1/4] bdelta.h: make header C compatible
+
+Exportaged names follow C calling. It's easier to
+to pull library in in other languages.
+
+Before patch:
+    $ nm libbdelta.so_ | grep bdelta_
+    0000000000002a00 T _Z11bdelta_passPvj
+    00000000000022c0 T _Z15bdelta_done_algPv
+    00000000000022b0 T _Z15bdelta_getErrorPv
+    0000000000002220 T _Z15bdelta_getMatchPvjPjS0_S0_
+    0000000000002190 T _Z15bdelta_init_algjjPFPvS_S_jjES_S_j
+
+After patch:
+    $ nm libbdelta.so | grep bdelta_
+    00000000000022e0 T bdelta_done_alg
+    00000000000022d0 T bdelta_getError
+    0000000000002240 T bdelta_getMatch
+    00000000000021b0 T bdelta_init_alg
+    0000000000002a20 T bdelta_pass
+
+Converted global constants to enum.
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ trunk/src/bdelta.h |   13 +++++++++++--
+ 1 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/trunk/src/bdelta.h b/trunk/src/bdelta.h
+index 4a7ea40..03b102b 100644
+--- a/trunk/src/bdelta.h
++++ b/trunk/src/bdelta.h
+@@ -13,6 +13,10 @@
+  * Author: John Whitney <jjw@deltup.org>
+  */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif // __cplusplus
++
+ // Callback function must return a pointer to the data requested.
+ // A "fill and forget" buffer is provided, but can be ignored, so
+ // long as the data persists throughout the life of bdelta_pass().
+@@ -31,7 +35,12 @@ void bdelta_getMatch(void *instance, unsigned matchNum,
+ 
+ int bdelta_getError(void *instance);
+ 
+-const int
++enum BDELTA_RESULT {
+ 	BDELTA_OK         =  0,
+ 	BDELTA_MEM_ERROR  = -1,
+-	BDELTA_READ_ERROR = -2;
++	BDELTA_READ_ERROR = -2
++};
++
++#ifdef __cplusplus
++}
++#endif // __cplusplus
+-- 
+1.7.8
+
diff --git a/dev-util/bdelta/files/bdelta-0.2.3-fix-stack-smash.patch b/dev-util/bdelta/files/bdelta-0.2.3-fix-stack-smash.patch
new file mode 100644
index 000000000000..884ef82ef28c
--- /dev/null
+++ b/dev-util/bdelta/files/bdelta-0.2.3-fix-stack-smash.patch
@@ -0,0 +1,68 @@
+commit 817cc738815542a1435d98c557954fad91fc9451
+Author: jjw <jjw@0b3c7260-62b7-4bd3-8502-661595b7e89c>
+Date:   Wed Dec 7 15:53:20 2011 +0000
+
+    Use heap allocation to prevent the stack from overflowing on large diffs.
+    
+    git-svn-id: svn://deltup.org/bdelta@41 0b3c7260-62b7-4bd3-8502-661595b7e89c
+
+Upstream: yes
+Reported-by: Artem S. Tashkinov
+Gentoo-bug: https://bugs.gentoo.org/show_bug.cgi?id=338327
+
+diff --git a/trunk/src/bdelta.cpp b/trunk/src/bdelta.cpp
+index 4eaaec7..8460451 100644
+--- a/trunk/src/bdelta.cpp
++++ b/trunk/src/bdelta.cpp
+@@ -45,9 +45,9 @@ int main(int argc, char **argv) {
+ 	for (int i = 512; i >= 16; i /= 2)
+ 		nummatches = bdelta_pass(b, i);
+ 
+-	STACK_ALLOC(copyloc1, unsigned, nummatches + 1);
+-	STACK_ALLOC(copyloc2, unsigned, nummatches + 1);
+-	STACK_ALLOC(copynum, unsigned, nummatches + 1);
++	unsigned * copyloc1 = new unsigned[nummatches + 1];
++	unsigned * copyloc2 = new unsigned[nummatches + 1];
++	unsigned *  copynum = new unsigned[nummatches + 1];
+ 
+ 	FILE *fout = fopen(argv[3], "wb");
+ 	if (!fout) {
+@@ -114,4 +114,10 @@ int main(int argc, char **argv) {
+ 
+ 	fclose(f1);
+ 	fclose(f2);
++
++	delete [] copynum;
++	delete [] copyloc2;
++	delete [] copyloc1;
++
++	return 0;
+ }
+diff --git a/trunk/src/bpatch.cpp b/trunk/src/bpatch.cpp
+index 0da02a8..8d6706b 100644
+--- a/trunk/src/bpatch.cpp
++++ b/trunk/src/bpatch.cpp
+@@ -67,9 +67,9 @@ int main(int argc, char **argv) {
+ 
+ 	unsigned nummatches = read_dword(patchfile);
+ 
+-	STACK_ALLOC(copyloc1, unsigned, nummatches + 1);
+-	STACK_ALLOC(copyloc2, unsigned, nummatches + 1);
+-	STACK_ALLOC(copynum, unsigned, nummatches + 1);
++	unsigned * copyloc1 = new unsigned[nummatches + 1];
++	unsigned * copyloc2 = new unsigned[nummatches + 1];
++	unsigned *  copynum = new unsigned[nummatches + 1];
+ 
+ 	for (unsigned i = 0; i < nummatches; ++i) {
+ 		copyloc1[i] = read_dword(patchfile);
+@@ -100,5 +100,10 @@ int main(int argc, char **argv) {
+ 			return -1;
+ 		}
+ 	}
++
++	delete [] copynum;
++	delete [] copyloc2;
++	delete [] copyloc1;
++
+ 	return 0;  
+ }
diff --git a/dev-util/bdelta/files/bdelta-0.2.3-libbdelta-rename-NDEBUG-to-DO_STATS_DEBUG.patch b/dev-util/bdelta/files/bdelta-0.2.3-libbdelta-rename-NDEBUG-to-DO_STATS_DEBUG.patch
new file mode 100644
index 000000000000..ca03ac1dc113
--- /dev/null
+++ b/dev-util/bdelta/files/bdelta-0.2.3-libbdelta-rename-NDEBUG-to-DO_STATS_DEBUG.patch
@@ -0,0 +1,65 @@
+From 3f2ac2dc56ed344dec1d2d38934682de2e326e49 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Wed, 7 Dec 2011 21:01:20 +0300
+Subject: [PATCH 3/4] libbdelta: rename NDEBUG to DO_STATS_DEBUG
+
+As it activates quite specific spam to stdout.
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ trunk/src/libbdelta.cpp |   11 +++++++----
+ 1 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/trunk/src/libbdelta.cpp b/trunk/src/libbdelta.cpp
+index 5808789..2a7e6e0 100644
+--- a/trunk/src/libbdelta.cpp
++++ b/trunk/src/libbdelta.cpp
+@@ -22,6 +22,9 @@ typedef uint16_t Token;
+ typedef uint32_t Token;
+ #endif
+ 
++// Enables delta chunk statistics
++// #define DO_STATS_DEBUG
++
+ #include <stdio.h>
+ #include <stdlib.h> 
+ #include "container.h"
+@@ -171,7 +174,7 @@ void sortTMatches(DLink<Match> *place, PotentialMatch *matches, unsigned numMatc
+ 	std::sort(matches, matches + numMatches, DistanceFromP1(lastf1Place));
+ }
+ 
+-#ifndef NDEBUG
++#ifdef DO_STATS_DEBUG
+ long long stata = 0, statb = 0;
+ #endif
+ void findMatches(BDelta_Instance *b, Checksums_Instance *h, unsigned start, unsigned end,
+@@ -200,7 +203,7 @@ void findMatches(BDelta_Instance *b, Checksums_Instance *h, unsigned start, unsi
+ 						// Keep the best 16
+ 						sortTMatches(place, pMatch, pMatchCount);
+ 						pMatchCount = 16;
+-#ifndef NDEBUG
++#ifdef DO_STATS_DEBUG
+ 						++statb;
+ #endif
+ 					}
+@@ -259,7 +262,7 @@ void findMatches(BDelta_Instance *b, Checksums_Instance *h, unsigned start, unsi
+ 					buf_loc = blocksize;
+ 					j += blocksize;
+ 				}
+-#ifndef NDEBUG
++#ifdef DO_STATS_DEBUG
+ 				++stata;
+ #endif
+ 				break;
+@@ -415,7 +418,7 @@ unsigned bdelta_pass(void *instance, unsigned blocksize) {
+ 	delete unused;
+ 	delete h.htable;
+ 	delete h.checksums;
+-#ifndef NDEBUG
++#ifdef DO_STATS_DEBUG
+ 	printf("a = %.lli; b = %.lli\n", stata, statb);
+ #endif
+ 	// printf("Found %i matches\n", b->matches.size());
+-- 
+1.7.8
+
diff --git a/dev-util/bdelta/files/bdelta-0.2.3-makefile-restect-user-s-LDFLAGS-CXXFLAGS-and-other-v.patch b/dev-util/bdelta/files/bdelta-0.2.3-makefile-restect-user-s-LDFLAGS-CXXFLAGS-and-other-v.patch
new file mode 100644
index 000000000000..d4150fd775f7
--- /dev/null
+++ b/dev-util/bdelta/files/bdelta-0.2.3-makefile-restect-user-s-LDFLAGS-CXXFLAGS-and-other-v.patch
@@ -0,0 +1,51 @@
+From c0e35d05c691171569b102e5cb0db0a8e3fc9320 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Wed, 7 Dec 2011 20:56:37 +0300
+Subject: [PATCH 2/4] makefile: restect user's LDFLAGS, CXXFLAGS and other
+ variables
+
+Distros like to push extra LDFLAGS and CXXFLAGS to allow user
+more freedom on optimization, debugging techniquires and
+just clever random hacks.
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ trunk/src/Makefile |   16 +++++++---------
+ 1 files changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/trunk/src/Makefile b/trunk/src/Makefile
+index ca8148f..db2026a 100644
+--- a/trunk/src/Makefile
++++ b/trunk/src/Makefile
+@@ -1,21 +1,19 @@
+ DESTDIR=
+-PREFIX=/usr
+-BINDIR=$(PREFIX)/bin
+-LIBDIR=${PREFIX}/lib
+-CXXFLAGS=-O2
++PREFIX   ?= /usr
++BINDIR   ?= $(PREFIX)/bin
++LIBDIR   ?= ${PREFIX}/lib
++CXXFLAGS += -O2
+ 
+ all: bpatch libbdelta.so bdelta
+ libbdelta.so: libbdelta.cpp compatibility.h container.h checksum.h file.h
+-	${CC} -shared -fPIC ${CXXFLAGS} $< -o $@
++	$(CXX) -shared -fPIC $(CXXFLAGS) $(LDFLAGS) $< -o $@
+ bdelta: bdelta.cpp bdelta.h compatibility.h container.h file.h
+-	${CC} $< -o $@ ${CXXFLAGS} -L. -lbdelta -lstdc++
++	$(CXX) $< -o $@ $(CXXFLAGS) $(LDFLAGS) -L. -lbdelta
+ bpatch: bpatch.cpp compatibility.h bdelta.h file.h
+ % : %.cpp
+-	${CC} $< -o $@ ${CXXFLAGS} -lstdc++
++	$(CXX) $< -o $@ $(CXXFLAGS) $(LDFLAGS)
+ install: libbdelta.so bdelta bpatch
+ 	mkdir -p $(DESTDIR)$(BINDIR)
+ 	install -m 755 libbdelta.so $(DESTDIR)$(LIBDIR)
+ 	install -m 755 bdelta $(DESTDIR)$(BINDIR)
+ 	install -m 755 bpatch $(DESTDIR)$(BINDIR)
+-
+-
+-- 
+1.7.8
+
diff --git a/dev-util/bdelta/metadata.xml b/dev-util/bdelta/metadata.xml
index 944d18d9a2a6..5a66e43ef83b 100644
--- a/dev-util/bdelta/metadata.xml
+++ b/dev-util/bdelta/metadata.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer>
+    <email>slyfox@gentoo.org</email>
+    <name>Sergei Trofimovich</name>
+    <description>Primary Maintainer</description>
+  </maintainer>
   <herd>tools-portage</herd>
 </pkgmetadata>
diff --git a/dev-util/kbuild/kbuild-0.1.9998_pre20110817.ebuild b/dev-util/kbuild/kbuild-0.1.9998_pre20110817.ebuild
index 5a2f3636b0d4..db4c982c2a19 100644
--- a/dev-util/kbuild/kbuild-0.1.9998_pre20110817.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.9998_pre20110817.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/dev-util/kbuild/kbuild-0.1.9998_pre20110817.ebuild,v 1.3 2011/11/01 11:01:17 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kbuild/kbuild-0.1.9998_pre20110817.ebuild,v 1.4 2011/12/07 17:29:44 phajdan.jr Exp $
 
 EAPI=2
 
@@ -16,7 +16,7 @@ SRC_URI="http://dev.gentoo.org/~polynomial-c/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="sys-devel/flex
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 8bad1345b297..391bc3863c93 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.506 2011/12/07 00:29:38 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.507 2011/12/07 16:11:17 vapier Exp $
 #
 # Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
 
@@ -1516,9 +1516,7 @@ toolchain_src_install() {
 			|| prepman "${DATAPATH}"
 	fi
 	# prune empty dirs left behind
-	for x in 1 2 3 4 ; do
-		find "${D}" -type d -exec rmdir "{}" \; >& /dev/null
-	done
+	find "${D}" -depth -type d -delete 2>/dev/null
 
 	# install testsuite results
 	if use test; then
diff --git a/java-virtuals/jaf/jaf-1.1-r1.ebuild b/java-virtuals/jaf/jaf-1.1-r1.ebuild
index 8814775a76a7..a8fdec67fa2d 100644
--- a/java-virtuals/jaf/jaf-1.1-r1.ebuild
+++ b/java-virtuals/jaf/jaf-1.1-r1.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/java-virtuals/jaf/jaf-1.1-r1.ebuild,v 1.10 2011/05/03 18:17:56 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jaf/jaf-1.1-r1.ebuild,v 1.11 2011/12/07 14:20:24 grobian Exp $
 
 EAPI=1
 
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/kde-base/activitymanager/Manifest b/kde-base/activitymanager/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/activitymanager/Manifest
+++ b/kde-base/activitymanager/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/activitymanager/activitymanager-4.7.2.ebuild b/kde-base/activitymanager/activitymanager-4.7.2.ebuild
deleted file mode 100644
index 47734b4035f1..000000000000
--- a/kde-base/activitymanager/activitymanager-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:56 alexxy 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/activitymanager/activitymanager-4.7.3.ebuild b/kde-base/activitymanager/activitymanager-4.7.3.ebuild
index fd7df109e527..aaeb3b8d78b8 100644
--- a/kde-base/activitymanager/activitymanager-4.7.3.ebuild
+++ b/kde-base/activitymanager/activitymanager-4.7.3.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/kde-base/activitymanager/activitymanager-4.7.3.ebuild,v 1.1 2011/11/02 20:48:05 alexxy Exp $
+# $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
 
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Activity manager"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug semantic-desktop"
 
 DEPEND="$(add_kdebase_dep kdelibs 'semantic-desktop=')"
diff --git a/kde-base/akonadiconsole/Manifest b/kde-base/akonadiconsole/Manifest
index 51674a0836d9..908da1ebad23 100644
--- a/kde-base/akonadiconsole/Manifest
+++ b/kde-base/akonadiconsole/Manifest
@@ -1,2 +1 @@
-DIST kdepim-4.7.2.tar.bz2 16171209 RMD160 378e7352725dd257617b1af7d2bb98a8d5569808 SHA1 41983556eb54a740a20d274878006ace5bc73c1c SHA256 1635dabfc73b95209466c92a009bd2856ebd73c42f486545ff97e719fec06630
 DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
diff --git a/kde-base/akonadiconsole/akonadiconsole-4.7.2.ebuild b/kde-base/akonadiconsole/akonadiconsole-4.7.2.ebuild
deleted file mode 100644
index 50c76ce8ceac..000000000000
--- a/kde-base/akonadiconsole/akonadiconsole-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:03 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="Akonadi developer console"
-KEYWORDS="~amd64 ~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/akonadiconsole/akonadiconsole-4.7.3.ebuild b/kde-base/akonadiconsole/akonadiconsole-4.7.3.ebuild
index 69587a6582c9..3661f9b37924 100644
--- a/kde-base/akonadiconsole/akonadiconsole-4.7.3.ebuild
+++ b/kde-base/akonadiconsole/akonadiconsole-4.7.3.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/kde-base/akonadiconsole/akonadiconsole-4.7.3.ebuild,v 1.2 2011/11/05 19:51:39 xarthisius Exp $
+# $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
 
@@ -9,7 +9,7 @@ KDE_SCM="git"
 inherit kde4-meta
 
 DESCRIPTION="Akonadi developer console"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/akregator/Manifest b/kde-base/akregator/Manifest
index 4e48133a3b7c..70a470d0ba9e 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.2.tar.bz2 16171209 RMD160 378e7352725dd257617b1af7d2bb98a8d5569808 SHA1 41983556eb54a740a20d274878006ace5bc73c1c SHA256 1635dabfc73b95209466c92a009bd2856ebd73c42f486545ff97e719fec06630
 DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
diff --git a/kde-base/akregator/akregator-4.7.2.ebuild b/kde-base/akregator/akregator-4.7.2.ebuild
deleted file mode 100644
index 28b137613a16..000000000000
--- a/kde-base/akregator/akregator-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:06 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE news feed aggregator."
-KEYWORDS="~amd64 ~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/akregator-4.7.3.ebuild b/kde-base/akregator/akregator-4.7.3.ebuild
index 7e3315141395..be6d933e933d 100644
--- a/kde-base/akregator/akregator-4.7.3.ebuild
+++ b/kde-base/akregator/akregator-4.7.3.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/kde-base/akregator/akregator-4.7.3.ebuild,v 1.2 2011/11/05 19:52:46 xarthisius Exp $
+# $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
 
@@ -10,7 +10,7 @@ KDE_SCM="git"
 inherit kde4-meta
 
 DESCRIPTION="KDE news feed aggregator."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/amor/Manifest b/kde-base/amor/Manifest
index c745b76a6b5e..2da998f1482f 100644
--- a/kde-base/amor/Manifest
+++ b/kde-base/amor/Manifest
@@ -1,4 +1,3 @@
 DIST kdetoys-4.6.3.tar.bz2 402892 RMD160 e17cf18bf95fab96814ba77bee7493a7d1901229 SHA1 07eaf12ccabc9209bd5de6a3f0e4ff6c70fca8b0 SHA256 ebbf38ac02a36bfebd8231c3c0d9e94193e98a947d04869e825e3bc404fad7b6
 DIST kdetoys-4.6.5.tar.bz2 402205 RMD160 94b7f5c9d81b1b3d6cb990440b54879b25641e67 SHA1 0ce43a76f5b7005d60430692ae87421661281f1f SHA256 4d4cc99a6117c1e330b7153d33d2157d6770969f17cf1d72593e86b4f8436c96
-DIST kdetoys-4.7.2.tar.bz2 413467 RMD160 b4540d47ee89d2fb23c01d44cfdbf85020244808 SHA1 51213ffadf0326863aad82d9d581a2c9997dda58 SHA256 61992a336e82528c929196c2cbfc8492dec76358a56bbeb4e107fc4633b9a969
 DIST kdetoys-4.7.3.tar.bz2 413419 RMD160 f082336f17e1fc3234e6a00c1109c7bec2eaf4b6 SHA1 93d6f0a92c805de51fc68469f940f38858f81fbe SHA256 edff03b9ae91b6c79e09a15a136ba4854c5c73c9be9ab4bfffe6ed8684dd6c31
diff --git a/kde-base/amor/amor-4.7.2.ebuild b/kde-base/amor/amor-4.7.2.ebuild
deleted file mode 100644
index 1b65f5714098..000000000000
--- a/kde-base/amor/amor-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:00 alexxy 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/amor/amor-4.7.3.ebuild b/kde-base/amor/amor-4.7.3.ebuild
index 049a9c1a6d8f..dced0906c2eb 100644
--- a/kde-base/amor/amor-4.7.3.ebuild
+++ b/kde-base/amor/amor-4.7.3.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/kde-base/amor/amor-4.7.3.ebuild,v 1.1 2011/11/02 20:47:53 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMNAME="kdetoys"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Amusing Misuse Of Resources - desktop-dwelling creature"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/ark/Manifest b/kde-base/ark/Manifest
index 348ce6a51263..65b585b0a481 100644
--- a/kde-base/ark/Manifest
+++ b/kde-base/ark/Manifest
@@ -1,4 +1,3 @@
 DIST kdeutils-4.6.3.tar.bz2 3703326 RMD160 1fe6287fed3fa21eef902ee764425171f7345e6c SHA1 1aa735c03689ef49b949278ee31d0d8e8536b7d6 SHA256 d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
 DIST kdeutils-4.6.5.tar.bz2 3699961 RMD160 65293718d8785c8e06e9149465f55f7f5a8718f5 SHA1 1c2ae023d9a6bcf72d3cebd0d7df2e6a175ffdcb SHA256 03de4b7728301414c8e704ba5c8650d8ded053747268ad47c901880fc1bf0b29
-DIST kdeutils-4.7.2.tar.bz2 3800427 RMD160 13fadbd312d70d7de360221facaf506707562fcc SHA1 52ce9b6b5f2c20475f46b6f7378ca4c530df37b4 SHA256 cdea138fc4556b4f6de5e63ee7ccbcb3485a780f372e699c0cb9fd6d65e02f96
 DIST kdeutils-4.7.3.tar.bz2 3802391 RMD160 0e0a73d290baaa289665b49722f04f19ab517dd9 SHA1 23fc9823647152d5d8cc250a55402c8930db4059 SHA256 a8c802f32b9e918d806a4487c25485f86019e4c473f0de6d3086d8ea8e492839
diff --git a/kde-base/ark/ark-4.7.2-r1.ebuild b/kde-base/ark/ark-4.7.2-r1.ebuild
deleted file mode 100644
index cd28330e8aa7..000000000000
--- a/kde-base/ark/ark-4.7.2-r1.ebuild
+++ /dev/null
@@ -1,45 +0,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.2-r1.ebuild,v 1.1 2011/10/20 00:14:06 reavertm 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}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.6.5-CVE-2011-2725.patch"
-)
-
-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/ark/ark-4.7.3.ebuild b/kde-base/ark/ark-4.7.3.ebuild
index 3487ecfe639f..e2ea41b3b77a 100644
--- a/kde-base/ark/ark-4.7.3.ebuild
+++ b/kde-base/ark/ark-4.7.3.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/kde-base/ark/ark-4.7.3.ebuild,v 1.1 2011/11/02 20:48:04 alexxy Exp $
+# $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
 
@@ -15,7 +15,7 @@ fi
 inherit ${kde_eclass}
 
 DESCRIPTION="KDE Archiving tool"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+archive +bzip2 debug lzma"
 
 DEPEND="
diff --git a/kde-base/attica/Manifest b/kde-base/attica/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/attica/Manifest
+++ b/kde-base/attica/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/attica/attica-4.7.2.ebuild b/kde-base/attica/attica-4.7.2.ebuild
deleted file mode 100644
index f086d8105bdb..000000000000
--- a/kde-base/attica/attica-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:00 alexxy 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/attica/attica-4.7.3.ebuild b/kde-base/attica/attica-4.7.3.ebuild
index ffcfc853e8b2..5e19eeea3994 100644
--- a/kde-base/attica/attica-4.7.3.ebuild
+++ b/kde-base/attica/attica-4.7.3.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/kde-base/attica/attica-4.7.3.ebuild,v 1.1 2011/11/02 20:47:52 alexxy Exp $
+# $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
 
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Open Collaboration Services provider management"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/blinken/Manifest b/kde-base/blinken/Manifest
index 85b93ad2cd00..71b2c84ebcdb 100644
--- a/kde-base/blinken/Manifest
+++ b/kde-base/blinken/Manifest
@@ -1,4 +1,3 @@
-DIST blinken-4.7.2.tar.bz2 602104 RMD160 367833d2e8fa6c192498c5ee657274debc1d0208 SHA1 ec0418900c5d71d64f65407b898d740a5255ce08 SHA256 2137e5070a498e12d0cbe2b4c03afd2e31e9ae9984e55f07880824e3faf12715
 DIST blinken-4.7.3.tar.bz2 602194 RMD160 44ee3cf9901b329c1311cb3f86a901a1409a77b7 SHA1 24f09f604e1687062b3296a30b873d1781379543 SHA256 7731e008d42669d3841ab6edee70801f3fb934bd9d58e1a92e3b397400a0ae2b
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
 DIST kdeedu-4.6.5.tar.bz2 71684677 RMD160 78cfdc42f648308477c57bd816f46434bb588449 SHA1 64247eb68b2710a66baaf824d798e46b34ca4d4f SHA256 1306ef6c8654a0a17131b98e16b19d68beb4e03a324749b2147b010f5c45394b
diff --git a/kde-base/blinken/blinken-4.7.2.ebuild b/kde-base/blinken/blinken-4.7.2.ebuild
deleted file mode 100644
index c8ab9e78beba..000000000000
--- a/kde-base/blinken/blinken-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:05 alexxy 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/blinken/blinken-4.7.3.ebuild b/kde-base/blinken/blinken-4.7.3.ebuild
index d97bb57fadae..98cb14eb0804 100644
--- a/kde-base/blinken/blinken-4.7.3.ebuild
+++ b/kde-base/blinken/blinken-4.7.3.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/kde-base/blinken/blinken-4.7.3.ebuild,v 1.1 2011/11/02 20:48:03 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="KDE version of the Simon Says game."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/blogilo/Manifest b/kde-base/blogilo/Manifest
index 4e48133a3b7c..70a470d0ba9e 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.2.tar.bz2 16171209 RMD160 378e7352725dd257617b1af7d2bb98a8d5569808 SHA1 41983556eb54a740a20d274878006ace5bc73c1c SHA256 1635dabfc73b95209466c92a009bd2856ebd73c42f486545ff97e719fec06630
 DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
diff --git a/kde-base/blogilo/blogilo-4.7.2.ebuild b/kde-base/blogilo/blogilo-4.7.2.ebuild
deleted file mode 100644
index 6d9369883d30..000000000000
--- a/kde-base/blogilo/blogilo-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:59 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE Blogging Client"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}
-"
diff --git a/kde-base/blogilo/blogilo-4.7.3.ebuild b/kde-base/blogilo/blogilo-4.7.3.ebuild
index 906f5c5e4cd8..e0a39b458164 100644
--- a/kde-base/blogilo/blogilo-4.7.3.ebuild
+++ b/kde-base/blogilo/blogilo-4.7.3.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/kde-base/blogilo/blogilo-4.7.3.ebuild,v 1.2 2011/11/05 19:53:32 xarthisius Exp $
+# $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
 
@@ -10,7 +10,7 @@ KDE_SCM="git"
 inherit kde4-meta
 
 DESCRIPTION="KDE Blogging Client"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/bomber/Manifest b/kde-base/bomber/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/bomber/Manifest
+++ b/kde-base/bomber/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/bomber/bomber-4.7.2.ebuild b/kde-base/bomber/bomber-4.7.2.ebuild
deleted file mode 100644
index 76ed13d5ce23..000000000000
--- a/kde-base/bomber/bomber-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:56 alexxy 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/bomber/bomber-4.7.3.ebuild b/kde-base/bomber/bomber-4.7.3.ebuild
index 4b7e9a16301c..b95fc009feb2 100644
--- a/kde-base/bomber/bomber-4.7.3.ebuild
+++ b/kde-base/bomber/bomber-4.7.3.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/kde-base/bomber/bomber-4.7.3.ebuild,v 1.1 2011/11/02 20:47:58 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="KDE arcade bombing game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/bovo/Manifest b/kde-base/bovo/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/bovo/Manifest
+++ b/kde-base/bovo/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/bovo/bovo-4.7.2.ebuild b/kde-base/bovo/bovo-4.7.2.ebuild
deleted file mode 100644
index 85a73ae3925f..000000000000
--- a/kde-base/bovo/bovo-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:52 alexxy 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/bovo/bovo-4.7.3.ebuild b/kde-base/bovo/bovo-4.7.3.ebuild
index d062fee475cf..09bc0f7dfb23 100644
--- a/kde-base/bovo/bovo-4.7.3.ebuild
+++ b/kde-base/bovo/bovo-4.7.3.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/kde-base/bovo/bovo-4.7.3.ebuild,v 1.1 2011/11/02 20:48:01 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="Five-in-a-row Board Game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/cantor/Manifest b/kde-base/cantor/Manifest
index 073200e2ab52..db64effad17c 100644
--- a/kde-base/cantor/Manifest
+++ b/kde-base/cantor/Manifest
@@ -1,4 +1,3 @@
-DIST cantor-4.7.2.tar.bz2 498360 RMD160 ca78e566285a01ac46e46e768a7a3d7d3c4efdaf SHA1 5cb978903868d3dbda7367fec21a02818f693d6b SHA256 1e9cbda34c5a1b8419cff05a0967ea77600cb4bc85fa72da8d4d658023e09d8d
 DIST cantor-4.7.3.tar.bz2 499214 RMD160 97aef2d4782722bcb7a090b7c60e2ceee6e96cde SHA1 ce6240d44cbf47b3dbfd1dbc03196c916e4394e9 SHA256 7451843080e2e5f68112e5da7f8b4d08c579a9436d816a4958d7d8253218d73d
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
 DIST kdeedu-4.6.5.tar.bz2 71684677 RMD160 78cfdc42f648308477c57bd816f46434bb588449 SHA1 64247eb68b2710a66baaf824d798e46b34ca4d4f SHA256 1306ef6c8654a0a17131b98e16b19d68beb4e03a324749b2147b010f5c45394b
diff --git a/kde-base/cantor/cantor-4.7.2.ebuild b/kde-base/cantor/cantor-4.7.2.ebuild
deleted file mode 100644
index 1b33b56bab3a..000000000000
--- a/kde-base/cantor/cantor-4.7.2.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.2.ebuild,v 1.2 2011/10/25 20:13:38 dilfridge 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/cantor/cantor-4.7.3.ebuild b/kde-base/cantor/cantor-4.7.3.ebuild
index 0246a2d04718..9149aaa38263 100644
--- a/kde-base/cantor/cantor-4.7.3.ebuild
+++ b/kde-base/cantor/cantor-4.7.3.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/kde-base/cantor/cantor-4.7.3.ebuild,v 1.1 2011/11/02 20:47:55 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="KDE4 interface for doing mathematics and scientific computing"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug ps +R"
 
 # TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
diff --git a/kde-base/cervisia/Manifest b/kde-base/cervisia/Manifest
index 8429b87a7c26..c05641549806 100644
--- a/kde-base/cervisia/Manifest
+++ b/kde-base/cervisia/Manifest
@@ -1,4 +1,3 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
 DIST kdesdk-4.6.5.tar.bz2 6063147 RMD160 0818eb740cb3f9c83ccf92bb238c4adbdd83b875 SHA1 8cffa0472fbe1096ebfea9bde49aaff76a145b34 SHA256 4b35eb3381bbf06e4d091dea4b38f6c807ce218d45e04d8719ee17ebd1820ff4
-DIST kdesdk-4.7.2.tar.bz2 5265267 RMD160 a8d275fcc858a548c7fe9ce04c0fd11279297174 SHA1 b6259b46fed642c35e1c1d1f90712084141ca441 SHA256 c9377df9429633413c57684574e6405b3dc3b493ac3ab43d9fd429ff3ab920be
 DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
diff --git a/kde-base/cervisia/cervisia-4.7.2.ebuild b/kde-base/cervisia/cervisia-4.7.2.ebuild
deleted file mode 100644
index 86a5924b7fd5..000000000000
--- a/kde-base/cervisia/cervisia-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:59 alexxy 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/cervisia/cervisia-4.7.3.ebuild b/kde-base/cervisia/cervisia-4.7.3.ebuild
index 1e73246d6984..79683d87229a 100644
--- a/kde-base/cervisia/cervisia-4.7.3.ebuild
+++ b/kde-base/cervisia/cervisia-4.7.3.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/kde-base/cervisia/cervisia-4.7.3.ebuild,v 1.1 2011/11/02 20:48:10 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kdesdk"
 inherit kde4-meta
 
 DESCRIPTION="Cervisia - A KDE CVS frontend"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/dolphin-plugins/Manifest b/kde-base/dolphin-plugins/Manifest
index 8429b87a7c26..c05641549806 100644
--- a/kde-base/dolphin-plugins/Manifest
+++ b/kde-base/dolphin-plugins/Manifest
@@ -1,4 +1,3 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
 DIST kdesdk-4.6.5.tar.bz2 6063147 RMD160 0818eb740cb3f9c83ccf92bb238c4adbdd83b875 SHA1 8cffa0472fbe1096ebfea9bde49aaff76a145b34 SHA256 4b35eb3381bbf06e4d091dea4b38f6c807ce218d45e04d8719ee17ebd1820ff4
-DIST kdesdk-4.7.2.tar.bz2 5265267 RMD160 a8d275fcc858a548c7fe9ce04c0fd11279297174 SHA1 b6259b46fed642c35e1c1d1f90712084141ca441 SHA256 c9377df9429633413c57684574e6405b3dc3b493ac3ab43d9fd429ff3ab920be
 DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
diff --git a/kde-base/dolphin-plugins/dolphin-plugins-4.7.2.ebuild b/kde-base/dolphin-plugins/dolphin-plugins-4.7.2.ebuild
deleted file mode 100644
index 64115724032c..000000000000
--- a/kde-base/dolphin-plugins/dolphin-plugins-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:46 alexxy 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-plugins/dolphin-plugins-4.7.3.ebuild b/kde-base/dolphin-plugins/dolphin-plugins-4.7.3.ebuild
index b3c1019e6f91..502482adbb31 100644
--- a/kde-base/dolphin-plugins/dolphin-plugins-4.7.3.ebuild
+++ b/kde-base/dolphin-plugins/dolphin-plugins-4.7.3.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/kde-base/dolphin-plugins/dolphin-plugins-4.7.3.ebuild,v 1.1 2011/11/02 20:48:09 alexxy Exp $
+# $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
 
@@ -8,7 +8,7 @@ KMNAME="kdesdk"
 inherit kde4-meta
 
 DESCRIPTION="Extra Dolphin plugins"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug +git +subversion"
 
 DEPEND="
diff --git a/kde-base/dolphin/Manifest b/kde-base/dolphin/Manifest
index 55198aaad7a5..4d43fae00274 100644
--- a/kde-base/dolphin/Manifest
+++ b/kde-base/dolphin/Manifest
@@ -1,4 +1,3 @@
-DIST kde-baseapps-4.7.2.tar.bz2 2685060 RMD160 f97994dabe6412065723a8373291f1cf3f7c3290 SHA1 b52937ad8e5e4be884cc76f265c19964f461ac2c SHA256 1104284ad9cfc9757b0bbd2516dfdcbe4119ea6a6e6daf3c9d7eb66c43760bfa
 DIST kde-baseapps-4.7.3.tar.bz2 2685074 RMD160 270f3f3ae7b473651517db8818160f16e4faf544 SHA1 952dc26d0d908b41973a8d7b4d27765bf5128d58 SHA256 e9fb0c5da9e9a255c1a1735dfa518dcadc1ea23c68a467164597ff3dbf51c8df
 DIST kdebase-4.6.3.tar.bz2 2682586 RMD160 38784d7a5a708703f5a22e39dc5f83ef7aecd833 SHA1 69cfba74099cdce27f7f72725288f025979b41f3 SHA256 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
 DIST kdebase-4.6.5.tar.bz2 2639622 RMD160 cef007659a02cbec3bd484aa9eb5a721c5200b4f SHA1 1a902d22956daaf380ceefe68f8db75b8b760ae6 SHA256 542a42fc806673ba46827dcc5616fe53239659107934f1b05bf476e46ecbffd5
diff --git a/kde-base/dolphin/dolphin-4.7.2.ebuild b/kde-base/dolphin/dolphin-4.7.2.ebuild
deleted file mode 100644
index dde16adab249..000000000000
--- a/kde-base/dolphin/dolphin-4.7.2.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/dolphin/dolphin-4.7.2.ebuild,v 1.1 2011/10/06 18:11:06 alexxy 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"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/dolphin/dolphin-4.7.3.ebuild b/kde-base/dolphin/dolphin-4.7.3.ebuild
index 85a53e666921..ebf4357598d8 100644
--- a/kde-base/dolphin/dolphin-4.7.3.ebuild
+++ b/kde-base/dolphin/dolphin-4.7.3.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/kde-base/dolphin/dolphin-4.7.3.ebuild,v 1.2 2011/12/04 17:44:28 dilfridge Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kde-baseapps"
 inherit kde4-meta
 
 DESCRIPTION="A KDE filemanager focusing on usability"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug semantic-desktop thumbnail"
 
 DEPEND="
diff --git a/kde-base/dragonplayer/Manifest b/kde-base/dragonplayer/Manifest
index b74697d7e5ca..299fa5e8456b 100644
--- a/kde-base/dragonplayer/Manifest
+++ b/kde-base/dragonplayer/Manifest
@@ -1,4 +1,3 @@
 DIST kdemultimedia-4.6.3.tar.bz2 1611668 RMD160 8824bda18a1f1051dea366a0ff0d6191068476dd SHA1 d5bde19156b65e9b56e0e6de800efc0efe117632 SHA256 b3a6732dead0558610b4b40d3ce28c4b7b5da8869a63436180eacb3aacec533b
 DIST kdemultimedia-4.6.5.tar.bz2 1611493 RMD160 70ca60910f21e464f49e4e106918fbcc1407b0c7 SHA1 081bead5ee758d169f3119c138424929b001d04f SHA256 7ab9afb233538e7065758b32cd13f52fee2b68306f4be3dead729f3ba93c9c58
-DIST kdemultimedia-4.7.2.tar.bz2 1643403 RMD160 3c5510cb381b64290dda9a15a483dff3062037db SHA1 2fc12558284fe95da63e24c73612846c6c1d31e1 SHA256 a5a6e1101f4d8fc278791d63c4c91e261d60e995e67b4e8d901f2f93ba7be800
 DIST kdemultimedia-4.7.3.tar.bz2 1644497 RMD160 de9d9f9341d91bf0d56fa9468c0441226cb6aba2 SHA1 4db44494e6a2ef886e3513b6a2eb4e526741a6ff SHA256 ad96332218b82c4466debcb165061d87051a917e0321bdc34e4024da9c8c30b1
diff --git a/kde-base/dragonplayer/dragonplayer-4.7.2.ebuild b/kde-base/dragonplayer/dragonplayer-4.7.2.ebuild
deleted file mode 100644
index 408713e8f0cc..000000000000
--- a/kde-base/dragonplayer/dragonplayer-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:10 alexxy 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/dragonplayer/dragonplayer-4.7.3.ebuild b/kde-base/dragonplayer/dragonplayer-4.7.3.ebuild
index 6f00b56561d3..ba8159ef8013 100644
--- a/kde-base/dragonplayer/dragonplayer-4.7.3.ebuild
+++ b/kde-base/dragonplayer/dragonplayer-4.7.3.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/kde-base/dragonplayer/dragonplayer-4.7.3.ebuild,v 1.1 2011/11/02 20:48:12 alexxy Exp $
+# $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
 
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-2"
 IUSE="debug xine"
 
diff --git a/kde-base/drkonqi/Manifest b/kde-base/drkonqi/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/drkonqi/Manifest
+++ b/kde-base/drkonqi/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/drkonqi/drkonqi-4.7.2.ebuild b/kde-base/drkonqi/drkonqi-4.7.2.ebuild
deleted file mode 100644
index b379356e37a0..000000000000
--- a/kde-base/drkonqi/drkonqi-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:06 alexxy 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/drkonqi/drkonqi-4.7.3.ebuild b/kde-base/drkonqi/drkonqi-4.7.3.ebuild
index 18ab036673d9..3a433e24e4d2 100644
--- a/kde-base/drkonqi/drkonqi-4.7.3.ebuild
+++ b/kde-base/drkonqi/drkonqi-4.7.3.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/kde-base/drkonqi/drkonqi-4.7.3.ebuild,v 1.1 2011/11/02 20:48:17 alexxy Exp $
+# $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
 
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 pkg_postinst() {
diff --git a/kde-base/ffmpegthumbs/Manifest b/kde-base/ffmpegthumbs/Manifest
index b74697d7e5ca..299fa5e8456b 100644
--- a/kde-base/ffmpegthumbs/Manifest
+++ b/kde-base/ffmpegthumbs/Manifest
@@ -1,4 +1,3 @@
 DIST kdemultimedia-4.6.3.tar.bz2 1611668 RMD160 8824bda18a1f1051dea366a0ff0d6191068476dd SHA1 d5bde19156b65e9b56e0e6de800efc0efe117632 SHA256 b3a6732dead0558610b4b40d3ce28c4b7b5da8869a63436180eacb3aacec533b
 DIST kdemultimedia-4.6.5.tar.bz2 1611493 RMD160 70ca60910f21e464f49e4e106918fbcc1407b0c7 SHA1 081bead5ee758d169f3119c138424929b001d04f SHA256 7ab9afb233538e7065758b32cd13f52fee2b68306f4be3dead729f3ba93c9c58
-DIST kdemultimedia-4.7.2.tar.bz2 1643403 RMD160 3c5510cb381b64290dda9a15a483dff3062037db SHA1 2fc12558284fe95da63e24c73612846c6c1d31e1 SHA256 a5a6e1101f4d8fc278791d63c4c91e261d60e995e67b4e8d901f2f93ba7be800
 DIST kdemultimedia-4.7.3.tar.bz2 1644497 RMD160 de9d9f9341d91bf0d56fa9468c0441226cb6aba2 SHA1 4db44494e6a2ef886e3513b6a2eb4e526741a6ff SHA256 ad96332218b82c4466debcb165061d87051a917e0321bdc34e4024da9c8c30b1
diff --git a/kde-base/ffmpegthumbs/ffmpegthumbs-4.7.2.ebuild b/kde-base/ffmpegthumbs/ffmpegthumbs-4.7.2.ebuild
deleted file mode 100644
index 5d48cd757daa..000000000000
--- a/kde-base/ffmpegthumbs/ffmpegthumbs-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:09 alexxy 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/ffmpegthumbs/ffmpegthumbs-4.7.3.ebuild b/kde-base/ffmpegthumbs/ffmpegthumbs-4.7.3.ebuild
index 2637b71e54c7..14a28b8c91bf 100644
--- a/kde-base/ffmpegthumbs/ffmpegthumbs-4.7.3.ebuild
+++ b/kde-base/ffmpegthumbs/ffmpegthumbs-4.7.3.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/kde-base/ffmpegthumbs/ffmpegthumbs-4.7.3.ebuild,v 1.1 2011/11/02 20:48:20 alexxy Exp $
+# $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
 
@@ -8,7 +8,7 @@ KMNAME="kdemultimedia"
 inherit kde4-meta
 
 DESCRIPTION="A FFmpeg based thumbnail Generator for Video Files."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/filelight/Manifest b/kde-base/filelight/Manifest
index 348ce6a51263..65b585b0a481 100644
--- a/kde-base/filelight/Manifest
+++ b/kde-base/filelight/Manifest
@@ -1,4 +1,3 @@
 DIST kdeutils-4.6.3.tar.bz2 3703326 RMD160 1fe6287fed3fa21eef902ee764425171f7345e6c SHA1 1aa735c03689ef49b949278ee31d0d8e8536b7d6 SHA256 d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
 DIST kdeutils-4.6.5.tar.bz2 3699961 RMD160 65293718d8785c8e06e9149465f55f7f5a8718f5 SHA1 1c2ae023d9a6bcf72d3cebd0d7df2e6a175ffdcb SHA256 03de4b7728301414c8e704ba5c8650d8ded053747268ad47c901880fc1bf0b29
-DIST kdeutils-4.7.2.tar.bz2 3800427 RMD160 13fadbd312d70d7de360221facaf506707562fcc SHA1 52ce9b6b5f2c20475f46b6f7378ca4c530df37b4 SHA256 cdea138fc4556b4f6de5e63ee7ccbcb3485a780f372e699c0cb9fd6d65e02f96
 DIST kdeutils-4.7.3.tar.bz2 3802391 RMD160 0e0a73d290baaa289665b49722f04f19ab517dd9 SHA1 23fc9823647152d5d8cc250a55402c8930db4059 SHA256 a8c802f32b9e918d806a4487c25485f86019e4c473f0de6d3086d8ea8e492839
diff --git a/kde-base/filelight/filelight-4.7.2.ebuild b/kde-base/filelight/filelight-4.7.2.ebuild
deleted file mode 100644
index 5aa9fa54e823..000000000000
--- a/kde-base/filelight/filelight-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:50 alexxy 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/filelight/filelight-4.7.3.ebuild b/kde-base/filelight/filelight-4.7.3.ebuild
index 77633474a5c3..a361ca693cfc 100644
--- a/kde-base/filelight/filelight-4.7.3.ebuild
+++ b/kde-base/filelight/filelight-4.7.3.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/kde-base/filelight/filelight-4.7.3.ebuild,v 1.1 2011/11/02 20:47:56 alexxy Exp $
+# $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
 
@@ -17,7 +17,7 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/freespacenotifier/Manifest b/kde-base/freespacenotifier/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/freespacenotifier/Manifest
+++ b/kde-base/freespacenotifier/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/freespacenotifier/freespacenotifier-4.7.2.ebuild b/kde-base/freespacenotifier/freespacenotifier-4.7.2.ebuild
deleted file mode 100644
index e1a86cb983ad..000000000000
--- a/kde-base/freespacenotifier/freespacenotifier-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:02 alexxy 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/freespacenotifier/freespacenotifier-4.7.3.ebuild b/kde-base/freespacenotifier/freespacenotifier-4.7.3.ebuild
index 2e4cbc577bf8..ae8942dd2727 100644
--- a/kde-base/freespacenotifier/freespacenotifier-4.7.3.ebuild
+++ b/kde-base/freespacenotifier/freespacenotifier-4.7.3.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/kde-base/freespacenotifier/freespacenotifier-4.7.3.ebuild,v 1.1 2011/11/02 20:48:14 alexxy Exp $
+# $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
 
@@ -8,5 +8,5 @@ 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"
+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 300caa131fb0..3da267543cb4 100644
--- a/kde-base/granatier/Manifest
+++ b/kde-base/granatier/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/granatier/granatier-4.7.2.ebuild b/kde-base/granatier/granatier-4.7.2.ebuild
deleted file mode 100644
index 7b1051162964..000000000000
--- a/kde-base/granatier/granatier-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:08 alexxy 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/granatier/granatier-4.7.3.ebuild b/kde-base/granatier/granatier-4.7.3.ebuild
index f3ecd1e3e20c..1ef26eb0c84b 100644
--- a/kde-base/granatier/granatier-4.7.3.ebuild
+++ b/kde-base/granatier/granatier-4.7.3.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/kde-base/granatier/granatier-4.7.3.ebuild,v 1.1 2011/11/02 20:47:52 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="KDE Bomberman game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/gwenview/Manifest b/kde-base/gwenview/Manifest
index dba4f6593c06..9d41738c877d 100644
--- a/kde-base/gwenview/Manifest
+++ b/kde-base/gwenview/Manifest
@@ -1,4 +1,3 @@
-DIST gwenview-4.7.2.tar.bz2 1975048 RMD160 eb9c6e851f63360e2566c9ee2941644ac5c1e26a SHA1 ce1c3df9e9147d81ce250c41e7d9a328993d8632 SHA256 ba379b0e0c790e5889a7a434d1de73e7bcdb2f31ae44981de7e53ca45f5ccf7e
 DIST gwenview-4.7.3.tar.bz2 1975245 RMD160 4edf13949e772e36934efbab68d0d1dfe0ff5b3c SHA1 7096721285d15311699acc76abd62755d6e93860 SHA256 41ca54aeec104bd7c7eb8b17f49176d77ce45481a668707f0d449835fe2fc972
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
 DIST kdegraphics-4.6.5.tar.bz2 5455380 RMD160 75fdf00994bfc2737a754b4ff360ab789cd824b5 SHA1 1e64698993d0754dfae1296d8d16ba9370f9a08c SHA256 5b8a7e54f281ac938d8e22db673b7ddcff8a1d8adfc128282150ad52c80b8c04
diff --git a/kde-base/gwenview/gwenview-4.7.2.ebuild b/kde-base/gwenview/gwenview-4.7.2.ebuild
deleted file mode 100644
index 26879bf30fe4..000000000000
--- a/kde-base/gwenview/gwenview-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:56 alexxy 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/gwenview/gwenview-4.7.3.ebuild b/kde-base/gwenview/gwenview-4.7.3.ebuild
index e63cd5d9f87c..e1f6edcb1f5a 100644
--- a/kde-base/gwenview/gwenview-4.7.3.ebuild
+++ b/kde-base/gwenview/gwenview-4.7.3.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/kde-base/gwenview/gwenview-4.7.3.ebuild,v 1.1 2011/11/02 20:48:05 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="KDE image viewer"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug kipi semantic-desktop"
 
 # tests hang, last checked for 4.2.96
diff --git a/kde-base/jovie/Manifest b/kde-base/jovie/Manifest
index ec42b82314e7..406e47a1919d 100644
--- a/kde-base/jovie/Manifest
+++ b/kde-base/jovie/Manifest
@@ -1,4 +1,3 @@
 DIST kdeaccessibility-4.6.3.tar.bz2 5225058 RMD160 29e3f99600e0670233f87837e8df7923877d3de6 SHA1 8d4053defbf839fd428820d6d1659b6e46ab468a SHA256 e3f64e002d98a2b878abb76897b96945ed3c17ff84ed64ef6f7156bd7e3018f8
 DIST kdeaccessibility-4.6.5.tar.bz2 5223262 RMD160 4b5c2725715a4ad1b73b09771bc7edc4ba3e5988 SHA1 6e40aab7c95671070cad0b5f59507ff887414ce0 SHA256 1cd785a4988727156927d5a6fa610a01c735df6cf2f091308b099aaea084e0c6
-DIST kdeaccessibility-4.7.2.tar.bz2 876861 RMD160 c7bdebf979af67559878b17f2582102c849c1bb2 SHA1 7a2f7ea0e635f0ba79d7d54b118814bcefa4b6a1 SHA256 1a10a2ed98b46a5854c697077cf6329102797cbe9f7660c78b11c8e22b4f339d
 DIST kdeaccessibility-4.7.3.tar.bz2 878030 RMD160 48a77ba186233a8b34e79fd1f3f7e15e250ca882 SHA1 9695d2b8b6f55266e3f76ebf05543f23857b9520 SHA256 d4225fcf207b06506972e0d1e405f7521492106e6b7994145ecb8cc3cd9f60d1
diff --git a/kde-base/jovie/jovie-4.7.2.ebuild b/kde-base/jovie/jovie-4.7.2.ebuild
deleted file mode 100644
index 94f40863b994..000000000000
--- a/kde-base/jovie/jovie-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:56 alexxy 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/jovie/jovie-4.7.3.ebuild b/kde-base/jovie/jovie-4.7.3.ebuild
index 36247f7c7887..82e15f62f8c5 100644
--- a/kde-base/jovie/jovie-4.7.3.ebuild
+++ b/kde-base/jovie/jovie-4.7.3.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/kde-base/jovie/jovie-4.7.3.ebuild,v 1.1 2011/11/02 20:48:05 alexxy Exp $
+# $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
 
@@ -16,7 +16,7 @@ fi
 inherit ${kde_eclass}
 
 DESCRIPTION="Jovie is a text to speech application"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/juk/Manifest b/kde-base/juk/Manifest
index b74697d7e5ca..299fa5e8456b 100644
--- a/kde-base/juk/Manifest
+++ b/kde-base/juk/Manifest
@@ -1,4 +1,3 @@
 DIST kdemultimedia-4.6.3.tar.bz2 1611668 RMD160 8824bda18a1f1051dea366a0ff0d6191068476dd SHA1 d5bde19156b65e9b56e0e6de800efc0efe117632 SHA256 b3a6732dead0558610b4b40d3ce28c4b7b5da8869a63436180eacb3aacec533b
 DIST kdemultimedia-4.6.5.tar.bz2 1611493 RMD160 70ca60910f21e464f49e4e106918fbcc1407b0c7 SHA1 081bead5ee758d169f3119c138424929b001d04f SHA256 7ab9afb233538e7065758b32cd13f52fee2b68306f4be3dead729f3ba93c9c58
-DIST kdemultimedia-4.7.2.tar.bz2 1643403 RMD160 3c5510cb381b64290dda9a15a483dff3062037db SHA1 2fc12558284fe95da63e24c73612846c6c1d31e1 SHA256 a5a6e1101f4d8fc278791d63c4c91e261d60e995e67b4e8d901f2f93ba7be800
 DIST kdemultimedia-4.7.3.tar.bz2 1644497 RMD160 de9d9f9341d91bf0d56fa9468c0441226cb6aba2 SHA1 4db44494e6a2ef886e3513b6a2eb4e526741a6ff SHA256 ad96332218b82c4466debcb165061d87051a917e0321bdc34e4024da9c8c30b1
diff --git a/kde-base/juk/juk-4.7.2.ebuild b/kde-base/juk/juk-4.7.2.ebuild
deleted file mode 100644
index eaaecbbfbb1f..000000000000
--- a/kde-base/juk/juk-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:55 alexxy 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/juk/juk-4.7.3.ebuild b/kde-base/juk/juk-4.7.3.ebuild
index b0dd6b51076a..3cfebfcccddd 100644
--- a/kde-base/juk/juk-4.7.3.ebuild
+++ b/kde-base/juk/juk-4.7.3.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/kde-base/juk/juk-4.7.3.ebuild,v 1.1 2011/11/02 20:48:02 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kdemultimedia"
 inherit kde4-meta
 
 DESCRIPTION="Jukebox and music manager for KDE."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug musicbrainz"
 
 DEPEND="
diff --git a/kde-base/kabcclient/Manifest b/kde-base/kabcclient/Manifest
index 4e48133a3b7c..70a470d0ba9e 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.2.tar.bz2 16171209 RMD160 378e7352725dd257617b1af7d2bb98a8d5569808 SHA1 41983556eb54a740a20d274878006ace5bc73c1c SHA256 1635dabfc73b95209466c92a009bd2856ebd73c42f486545ff97e719fec06630
 DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
diff --git a/kde-base/kabcclient/kabcclient-4.7.2.ebuild b/kde-base/kabcclient/kabcclient-4.7.2.ebuild
deleted file mode 100644
index 4f7b1554b2ce..000000000000
--- a/kde-base/kabcclient/kabcclient-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:11 alexxy 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 ~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/kabcclient/kabcclient-4.7.3.ebuild b/kde-base/kabcclient/kabcclient-4.7.3.ebuild
index 51714aea882a..ffca3984deae 100644
--- a/kde-base/kabcclient/kabcclient-4.7.3.ebuild
+++ b/kde-base/kabcclient/kabcclient-4.7.3.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/kde-base/kabcclient/kabcclient-4.7.3.ebuild,v 1.2 2011/11/05 19:54:13 xarthisius Exp $
+# $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
 
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kaccessible/Manifest b/kde-base/kaccessible/Manifest
index ec42b82314e7..406e47a1919d 100644
--- a/kde-base/kaccessible/Manifest
+++ b/kde-base/kaccessible/Manifest
@@ -1,4 +1,3 @@
 DIST kdeaccessibility-4.6.3.tar.bz2 5225058 RMD160 29e3f99600e0670233f87837e8df7923877d3de6 SHA1 8d4053defbf839fd428820d6d1659b6e46ab468a SHA256 e3f64e002d98a2b878abb76897b96945ed3c17ff84ed64ef6f7156bd7e3018f8
 DIST kdeaccessibility-4.6.5.tar.bz2 5223262 RMD160 4b5c2725715a4ad1b73b09771bc7edc4ba3e5988 SHA1 6e40aab7c95671070cad0b5f59507ff887414ce0 SHA256 1cd785a4988727156927d5a6fa610a01c735df6cf2f091308b099aaea084e0c6
-DIST kdeaccessibility-4.7.2.tar.bz2 876861 RMD160 c7bdebf979af67559878b17f2582102c849c1bb2 SHA1 7a2f7ea0e635f0ba79d7d54b118814bcefa4b6a1 SHA256 1a10a2ed98b46a5854c697077cf6329102797cbe9f7660c78b11c8e22b4f339d
 DIST kdeaccessibility-4.7.3.tar.bz2 878030 RMD160 48a77ba186233a8b34e79fd1f3f7e15e250ca882 SHA1 9695d2b8b6f55266e3f76ebf05543f23857b9520 SHA256 d4225fcf207b06506972e0d1e405f7521492106e6b7994145ecb8cc3cd9f60d1
diff --git a/kde-base/kaccessible/kaccessible-4.7.2.ebuild b/kde-base/kaccessible/kaccessible-4.7.2.ebuild
deleted file mode 100644
index 050bf9b3ab5a..000000000000
--- a/kde-base/kaccessible/kaccessible-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:11 alexxy 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/kaccessible/kaccessible-4.7.3.ebuild b/kde-base/kaccessible/kaccessible-4.7.3.ebuild
index fa4d501a0acc..db261370606e 100644
--- a/kde-base/kaccessible/kaccessible-4.7.3.ebuild
+++ b/kde-base/kaccessible/kaccessible-4.7.3.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/kde-base/kaccessible/kaccessible-4.7.3.ebuild,v 1.1 2011/11/02 20:48:02 alexxy Exp $
+# $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
 
@@ -14,7 +14,7 @@ fi
 inherit ${kde_eclass}
 
 DESCRIPTION="Provides accessibility services like focus tracking"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug +speechd"
 
 DEPEND="app-accessibility/speech-dispatcher"
diff --git a/kde-base/kactivities/Manifest b/kde-base/kactivities/Manifest
index bdcc8600f929..6228562228d9 100644
--- a/kde-base/kactivities/Manifest
+++ b/kde-base/kactivities/Manifest
@@ -1,2 +1 @@
-DIST kdelibs-4.7.2.tar.bz2 12066803 RMD160 b887172ac490fa1d69f38eddebc99fbced1c249f SHA1 4b074633cbf69752fda96018514ee771efe8f18b SHA256 bfa70b33d2153c209a21735d73ae061772c59696c1715881191da7a3993f8b38
 DIST kdelibs-4.7.3.tar.bz2 12071229 RMD160 e8bb93554a915d97d6619b8a9bfccdd7175259a0 SHA1 4f1bbd1b4d558f3541057747db9bf7e9dcececb3 SHA256 00ef65295134e998e8bc1123b0bd64245811106e827ab90458378ea4ab5b0e66
diff --git a/kde-base/kactivities/kactivities-4.7.2.ebuild b/kde-base/kactivities/kactivities-4.7.2.ebuild
deleted file mode 100644
index 345c661250cb..000000000000
--- a/kde-base/kactivities/kactivities-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:07 alexxy 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/kactivities/kactivities-4.7.3.ebuild b/kde-base/kactivities/kactivities-4.7.3.ebuild
index d55f6f33d0e3..ce015c68d221 100644
--- a/kde-base/kactivities/kactivities-4.7.3.ebuild
+++ b/kde-base/kactivities/kactivities-4.7.3.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/kde-base/kactivities/kactivities-4.7.3.ebuild,v 1.1 2011/11/02 20:47:58 alexxy Exp $
+# $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
 
@@ -11,7 +11,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE Activity Manager"
 
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RESTRICT="test"
diff --git a/kde-base/kaddressbook/Manifest b/kde-base/kaddressbook/Manifest
index 4e48133a3b7c..70a470d0ba9e 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.2.tar.bz2 16171209 RMD160 378e7352725dd257617b1af7d2bb98a8d5569808 SHA1 41983556eb54a740a20d274878006ace5bc73c1c SHA256 1635dabfc73b95209466c92a009bd2856ebd73c42f486545ff97e719fec06630
 DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
diff --git a/kde-base/kaddressbook/kaddressbook-4.7.2.ebuild b/kde-base/kaddressbook/kaddressbook-4.7.2.ebuild
deleted file mode 100644
index 2f7a8bb18778..000000000000
--- a/kde-base/kaddressbook/kaddressbook-4.7.2.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/kaddressbook/kaddressbook-4.7.2.ebuild,v 1.1 2011/10/06 18:10:44 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="The KDE Address Book"
-KEYWORDS="~amd64 ~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}"
-
-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/kaddressbook/kaddressbook-4.7.3.ebuild b/kde-base/kaddressbook/kaddressbook-4.7.3.ebuild
index d956c7947395..0493f70276da 100644
--- a/kde-base/kaddressbook/kaddressbook-4.7.3.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-4.7.3.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/kde-base/kaddressbook/kaddressbook-4.7.3.ebuild,v 1.3 2011/12/04 20:33:21 dilfridge Exp $
+# $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
 
@@ -10,7 +10,7 @@ KDE_SCM="git"
 inherit kde4-meta
 
 DESCRIPTION="The KDE Address Book"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kajongg/Manifest b/kde-base/kajongg/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/kajongg/Manifest
+++ b/kde-base/kajongg/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/kajongg/kajongg-4.7.2-r1.ebuild b/kde-base/kajongg/kajongg-4.7.2-r1.ebuild
deleted file mode 100644
index 50bacee59ef8..000000000000
--- a/kde-base/kajongg/kajongg-4.7.2-r1.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.2-r1.ebuild,v 1.1 2011/10/28 19:43:57 abcd 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/kajongg/kajongg-4.7.3.ebuild b/kde-base/kajongg/kajongg-4.7.3.ebuild
index 1a5fbb0542b7..1e7b4384a0e5 100644
--- a/kde-base/kajongg/kajongg-4.7.3.ebuild
+++ b/kde-base/kajongg/kajongg-4.7.3.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/kde-base/kajongg/kajongg-4.7.3.ebuild,v 1.1 2011/11/02 20:47:58 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kdegames"
 inherit kde4-meta python
 
 DESCRIPTION="The classical Mah Jongg for four players"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kalarm/Manifest b/kde-base/kalarm/Manifest
index 4e48133a3b7c..70a470d0ba9e 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.2.tar.bz2 16171209 RMD160 378e7352725dd257617b1af7d2bb98a8d5569808 SHA1 41983556eb54a740a20d274878006ace5bc73c1c SHA256 1635dabfc73b95209466c92a009bd2856ebd73c42f486545ff97e719fec06630
 DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
diff --git a/kde-base/kalarm/kalarm-4.7.2.ebuild b/kde-base/kalarm/kalarm-4.7.2.ebuild
deleted file mode 100644
index 6574326067ca..000000000000
--- a/kde-base/kalarm/kalarm-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:55 alexxy 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 ~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/kalarm/kalarm-4.7.3.ebuild b/kde-base/kalarm/kalarm-4.7.3.ebuild
index 0537749203a6..ddffab37cdc7 100644
--- a/kde-base/kalarm/kalarm-4.7.3.ebuild
+++ b/kde-base/kalarm/kalarm-4.7.3.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/kde-base/kalarm/kalarm-4.7.3.ebuild,v 1.2 2011/11/05 19:55:56 xarthisius Exp $
+# $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
 
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/kalgebra/Manifest b/kde-base/kalgebra/Manifest
index 1b269f29c59c..24d83fc49515 100644
--- a/kde-base/kalgebra/Manifest
+++ b/kde-base/kalgebra/Manifest
@@ -1,4 +1,3 @@
-DIST kalgebra-4.7.2.tar.bz2 232924 RMD160 d1b486cf982874736eda868d49de8cefd788d723 SHA1 4507b93e67d953705f7fe5eccec10868971a79ca SHA256 85f213eb34042bf2ec4a4c481fb48b60821aed247b438502415387c4ee5611b7
 DIST kalgebra-4.7.3.tar.bz2 233440 RMD160 db28cc47099a7776466f0b5e3c03d41ebd5ce871 SHA1 88cc89a6c942b7cef548532702c5e68bf75f0748 SHA256 59a498304606204ad12ea26460643dc1422ee35167f2bdc8c9584bc8d7547bf0
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
 DIST kdeedu-4.6.5.tar.bz2 71684677 RMD160 78cfdc42f648308477c57bd816f46434bb588449 SHA1 64247eb68b2710a66baaf824d798e46b34ca4d4f SHA256 1306ef6c8654a0a17131b98e16b19d68beb4e03a324749b2147b010f5c45394b
diff --git a/kde-base/kalgebra/kalgebra-4.7.2.ebuild b/kde-base/kalgebra/kalgebra-4.7.2.ebuild
deleted file mode 100644
index 67102ce86180..000000000000
--- a/kde-base/kalgebra/kalgebra-4.7.2.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/kalgebra/kalgebra-4.7.2.ebuild,v 1.1 2011/10/06 18:11:11 alexxy 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/
-"
-
-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/kalgebra/kalgebra-4.7.3.ebuild b/kde-base/kalgebra/kalgebra-4.7.3.ebuild
index c2e3cb92effc..f52852ae84c3 100644
--- a/kde-base/kalgebra/kalgebra-4.7.3.ebuild
+++ b/kde-base/kalgebra/kalgebra-4.7.3.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/kde-base/kalgebra/kalgebra-4.7.3.ebuild,v 1.2 2011/12/04 15:47:33 dilfridge Exp $
+# $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
 
@@ -10,7 +10,7 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="MathML-based graph calculator for KDE."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug +plasma readline"
 
 DEPEND="
diff --git a/kde-base/kalzium/Manifest b/kde-base/kalzium/Manifest
index 87172e078cfd..fbf21fefd650 100644
--- a/kde-base/kalzium/Manifest
+++ b/kde-base/kalzium/Manifest
@@ -1,4 +1,3 @@
-DIST kalzium-4.7.2.tar.bz2 3949652 RMD160 e69129ee4466f03e8369700eb289eb72a91a3e24 SHA1 3e750692964ca76da9ccbae5bdc263413a22a049 SHA256 15ce0b86a1e724a4dbe991ad2a64852f3970bf264960d0f305c2c754adacda2b
 DIST kalzium-4.7.3.tar.bz2 3949095 RMD160 f7cb5af0fd6d2b4a5401f58d967e321356e727b3 SHA1 e22b54be4a2e8ce8a22af73fa6155ee012fa6fdf SHA256 8b433b23e1105dea11c046c051aaa3303b93616453d5aa4b4c24f67b355db3d5
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
 DIST kdeedu-4.6.5.tar.bz2 71684677 RMD160 78cfdc42f648308477c57bd816f46434bb588449 SHA1 64247eb68b2710a66baaf824d798e46b34ca4d4f SHA256 1306ef6c8654a0a17131b98e16b19d68beb4e03a324749b2147b010f5c45394b
diff --git a/kde-base/kalzium/kalzium-4.7.2.ebuild b/kde-base/kalzium/kalzium-4.7.2.ebuild
deleted file mode 100644
index 136453746063..000000000000
--- a/kde-base/kalzium/kalzium-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:11 alexxy 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/kalzium/kalzium-4.7.3.ebuild b/kde-base/kalzium/kalzium-4.7.3.ebuild
index 4e45d5a1a0f2..59914a6b38b6 100644
--- a/kde-base/kalzium/kalzium-4.7.3.ebuild
+++ b/kde-base/kalzium/kalzium-4.7.3.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/kde-base/kalzium/kalzium-4.7.3.ebuild,v 1.1 2011/11/02 20:48:07 alexxy Exp $
+# $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
 
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="editor debug +plasma solver"
 
 RDEPEND="
diff --git a/kde-base/kamera/Manifest b/kde-base/kamera/Manifest
index d799ff669cf3..ee4d9a62c529 100644
--- a/kde-base/kamera/Manifest
+++ b/kde-base/kamera/Manifest
@@ -1,4 +1,3 @@
-DIST kamera-4.7.2.tar.bz2 38608 RMD160 5f94c33a747b50a234e1994ffb7e885ce5c4cba4 SHA1 354d45d8f62c66bef0bc04c6e6e2056060ca7f0b SHA256 f68c8e3150ab7175a239f95375a7c633f5f6d18cdfa145c9762e1e3ab2836ecd
 DIST kamera-4.7.3.tar.bz2 38725 RMD160 345a4e75743bf0c6012acdebc8e143fe475ac4f7 SHA1 820f9b6449732f6cab48f5c2d9e7dbcf53eb6437 SHA256 81aacb6f499d27df6eab6496385b4969383aa58b5d578e89d3f50e66ba82f2c7
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
 DIST kdegraphics-4.6.5.tar.bz2 5455380 RMD160 75fdf00994bfc2737a754b4ff360ab789cd824b5 SHA1 1e64698993d0754dfae1296d8d16ba9370f9a08c SHA256 5b8a7e54f281ac938d8e22db673b7ddcff8a1d8adfc128282150ad52c80b8c04
diff --git a/kde-base/kamera/kamera-4.7.2.ebuild b/kde-base/kamera/kamera-4.7.2.ebuild
deleted file mode 100644
index ba05abd8c10b..000000000000
--- a/kde-base/kamera/kamera-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:05 alexxy 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/kamera/kamera-4.7.3.ebuild b/kde-base/kamera/kamera-4.7.3.ebuild
index 06a326a89655..31efbf39c4f2 100644
--- a/kde-base/kamera/kamera-4.7.3.ebuild
+++ b/kde-base/kamera/kamera-4.7.3.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/kde-base/kamera/kamera-4.7.3.ebuild,v 1.1 2011/11/02 20:48:11 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="KDE digital camera manager"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kanagram/Manifest b/kde-base/kanagram/Manifest
index 7006c66dc856..acd1823b1ac4 100644
--- a/kde-base/kanagram/Manifest
+++ b/kde-base/kanagram/Manifest
@@ -1,4 +1,3 @@
-DIST kanagram-4.7.2.tar.bz2 650633 RMD160 32614e96d680fe4c496f908ff9dd17c006d3882c SHA1 0dd7dd66f87f99a5f0f2b4a7340c4690240c2478 SHA256 39a410d6214d396aaec4773cdaeba59011ea4c413053369c49cf5f6a8c3cc399
 DIST kanagram-4.7.3.tar.bz2 650672 RMD160 fb9e147d9dbddec288235bf756c0a82e331e4f6a SHA1 44a60b76bbc8ae61b8673c37c2b8721f12dc22bb SHA256 a834259a6f8cc9c5bcdd7d43906c3cec6b34c65371164fb85ab8eadb5bdb6a1f
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
 DIST kdeedu-4.6.5.tar.bz2 71684677 RMD160 78cfdc42f648308477c57bd816f46434bb588449 SHA1 64247eb68b2710a66baaf824d798e46b34ca4d4f SHA256 1306ef6c8654a0a17131b98e16b19d68beb4e03a324749b2147b010f5c45394b
diff --git a/kde-base/kanagram/kanagram-4.7.2.ebuild b/kde-base/kanagram/kanagram-4.7.2.ebuild
deleted file mode 100644
index 0fe762a3d692..000000000000
--- a/kde-base/kanagram/kanagram-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:47 alexxy 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/kanagram/kanagram-4.7.3.ebuild b/kde-base/kanagram/kanagram-4.7.3.ebuild
index 5f075c1097dd..2cf9cfb63637 100644
--- a/kde-base/kanagram/kanagram-4.7.3.ebuild
+++ b/kde-base/kanagram/kanagram-4.7.3.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/kde-base/kanagram/kanagram-4.7.3.ebuild,v 1.1 2011/11/02 20:47:55 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="KDE: letter order game."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kapman/Manifest b/kde-base/kapman/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/kapman/Manifest
+++ b/kde-base/kapman/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/kapman/kapman-4.7.2.ebuild b/kde-base/kapman/kapman-4.7.2.ebuild
deleted file mode 100644
index 20310845f57f..000000000000
--- a/kde-base/kapman/kapman-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:08 alexxy 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/kapman/kapman-4.7.3.ebuild b/kde-base/kapman/kapman-4.7.3.ebuild
index 49afffa9a0ce..d2dcc543acc6 100644
--- a/kde-base/kapman/kapman-4.7.3.ebuild
+++ b/kde-base/kapman/kapman-4.7.3.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/kde-base/kapman/kapman-4.7.3.ebuild,v 1.1 2011/11/02 20:48:14 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="Pac-Man clone for KDE"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kapptemplate/Manifest b/kde-base/kapptemplate/Manifest
index 8429b87a7c26..c05641549806 100644
--- a/kde-base/kapptemplate/Manifest
+++ b/kde-base/kapptemplate/Manifest
@@ -1,4 +1,3 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
 DIST kdesdk-4.6.5.tar.bz2 6063147 RMD160 0818eb740cb3f9c83ccf92bb238c4adbdd83b875 SHA1 8cffa0472fbe1096ebfea9bde49aaff76a145b34 SHA256 4b35eb3381bbf06e4d091dea4b38f6c807ce218d45e04d8719ee17ebd1820ff4
-DIST kdesdk-4.7.2.tar.bz2 5265267 RMD160 a8d275fcc858a548c7fe9ce04c0fd11279297174 SHA1 b6259b46fed642c35e1c1d1f90712084141ca441 SHA256 c9377df9429633413c57684574e6405b3dc3b493ac3ab43d9fd429ff3ab920be
 DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
diff --git a/kde-base/kapptemplate/kapptemplate-4.7.2.ebuild b/kde-base/kapptemplate/kapptemplate-4.7.2.ebuild
deleted file mode 100644
index 9fbb75be4988..000000000000
--- a/kde-base/kapptemplate/kapptemplate-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:07 alexxy 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/kapptemplate/kapptemplate-4.7.3.ebuild b/kde-base/kapptemplate/kapptemplate-4.7.3.ebuild
index 7718fbfc4897..0a2f81226569 100644
--- a/kde-base/kapptemplate/kapptemplate-4.7.3.ebuild
+++ b/kde-base/kapptemplate/kapptemplate-4.7.3.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/kde-base/kapptemplate/kapptemplate-4.7.3.ebuild,v 1.1 2011/11/02 20:48:18 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kate/Manifest b/kde-base/kate/Manifest
index c71d25b67d47..f81744dba342 100644
--- a/kde-base/kate/Manifest
+++ b/kde-base/kate/Manifest
@@ -1,4 +1,3 @@
-DIST kate-4.7.2.tar.bz2 2035600 RMD160 1f89a9f160de2b3c9b46cd51d03aca1b9be73846 SHA1 467b0558f1f86d0b210abd2d78c94cbe63b8579d SHA256 04cb8855bb787fcbf7356a21160742d66668ec76fd8ba6615244ef1926641be2
 DIST kate-4.7.3.tar.bz2 2038690 RMD160 c5809a4b915dc6b2c55d1bef9d1ebfa16606e5c7 SHA1 d67e871a49d426246f2e555ace0ad5a303c41045 SHA256 154dd3dfc16745ea567834eac7d082990d2251a79c6161c9fc4d34566936fc95
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
 DIST kdesdk-4.6.5.tar.bz2 6063147 RMD160 0818eb740cb3f9c83ccf92bb238c4adbdd83b875 SHA1 8cffa0472fbe1096ebfea9bde49aaff76a145b34 SHA256 4b35eb3381bbf06e4d091dea4b38f6c807ce218d45e04d8719ee17ebd1820ff4
diff --git a/kde-base/kate/kate-4.7.2.ebuild b/kde-base/kate/kate-4.7.2.ebuild
deleted file mode 100644
index 0b4f1379dd16..000000000000
--- a/kde-base/kate/kate-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:54 alexxy 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/kate/kate-4.7.3.ebuild b/kde-base/kate/kate-4.7.3.ebuild
index 7c7c4cbcc5e6..3802212891e9 100644
--- a/kde-base/kate/kate-4.7.3.ebuild
+++ b/kde-base/kate/kate-4.7.3.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/kde-base/kate/kate-4.7.3.ebuild,v 1.1 2011/11/02 20:48:10 alexxy Exp $
+# $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
 
@@ -10,7 +10,7 @@ KDE_SCM="git"
 inherit kde4-meta
 
 DESCRIPTION="Kate is an MDI texteditor."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug +plasma"
 
 DEPEND="
diff --git a/kde-base/katepart/Manifest b/kde-base/katepart/Manifest
index fa74d903ef06..176241b5f93b 100644
--- a/kde-base/katepart/Manifest
+++ b/kde-base/katepart/Manifest
@@ -1,2 +1 @@
-DIST kate-4.7.2.tar.bz2 2035600 RMD160 1f89a9f160de2b3c9b46cd51d03aca1b9be73846 SHA1 467b0558f1f86d0b210abd2d78c94cbe63b8579d SHA256 04cb8855bb787fcbf7356a21160742d66668ec76fd8ba6615244ef1926641be2
 DIST kate-4.7.3.tar.bz2 2038690 RMD160 c5809a4b915dc6b2c55d1bef9d1ebfa16606e5c7 SHA1 d67e871a49d426246f2e555ace0ad5a303c41045 SHA256 154dd3dfc16745ea567834eac7d082990d2251a79c6161c9fc4d34566936fc95
diff --git a/kde-base/katepart/katepart-4.7.2.ebuild b/kde-base/katepart/katepart-4.7.2.ebuild
deleted file mode 100644
index 11492fd06b41..000000000000
--- a/kde-base/katepart/katepart-4.7.2.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/katepart/katepart-4.7.2.ebuild,v 1.1 2011/10/06 18:10:56 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kate"
-KMMODULE="part"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE Editor KPart"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug"
-
-add_blocker kdelibs 4.6.50
-
-src_configure() {
-	local mycmakeargs=(
-		"-DKDE4_BUILD_TESTS=OFF"
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/katepart/katepart-4.7.3.ebuild b/kde-base/katepart/katepart-4.7.3.ebuild
index ac60d6e2b211..614dfa08d5dc 100644
--- a/kde-base/katepart/katepart-4.7.3.ebuild
+++ b/kde-base/katepart/katepart-4.7.3.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/kde-base/katepart/katepart-4.7.3.ebuild,v 1.3 2011/12/03 15:42:08 dilfridge Exp $
+# $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
 
@@ -11,7 +11,7 @@ KDE_SCM="git"
 inherit kde4-meta
 
 DESCRIPTION="KDE Editor KPart"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="debug"
 
 RESTRICT="test"
diff --git a/kde-base/katomic/Manifest b/kde-base/katomic/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/katomic/Manifest
+++ b/kde-base/katomic/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/katomic/katomic-4.7.2.ebuild b/kde-base/katomic/katomic-4.7.2.ebuild
deleted file mode 100644
index 6d3d8c6df71d..000000000000
--- a/kde-base/katomic/katomic-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:58 alexxy 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/katomic/katomic-4.7.3.ebuild b/kde-base/katomic/katomic-4.7.3.ebuild
index 2c63ba1498f3..73e90c964f8b 100644
--- a/kde-base/katomic/katomic-4.7.3.ebuild
+++ b/kde-base/katomic/katomic-4.7.3.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/kde-base/katomic/katomic-4.7.3.ebuild,v 1.1 2011/11/02 20:48:08 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="KDE Atomic Entertainment Game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kbattleship/Manifest b/kde-base/kbattleship/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/kbattleship/Manifest
+++ b/kde-base/kbattleship/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/kbattleship/kbattleship-4.7.2.ebuild b/kde-base/kbattleship/kbattleship-4.7.2.ebuild
deleted file mode 100644
index df3d0a6a1ab6..000000000000
--- a/kde-base/kbattleship/kbattleship-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:58 alexxy 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/kbattleship/kbattleship-4.7.3.ebuild b/kde-base/kbattleship/kbattleship-4.7.3.ebuild
index a1f325851953..e2bf7c0a89d7 100644
--- a/kde-base/kbattleship/kbattleship-4.7.3.ebuild
+++ b/kde-base/kbattleship/kbattleship-4.7.3.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/kde-base/kbattleship/kbattleship-4.7.3.ebuild,v 1.1 2011/11/02 20:47:56 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kdegames"
 inherit games-ggz kde4-meta
 
 DESCRIPTION="The KDE Battleship clone"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 src_prepare() {
diff --git a/kde-base/kblackbox/Manifest b/kde-base/kblackbox/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/kblackbox/Manifest
+++ b/kde-base/kblackbox/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/kblackbox/kblackbox-4.7.2.ebuild b/kde-base/kblackbox/kblackbox-4.7.2.ebuild
deleted file mode 100644
index a6e04480a8a1..000000000000
--- a/kde-base/kblackbox/kblackbox-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:13 alexxy 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/kblackbox/kblackbox-4.7.3.ebuild b/kde-base/kblackbox/kblackbox-4.7.3.ebuild
index 3267e0f42c06..ff255e22c841 100644
--- a/kde-base/kblackbox/kblackbox-4.7.3.ebuild
+++ b/kde-base/kblackbox/kblackbox-4.7.3.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/kde-base/kblackbox/kblackbox-4.7.3.ebuild,v 1.1 2011/11/02 20:48:21 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="KDE Blackbox Game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kblocks/Manifest b/kde-base/kblocks/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/kblocks/Manifest
+++ b/kde-base/kblocks/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/kblocks/kblocks-4.7.2.ebuild b/kde-base/kblocks/kblocks-4.7.2.ebuild
deleted file mode 100644
index b8fad2e63194..000000000000
--- a/kde-base/kblocks/kblocks-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:55 alexxy 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/kblocks/kblocks-4.7.3.ebuild b/kde-base/kblocks/kblocks-4.7.3.ebuild
index cb92ca24da67..df3aab83be65 100644
--- a/kde-base/kblocks/kblocks-4.7.3.ebuild
+++ b/kde-base/kblocks/kblocks-4.7.3.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/kde-base/kblocks/kblocks-4.7.3.ebuild,v 1.1 2011/11/02 20:48:04 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Kblocks is a single-player Tetris-like game."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kbounce/Manifest b/kde-base/kbounce/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/kbounce/Manifest
+++ b/kde-base/kbounce/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/kbounce/kbounce-4.7.2.ebuild b/kde-base/kbounce/kbounce-4.7.2.ebuild
deleted file mode 100644
index 742ee2e6ba19..000000000000
--- a/kde-base/kbounce/kbounce-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:56 alexxy 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/kbounce/kbounce-4.7.3.ebuild b/kde-base/kbounce/kbounce-4.7.3.ebuild
index 909e3035f800..51d5b4365eb6 100644
--- a/kde-base/kbounce/kbounce-4.7.3.ebuild
+++ b/kde-base/kbounce/kbounce-4.7.3.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/kde-base/kbounce/kbounce-4.7.3.ebuild,v 1.1 2011/11/02 20:48:05 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="KDE Bounce Ball Game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kbreakout/Manifest b/kde-base/kbreakout/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/kbreakout/Manifest
+++ b/kde-base/kbreakout/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/kbreakout/kbreakout-4.7.2.ebuild b/kde-base/kbreakout/kbreakout-4.7.2.ebuild
deleted file mode 100644
index 02b01f9823ff..000000000000
--- a/kde-base/kbreakout/kbreakout-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:10 alexxy 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/kbreakout/kbreakout-4.7.3.ebuild b/kde-base/kbreakout/kbreakout-4.7.3.ebuild
index 47e22adbf823..e937ec731e15 100644
--- a/kde-base/kbreakout/kbreakout-4.7.3.ebuild
+++ b/kde-base/kbreakout/kbreakout-4.7.3.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/kde-base/kbreakout/kbreakout-4.7.3.ebuild,v 1.1 2011/11/02 20:48:22 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="KDE: A Breakout-like game for KDE."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kbruch/Manifest b/kde-base/kbruch/Manifest
index 1d48ab3ff4fb..491ac037ea69 100644
--- a/kde-base/kbruch/Manifest
+++ b/kde-base/kbruch/Manifest
@@ -1,4 +1,3 @@
-DIST kbruch-4.7.2.tar.bz2 964368 RMD160 4c44ec2d44f2e2fc2c847060196300cc3cd20515 SHA1 db4959982db7a36fef61798978d8c885408a3e3f SHA256 5213ced8e41d8aa7c5e657fd434eb1f6fe8eecf57020ba0f785df3e53d6fac43
 DIST kbruch-4.7.3.tar.bz2 964151 RMD160 a3843e06e17110eebec569f391a4745299186f7a SHA1 c90205954d9c153aaa5966b424aa437b07e657f7 SHA256 a77f3490721c50d3cefd13ca815419212103a9cefb02be275dda562e00e7a507
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
 DIST kdeedu-4.6.5.tar.bz2 71684677 RMD160 78cfdc42f648308477c57bd816f46434bb588449 SHA1 64247eb68b2710a66baaf824d798e46b34ca4d4f SHA256 1306ef6c8654a0a17131b98e16b19d68beb4e03a324749b2147b010f5c45394b
diff --git a/kde-base/kbruch/kbruch-4.7.2.ebuild b/kde-base/kbruch/kbruch-4.7.2.ebuild
deleted file mode 100644
index b84de4297b22..000000000000
--- a/kde-base/kbruch/kbruch-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:56 alexxy 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/kbruch/kbruch-4.7.3.ebuild b/kde-base/kbruch/kbruch-4.7.3.ebuild
index 5d5fbfc27905..fa58679ddf20 100644
--- a/kde-base/kbruch/kbruch-4.7.3.ebuild
+++ b/kde-base/kbruch/kbruch-4.7.3.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/kde-base/kbruch/kbruch-4.7.3.ebuild,v 1.1 2011/11/02 20:48:00 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="KDE Educational: Learn calculating with fractions"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kcachegrind/Manifest b/kde-base/kcachegrind/Manifest
index 8429b87a7c26..c05641549806 100644
--- a/kde-base/kcachegrind/Manifest
+++ b/kde-base/kcachegrind/Manifest
@@ -1,4 +1,3 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
 DIST kdesdk-4.6.5.tar.bz2 6063147 RMD160 0818eb740cb3f9c83ccf92bb238c4adbdd83b875 SHA1 8cffa0472fbe1096ebfea9bde49aaff76a145b34 SHA256 4b35eb3381bbf06e4d091dea4b38f6c807ce218d45e04d8719ee17ebd1820ff4
-DIST kdesdk-4.7.2.tar.bz2 5265267 RMD160 a8d275fcc858a548c7fe9ce04c0fd11279297174 SHA1 b6259b46fed642c35e1c1d1f90712084141ca441 SHA256 c9377df9429633413c57684574e6405b3dc3b493ac3ab43d9fd429ff3ab920be
 DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
diff --git a/kde-base/kcachegrind/kcachegrind-4.7.2.ebuild b/kde-base/kcachegrind/kcachegrind-4.7.2.ebuild
deleted file mode 100644
index b13c82693262..000000000000
--- a/kde-base/kcachegrind/kcachegrind-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:49 alexxy 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/kcachegrind/kcachegrind-4.7.3.ebuild b/kde-base/kcachegrind/kcachegrind-4.7.3.ebuild
index fd9827e1da3e..d7c6688133d3 100644
--- a/kde-base/kcachegrind/kcachegrind-4.7.3.ebuild
+++ b/kde-base/kcachegrind/kcachegrind-4.7.3.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/kde-base/kcachegrind/kcachegrind-4.7.3.ebuild,v 1.1 2011/11/02 20:47:54 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kdesdk"
 inherit kde4-meta
 
 DESCRIPTION="KDE Frontend for Cachegrind"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/kcalc/Manifest b/kde-base/kcalc/Manifest
index 348ce6a51263..65b585b0a481 100644
--- a/kde-base/kcalc/Manifest
+++ b/kde-base/kcalc/Manifest
@@ -1,4 +1,3 @@
 DIST kdeutils-4.6.3.tar.bz2 3703326 RMD160 1fe6287fed3fa21eef902ee764425171f7345e6c SHA1 1aa735c03689ef49b949278ee31d0d8e8536b7d6 SHA256 d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
 DIST kdeutils-4.6.5.tar.bz2 3699961 RMD160 65293718d8785c8e06e9149465f55f7f5a8718f5 SHA1 1c2ae023d9a6bcf72d3cebd0d7df2e6a175ffdcb SHA256 03de4b7728301414c8e704ba5c8650d8ded053747268ad47c901880fc1bf0b29
-DIST kdeutils-4.7.2.tar.bz2 3800427 RMD160 13fadbd312d70d7de360221facaf506707562fcc SHA1 52ce9b6b5f2c20475f46b6f7378ca4c530df37b4 SHA256 cdea138fc4556b4f6de5e63ee7ccbcb3485a780f372e699c0cb9fd6d65e02f96
 DIST kdeutils-4.7.3.tar.bz2 3802391 RMD160 0e0a73d290baaa289665b49722f04f19ab517dd9 SHA1 23fc9823647152d5d8cc250a55402c8930db4059 SHA256 a8c802f32b9e918d806a4487c25485f86019e4c473f0de6d3086d8ea8e492839
diff --git a/kde-base/kcalc/kcalc-4.7.2.ebuild b/kde-base/kcalc/kcalc-4.7.2.ebuild
deleted file mode 100644
index 7e20d26f2894..000000000000
--- a/kde-base/kcalc/kcalc-4.7.2.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/kcalc/kcalc-4.7.2.ebuild,v 1.1 2011/10/06 18:10:52 alexxy 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}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.2-solaris-knumber_priv.patch
-)
-
-src_test() {
-	LANG=C ${kde_eclass}_src_test
-}
diff --git a/kde-base/kcalc/kcalc-4.7.3.ebuild b/kde-base/kcalc/kcalc-4.7.3.ebuild
index c1a6a19bf7c4..93283149f890 100644
--- a/kde-base/kcalc/kcalc-4.7.3.ebuild
+++ b/kde-base/kcalc/kcalc-4.7.3.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/kde-base/kcalc/kcalc-4.7.3.ebuild,v 1.2 2011/12/04 16:14:59 dilfridge Exp $
+# $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
 
@@ -16,7 +16,7 @@ fi
 inherit ${kde_eclass}
 
 DESCRIPTION="KDE calculator"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kcharselect/Manifest b/kde-base/kcharselect/Manifest
index 348ce6a51263..65b585b0a481 100644
--- a/kde-base/kcharselect/Manifest
+++ b/kde-base/kcharselect/Manifest
@@ -1,4 +1,3 @@
 DIST kdeutils-4.6.3.tar.bz2 3703326 RMD160 1fe6287fed3fa21eef902ee764425171f7345e6c SHA1 1aa735c03689ef49b949278ee31d0d8e8536b7d6 SHA256 d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
 DIST kdeutils-4.6.5.tar.bz2 3699961 RMD160 65293718d8785c8e06e9149465f55f7f5a8718f5 SHA1 1c2ae023d9a6bcf72d3cebd0d7df2e6a175ffdcb SHA256 03de4b7728301414c8e704ba5c8650d8ded053747268ad47c901880fc1bf0b29
-DIST kdeutils-4.7.2.tar.bz2 3800427 RMD160 13fadbd312d70d7de360221facaf506707562fcc SHA1 52ce9b6b5f2c20475f46b6f7378ca4c530df37b4 SHA256 cdea138fc4556b4f6de5e63ee7ccbcb3485a780f372e699c0cb9fd6d65e02f96
 DIST kdeutils-4.7.3.tar.bz2 3802391 RMD160 0e0a73d290baaa289665b49722f04f19ab517dd9 SHA1 23fc9823647152d5d8cc250a55402c8930db4059 SHA256 a8c802f32b9e918d806a4487c25485f86019e4c473f0de6d3086d8ea8e492839
diff --git a/kde-base/kcharselect/kcharselect-4.7.2.ebuild b/kde-base/kcharselect/kcharselect-4.7.2.ebuild
deleted file mode 100644
index 87431412a6bd..000000000000
--- a/kde-base/kcharselect/kcharselect-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:09 alexxy 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/kcharselect/kcharselect-4.7.3.ebuild b/kde-base/kcharselect/kcharselect-4.7.3.ebuild
index 7e2fbb48b34a..9e4036e2d10f 100644
--- a/kde-base/kcharselect/kcharselect-4.7.3.ebuild
+++ b/kde-base/kcharselect/kcharselect-4.7.3.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/kde-base/kcharselect/kcharselect-4.7.3.ebuild,v 1.1 2011/11/02 20:48:00 alexxy Exp $
+# $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
 
@@ -15,5 +15,5 @@ fi
 inherit ${kde_eclass}
 
 DESCRIPTION="KDE character selection utility"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kcheckpass/Manifest b/kde-base/kcheckpass/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/kcheckpass/Manifest
+++ b/kde-base/kcheckpass/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/kcheckpass/kcheckpass-4.7.2.ebuild b/kde-base/kcheckpass/kcheckpass-4.7.2.ebuild
deleted file mode 100644
index 94593d3f1146..000000000000
--- a/kde-base/kcheckpass/kcheckpass-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:12 alexxy 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/kcheckpass/kcheckpass-4.7.3.ebuild b/kde-base/kcheckpass/kcheckpass-4.7.3.ebuild
index 818498032af4..81ebf15bb4bd 100644
--- a/kde-base/kcheckpass/kcheckpass-4.7.3.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-4.7.3.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/kde-base/kcheckpass/kcheckpass-4.7.3.ebuild,v 1.1 2011/11/02 20:48:09 alexxy Exp $
+# $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
 
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug pam"
 
 RDEPEND="
diff --git a/kde-base/kcminit/Manifest b/kde-base/kcminit/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/kcminit/Manifest
+++ b/kde-base/kcminit/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/kcminit/kcminit-4.7.2.ebuild b/kde-base/kcminit/kcminit-4.7.2.ebuild
deleted file mode 100644
index 06742d3192d0..000000000000
--- a/kde-base/kcminit/kcminit-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:07 alexxy 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/kcminit/kcminit-4.7.3.ebuild b/kde-base/kcminit/kcminit-4.7.3.ebuild
index e6684c109473..059d655b937e 100644
--- a/kde-base/kcminit/kcminit-4.7.3.ebuild
+++ b/kde-base/kcminit/kcminit-4.7.3.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/kde-base/kcminit/kcminit-4.7.3.ebuild,v 1.1 2011/11/02 20:48:13 alexxy Exp $
+# $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
 
@@ -8,7 +8,7 @@ KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KCMInit - runs startups initialization for Control Modules."
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kcmshell/Manifest b/kde-base/kcmshell/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/kcmshell/Manifest
+++ b/kde-base/kcmshell/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/kcmshell/kcmshell-4.7.2.ebuild b/kde-base/kcmshell/kcmshell-4.7.2.ebuild
deleted file mode 100644
index a01e9fb4c900..000000000000
--- a/kde-base/kcmshell/kcmshell-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:06 alexxy 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/kcmshell/kcmshell-4.7.3.ebuild b/kde-base/kcmshell/kcmshell-4.7.3.ebuild
index 2b55c238c2fc..9733cba31ad4 100644
--- a/kde-base/kcmshell/kcmshell-4.7.3.ebuild
+++ b/kde-base/kcmshell/kcmshell-4.7.3.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/kde-base/kcmshell/kcmshell-4.7.3.ebuild,v 1.1 2011/11/02 20:48:17 alexxy Exp $
+# $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
 
@@ -8,5 +8,5 @@ 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"
+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 d44ca34b5ccf..cd0e8c7aa33c 100644
--- a/kde-base/kcolorchooser/Manifest
+++ b/kde-base/kcolorchooser/Manifest
@@ -1,4 +1,3 @@
-DIST kcolorchooser-4.7.2.tar.bz2 4808 RMD160 4870dc26b826885c97c0de63ae8ed1ca75558fab SHA1 64bd726f1bbb1e771bc037d9929f0eba098d844d SHA256 3814fdbe823b6f9bace3d8b007992f34b49216a2abcd441a2216c2b16c22e842
 DIST kcolorchooser-4.7.3.tar.bz2 4817 RMD160 4572f8b70904115870deb104b80b8e952e792499 SHA1 bdd35e5defbcfc151f4960541c351246cb4dfa9e SHA256 7043dec3ef38cea45380295fb289b146255b5649c46f6aa74d5d684a7a040b22
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
 DIST kdegraphics-4.6.5.tar.bz2 5455380 RMD160 75fdf00994bfc2737a754b4ff360ab789cd824b5 SHA1 1e64698993d0754dfae1296d8d16ba9370f9a08c SHA256 5b8a7e54f281ac938d8e22db673b7ddcff8a1d8adfc128282150ad52c80b8c04
diff --git a/kde-base/kcolorchooser/kcolorchooser-4.7.2.ebuild b/kde-base/kcolorchooser/kcolorchooser-4.7.2.ebuild
deleted file mode 100644
index de6b17554c98..000000000000
--- a/kde-base/kcolorchooser/kcolorchooser-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:55 alexxy 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/kcolorchooser/kcolorchooser-4.7.3.ebuild b/kde-base/kcolorchooser/kcolorchooser-4.7.3.ebuild
index ff77a0e23564..b2ab8f4f88f0 100644
--- a/kde-base/kcolorchooser/kcolorchooser-4.7.3.ebuild
+++ b/kde-base/kcolorchooser/kcolorchooser-4.7.3.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/kde-base/kcolorchooser/kcolorchooser-4.7.3.ebuild,v 1.1 2011/11/02 20:48:07 alexxy Exp $
+# $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
 
@@ -8,5 +8,5 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="KDE color selector/editor"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kcontrol/Manifest b/kde-base/kcontrol/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/kcontrol/Manifest
+++ b/kde-base/kcontrol/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/kcontrol/kcontrol-4.7.2.ebuild b/kde-base/kcontrol/kcontrol-4.7.2.ebuild
deleted file mode 100644
index c7e5aecedfb2..000000000000
--- a/kde-base/kcontrol/kcontrol-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:12 alexxy 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/kcontrol/kcontrol-4.7.3.ebuild b/kde-base/kcontrol/kcontrol-4.7.3.ebuild
index 5bd0aa0c8279..8c617dd28f12 100644
--- a/kde-base/kcontrol/kcontrol-4.7.3.ebuild
+++ b/kde-base/kcontrol/kcontrol-4.7.3.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/kde-base/kcontrol/kcontrol-4.7.3.ebuild,v 1.1 2011/11/02 20:48:22 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="The KDE Control Center"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/kcron/Manifest b/kde-base/kcron/Manifest
index 8972cd6bec5d..fff74e88e259 100644
--- a/kde-base/kcron/Manifest
+++ b/kde-base/kcron/Manifest
@@ -1,4 +1,3 @@
 DIST kdeadmin-4.6.3.tar.bz2 792325 RMD160 b36d9a7c983f5da9e6a3524d3cde1f28464d1580 SHA1 141e8e794ebd5341940d2d22986b7376a2abefbf SHA256 1db65d3f5afb83affdad921ee034f33d7aeb1aac7fe9a55f4b1d26c385577076
 DIST kdeadmin-4.6.5.tar.bz2 790804 RMD160 5eea0659691e0870e3646ebb33b98e84173781e8 SHA1 010912294a12461a8a0bfdce69c5373b37342cb6 SHA256 a1ef6784a00cd714eb30147e64c56f66e15d712fe7b9fc49c5dfad2ccc5c3ed7
-DIST kdeadmin-4.7.2.tar.bz2 806180 RMD160 154f11d28d86fffd929dd16804d0fca5f0caddb4 SHA1 c96ddd94a4903b035e73b3e958e6b189ca173fe9 SHA256 f7085433fa3f180575549340a6a360c6d67e21efdbfc9a40c3eb09de11e0cc57
 DIST kdeadmin-4.7.3.tar.bz2 806208 RMD160 5aefc3021a1fea4725295ebe97ba8486a09f2768 SHA1 b2d6d210bc40e8731a9ae8409673f3d71b57de0a SHA256 00b32dfb17a8edd89cdd01083df71b1b177e79c7a6ab7fce679a3d0246647029
diff --git a/kde-base/kcron/kcron-4.7.2.ebuild b/kde-base/kcron/kcron-4.7.2.ebuild
deleted file mode 100644
index 9fbd5e597d4a..000000000000
--- a/kde-base/kcron/kcron-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:57 alexxy 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/kcron/kcron-4.7.3.ebuild b/kde-base/kcron/kcron-4.7.3.ebuild
index c72eeb034f30..fcd4e8e8bd3f 100644
--- a/kde-base/kcron/kcron-4.7.3.ebuild
+++ b/kde-base/kcron/kcron-4.7.3.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/kde-base/kcron/kcron-4.7.3.ebuild,v 1.1 2011/11/02 20:48:16 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kdeadmin"
 inherit kde4-meta
 
 DESCRIPTION="KDE Task Scheduler"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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.2.ebuild b/kde-base/kde-env/kde-env-4.7.2.ebuild
deleted file mode 100644
index 7622c6c0afcc..000000000000
--- a/kde-base/kde-env/kde-env-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:52 alexxy 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-env/kde-env-4.7.3.ebuild b/kde-base/kde-env/kde-env-4.7.3.ebuild
index cd234624eb5d..1655bf714b38 100644
--- a/kde-base/kde-env/kde-env-4.7.3.ebuild
+++ b/kde-base/kde-env/kde-env-4.7.3.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/kde-base/kde-env/kde-env-4.7.3.ebuild,v 1.1 2011/11/02 20:48:21 alexxy Exp $
+# $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
 
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 LICENSE="as-is"
 IUSE="aqua"
 
diff --git a/kde-base/kde-l10n/Manifest b/kde-base/kde-l10n/Manifest
index f28321097fd4..d7f3f6ed5250 100644
--- a/kde-base/kde-l10n/Manifest
+++ b/kde-base/kde-l10n/Manifest
@@ -1,210 +1,158 @@
 DIST kde-l10n-ar-4.6.3.tar.bz2 3077588 RMD160 83f13cb0c3ce407abb5bcff8bf400a007bc7dcf0 SHA1 a433fbfcde29131bca6a06fdcb6d44c748008927 SHA256 6fc25a94093fffcfde4f3805f612bb6aa7ac6858ff33cd9a15241f77e83d6c8b
 DIST kde-l10n-ar-4.6.5.tar.bz2 3563553 RMD160 9bd3b7578bae59c25afca707ac7f63334f200d6c SHA1 0b02d58c399b0b99c1b44d2df3a39eec64d38eaa SHA256 dbe624ec1bb966951f1a5e026fe290b7c6079c3dc3502bf9f16b55c9da4cad9c
-DIST kde-l10n-ar-4.7.2.tar.bz2 3593739 RMD160 24db48132c1a59af81c5dc6e89fe325063521ee5 SHA1 04c10068c2d4f6fdf9e1bad475da72ae47053ee7 SHA256 e27db561abfa68464d4662df3afdb969f325ebf5463e2956293998927d68409f
 DIST kde-l10n-ar-4.7.3.tar.bz2 3595175 RMD160 347d0a6f52cb140d5b79c3b09dd2671def15b08a SHA1 6cc066ec6cfdc592918615dca655af9fe25d0f3f SHA256 63d37595e933de20f8d402411274a5bbf7e4492a423f5a97c10e2baa2af76127
 DIST kde-l10n-bg-4.6.3.tar.bz2 1701946 RMD160 47da9d254f2ed18411ee6bd3824d1c4afe8e3650 SHA1 8e2b8c7b8554e1facfb02656a4dcfb8b3fe7d349 SHA256 0e7a7315384900faca5e9a655a29c0c143f619bd583a3660776395d66d76eb64
 DIST kde-l10n-bg-4.6.5.tar.bz2 2111245 RMD160 e7d928607e02593416c04d010602e341ff6795c1 SHA1 f3a163802bcef7f27e4986041fd0eaa9fd1b981f SHA256 0b638529180d2fcc0298d969af4b8b99b025c9153156fb9683d5826ea7ffaf28
-DIST kde-l10n-bg-4.7.2.tar.bz2 2155590 RMD160 a26cf27ea73b05e5e41f8f3f92a7e2723ae70bd1 SHA1 6307d79d97e318134336940eee62fa8598f40abe SHA256 6fa70ff01454a303af994222198986cbefddc77db32fb2303cbc6248760979e0
 DIST kde-l10n-bg-4.7.3.tar.bz2 2155895 RMD160 3bddbedbfb86f56f5fc93b6a2e64b60e1272100e SHA1 5552ee00bba8c33a59c1684210e0967213ee3de5 SHA256 5b14c2367e4ac1f08e9587ee16df3157fb40714e3042d5f3d0385041cec91586
-DIST kde-l10n-bs-4.7.2.tar.bz2 2478609 RMD160 649ebdfd9bbcba3817e906409d705ec9676bc48c SHA1 bd03dc7b85a1c02a498d63297039fb2b0942af32 SHA256 fae2418e132a06c4f686a5a1510d781a68e6c05b53f69672b079b8f9abaa0003
 DIST kde-l10n-bs-4.7.3.tar.bz2 2479149 RMD160 f708ec212f24bb28df6f3fbe782d4f3287422279 SHA1 206dd68f06ed7e69fb7850c4c17d8e6084bb4ab3 SHA256 211145eeed46a6a0aa1a6943512aac8a1c2877a5b51d9acd99085447abdd96d8
 DIST kde-l10n-ca-4.6.3.tar.bz2 4344297 RMD160 140fd984971cd0d6626a2d60fe6bedf3776ebbd7 SHA1 4f996f389b629ff079c1deb68156b82ddc8b0037 SHA256 2f0d9e02cd2da46a47ca83d629fe6b16a955e44a5a4c8b0234e4777244879389
 DIST kde-l10n-ca-4.6.5.tar.bz2 4908074 RMD160 c9d880cfeb096dbab38727a773e1008d5223f03a SHA1 515ab7fb4b6ceeddc326cf4d8d7398c3d4cf0ac9 SHA256 7fa8a6fcb183431423a6374c8e2f9d098fca58393e4ae90a5a2f212072bafdd1
-DIST kde-l10n-ca-4.7.2.tar.bz2 8536283 RMD160 2bd922a08dd8f67dc0bdb065a61cacb9a18eee60 SHA1 04042b7c245dc620d53c2160d0c7f03314cfee72 SHA256 fb916e4676ce68ffb637b9507fd61542adba5ab713c95ec7c01dab190b403dcd
 DIST kde-l10n-ca-4.7.3.tar.bz2 9288467 RMD160 e6cba1b3fd6ab2b06b7ede0a3a84191b99d90beb SHA1 a516d7ef6020083cd746f30effdaa8eb22f75961 SHA256 09a95546e5a671ccd64701c379428b36671e137d0e0cdd2587329e9902a70281
 DIST kde-l10n-ca@valencia-4.6.3.tar.bz2 2126551 RMD160 09e70412f6f4e362011c7fa2d30d6a390d0165ad SHA1 6fdd39a67eaa3c09ccdd266b3824ec2cde690222 SHA256 f374f56a7fa3f9f2f1f02bed9e365827c1957ad514acc706bd3122bcecf3d8f6
 DIST kde-l10n-ca@valencia-4.6.5.tar.bz2 2458555 RMD160 cf32bcb0905e53b622bbfb4a195cc41a174bbc2c SHA1 9daf5f14831ae2634f38a6406b2baca2d4887033 SHA256 76614c99af7eb5f1f4389f884a6479159e5bfa42b12aed7227b6f849b2d0c041
-DIST kde-l10n-ca@valencia-4.7.2.tar.bz2 2493540 RMD160 4c7ab5256373d935ec108f1c2ffa247e11ec3458 SHA1 5a11eadd3f1be090f12f768e0041d45c95fcda3b SHA256 029669d7dcbf30d0b11fbbf0501c9ca170a8763fed3007d436d07f9ebba6dd7d
 DIST kde-l10n-ca@valencia-4.7.3.tar.bz2 2494576 RMD160 30abf6c16e92c2a3555ef1130b533802b86ae290 SHA1 58413cf8d0c210d53c9b20dcca9eb14041b9c2df SHA256 397e5deff961894d47aedaeb748b1f4c8192d26ba1a61089ff2a74e1573e79cc
 DIST kde-l10n-cs-4.6.3.tar.bz2 2856093 RMD160 ef2c8b4c4f43a7513621fdb83bd3b605defc7239 SHA1 8a485a912c272c5660da8b9113ae6637daecaaca SHA256 3fcc275b2eb7c069d2d3288c1314e290943f2fd734470a1062943b8e4fd9fd37
 DIST kde-l10n-cs-4.6.5.tar.bz2 3254691 RMD160 05ecb70004326a50cd2254bffbdb0361b33f4446 SHA1 c20295a121276352e2fc535cb7b81b9a35b2a79a SHA256 df07202c8d35f9ba2aa24a59d9fcaf27a75ef3a9c223c47d11c5be7d8863c1ee
-DIST kde-l10n-cs-4.7.2.tar.bz2 3299309 RMD160 3d0e4589226f4ed3f21b363b7f2ac44a3fdbf390 SHA1 9c8248f3a4cd0d9eebe47bb135f0a5c147b3c59b SHA256 c93053a26648739caef7b24223c4219d035a8b31d04dc6ca29bb71dc2967aca9
 DIST kde-l10n-cs-4.7.3.tar.bz2 3305556 RMD160 823253cbfbb777336e550919dffa9f5b8de829e7 SHA1 1a59b0480bbab0d53660a276aa736f6e8c2c116f SHA256 57825b309f0b923a5dd319fae1d086808af2d4100f66eaadd41816d6978f4c87
 DIST kde-l10n-da-4.6.3.tar.bz2 12921841 RMD160 e5254d6bc018f5b933236440eb1e6c169255a88a SHA1 71c61b0f09e47eb945420581a6dc1e46baefcefb SHA256 f9a1c48d817655e5bb27315b0fc170938463d674c10d922ab2cb7be022a1ed06
 DIST kde-l10n-da-4.6.5.tar.bz2 13465845 RMD160 b2d9b542dff5e1d367475393d4fab2271111e49e SHA1 bb1787fd9d7085bf814da84c3714e8ff2b3b2fcb SHA256 e0857c7e2844be42a66001a79860b673af60ddb26224513fe314fcf1383c0223
-DIST kde-l10n-da-4.7.2.tar.bz2 14264347 RMD160 43305e6af5fcf92e09e677c533c6b75420be94d3 SHA1 7b35a8bfdc5e33483fbabb2fc22134fde9963b1a SHA256 b1b7c0460952597225aeeed3588813e2caa5c4779fc6423cd59fb3e1ce5e1f34
 DIST kde-l10n-da-4.7.3.tar.bz2 14262565 RMD160 d9dd3d783ce3232fa9173302cf7158e5939e4191 SHA1 e73907144816b795b9be6b245b582719654e8e7d SHA256 18926bc1b3cc632acf94cdd791297244a96d14c3915422f48b71fa9b3d6f76d5
 DIST kde-l10n-de-4.6.3.tar.bz2 28532174 RMD160 fc8521ba8aa0ba0d7e08fffb75b02451802962fc SHA1 6abb82ad32329672ca254e1b971c3d61274a20d4 SHA256 66357e1186a07fac53b825db2a16bfe6ab87bd98ce0352ca66686a15c4449903
 DIST kde-l10n-de-4.6.5.tar.bz2 29758654 RMD160 4a8341510c9cec6aa3004619467197518849d57f SHA1 8b01f47f2e01e69d23c2a7cef9eb870c716523b5 SHA256 ed6674beb677fea57f1869a933cda09ea49e432973c3243995ddbae81441268d
-DIST kde-l10n-de-4.7.2.tar.bz2 37553019 RMD160 656f7cf987848fa3970ac8601853d18571f20caa SHA1 a39a52e38b3215cf0f101350bd196d1520cfe6ce SHA256 8165acd5b6cafc8e2f3ccd9a88c45cba113dde688e2b83b86dbb0160cbdfbf0a
 DIST kde-l10n-de-4.7.3.tar.bz2 37551846 RMD160 6df5289dd6ec0d4096044189dbcb02f9d985cc37 SHA1 d53939327c050b8807779c92965a5fd09cfed25f SHA256 443a06eb80119e8c6c9ea1c3765738237aecba418bd9d2b09e0d1ed4e0944cd8
 DIST kde-l10n-el-4.6.3.tar.bz2 3676261 RMD160 d562207d9d2aa5e135fe1c6726344e10b8b2cffb SHA1 1b22436c2aa5b4ec51c64d552455ff658ae26ece SHA256 3fa84ef37f2c8a67404b56d2ae2524c0441e82c01b9486d4d8f67a86f22d7cad
 DIST kde-l10n-el-4.6.5.tar.bz2 4208588 RMD160 b37a437ed71112596a955aa5bea401f29c87e148 SHA1 e8680089abfa8a50c6bc7e0cd5ddd7ad63e7c980 SHA256 c8bddb25772efcb8964e06e884076a2f5283243755138b852960533a726192af
-DIST kde-l10n-el-4.7.2.tar.bz2 4770787 RMD160 c345338d2c0022ff5a3ed165d6937ed54c69b3ef SHA1 8c1aefd1f8fcb16f0e7e8ea2f1a7361be179244b SHA256 8462bd0ade28018f9edd1ce9a73b808766c67d11ddf5a7561d39f1f92a02f101
 DIST kde-l10n-el-4.7.3.tar.bz2 4770850 RMD160 305461e294fd64cfc071e18dc59d1adf3bb2333d SHA1 ff082e9bc86e9612fdf496c932a9f329305a2ccb SHA256 ebb825d7e27068785ee82f6735fe10781f3afcce1cede52dd194689c559b9940
 DIST kde-l10n-en_GB-4.6.3.tar.bz2 2821787 RMD160 cc563d2454cd407e91677636ff2a83ed8ee191b0 SHA1 d643c59fea3104df7c362a6ea63cefa785e26938 SHA256 0e4add450be96d805424429b2291a451d30b76b2b0cec01f332e7fd9b3682191
 DIST kde-l10n-en_GB-4.6.5.tar.bz2 3320915 RMD160 b7cde2ac5cbb9713a57ff0ebc38c07ab619fbb88 SHA1 0091423be22512e6e1d57533b605500c941be5a6 SHA256 7cef537d0bef27908858cbc83d77eeb13c2470ee71c53de38cc3ff130e401830
-DIST kde-l10n-en_GB-4.7.2.tar.bz2 3558348 RMD160 ad39705e670757c0a70398fe8ba2cf4d9eb4708b SHA1 921686d8898da229f773460a06ca0b83055c4c29 SHA256 d95f475e93d0d0c56ad885673b3d699dd63dab7fc043192f73ed3d0dee8dc769
 DIST kde-l10n-en_GB-4.7.3.tar.bz2 3558545 RMD160 4fb5eb3e17241901af8f7b73d72c5be0f78058fb SHA1 56e2de38ef100b600feb4113f022586452f8d014 SHA256 237b6e1ecf42f74157de91161b436b238f322def334630661ccbec3527be1380
 DIST kde-l10n-es-4.6.3.tar.bz2 24800825 RMD160 25ce6a70699a4fa62dc4fb19cd613e46c3911abb SHA1 06a1f04cd692180c6c2ea43034f0ba47aefc4082 SHA256 3949a7103d06ab49f7928e66092d2f7ed3a5c8d25ec025295cabc2de48917fa8
 DIST kde-l10n-es-4.6.5.tar.bz2 25541107 RMD160 d62b1281253e00d4484d4f051fdced4f03932062 SHA1 c1c8bf1251ee91e1f964e0116012ce73dee60f32 SHA256 8736152d5afa40b45b322ef2588ac33003358847f0541fbd2fe1a5b8a88e9f6d
-DIST kde-l10n-es-4.7.2.tar.bz2 29249581 RMD160 e4eff9071526e6de2ee238c1160441bff4391c73 SHA1 ebda75b721beb8fb90e0d4858c7f908c4f94dc9c SHA256 c432acd777020b4c5070d36e58ccdfad301280a24d2b8bc9682aa7d12bffbf2b
 DIST kde-l10n-es-4.7.3.tar.bz2 29253576 RMD160 bd36ac8091c9d5a8f8f18ae03998c02092ab230a SHA1 21ecf5cd219cb55bdee39caa8d86169486912cc4 SHA256 4d49f21686c945aa96636b658ed5fe94378537f1ea4a0875dcb23be78c65b96e
 DIST kde-l10n-et-4.6.3.tar.bz2 5721051 RMD160 18455d9e563cc26a63d88f7cd2164c651dc81f76 SHA1 ee4cf1ea49671d13ff725afcaab4d5ce57025924 SHA256 75886b928cd30baab9d0bfa5aaa61210cafc668225dfcd41c431be4825f0fd8a
 DIST kde-l10n-et-4.6.5.tar.bz2 6163500 RMD160 a08d4234dd4f622a559decdd8aa0918ae2f2011e SHA1 286ff64481137f7d3e715e516c645aac1b87070c SHA256 ced1b26f98f63836d02934ea91cc084f66b202f97cc4f2d2d87b6f225c4227c9
-DIST kde-l10n-et-4.7.2.tar.bz2 5886651 RMD160 792970c19224f7f7cdbefdaf01e72537c42284e3 SHA1 f6b10e802b14d2ab34596f998b32f97a5328fa50 SHA256 8599d85d2b30d73744d2488cfb41fd42962cf50f21b0b9e65cd08ae028cf1720
 DIST kde-l10n-et-4.7.3.tar.bz2 5889791 RMD160 a7c36f944d640135278b7516e0cd6621a5ef8c55 SHA1 43f80846881131adad5a6dfd1e07d6b7e07a0be1 SHA256 a01857d73a55c005967e2cde350f9d39a7a7af7523d93e3b752c7807d0f7c0ae
 DIST kde-l10n-eu-4.6.3.tar.bz2 1853507 RMD160 2f10480d0e4637b946bfb47f866b043c81abd9cb SHA1 9e8ec39c769ca02d60531b11e41fbb1381433038 SHA256 fce530622becc19e8439b955d4bae52774381874cba55e3046421661b20b325d
 DIST kde-l10n-eu-4.6.5.tar.bz2 2292609 RMD160 2d3f0061c3bbb5445f2e19c1dec5c24f54a5d2e9 SHA1 a4667521245dcd042483ab0dd6f89284bc36f9b9 SHA256 2ce8c3aaacb4ebb03ff8359109ee41a2f029ed4de1d7531ed2ebd3d04925cf5c
-DIST kde-l10n-eu-4.7.2.tar.bz2 2323350 RMD160 4e8a023c07716bb029fd22aadc40a2d286df6c93 SHA1 8a5f185df2b59a9b7ac03d10903dddd6a9164fa8 SHA256 1f62b63568c8155502c22b839334f5f49d375a8e7decfdb3ddf67edb7b006c6d
 DIST kde-l10n-eu-4.7.3.tar.bz2 2329392 RMD160 50f098aef726ea39feadba63c6f047d4fe0e997b SHA1 9bf412c5993846c14f362caf65ecc2cd39a5229e SHA256 52d673f68124a62ffd18e3b70b7be5da730b5d1fb19dff318f3be7a611c50375
 DIST kde-l10n-fi-4.6.3.tar.bz2 2243414 RMD160 f4b73992a133e232e9e52fef2e4a5fedf1937442 SHA1 db2926ab71d0a67a9c017154580708cec6a37bef SHA256 5ef122a824b31a820cc6a4b93ecee6c040ac87002ad079fbfcc26233763f5e6b
 DIST kde-l10n-fi-4.6.5.tar.bz2 2781022 RMD160 ce2f855c9df8e3b358b5386c85eef92aec757c75 SHA1 71204dc08656233ed3d397d082bc471828248b63 SHA256 293cb11443dcff38785f5420ba5c128abc4535ccbd527bdb03f6951521e21e6e
-DIST kde-l10n-fi-4.7.2.tar.bz2 2902063 RMD160 70d50d42a4e4ac66546e1e8b7ec5b7b87229b0b7 SHA1 1f2b45fb44b9a87b0e49718ccb5c251373a91f13 SHA256 f240005566e42b91dc2908453f22628ee2e0a642b4d8f8076d03f229184c1166
 DIST kde-l10n-fi-4.7.3.tar.bz2 2933099 RMD160 c9eaa36c5321c7786985fa4cc2b78090564810f1 SHA1 5361265d5bd3176f8090b36ae8885706c5529d76 SHA256 6bd3a7ae3ee6bda5fb7f3a222b60200141e4d57d0ca211ab8aaecff2f8d1b48f
 DIST kde-l10n-fr-4.6.3.tar.bz2 20077793 RMD160 bba51ddc25ea4ea84939ab1a84e37bab07cc0d09 SHA1 aa2ba512e244ee03807e5f6542499cd0d27d3df7 SHA256 23eb47b6bcd144008d8a783a168cd1aa277517ff17f3091aac5b7379db4bf446
 DIST kde-l10n-fr-4.6.5.tar.bz2 20682798 RMD160 4995af110a2cf0659932032c3400d3d08e6fd1f1 SHA1 4ec39c36654763ce84d8d0b65e51ac96c931f075 SHA256 9f5494f39c0e749b00dcf6862fd36825b908eb2becaaef721ebb90266ce67980
-DIST kde-l10n-fr-4.7.2.tar.bz2 21800648 RMD160 19f03369c04747ea83a05186eb95b9b2b9996330 SHA1 5c9218204cc5e91fe04d89b5a569cbe56ecb65fb SHA256 49cab7b8c4a8e2aa1d3609b62cdeb46917cdeaeb107c6923249cc23b769c944b
 DIST kde-l10n-fr-4.7.3.tar.bz2 21833929 RMD160 216a3a3f8dc42e51f5cbb9bf5643761a2599b77e SHA1 68bfcff6d11617ae918be856c4d89de1f4ab9441 SHA256 bd201ee4aacc7b53a1586197d3a4ad2ab17d8f9d0e380bcf98d75b1d7c76a23e
 DIST kde-l10n-ga-4.6.3.tar.bz2 3184545 RMD160 11b03c480dc897199613340e8ba6cc9f2319b253 SHA1 d63493d9a887a4e45a40738154a7b362c64bf592 SHA256 b1af02697e32e23346084b88c85dbd1c1cd0b693ac74a80b34fae551319ab7d9
 DIST kde-l10n-ga-4.6.5.tar.bz2 3464722 RMD160 680be49fdf87c593180c569618aca8d31bfbeec7 SHA1 c3ea379ff4e02b2b1db80ff72086544007ce1324 SHA256 a741603b8bda419e6f6baecb3cd03a80d25115fac67d77b38f902c3cb88b441b
-DIST kde-l10n-ga-4.7.2.tar.bz2 3553634 RMD160 7e74947d02046370d2908e5ab574a8dfca308cdd SHA1 bd771682605ad5dade89c8d4173144fab95fe447 SHA256 6d48720708d165b75eead1a528569231870febefbe084eac155ddbd94f19275b
 DIST kde-l10n-ga-4.7.3.tar.bz2 3553997 RMD160 c50dd4809a38755abdbb1a34ae05d5a49ea010ea SHA1 779ec0cc115bbe8928a74de51b60a063e6e2e12c SHA256 d0a758b50da27a50759ae38ecd918ba8991efcebd73710d7268060ec8b6e6bf3
 DIST kde-l10n-gl-4.6.3.tar.bz2 3478795 RMD160 9665c3212b004b0b894af2ed85df3d29a19f1759 SHA1 d94bb75da54d7257093429a021d6f952e389ad73 SHA256 60437411af84a793e5fb5d6c88e585e289abef357e8c9e98920c91243bc9c662
 DIST kde-l10n-gl-4.6.5.tar.bz2 3976192 RMD160 36478d8b676129dea9fff973ba04b042e00a5505 SHA1 faadc49fda96ed4b8895aa414f94882143e911e0 SHA256 d354476322cfb395545d6637a1ca2edbf992b40293163a66c86110f8b15002c8
-DIST kde-l10n-gl-4.7.2.tar.bz2 4304891 RMD160 2c47156910170dd9d5543a9e1274ff5ab14cd9af SHA1 bfc3de42ae7226fa9af78f3cdd7716ef151c12fe SHA256 91c1314e9dfb0476092b2e36f01de57b88f5ab3a30e764cd5db53d617d7776bb
 DIST kde-l10n-gl-4.7.3.tar.bz2 4305543 RMD160 89369943040b9e7a638c59a439d10d5b3183c663 SHA1 43a7a00ab479cdd4600035ec5f23113cc99a1e46 SHA256 1e2e15b29ef086db2b1e76f906f195e72ba5a19118617fd051dd195d52db273c
 DIST kde-l10n-gu-4.6.3.tar.bz2 858183 RMD160 a9f37a88e4c6cb9c3a6059c5f22020e722a2914d SHA1 631463f7fe3a90f293632ac5782a3035ff75091c SHA256 307b8d8ea0c1c6cd45a57709dd3540837ea6079d87554840b1f1d07b9fda49d6
 DIST kde-l10n-gu-4.6.5.tar.bz2 858886 RMD160 09faa0e98cb88b0debbce720ab0bb9ffef392148 SHA1 32eacc28fbf36dfe952ef11650bed8b84a038c12 SHA256 70e83e5165b26d3b68eb72bbcac07eedf3270d101d69d1b2e5a7d67f52e4cd80
 DIST kde-l10n-he-4.6.3.tar.bz2 1986558 RMD160 0f13fd6c20ea8c33380a9899efe729c7e3e38a9b SHA1 68a9f3fdcfd9f4d5b44fdf57261201d035f9b48a SHA256 61da3c6113bd98771610051d515b71aaee79d1376cd9912436505061cee2b3f9
 DIST kde-l10n-he-4.6.5.tar.bz2 2334833 RMD160 a0061fe38ebb13bd25637f017e3245f5dc8af741 SHA1 73e9fe55ad2037aa10b12789814ba28c61225729 SHA256 3ccbb36cce4a821588ac2ad5c2d169edcfea7c1cbd1a547b1b5af947ffc9c787
-DIST kde-l10n-he-4.7.2.tar.bz2 2361840 RMD160 c4cff9f930a653f4ec3ec1c1a2d1f34029d72d23 SHA1 8e871aca4dba0407ae4279184da81dcfc5e0e55e SHA256 4dff6f873ff090b78997d78b3a3a427837f22a1a3ab69d478730a0a6dce2b9e6
 DIST kde-l10n-he-4.7.3.tar.bz2 2362009 RMD160 3312213d167b23e1ba09d6ca4d8991168c0591d3 SHA1 e4e3a6b8e6fcc354c8d2671db5bce3dc4d03cd46 SHA256 c8c586d02b31bb8912978b39e7f2a66db1594b162991e1eefa7a848ca5b8d75d
 DIST kde-l10n-hi-4.6.3.tar.bz2 1650726 RMD160 1e553fad1b58d6b148831f1959428ac4b9c0331b SHA1 e2ba20baf3d53e1802abf91f696df56bd966c0fe SHA256 28fbfb5849f7c2ceee37287947b63857e2ac484c8b32b3e079566ab2b429ecac
 DIST kde-l10n-hi-4.6.5.tar.bz2 1939735 RMD160 181e7d395f9dc697dbe89b96bd1c5b5d651039c3 SHA1 30af5e295ffd2f9b9e6c8665e24f0b11cae41b73 SHA256 d803ef175015dcd0725d078c4c3299bf1e884f5be53c8014cc710ff7c3f458c1
 DIST kde-l10n-hr-4.6.3.tar.bz2 1932759 RMD160 70c1d3f570ef97f75521313cf0ceb2adfb4e9f3c SHA1 83b7df72f80aaaeaced7ad7f89ae5a123fc3a290 SHA256 92dc437122fd729720a7065c4abcabfab905bac5b82dac8bf83c848a3d988b3d
 DIST kde-l10n-hr-4.6.5.tar.bz2 2263730 RMD160 30e13cf50500bc8b1fdbe6ad1622c701030c1d93 SHA1 a1aad3a4ae6b597d261e908f2f374f5b3e047a74 SHA256 f5c0d0c3eb454c2fa28cf5f2edd608ec44063707c2f99a2371ff0bde07498a21
-DIST kde-l10n-hr-4.7.2.tar.bz2 2289511 RMD160 1fceebb33d9ad8acf092e6affce33415837dbbf6 SHA1 4f6eef4f7d3be10d25aea264f50ed27715ff7825 SHA256 d04e93b0de3d40864915b6f4c0a41a70f909320948f3f0bacd92e6d09a254370
 DIST kde-l10n-hr-4.7.3.tar.bz2 2289838 RMD160 dcf781294fdaf7e8efb39fac30870cd71b44b037 SHA1 1660184438749efdc34a221052475fd9a10d5043 SHA256 af48137b21a11857f68af94c37fab5c00fcd4da17ce172c45d15f51df3de2888
 DIST kde-l10n-hu-4.6.3.tar.bz2 3947675 RMD160 e3a56b94d289bae6a7d180025a3fd08290069738 SHA1 a5c9d9f49afba78815ecf7735a8cc8d69def5327 SHA256 3d230a82df3e1d75dc095810e12e13ee6066c53635e02dca322c0542d23b103b
 DIST kde-l10n-hu-4.6.5.tar.bz2 4423387 RMD160 e3d59658f906aac8de0c9765dea3d6ae890ac516 SHA1 1b49bd7ca144ea27066b8a78f2f572222900718c SHA256 b61d0841b19a9a018d7692822d937bd4bec8cfbaca2f8dec02904834c0474274
-DIST kde-l10n-hu-4.7.2.tar.bz2 4384322 RMD160 0a2238f9baba55154c558a324e97f8097073fab2 SHA1 a9d74c78f49ab3835fe94b4ed31fa25353e31256 SHA256 264d0334825d5752ed2a862a6d27aada3a4aeba7efe36ffac525b2a1b0544a66
 DIST kde-l10n-hu-4.7.3.tar.bz2 4383891 RMD160 2954e7a85e389bfd8c3e00b2a82b26c7470587e4 SHA1 e4b144aa2719e69d5edab20bb2e8c7c29debc390 SHA256 e934d11a4d74b52e3699e838f443fc6f8f36ed3a42ed69de7e5cc3f3cb9826a5
 DIST kde-l10n-ia-4.6.3.tar.bz2 796078 RMD160 57b2be770e4b923ca3c743696b990c39c82c3b3b SHA1 0c820c3a1d32f3ad121ad0d08a93b42000a2cad1 SHA256 16ee3dfb2996aa3471ee8372f8694a42c37638f42c1a8458016a5a2dbd13aadd
 DIST kde-l10n-ia-4.6.5.tar.bz2 903475 RMD160 a6e4bb103120b500d22adc6fa24fd647a021469a SHA1 22aeb381a98feba2054dc7c1aaa8cc9f4102cd99 SHA256 03bbe7dd82034f104c5a5767058fa260ef591a9ad21c835d0ac67167428291ac
-DIST kde-l10n-ia-4.7.2.tar.bz2 1171903 RMD160 f8115a415a72dda72496d98a6ee0af3cfbdffe29 SHA1 442b307cfc5aa9cc1e303269785b2a17d355ec8e SHA256 897dd28bc11aa2e191d1afe1046718933c4b9b11326852e860d29da9b0b03a97
 DIST kde-l10n-ia-4.7.3.tar.bz2 1182411 RMD160 972e8ffc8b96a70df644639044d84d7f4562cd9f SHA1 80d83ce4316724f5e7e73ad0620141136d848983 SHA256 564715a7bb109cab327d6b2b73a8c5b9e5bdcca90cf14f0fb684525ee671c1de
 DIST kde-l10n-id-4.6.3.tar.bz2 510692 RMD160 aac3173ac3a21cc6543971c128ba1fb19db7a6a8 SHA1 631bbce80890b480bc833141b5068dc2c6f684af SHA256 72ec9ba451e0f938e313cea618fdc895bddca8c6a2980ac804c62da6d0e324aa
 DIST kde-l10n-id-4.6.5.tar.bz2 511508 RMD160 3768209c5e8c7253daa09f8db9e452fb62e8eabd SHA1 ae2413ade1bf4553368610483fc47dfc316d196a SHA256 fdb180d7678d05595af90382f0920a16c551ec7532b1bd2b45673359dd2716e5
-DIST kde-l10n-id-4.7.2.tar.bz2 535198 RMD160 79329567155302cad65a37ca5095ca593b83129a SHA1 3f11acf5276ea7c63f5e910e973532d5de282633 SHA256 3845392a8d672cec945595095f4407367d218e5d8a19504e60729be9c38e8c36
 DIST kde-l10n-id-4.7.3.tar.bz2 535378 RMD160 8e6788c9f6f4f8c84be016804360b89bc2c2f435 SHA1 aacf9136fff9f10763273cb3333bf0fc996d5d30 SHA256 28148966677b58b232f93241290028ac1ccfc57a5f9b81dfe9dd5d95562b9fc2
 DIST kde-l10n-is-4.6.3.tar.bz2 1642256 RMD160 833610eccc1571ebac502702e3500ea2ad292e0a SHA1 5345433637df4b5ec842474d67ab4135a804831d SHA256 64ffabd6729e3304fe871a0eb4d81d82e720251ded2fb231813ce4fdc2c2d215
 DIST kde-l10n-is-4.6.5.tar.bz2 2047202 RMD160 e2a06b04986a0ea44a28677f4e3574f76bf15fed SHA1 b8b872d1e7237200b19701ad0a9c9158d46b71a7 SHA256 839aac227c7e9460f77a360e9b38ecfd57300878b568bb9d1bfbef8ad3b760c2
-DIST kde-l10n-is-4.7.2.tar.bz2 2064476 RMD160 c9c803a6f8c9176d1e3e1448bfd3ebcb61786269 SHA1 0bebbdeddae7b398e5ed4aa19196649e16056f9e SHA256 abc654d1aedb851af327943a14c5b69275e20c86d99ebab6b805084287f81a47
 DIST kde-l10n-is-4.7.3.tar.bz2 2064299 RMD160 c1aab8e5a5c7780c245a5f9a74e1229dab1faf82 SHA1 5392040a07d79189745e629f635a89b51cdbe884 SHA256 615b672b0437173ff47ee950fbbc88ff35ebfb78a295b497164cea2b87f420fe
 DIST kde-l10n-it-4.6.3.tar.bz2 10343550 RMD160 7317b723bfa982ccd2fdc57310f7a78054a572e7 SHA1 f040f9587913acff0cf5f87ac67433d29455aeeb SHA256 e023ff3e85855badd13c5d138f17b785197420033734d01f591e12b8b6987376
 DIST kde-l10n-it-4.6.5.tar.bz2 11336867 RMD160 527dfcd5b8e47722262a8613855aba828db299b7 SHA1 37beae53fb59c6a2684166a33921d89925451ed1 SHA256 f8e30ef7292e906ec0f7088e92218b9cb0c8877592d80354232b045a23e34161
-DIST kde-l10n-it-4.7.2.tar.bz2 11593013 RMD160 7f0b3b85d7f5ace50bc1df10c5f1fcb4a2de8279 SHA1 7c7afbb4addc0d3f46981ddde4d83dc78e1fe0b9 SHA256 c02271a23406e06d30969df954cc059efa27637abd399eb3729f346198e0abf6
 DIST kde-l10n-it-4.7.3.tar.bz2 11600838 RMD160 763eae2d0dd9325dbbafee2812d888f9476de491 SHA1 8a5358e6a21a0f1de5dc4ce4e54e90e8391028cc SHA256 68ec0b26ca2c6c62fd4afae7ea26ff06f610936fc29806c8024bb7269373cc3e
 DIST kde-l10n-ja-4.6.3.tar.bz2 2143338 RMD160 6a43b448a210e2166f7acc6fb502d20fa10bb3cb SHA1 85d9a7bef80c53322b5dcb8bfc7c79c0ee2910f1 SHA256 d986cf83e99bdea2fb91f886364eaca255c0a11ea26078401705c6262a77a4b6
 DIST kde-l10n-ja-4.6.5.tar.bz2 2431215 RMD160 059cd91b3c0b7cfe3c7a9aeb6ce3ff0ce8b8cbc3 SHA1 60082c005704cff964079ece9603379d29eb8d64 SHA256 c0897a4afec1f1c2f6ae88436d64cf527350a9cbbd2e3090bec3e2cee9eb468b
-DIST kde-l10n-ja-4.7.2.tar.bz2 2424505 RMD160 b8a3c094a4160d5fe15733fec3ba473bc0315523 SHA1 ef5934199ffe9a42b167cb37e2ab216840b7a511 SHA256 c59d305167e4ae01fc411f36ee526c1e385aa1c4b254af9c5ca5d5a3e14e38cb
 DIST kde-l10n-ja-4.7.3.tar.bz2 2424571 RMD160 74bb3c1194116a448b09a24e1fea7b936a0a7d4a SHA1 17597dd170c73dc8ad5165443c222e55c2c8e4c0 SHA256 578f69d7564ad875bf0dd2df5b0b96ea8c992f23dfc6eced93b1b1038243cb81
 DIST kde-l10n-kk-4.6.3.tar.bz2 1682883 RMD160 26c31213c76e99f9257fb1285b5972b8b3f35c0a SHA1 51a7ef1ad1c0664d4a409580362fb6d6d89ec391 SHA256 26679fe745b3f492ffc211e102ce397051db527bf1a1c851553a3a05a9c8dac1
 DIST kde-l10n-kk-4.6.5.tar.bz2 2278857 RMD160 90fc255fbb70d89f546384aefecae69bddee87b9 SHA1 866c077fc0aa52d3a4f83c99da00d3a7d561dd0e SHA256 e924d405ee198cf64eeb986691474ccdc6fc5b09dec475097e580d41d4a3d11a
-DIST kde-l10n-kk-4.7.2.tar.bz2 2353360 RMD160 a9bcd1cb741bb98f65a726cd562a1475476cbbfa SHA1 939a4c3687349cfb255c076a034e073c88be194f SHA256 c047cc613f4b51e29203e59d0329b1a8b8e604ec72b4f07c0d574a143da2b2b4
 DIST kde-l10n-kk-4.7.3.tar.bz2 2379395 RMD160 a3d5671538ade9d592e9ace51d3df4157cdf7312 SHA1 77ac4645578b68e4100e9dc2dfb3c4c471abbd9e SHA256 e7a43aaadfd149aa7ed27bbf04a540ce410dd3898325515f9a2543d8b62264ee
 DIST kde-l10n-km-4.6.3.tar.bz2 1897291 RMD160 501dfdbe205c6ff65e69c5c0b3288f7e47bb30f6 SHA1 a593eb1134dcf1fdde7e67e46636c91fc72bab8d SHA256 880fb3f9d4df7040e0c2f7b27b62f2e34d55783853bd65bdac6e666589d4b344
 DIST kde-l10n-km-4.6.5.tar.bz2 2195812 RMD160 1b28d1d3c17b5d2e8c435e0b2546679b89b94df4 SHA1 ae62c87afe5aee0f0131f64854848950fdac63fa SHA256 1c3602c5b601a71f032d20f6566a190a5f6a710cf9707f73e8e53c09af10eb28
-DIST kde-l10n-km-4.7.2.tar.bz2 2219178 RMD160 21ad2e9445be0f0fffca7464f250201bb4b27cd6 SHA1 905cabd57cc3b7d19ea9915ecf80ef298cb51636 SHA256 d54a28067e82ae5b0588181b98e8b728358e86bbb60417853f47c7aa2baffdaa
 DIST kde-l10n-km-4.7.3.tar.bz2 2219712 RMD160 83181538b3b01698be2b8e16c42aeda877bfb696 SHA1 d149e90c6732391316fde90c619ba3abf3461c97 SHA256 94ece7de2bdc589025a7039023ac3b49f01712f9c4fbe5d28b22f15c5084dc9b
 DIST kde-l10n-kn-4.6.3.tar.bz2 446869 RMD160 364e55b91ab03218a7c7a01f86c0c75d0faa96be SHA1 dd074c3ff03582006c5e202dd6312475320b5567 SHA256 78c21057033abe091b075b2b584e9e66e3c80fd98c0f639c4da3a08537d4edc5
 DIST kde-l10n-kn-4.6.5.tar.bz2 446693 RMD160 3fbdf59340bbb381358ab888642224f72694815d SHA1 e54128116ee7afcae2e63e8ae98ceab40da29c84 SHA256 8fda264742314c761a5c280c740ab315f9a17899c0a866e17e42f1b3a1f03539
-DIST kde-l10n-kn-4.7.2.tar.bz2 532888 RMD160 13433e4db7c393a3d9e07f21eece5c82b443f912 SHA1 bf75a6fd8ace0b52d56710556c0e6f96b1c70c32 SHA256 284855bb35d8ffc1c5481488b97e11ff823dfc6b40fe81ddc15e824e2a69e064
 DIST kde-l10n-kn-4.7.3.tar.bz2 532878 RMD160 5dfd362f3fc3565e2b23280ddfec44c02f637531 SHA1 eef4b7cf1a0e853a6a117b371a88e0c9846951e0 SHA256 8e3974c2e9574a46935908027704990ef36a4d483f651b3883eebc127202c46e
 DIST kde-l10n-ko-4.6.3.tar.bz2 1559518 RMD160 352e01105c55b4a5c1562492bbb5837a8d13d5cc SHA1 aa5d5b2fde391cd373b9c00047f2523749f22fbf SHA256 9a8c4797115f7b56801f167b86ca252b9ca46602fd552367571bf0aaf0816146
 DIST kde-l10n-ko-4.6.5.tar.bz2 1798821 RMD160 8a5c41b7d68b35ef0d38ee6b994eded8b8a9446c SHA1 4881bf2297dd87c1948ec1e66c474022a7e4c985 SHA256 3567e0a74c2bc8d2e4d52fc5f483b847159e16c8b3d7de095042df11fccce4d4
-DIST kde-l10n-ko-4.7.2.tar.bz2 1901692 RMD160 5a5786d0cfaee0889b6792385ffe324fd366ca6d SHA1 ec6e6a1159ccd380edc6ce93cb597905456420d6 SHA256 67cbefb4cfc1e33120f25208d4d87f30890fac8e4f74ab5c74e510610dbc227f
 DIST kde-l10n-ko-4.7.3.tar.bz2 1901844 RMD160 05776133bffd0061ace97fbebbbf8162ca14f858 SHA1 6934688e5dee395042903c06bc3a88f982dfe422 SHA256 a2aed9827a17e0a28a3cd2951c43a0a746b298c35675e59a38064c457a9f2144
 DIST kde-l10n-lt-4.6.3.tar.bz2 3458190 RMD160 a9052e7d480b150628ae736e0acfffe86108228e SHA1 fb4438d0fb280f56e310f330953ab08ea4e365f2 SHA256 6b3ef4ca2ed098c899c7410a8b723bd851e087fa123bcaff3b6a9e402dc7834b
 DIST kde-l10n-lt-4.6.5.tar.bz2 3744662 RMD160 a3c99e739be1ea230bf9f0860bbd40cd8be1d08a SHA1 c915e3bfb84efd51129715b46e1ca359cd6da864 SHA256 581e548ba22501c840cfc1efc604a695f91f977dc2e1ad620686b44c0b853c1e
-DIST kde-l10n-lt-4.7.2.tar.bz2 6791003 RMD160 6c4ad71f2f944012a571c62fcb2553b1f0eff5b6 SHA1 e966cee2d3a6d70ad244171ea018bf164790ca8a SHA256 9e53320c8babff55b53711f334a055b3b7b5bfc10e37a44404cb8465c5f17b8b
 DIST kde-l10n-lt-4.7.3.tar.bz2 6797869 RMD160 8cfa3121bcadb978b7f30fb35d147e4e44420c6b SHA1 92f3cb20bd47594e1d344c36ab3eeac125f0395d SHA256 d04dc95c29f9aef3d88f0ed741a653c64d352426301925f9c661afad3cf59f21
 DIST kde-l10n-lv-4.6.3.tar.bz2 1925475 RMD160 de86170b59091b1f866483f731c856bd17d82659 SHA1 e6c5377ec11ebc81131b1b552d6f7a74c93729a1 SHA256 651d08b8f5b8da474fa3f3ac7483b51f94d031c23503d277dff45b881728f6a0
 DIST kde-l10n-lv-4.6.5.tar.bz2 2392233 RMD160 8677e054b2cfae7c1f609ed6b8571e9150d8bf22 SHA1 02d613b6618277bc85fe9da956e4f66b9a096613 SHA256 51f9e9fe8a636458e43399b3fc9e61d79f29f5e18720af043e1ab1c440f9d3d8
-DIST kde-l10n-lv-4.7.2.tar.bz2 2451927 RMD160 c2c7f2fe4f1c8b4daa1428ea68a3710f20027eb8 SHA1 34d52e7b75bd7601e648066b882c8604c9b0a5d9 SHA256 37f98717b1ce2df7206b26de777d4b13eac9da96e229c140ac9661d8bccd5db5
 DIST kde-l10n-lv-4.7.3.tar.bz2 2452185 RMD160 35644ec7b5f060d64372ae09e76b1c75b84187c6 SHA1 e49072ae22b8280f7ed168e36f8c4db27b4287e2 SHA256 bb29dac7166a565f0f11b85ec9b23429664e94cbf651cec1deb996816cc90fa8
 DIST kde-l10n-mai-4.6.3.tar.bz2 1237972 RMD160 e737929eb77e80df009cacc92a46f47d6573837b SHA1 1f2a48c213abacccb086f9ba38349da035bdf027 SHA256 43c1fd95b9a18983572625efbc43caf1a762523cf9f1bb581d7d839d1042e40a
 DIST kde-l10n-mai-4.6.5.tar.bz2 1355582 RMD160 86f643f5555a92e25cbffa54dd0ac0658b492dae SHA1 9d125a3bc7af6086850eba078a1dd3e1e34c2458 SHA256 ff7c5c34e07a9987dec73b7629d945e6765a23b0694125ef00a423657451c332
 DIST kde-l10n-nb-4.6.3.tar.bz2 2299177 RMD160 f5a01af5a001a7c19bd19a112e21d2773e7791d8 SHA1 db0216de633f032efe0cb2e915607f9a25e7208d SHA256 94d2fc7bd8e0f8811d2dc4f722d6c81de1cad55ca7094099581e83d602506af3
 DIST kde-l10n-nb-4.6.5.tar.bz2 2669043 RMD160 3868aa9b30c8c9b6aa010a94184de4e2cdc30f59 SHA1 1f915a43b4b97282bc1c47db63eaa7cd6849103e SHA256 9f98e191f02c1444bfec42ca6ae55dc2424f586ebdfdf0c240f36c4ebe4b9381
-DIST kde-l10n-nb-4.7.2.tar.bz2 2664001 RMD160 5b86ac80cd1a9fc1a1db5b3c408162ad9fb668b8 SHA1 3d16698e22e71c8912e9c627d7a78c14a1fccb09 SHA256 b5476847690c723c28399380d23d34d41f9618bcdec810909ae6a529da5b53d6
 DIST kde-l10n-nb-4.7.3.tar.bz2 2666049 RMD160 31394129dc1f4a876197b00715a0126e0b3596d1 SHA1 baadcde24f4910f0b8db603c1c9b9a1b4ee6f1f8 SHA256 aedbf33588253f6cf7d33c39eaadd9b3e8ca0bb37fe542685a1aefed4be5a1f9
 DIST kde-l10n-nds-4.6.3.tar.bz2 3619430 RMD160 0befae581a05af5aa0190c32ea6163f5efdf4351 SHA1 45ca1d44f6140cfef0b75f6510bb623f9b1ee6ac SHA256 e6f308c42ceeb36b797efe239f83072caa684df1ec1a62f0d15e19b1642a7a5d
 DIST kde-l10n-nds-4.6.5.tar.bz2 4144522 RMD160 299d5ed93eca25d7329b3ddab25b8a9068d17145 SHA1 689e5c7c7cd253894ec46190e4fb481a3eaf164a SHA256 714ecfb2d0af15ab403b2b148cfd8818300c1fc83ad35beb8f99d5950f4373e0
-DIST kde-l10n-nds-4.7.2.tar.bz2 4168192 RMD160 6b5ee88786cd58537d28c9c4514374752dfce833 SHA1 fb4015fd41af2ab239c87d5cb344faaced8ce824 SHA256 e9e853c89666942c233e732f0539ae04fc30c7ea9bd41f9b73cbc35bbcfb3e6f
 DIST kde-l10n-nds-4.7.3.tar.bz2 4169394 RMD160 f5511cb220c1e3f4a31785b8172b245a23d18ab6 SHA1 493f1545359d79c53f49ecf11904163bf69d503d SHA256 b9c341fdcf95d59c18e4a1b82835361c79155c5dd636afda5203c4785657075b
 DIST kde-l10n-nl-4.6.3.tar.bz2 13622561 RMD160 3fc05b481b9d8d653c2307e9d5905317bff2d5db SHA1 a364726d1d263b79930d1ed43b6e2a8957adba0d SHA256 6b7b3f6e3b40f9aab3c3f1d311830853ec0a3102dacb5cdb458809fc782a717b
 DIST kde-l10n-nl-4.6.5.tar.bz2 15246615 RMD160 96326ac9f69fecd46b8a01012ac7a1cb336c892d SHA1 33edd31abfa3921a47f60d116e445fbe98d99458 SHA256 e67761079ec899da80fcecb04344bce9e74fef5d35327b436d16d5ca9aa42044
-DIST kde-l10n-nl-4.7.2.tar.bz2 15679751 RMD160 0d3bbe4012a995a7bc3025370a21df5e1a5bb933 SHA1 f64503b1285ed8c30dcb4408a6ed66466687db81 SHA256 43be18175582d221b63ac35823bce928dca6d4d33243b5b598cc5fca3d88889b
 DIST kde-l10n-nl-4.7.3.tar.bz2 15680330 RMD160 2624218354663fd594badd129dc6232a0749a0be SHA1 21731691f920e2945bf8308a1721107133b612af SHA256 0e8aabf25dc7e0a81950ac95492500f5b3667d24fe9e65f2bd0c923cd33922c4
 DIST kde-l10n-nn-4.6.3.tar.bz2 1872341 RMD160 3dd147cba93a0a8a3939d6564251916f9b59b5e3 SHA1 116dd6c6b05a6bf7a9913e6cd2a6ff0ab5a90929 SHA256 67530758de9ed53a44523e53c348c2d1faca7329d457f819e6969465c1fb0f53
 DIST kde-l10n-nn-4.6.5.tar.bz2 2165281 RMD160 bf02218bb941ab8540b1abb8d5b0bc4f5584f408 SHA1 f6108cb25f63b188e78ae747a9fff1c48831f470 SHA256 d8a45fcd657e8158efd074ef418b3fba4c86ee107e2b7ff19fe55491d3e2cabb
-DIST kde-l10n-nn-4.7.2.tar.bz2 2157488 RMD160 7004fa4b8911638bd3aaf34b14a3781d2f06d701 SHA1 8902af8d1b5e5f2af4043699657a7d93f6697696 SHA256 90056e4949bedb449cd114603c8b9892abe1c1ce951b5bb3586da65864b600cf
 DIST kde-l10n-nn-4.7.3.tar.bz2 2157518 RMD160 c5bd6ae6cfde9619896fdea67aa856941357ed04 SHA1 3510559e378a0705ecc9ccb45458617159b25ee8 SHA256 089b57bbe411a2978bbeaa7363836bb985f453a47f10e128a44a8337cb5ae275
 DIST kde-l10n-pa-4.6.3.tar.bz2 1612220 RMD160 5b11124ecb02395790c270000fa29a26ad3d6a64 SHA1 585f7af652f7193cf79789abc7cc422d1b9beda3 SHA256 b49dc5168c48cc18eef6e5bac8f1182f3df68d0c92dc9e2e1036dfea0e885995
 DIST kde-l10n-pa-4.6.5.tar.bz2 1971212 RMD160 a6e603b9588af83fc8da9e3c309500f46d5bdb86 SHA1 9195b8edab0b6eacd4ccc8fc7d688e082f2c1634 SHA256 b38988ee37cef851e0fa3099786c7d616781ca8338e54e4e091a3748ffb74f92
-DIST kde-l10n-pa-4.7.2.tar.bz2 2016504 RMD160 becc17b6eae214f7d9d22fcde365c7938bf6faa3 SHA1 2a16595b1c381da3eb0483bd6a1e4dab180f20de SHA256 a34890b1e3008dab3ce28ddc92d624c04e7f07d59b2c5cc6aa34a5bc6852b889
 DIST kde-l10n-pa-4.7.3.tar.bz2 2015757 RMD160 dd463b0d43f5ed323d6bd0bd5672379def01ef15 SHA1 e344769783894f64e5b4301f48d2b0830b3efa8b SHA256 d46615532a9c9df6838fed42bdbda78ba248cca9966ae7acde9c26ce98662618
 DIST kde-l10n-pl-4.6.3.tar.bz2 18345785 RMD160 3828b906d303cecc481d09542b8730595164a72e SHA1 a0d97485786c98bce8069452af28ae3f60c55225 SHA256 0799421b541efa8370bf64de6fb6948c404486a4dcea50e381c27a1968c2a2da
 DIST kde-l10n-pl-4.6.5.tar.bz2 18938728 RMD160 c38c842839e260751346ab5e0ab9af9c1bcc3934 SHA1 f15e07cb79d2d1b0f83f94006d7b1f44014d1473 SHA256 32348e21c586f5672415450531c32d285ba54961b61f80bf1562cd33a8fb2871
-DIST kde-l10n-pl-4.7.2.tar.bz2 19100076 RMD160 e940233d00c7e609d5c2a9fe1f9809e7a7180107 SHA1 cdb14d35ecee704e76a73d379b7405dc3114c8af SHA256 8113c2086114c7f4e3f9aa5a52e86c7be85c77be3ff41870ce6490b21377ac55
 DIST kde-l10n-pl-4.7.3.tar.bz2 19099476 RMD160 c45d91fe675b217d81e772caebd25f76afe3c28b SHA1 069d44526d2df805910dd9839491c2b6d530d203 SHA256 cfc730e047338f9b2ba70dc1d9e828725d8f920bb378d3cb60df881cf37e8410
 DIST kde-l10n-pt-4.6.3.tar.bz2 5180045 RMD160 141932a7f4225e1f451584a0edd85cf3c1d37091 SHA1 cd12faa4fe8946ad92f0233c075d617749b1c022 SHA256 234ed4e6df15efba354db7f7e801731cecc0af872496bbef348a5c118749b7d4
 DIST kde-l10n-pt-4.6.5.tar.bz2 5431689 RMD160 e75dcfbccb69268580021f847502fac5519ee8f9 SHA1 d141652737dd7fbefa1b6fc8207e3b036edb0537 SHA256 b6c5aa464c94b67af288707992574ec49d3404cebe8503634380b298bdd7007f
-DIST kde-l10n-pt-4.7.2.tar.bz2 6111094 RMD160 78d343a3ce5e358fb41a3badbc3e02c19de62ba2 SHA1 666d6d16fa52577f14911efaef3c71f529bf07a7 SHA256 520c2bc9d053c3f745cb7142f61a0bdf1f1d168191d98137dc1c109096807c21
 DIST kde-l10n-pt-4.7.3.tar.bz2 6110855 RMD160 ccc8b4f5a441926997abb6a9cdeb1417a105d46f SHA1 c49e6715429b8b6193e88186a0e86808f5ecdee3 SHA256 6a60c677074f62023b9f480fbc0a0ff2050109b5ae098ab1a44fbf93e460d34e
 DIST kde-l10n-pt_BR-4.6.3.tar.bz2 21033943 RMD160 8b3cba6515d6db6b3ad5d0562dae7fc755d1d990 SHA1 4c2ee361834a7e02f61447d4c705b8ae2b3c5802 SHA256 31edb19092f1360bcf4dda823eb9ac2d926f5d50c73911a5d06e0f91e8f2ce15
 DIST kde-l10n-pt_BR-4.6.5.tar.bz2 21789906 RMD160 1806d204e68ccae7757961329617e00cdf700eba SHA1 52b3d095d28a42050a29d2fbc045fa45ffddfadc SHA256 260b6ff1dc0960fac23c77746a70ca301f39228678ea9858e0990efe4175f1bc
-DIST kde-l10n-pt_BR-4.7.2.tar.bz2 27487773 RMD160 e1b1157132fd4165c69516fc2faabd195694ee6a SHA1 ab26f7da92accc51eb0e8b4b219511bff839d278 SHA256 358286fcc59d993b46531be0020bc3f5d4b3a1a89f64d6f3161ed549f57cbf90
 DIST kde-l10n-pt_BR-4.7.3.tar.bz2 27492912 RMD160 6e7cd8d28d10f9557dc2c8790f9cf519492dedde SHA1 642574d93379ac37c957b77e35ebdc731b22a2eb SHA256 03019fcc4a93c1c8cf5b38dc2afcef28deccf92032aaedabd43c6d2027fac777
 DIST kde-l10n-ro-4.6.3.tar.bz2 3109555 RMD160 b4d7f826031620d547f69f87be669716c29ecf4a SHA1 309736c15ed42c80c70bfc9feebd175f1bd91014 SHA256 3167f273a17856af77eaa4662054bfdca3dfe297843ba3b80d3521fe46390a71
 DIST kde-l10n-ro-4.6.5.tar.bz2 3585959 RMD160 52ba36d7d6b59cd29729f3e32dc732ad2b0a83d7 SHA1 cb514c632759b43a6dd56a016ab47054610429ef SHA256 72cedf4f1a5a4497ec81dce23fd60285e03a615fd7daac5fa84103d254b62059
-DIST kde-l10n-ro-4.7.2.tar.bz2 3644504 RMD160 a5eab7cb6aca5cefc289875aabf908c0e6efb1a7 SHA1 b0cbe7904f097d4c53080c3fb126c98cc0aa06ab SHA256 d7b4f989229b427b8edffa6f62017abc402d8718ea131aebca72e93ae0417a70
 DIST kde-l10n-ro-4.7.3.tar.bz2 3645293 RMD160 5da3ca2a20f7ef9a6cecf75f88ee95272994185b SHA1 9850302e24ea05dfd513c2c18ec5a96f25aeca55 SHA256 1d2b163b49770b1b68692048b15235a6276194dfed31caecc438c2e94c29f6ec
 DIST kde-l10n-ru-4.6.3.tar.bz2 12159214 RMD160 8cfb83088c9a13b923497a8073a4f6192b9dae61 SHA1 5c13e0f02db44b09c3d2fe3b9f749d26da08851c SHA256 79c8ace1b2932bfd55038f51cec048eaf92d22ccdfc6469d179754851148c091
 DIST kde-l10n-ru-4.6.5.tar.bz2 12802933 RMD160 7053e9bc946c619a33607e4537e5060a17a09d15 SHA1 e2a2280ce7fdf737fbbd928309842272174515de SHA256 33814181500099962d7fdea10fb7d7832a935a302a61c35e37538cb78213e84b
-DIST kde-l10n-ru-4.7.2.tar.bz2 13866548 RMD160 de4bbb0f2af554cfe12277c5f343fe9dcea042cb SHA1 9e956a495dcb82286114cd81f301247433947daf SHA256 1bcc89a05c4e4be34c150a1dcb234ead2e861a1543dfab1d15b531f14878adb1
 DIST kde-l10n-ru-4.7.3.tar.bz2 13865682 RMD160 a0fdf091fae02fbe15948e99cc157fd9a7f14553 SHA1 7accd85fed345a5a6c035007c5d2798532ffd5d3 SHA256 a6bbc4356e9d5baa1ea9dbba128f199bf0b0341933e1b90e4333056582e8c6d6
 DIST kde-l10n-sk-4.6.3.tar.bz2 4157362 RMD160 4ea0031e8e2185512cd6e0bd3322dfab025250d7 SHA1 1cfeb55c43ee80f09fac78c9d109788dd3969a1e SHA256 44f7628ea0e824b371352982ca1f2e9ee39377cdd9709823b2b35db0c2f80981
 DIST kde-l10n-sk-4.6.5.tar.bz2 4453209 RMD160 8413204387693b96a533fe42d8df135667a82230 SHA1 e7b93a8a6cd42b1df4d3cdd4b248a06130f672aa SHA256 17af2e32b3230e448d2565168f363bcc6bbb75f67327e761d85c7e68551981e4
-DIST kde-l10n-sk-4.7.2.tar.bz2 4438315 RMD160 e5fbb631140f46c9d0afeff0cbb8cb21c066c47a SHA1 fffd28d2be4f4a09e2611f49ecc0ca2fa2bc58a3 SHA256 dc9cedae5a76667987cd9606718814ae81d6b6530d81f6d3de68ee1294ab8f72
 DIST kde-l10n-sk-4.7.3.tar.bz2 4437400 RMD160 aec9fa18f9a1ddd003ccc72c9e51ddb995cd2acf SHA1 659279f42e5e1554933307cd5492f6d45671a49b SHA256 3b9546178987d6e38953168645e6e107900b0fb0220263cb03ffcef2e7903b0e
 DIST kde-l10n-sl-4.6.3.tar.bz2 3845675 RMD160 9fb978afcab0d521c7ef3165ae695d8890def7e9 SHA1 f460e6df1e0b09ea3de697ad4764f81fb3091f79 SHA256 22a2ac63234ee7ec63641d6201ac377e2fd700ec4724e074bffcb424f8c17c2a
 DIST kde-l10n-sl-4.6.5.tar.bz2 4409181 RMD160 b9565e9a59514405124e6b4cdf1376e100325879 SHA1 68d1b746d4675a806056052c2aef79e2376085c7 SHA256 e51952168d0da3f2539029fc8ecb60b29ec3b95f1b519083bc306f3c4ebae78d
-DIST kde-l10n-sl-4.7.2.tar.bz2 3674011 RMD160 8bfc1cd000f885e292fb9d879d07e84d9befd3f6 SHA1 5c80a71891a719638f26931ea894abb9040f1828 SHA256 174d2b76c0d9e0a9f994c5a94278671215f17b0147d54fbad00b7687bc21dd9c
 DIST kde-l10n-sl-4.7.3.tar.bz2 3675273 RMD160 6865c2a53afc879d72deed48624c49cf6139c389 SHA1 f3538e94789768a3343136a05adf17f80f2323d9 SHA256 de3006d6fd3d2e619cc38c9f766f483d464c0d1b88e672e0bc1f312b902031fe
 DIST kde-l10n-sr-4.6.3.tar.bz2 10679025 RMD160 6297a2e6e6fd8ff87a71c23d190339b6b9bc6e6f SHA1 73d958081dce0d566bc0ed73ed23a01cefd61d4e SHA256 9cf06ffe6e13015ab73b0d9c3564d23ac9a70d27dfe58fcbc4a16ef88f3120cd
 DIST kde-l10n-sr-4.6.5.tar.bz2 10726777 RMD160 96a2a97f6b6bc8988c4349688d7676237908cd77 SHA1 801b64c457e28447b46687f599f3e6b254d1bfce SHA256 72a1ac4b94fd04158182f67a3e6e5fd21991efa6f15848a1199a82f214a7aad1
-DIST kde-l10n-sr-4.7.2.tar.bz2 11903841 RMD160 70cc6f7d4a8bd36f65067ea7c8cb1b2b93d53544 SHA1 24e58052c8032d212fe1ac600e725003f43639cc SHA256 6568c989357e7ecb5a355be22d8735cd8539543ceafcf1d497fb665fe9eab9eb
 DIST kde-l10n-sr-4.7.3.tar.bz2 11908606 RMD160 9a5f3ca86c18662672f0db0c6c0df75c5087a850 SHA1 333e68638e3a17e345a99457d1c2325013d6d3a6 SHA256 235dcae68053ef7130a4b13d93752c158f93636db10a0ce3b6611d4802f226aa
 DIST kde-l10n-sv-4.6.3.tar.bz2 14425511 RMD160 9f9d79c6608d99c72242bf2bd7152178a334b331 SHA1 f4acc7c3850dd7b1ff2aa6f6672cacf3d9e1363d SHA256 348b59bb99e07558892fac08ae07478c5a3643e9575fda7e05a1622471b36e40
 DIST kde-l10n-sv-4.6.5.tar.bz2 14851488 RMD160 95ab772510a18b93066a2b9826b661a1c291ef57 SHA1 feaa0789dd1ae0fd476f964eef00cea0b4e7401a SHA256 c782c1647760d6e225a20a8ca9832826a51ec4cf8f447e80194ea66e05d3a583
-DIST kde-l10n-sv-4.7.2.tar.bz2 17629089 RMD160 a103bf85851e151572bd464cdd2dd78f16b64843 SHA1 43bd6660aab8c8701a8262730052447e8dc2b095 SHA256 dd5e75c6636ef5feed621b638fdb03fd47c37ae2fe48df0a6ebe3f5ee03d28da
 DIST kde-l10n-sv-4.7.3.tar.bz2 17642938 RMD160 3373f827c39c769d8a70fc5259548a6e4defceef SHA1 8d464d253269da49c328141191cd6644b05acccc SHA256 625568b37c2037f9bb9b102efb46d1a33201b99d1cf3c5a9c8a12e5bbcd395d3
 DIST kde-l10n-th-4.6.3.tar.bz2 1525928 RMD160 d8dbfe48f96ca33388a7e968daebe05f51281d66 SHA1 44e6490e4fa5be591189af62322399b3a13d7aae SHA256 d0c85e93ed05e329c0ddb07749904501704a15f89a375f70c372b063ec78fd54
 DIST kde-l10n-th-4.6.5.tar.bz2 1849667 RMD160 eb0470f5ca7e68e4857be69897a4862aaa191704 SHA1 6875f839497a04939f4c07f80bff8709612b6c30 SHA256 fb9755ee0a48191a83de313c39fe1f1649938b83303ccaffdb1524f9019bb073
-DIST kde-l10n-th-4.7.2.tar.bz2 1885356 RMD160 835dfbb39e135f2bcac1c35cc3cf6d31d91ab514 SHA1 e710294085a23d08a29c765476d6c6e3523639e1 SHA256 d05e785910c6e48ecc93270d44f96040e35adf9489a75fc2bb249cb536b08ea8
 DIST kde-l10n-th-4.7.3.tar.bz2 1884862 RMD160 24edf2231b36924533e3edbb746c7b2e292fb37c SHA1 ca56719eaa6c384fd98c955f0dd73243de40c8f5 SHA256 4f1dc981f781e83531f06e0571585aca957c6f7b7b8fc6a1c1702d0eebb78f1c
 DIST kde-l10n-tr-4.6.3.tar.bz2 2255958 RMD160 1f4d694fc87c0ef9646f7b14737e7a41e3c3ff0a SHA1 1f3c5bbd6f5c92b1e97c111dc0e734c5219481aa SHA256 888d124650ff9f79bb0c9e9a745f58d45371c0a7c4b07ce716846cd50261ef31
 DIST kde-l10n-tr-4.6.5.tar.bz2 2745018 RMD160 652acd294b03a461f881fc50c4d82f9ed31818f9 SHA1 81c51b15ebc60f3b56373687029d3dddd491e8e8 SHA256 82d8b2c7b5414f8093f91ad6817939dbe5ea6c20f5359bea1324038d4d7bb042
-DIST kde-l10n-tr-4.7.2.tar.bz2 2782384 RMD160 7cd914de5884bf151980743ffc89c43c6fd80d78 SHA1 3c4628d38aaa178518186f028217d36c52be82ff SHA256 dabc24754853b323bc3356586db1f03d209497ad13543e0c8a3541ba4b0ea826
 DIST kde-l10n-tr-4.7.3.tar.bz2 2785265 RMD160 88db07592e65de5dc46cb2b543d047033a5c1717 SHA1 dc72f01f586529fb0e9b9dacabcb1dce0616db01 SHA256 b313b7950fe34e4d8ee7bd299cd48c687a536b060f2d451329a4118956a06931
-DIST kde-l10n-ug-4.7.2.tar.bz2 1772308 RMD160 7add6b2de3aeae97768b0ed052bf60924beaa79b SHA1 80e8221d88ac11767bef8ebfd1a4934d99527e25 SHA256 8f33cf36f64aab65c2bd2887c12709025396503d7b84d2ca275f03c37edb31a4
 DIST kde-l10n-ug-4.7.3.tar.bz2 1781060 RMD160 6cd6b72ba21f926f466329d98298492a65ab7aa6 SHA1 9ab4a55e0f5ef8c99a1656ab859b9570f7e89d6d SHA256 6af2aa6d040c3f6ce0dd849bf21f9bbf894afea24dc32013f8ad1172497d62f8
 DIST kde-l10n-uk-4.6.3.tar.bz2 13943804 RMD160 6c30958a4c6de521827e62bf05b74438c87cccc5 SHA1 9c8d7974340218109bc3666c46dccaf5fac8d3ef SHA256 70ac39b4962fb0d4b7501b779957ae7d84efee9a0290e12b33f317d5e20d7891
 DIST kde-l10n-uk-4.6.5.tar.bz2 15166087 RMD160 3767954ae5232a9be8bb1ed0e332c1e9e1ab6fbb SHA1 80a4e4a09248e1e030611f4d3626cf1cadf8959f SHA256 f0cf5766b02f6f74f7754fd076429ca84bff66889f696163d4b3e609df939fce
-DIST kde-l10n-uk-4.7.2.tar.bz2 16579112 RMD160 ce6b0f63bc7cd8b23e79157e9e3e5b71849742ed SHA1 5a6a96282d5084ab94351109b79382b1e44b1edb SHA256 2e135a77c86345f77c5e0baa3d4ede90a7698edc28145b623e87ef0c47108184
 DIST kde-l10n-uk-4.7.3.tar.bz2 16579041 RMD160 49ec37365006a04736fe73153ce97dd4383c015a SHA1 919584d0aa7b0a54e8e61184ec58063d0dfd2aae SHA256 fd7df6ba7f164f856bb59dea76c10069cab9e140b9280f977c159c97f8fe8bbf
 DIST kde-l10n-wa-4.6.3.tar.bz2 1661623 RMD160 bba8c50e23a5cf916afd5a61b2293157ef711533 SHA1 7f0aaeeb3bc7cf0d0e142fb2372d7064d2277bf7 SHA256 4c1209d0d4700434b95977275bb543d0ab65ba9d66ee03c7b44b6e1a70a845e8
 DIST kde-l10n-wa-4.6.5.tar.bz2 1856769 RMD160 a53bf61371f2227669c322e963fe9addb2571f09 SHA1 51be32786c5ba832b594990d1f661b3f4fccd7c7 SHA256 8481d5c156b4c9b33614fe57e1c0f52e64087c8a4ee558e67184d25450950e9e
-DIST kde-l10n-wa-4.7.2.tar.bz2 1896540 RMD160 de31a9af907e1171e7cc7a6f8d70328a77305ea0 SHA1 2bdb5f65c80dbb98fbc2d1af6f92d7501cefdeea SHA256 996bd1209191e8582affc6d8ead81af23c6b6908e7257a6bd065fd823f9f9f55
 DIST kde-l10n-wa-4.7.3.tar.bz2 1896487 RMD160 be7f629ba5c29826e55f264f5f531c02296fee71 SHA1 68aab9c979b96dc4a88bf00dcb33fdeef048a7a3 SHA256 b69160326065de01eda71907324396c3fb0f7e7789b20e9ab0bb4743a8992a6c
 DIST kde-l10n-zh_CN-4.6.3.tar.bz2 3292400 RMD160 3e4531397c56e41d9753596dd0e98829c8e874b5 SHA1 7cab80d92e5ed82e2e16614c0c84bc58c20b38bb SHA256 1c93e226629ee151659866681ac938f4c965df2595c13462eab989cf36a3751d
 DIST kde-l10n-zh_CN-4.6.5.tar.bz2 3625564 RMD160 b2e2412bbcc72941d1f8367ef21de391ce28a84c SHA1 93ff5255cbee2eb831df5442d193547266ebe1c5 SHA256 516f77d85bf9aac72ff6f834b40d95512540411b5171444e93d222ccbeec1d3c
-DIST kde-l10n-zh_CN-4.7.2.tar.bz2 3664744 RMD160 0df50bf3da68e53a58747d775dcaf74459e4f48e SHA1 f2f54b4e0e47e9b2b922cff9752b9c9092abafc6 SHA256 3944d5cbd54e51d2ab92860c67832a203acf83b33e3733561d73c0d6409d4565
 DIST kde-l10n-zh_CN-4.7.3.tar.bz2 3666007 RMD160 ced3e4f3f1c888e7a615ef47049e7b9f60b5b187 SHA1 692dae3418a79249fbb9ce7bdf0c6c91da03ea21 SHA256 03ba5dad0ecff0e536bfd7950435fb2053b824b41adfe69a285ed35a8128ea1d
 DIST kde-l10n-zh_TW-4.6.3.tar.bz2 2262527 RMD160 cd4c71eb1e5264edf804dd70684d719ff98a90b8 SHA1 3b6d33832415d56c09c88fe598a90f1fb000788c SHA256 d4282b152d9c220ef6a0c5f37f71f541e98f60036e7d3d75368b57b2136c617d
 DIST kde-l10n-zh_TW-4.6.5.tar.bz2 2785581 RMD160 eec72fd60729e2ca607b472f269fa6ddfbb7ea3b SHA1 e4653f9dd7879f02c0f31384cc6fa3b0c3aae08d SHA256 b1a0efbfa10f1f29fd9577072b37716eb99a59fd8b7f0e8ef540adec0f2d0d3a
-DIST kde-l10n-zh_TW-4.7.2.tar.bz2 2829192 RMD160 a5c6b7a05a1e7420bf737d73ad8212ed6272d733 SHA1 a49a81895dc633a102efbfe4c7e92a823ce0fd50 SHA256 ce33ed59430105b2d015104a98820f218b85ec2edc5a91e4c46a101734046c61
 DIST kde-l10n-zh_TW-4.7.3.tar.bz2 2830325 RMD160 638990af12cbdd9b03baa2d8014f966b1dbbe11e SHA1 7b36964b2362a8b0d172d4170c5992ddda976f12 SHA256 035b05019fa5f4cae8ad17d97a972b4453e46ed7f773e973a9e163b003d7acc3
diff --git a/kde-base/kde-l10n/kde-l10n-4.7.2-r1.ebuild b/kde-base/kde-l10n/kde-l10n-4.7.2-r1.ebuild
deleted file mode 100644
index f11ddedcecaa..000000000000
--- a/kde-base/kde-l10n/kde-l10n-4.7.2-r1.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.2-r1.ebuild,v 1.1 2011/10/28 19:48:03 abcd 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-l10n/kde-l10n-4.7.3.ebuild b/kde-base/kde-l10n/kde-l10n-4.7.3.ebuild
index 7a58c6729b20..a4e05cc6e296 100644
--- a/kde-base/kde-l10n/kde-l10n-4.7.3.ebuild
+++ b/kde-base/kde-l10n/kde-l10n-4.7.3.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/kde-base/kde-l10n/kde-l10n-4.7.3.ebuild,v 1.1 2011/11/02 20:47:52 alexxy Exp $
+# $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"
 
@@ -15,7 +15,7 @@ DEPEND="
 "
 RDEPEND="!<kde-misc/konq-plugins-4.6"
 
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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' ' '
diff --git a/kde-base/kde-meta/kde-meta-4.7.2.ebuild b/kde-base/kde-meta/kde-meta-4.7.2.ebuild
deleted file mode 100644
index ecc7b546ef4c..000000000000
--- a/kde-base/kde-meta/kde-meta-4.7.2.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.2.ebuild,v 1.2 2011/10/28 19:15:15 dilfridge 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-meta/kde-meta-4.7.3.ebuild b/kde-base/kde-meta/kde-meta-4.7.3.ebuild
index ff49e4f1e43c..bafdb76f5586 100644
--- a/kde-base/kde-meta/kde-meta-4.7.3.ebuild
+++ b/kde-base/kde-meta/kde-meta-4.7.3.ebuild
@@ -1,12 +1,12 @@
 # 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.1 2011/11/02 20:48:16 alexxy Exp $
+# $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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="accessibility nls sdk semantic-desktop"
 
 RDEPEND="
diff --git a/kde-base/kde-wallpapers/Manifest b/kde-base/kde-wallpapers/Manifest
index c227418abbd7..68d80423c9ec 100644
--- a/kde-base/kde-wallpapers/Manifest
+++ b/kde-base/kde-wallpapers/Manifest
@@ -1,2 +1 @@
-DIST kde-wallpapers-4.7.2.tar.bz2 49224500 RMD160 9f5924060764963a166abd49eb6cb212a18aa289 SHA1 41398c918112e266c365c7269a6eb40795a2de19 SHA256 910219bc8575733a4922178a31c86bef9c588362f45194807f9b06d970968f41
 DIST kde-wallpapers-4.7.3.tar.bz2 49225512 RMD160 63fda03049a59c630dbbec6a98e2ca0669166393 SHA1 d1b5b9a65a731469a3fbeaae9169d50196fe4158 SHA256 00301f0d6247e605be76cbce8f8e308110dc6841a148405284eb230e21d78a53
diff --git a/kde-base/kde-wallpapers/kde-wallpapers-4.7.2-r1.ebuild b/kde-base/kde-wallpapers/kde-wallpapers-4.7.2-r1.ebuild
deleted file mode 100644
index 260716dc55ad..000000000000
--- a/kde-base/kde-wallpapers/kde-wallpapers-4.7.2-r1.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.2-r1.ebuild,v 1.1 2011/10/28 19:50:43 abcd Exp $
-
-EAPI=4
-
-KMNAME="kde-wallpapers"
-KDE_SCM="svn"
-inherit kde4-base
-
-DESCRIPTION="KDE wallpapers"
-KEYWORDS="~amd64 ~arm ~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/kde-wallpapers/kde-wallpapers-4.7.3.ebuild b/kde-base/kde-wallpapers/kde-wallpapers-4.7.3.ebuild
index b11cb5ede366..fd38a6d2aedb 100644
--- a/kde-base/kde-wallpapers/kde-wallpapers-4.7.3.ebuild
+++ b/kde-base/kde-wallpapers/kde-wallpapers-4.7.3.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/kde-base/kde-wallpapers/kde-wallpapers-4.7.3.ebuild,v 1.2 2011/11/05 20:04:44 xarthisius Exp $
+# $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
 
@@ -9,7 +9,7 @@ KDE_SCM="svn"
 inherit kde4-base
 
 DESCRIPTION="KDE wallpapers"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 add_blocker kdebase-wallpapers
diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.7.2.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.7.2.ebuild
deleted file mode 100644
index 147d7f6f18a0..000000000000
--- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:05 alexxy 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/kdeaccessibility-meta/kdeaccessibility-meta-4.7.3.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.7.3.ebuild
index d779739ea43a..596e96b4f1ea 100644
--- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.7.3.ebuild
+++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.7.3.ebuild
@@ -1,12 +1,12 @@
 # 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.1 2011/11/02 20:48:23 alexxy Exp $
+# $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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdeaccounts-plugin/Manifest b/kde-base/kdeaccounts-plugin/Manifest
index 8429b87a7c26..c05641549806 100644
--- a/kde-base/kdeaccounts-plugin/Manifest
+++ b/kde-base/kdeaccounts-plugin/Manifest
@@ -1,4 +1,3 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
 DIST kdesdk-4.6.5.tar.bz2 6063147 RMD160 0818eb740cb3f9c83ccf92bb238c4adbdd83b875 SHA1 8cffa0472fbe1096ebfea9bde49aaff76a145b34 SHA256 4b35eb3381bbf06e4d091dea4b38f6c807ce218d45e04d8719ee17ebd1820ff4
-DIST kdesdk-4.7.2.tar.bz2 5265267 RMD160 a8d275fcc858a548c7fe9ce04c0fd11279297174 SHA1 b6259b46fed642c35e1c1d1f90712084141ca441 SHA256 c9377df9429633413c57684574e6405b3dc3b493ac3ab43d9fd429ff3ab920be
 DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
diff --git a/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.7.2.ebuild b/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.7.2.ebuild
deleted file mode 100644
index 118fd9a088eb..000000000000
--- a/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:01 alexxy 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/kdeaccounts-plugin/kdeaccounts-plugin-4.7.3.ebuild b/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.7.3.ebuild
index 8fb46b2f9639..688112a06dcb 100644
--- a/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.7.3.ebuild
+++ b/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.7.3.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/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.7.3.ebuild,v 1.1 2011/11/02 20:48:13 alexxy Exp $
+# $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
 
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kdeadmin-meta/kdeadmin-meta-4.7.2.ebuild b/kde-base/kdeadmin-meta/kdeadmin-meta-4.7.2.ebuild
deleted file mode 100644
index 0146cd138cae..000000000000
--- a/kde-base/kdeadmin-meta/kdeadmin-meta-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:46 alexxy 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/kdeadmin-meta/kdeadmin-meta-4.7.3.ebuild b/kde-base/kdeadmin-meta/kdeadmin-meta-4.7.3.ebuild
index 22816934d20e..9c7881555296 100644
--- a/kde-base/kdeadmin-meta/kdeadmin-meta-4.7.3.ebuild
+++ b/kde-base/kdeadmin-meta/kdeadmin-meta-4.7.3.ebuild
@@ -1,12 +1,12 @@
 # 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.1 2011/11/02 20:47:54 alexxy Exp $
+# $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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="cups"
 
 RDEPEND="
diff --git a/kde-base/kdeartwork-colorschemes/Manifest b/kde-base/kdeartwork-colorschemes/Manifest
index 7df451008420..00a526a75522 100644
--- a/kde-base/kdeartwork-colorschemes/Manifest
+++ b/kde-base/kdeartwork-colorschemes/Manifest
@@ -1,4 +1,3 @@
 DIST kdeartwork-4.6.3.tar.bz2 116889676 RMD160 c82f0e792e9dd51ef489970ea8d479df3e91098d SHA1 084834ac3c654ea24257d9ed407c2384bf5aa110 SHA256 5b9865381cdb41901b936745681e3b429b633f019bb9fd8a2ec36a59a4ebfcaa
 DIST kdeartwork-4.6.5.tar.bz2 116890061 RMD160 8cb9b433537cb311fb746cdde897a0c184f0c027 SHA1 9bcf223f7ee2ca0e12f9c8ab8235dcd35f589a8d SHA256 762e6152fb46dac5ccb89db65b5ac92b31476c0e9be773d50920ceb62c512d72
-DIST kdeartwork-4.7.2.tar.bz2 122440524 RMD160 72322c1244535ba31b6527375ec40691ea0375dc SHA1 a536d530e1f97d14f11ada47435f3e194e93beae SHA256 e4c0e8fba004273f06a7f7ea3f863273536a571964def6b2520b1b1d7e2d0733
 DIST kdeartwork-4.7.3.tar.bz2 122446083 RMD160 b2cbc3a49c49fb8b768ddbcfc9a2fed2ef0fd5df SHA1 4d3611cbcd6052a7ba7137baa196c654d9d38d4d SHA256 be0847c6c877ce20cf234a1b422283e48e63e2872f46b975379ffb33d932f4a0
diff --git a/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.7.2.ebuild b/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.7.2.ebuild
deleted file mode 100644
index c1c403d33634..000000000000
--- a/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:11 alexxy 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-colorschemes/kdeartwork-colorschemes-4.7.3.ebuild b/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.7.3.ebuild
index 6f55c3ec0511..c49791d191f2 100644
--- a/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.7.3.ebuild
+++ b/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.7.3.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/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.7.3.ebuild,v 1.1 2011/11/02 20:48:16 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMMODULE="ColorSchemes"
 inherit kde4-meta
 
 DESCRIPTION="KDE extra colorschemes"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # Moved here in 4.7
diff --git a/kde-base/kdeartwork-desktopthemes/Manifest b/kde-base/kdeartwork-desktopthemes/Manifest
index 7df451008420..00a526a75522 100644
--- a/kde-base/kdeartwork-desktopthemes/Manifest
+++ b/kde-base/kdeartwork-desktopthemes/Manifest
@@ -1,4 +1,3 @@
 DIST kdeartwork-4.6.3.tar.bz2 116889676 RMD160 c82f0e792e9dd51ef489970ea8d479df3e91098d SHA1 084834ac3c654ea24257d9ed407c2384bf5aa110 SHA256 5b9865381cdb41901b936745681e3b429b633f019bb9fd8a2ec36a59a4ebfcaa
 DIST kdeartwork-4.6.5.tar.bz2 116890061 RMD160 8cb9b433537cb311fb746cdde897a0c184f0c027 SHA1 9bcf223f7ee2ca0e12f9c8ab8235dcd35f589a8d SHA256 762e6152fb46dac5ccb89db65b5ac92b31476c0e9be773d50920ceb62c512d72
-DIST kdeartwork-4.7.2.tar.bz2 122440524 RMD160 72322c1244535ba31b6527375ec40691ea0375dc SHA1 a536d530e1f97d14f11ada47435f3e194e93beae SHA256 e4c0e8fba004273f06a7f7ea3f863273536a571964def6b2520b1b1d7e2d0733
 DIST kdeartwork-4.7.3.tar.bz2 122446083 RMD160 b2cbc3a49c49fb8b768ddbcfc9a2fed2ef0fd5df SHA1 4d3611cbcd6052a7ba7137baa196c654d9d38d4d SHA256 be0847c6c877ce20cf234a1b422283e48e63e2872f46b975379ffb33d932f4a0
diff --git a/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.7.2.ebuild b/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.7.2.ebuild
deleted file mode 100644
index 281bbeff2122..000000000000
--- a/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:50 alexxy 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-desktopthemes/kdeartwork-desktopthemes-4.7.3.ebuild b/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.7.3.ebuild
index e7a37f067312..df212257d025 100644
--- a/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.7.3.ebuild
+++ b/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.7.3.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/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.7.3.ebuild,v 1.1 2011/11/02 20:47:59 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMNAME="kdeartwork"
 inherit kde4-meta
 
 DESCRIPTION="Additional KDE4 Plasma themes"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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 7df451008420..00a526a75522 100644
--- a/kde-base/kdeartwork-emoticons/Manifest
+++ b/kde-base/kdeartwork-emoticons/Manifest
@@ -1,4 +1,3 @@
 DIST kdeartwork-4.6.3.tar.bz2 116889676 RMD160 c82f0e792e9dd51ef489970ea8d479df3e91098d SHA1 084834ac3c654ea24257d9ed407c2384bf5aa110 SHA256 5b9865381cdb41901b936745681e3b429b633f019bb9fd8a2ec36a59a4ebfcaa
 DIST kdeartwork-4.6.5.tar.bz2 116890061 RMD160 8cb9b433537cb311fb746cdde897a0c184f0c027 SHA1 9bcf223f7ee2ca0e12f9c8ab8235dcd35f589a8d SHA256 762e6152fb46dac5ccb89db65b5ac92b31476c0e9be773d50920ceb62c512d72
-DIST kdeartwork-4.7.2.tar.bz2 122440524 RMD160 72322c1244535ba31b6527375ec40691ea0375dc SHA1 a536d530e1f97d14f11ada47435f3e194e93beae SHA256 e4c0e8fba004273f06a7f7ea3f863273536a571964def6b2520b1b1d7e2d0733
 DIST kdeartwork-4.7.3.tar.bz2 122446083 RMD160 b2cbc3a49c49fb8b768ddbcfc9a2fed2ef0fd5df SHA1 4d3611cbcd6052a7ba7137baa196c654d9d38d4d SHA256 be0847c6c877ce20cf234a1b422283e48e63e2872f46b975379ffb33d932f4a0
diff --git a/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.7.2.ebuild b/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.7.2.ebuild
deleted file mode 100644
index 843da50b5e20..000000000000
--- a/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:01 alexxy 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-emoticons/kdeartwork-emoticons-4.7.3.ebuild b/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.7.3.ebuild
index 4f44fa40d3b4..bdf77b3a63f1 100644
--- a/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.7.3.ebuild
+++ b/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.7.3.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/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.7.3.ebuild,v 1.1 2011/11/02 20:47:55 alexxy Exp $
+# $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
 
@@ -11,5 +11,5 @@ KMNAME="kdeartwork"
 inherit kde4-meta
 
 DESCRIPTION="EmotIcons (icons for things like smilies :-) for kde"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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 7df451008420..00a526a75522 100644
--- a/kde-base/kdeartwork-iconthemes/Manifest
+++ b/kde-base/kdeartwork-iconthemes/Manifest
@@ -1,4 +1,3 @@
 DIST kdeartwork-4.6.3.tar.bz2 116889676 RMD160 c82f0e792e9dd51ef489970ea8d479df3e91098d SHA1 084834ac3c654ea24257d9ed407c2384bf5aa110 SHA256 5b9865381cdb41901b936745681e3b429b633f019bb9fd8a2ec36a59a4ebfcaa
 DIST kdeartwork-4.6.5.tar.bz2 116890061 RMD160 8cb9b433537cb311fb746cdde897a0c184f0c027 SHA1 9bcf223f7ee2ca0e12f9c8ab8235dcd35f589a8d SHA256 762e6152fb46dac5ccb89db65b5ac92b31476c0e9be773d50920ceb62c512d72
-DIST kdeartwork-4.7.2.tar.bz2 122440524 RMD160 72322c1244535ba31b6527375ec40691ea0375dc SHA1 a536d530e1f97d14f11ada47435f3e194e93beae SHA256 e4c0e8fba004273f06a7f7ea3f863273536a571964def6b2520b1b1d7e2d0733
 DIST kdeartwork-4.7.3.tar.bz2 122446083 RMD160 b2cbc3a49c49fb8b768ddbcfc9a2fed2ef0fd5df SHA1 4d3611cbcd6052a7ba7137baa196c654d9d38d4d SHA256 be0847c6c877ce20cf234a1b422283e48e63e2872f46b975379ffb33d932f4a0
diff --git a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.7.2.ebuild b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.7.2.ebuild
deleted file mode 100644
index 619e6e56f1f4..000000000000
--- a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:57 alexxy 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-iconthemes/kdeartwork-iconthemes-4.7.3.ebuild b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.7.3.ebuild
index 6b24f6baa6d9..17708b0213c6 100644
--- a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.7.3.ebuild
+++ b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.7.3.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/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.7.3.ebuild,v 1.1 2011/11/02 20:48:07 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMMODULE="IconThemes"
 inherit kde4-meta
 
 DESCRIPTION="Icon themes for kde"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # Provides nuvola icon theme
diff --git a/kde-base/kdeartwork-kscreensaver/Manifest b/kde-base/kdeartwork-kscreensaver/Manifest
index 7df451008420..00a526a75522 100644
--- a/kde-base/kdeartwork-kscreensaver/Manifest
+++ b/kde-base/kdeartwork-kscreensaver/Manifest
@@ -1,4 +1,3 @@
 DIST kdeartwork-4.6.3.tar.bz2 116889676 RMD160 c82f0e792e9dd51ef489970ea8d479df3e91098d SHA1 084834ac3c654ea24257d9ed407c2384bf5aa110 SHA256 5b9865381cdb41901b936745681e3b429b633f019bb9fd8a2ec36a59a4ebfcaa
 DIST kdeartwork-4.6.5.tar.bz2 116890061 RMD160 8cb9b433537cb311fb746cdde897a0c184f0c027 SHA1 9bcf223f7ee2ca0e12f9c8ab8235dcd35f589a8d SHA256 762e6152fb46dac5ccb89db65b5ac92b31476c0e9be773d50920ceb62c512d72
-DIST kdeartwork-4.7.2.tar.bz2 122440524 RMD160 72322c1244535ba31b6527375ec40691ea0375dc SHA1 a536d530e1f97d14f11ada47435f3e194e93beae SHA256 e4c0e8fba004273f06a7f7ea3f863273536a571964def6b2520b1b1d7e2d0733
 DIST kdeartwork-4.7.3.tar.bz2 122446083 RMD160 b2cbc3a49c49fb8b768ddbcfc9a2fed2ef0fd5df SHA1 4d3611cbcd6052a7ba7137baa196c654d9d38d4d SHA256 be0847c6c877ce20cf234a1b422283e48e63e2872f46b975379ffb33d932f4a0
diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.7.2.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.7.2.ebuild
deleted file mode 100644
index 401c2d880c7a..000000000000
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:52 alexxy 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-kscreensaver/kdeartwork-kscreensaver-4.7.3.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.7.3.ebuild
index 9155545f0075..18f8711c1df2 100644
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.7.3.ebuild
+++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.7.3.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/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.7.3.ebuild,v 1.1 2011/11/02 20:47:55 alexxy Exp $
+# $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
 
@@ -10,7 +10,7 @@ OPENGL_REQUIRED="optional"
 inherit kde4-meta
 
 DESCRIPTION="Extra screensavers for kde"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug +eigen +kexiv2 opengl xscreensaver"
 
 # libkworkspace - only as a stub to provide KDE4Workspace config
diff --git a/kde-base/kdeartwork-meta/kdeartwork-meta-4.7.2.ebuild b/kde-base/kdeartwork-meta/kdeartwork-meta-4.7.2.ebuild
deleted file mode 100644
index c6dfeb2a5605..000000000000
--- a/kde-base/kdeartwork-meta/kdeartwork-meta-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:11 alexxy 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-meta/kdeartwork-meta-4.7.3.ebuild b/kde-base/kdeartwork-meta/kdeartwork-meta-4.7.3.ebuild
index aec943d52daf..9ccfd2d9bd43 100644
--- a/kde-base/kdeartwork-meta/kdeartwork-meta-4.7.3.ebuild
+++ b/kde-base/kdeartwork-meta/kdeartwork-meta-4.7.3.ebuild
@@ -1,12 +1,12 @@
 # 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.1 2011/11/02 20:48:21 alexxy Exp $
+# $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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdeartwork-sounds/Manifest b/kde-base/kdeartwork-sounds/Manifest
index 7df451008420..00a526a75522 100644
--- a/kde-base/kdeartwork-sounds/Manifest
+++ b/kde-base/kdeartwork-sounds/Manifest
@@ -1,4 +1,3 @@
 DIST kdeartwork-4.6.3.tar.bz2 116889676 RMD160 c82f0e792e9dd51ef489970ea8d479df3e91098d SHA1 084834ac3c654ea24257d9ed407c2384bf5aa110 SHA256 5b9865381cdb41901b936745681e3b429b633f019bb9fd8a2ec36a59a4ebfcaa
 DIST kdeartwork-4.6.5.tar.bz2 116890061 RMD160 8cb9b433537cb311fb746cdde897a0c184f0c027 SHA1 9bcf223f7ee2ca0e12f9c8ab8235dcd35f589a8d SHA256 762e6152fb46dac5ccb89db65b5ac92b31476c0e9be773d50920ceb62c512d72
-DIST kdeartwork-4.7.2.tar.bz2 122440524 RMD160 72322c1244535ba31b6527375ec40691ea0375dc SHA1 a536d530e1f97d14f11ada47435f3e194e93beae SHA256 e4c0e8fba004273f06a7f7ea3f863273536a571964def6b2520b1b1d7e2d0733
 DIST kdeartwork-4.7.3.tar.bz2 122446083 RMD160 b2cbc3a49c49fb8b768ddbcfc9a2fed2ef0fd5df SHA1 4d3611cbcd6052a7ba7137baa196c654d9d38d4d SHA256 be0847c6c877ce20cf234a1b422283e48e63e2872f46b975379ffb33d932f4a0
diff --git a/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.7.2.ebuild b/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.7.2.ebuild
deleted file mode 100644
index e40659b942ee..000000000000
--- a/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:06 alexxy 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-sounds/kdeartwork-sounds-4.7.3.ebuild b/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.7.3.ebuild
index 35b7b6c65e16..1b425681acac 100644
--- a/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.7.3.ebuild
+++ b/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.7.3.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/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.7.3.ebuild,v 1.1 2011/11/02 20:48:17 alexxy Exp $
+# $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
 
@@ -11,5 +11,5 @@ KMNAME="kdeartwork"
 inherit kde4-meta
 
 DESCRIPTION="Extra sound themes for kde"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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 7df451008420..00a526a75522 100644
--- a/kde-base/kdeartwork-styles/Manifest
+++ b/kde-base/kdeartwork-styles/Manifest
@@ -1,4 +1,3 @@
 DIST kdeartwork-4.6.3.tar.bz2 116889676 RMD160 c82f0e792e9dd51ef489970ea8d479df3e91098d SHA1 084834ac3c654ea24257d9ed407c2384bf5aa110 SHA256 5b9865381cdb41901b936745681e3b429b633f019bb9fd8a2ec36a59a4ebfcaa
 DIST kdeartwork-4.6.5.tar.bz2 116890061 RMD160 8cb9b433537cb311fb746cdde897a0c184f0c027 SHA1 9bcf223f7ee2ca0e12f9c8ab8235dcd35f589a8d SHA256 762e6152fb46dac5ccb89db65b5ac92b31476c0e9be773d50920ceb62c512d72
-DIST kdeartwork-4.7.2.tar.bz2 122440524 RMD160 72322c1244535ba31b6527375ec40691ea0375dc SHA1 a536d530e1f97d14f11ada47435f3e194e93beae SHA256 e4c0e8fba004273f06a7f7ea3f863273536a571964def6b2520b1b1d7e2d0733
 DIST kdeartwork-4.7.3.tar.bz2 122446083 RMD160 b2cbc3a49c49fb8b768ddbcfc9a2fed2ef0fd5df SHA1 4d3611cbcd6052a7ba7137baa196c654d9d38d4d SHA256 be0847c6c877ce20cf234a1b422283e48e63e2872f46b975379ffb33d932f4a0
diff --git a/kde-base/kdeartwork-styles/kdeartwork-styles-4.7.2.ebuild b/kde-base/kdeartwork-styles/kdeartwork-styles-4.7.2.ebuild
deleted file mode 100644
index 639a2090985d..000000000000
--- a/kde-base/kdeartwork-styles/kdeartwork-styles-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:48 alexxy 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-styles/kdeartwork-styles-4.7.3.ebuild b/kde-base/kdeartwork-styles/kdeartwork-styles-4.7.3.ebuild
index a93cdddc69cd..f5249b3c14be 100644
--- a/kde-base/kdeartwork-styles/kdeartwork-styles-4.7.3.ebuild
+++ b/kde-base/kdeartwork-styles/kdeartwork-styles-4.7.3.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/kde-base/kdeartwork-styles/kdeartwork-styles-4.7.3.ebuild,v 1.1 2011/11/02 20:47:56 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kdeartwork"
 inherit kde4-meta
 
 DESCRIPTION="Extra KWin styles and window decorations"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 add_blocker kwin '<4.5.67'
diff --git a/kde-base/kdeartwork-wallpapers/Manifest b/kde-base/kdeartwork-wallpapers/Manifest
index 7df451008420..00a526a75522 100644
--- a/kde-base/kdeartwork-wallpapers/Manifest
+++ b/kde-base/kdeartwork-wallpapers/Manifest
@@ -1,4 +1,3 @@
 DIST kdeartwork-4.6.3.tar.bz2 116889676 RMD160 c82f0e792e9dd51ef489970ea8d479df3e91098d SHA1 084834ac3c654ea24257d9ed407c2384bf5aa110 SHA256 5b9865381cdb41901b936745681e3b429b633f019bb9fd8a2ec36a59a4ebfcaa
 DIST kdeartwork-4.6.5.tar.bz2 116890061 RMD160 8cb9b433537cb311fb746cdde897a0c184f0c027 SHA1 9bcf223f7ee2ca0e12f9c8ab8235dcd35f589a8d SHA256 762e6152fb46dac5ccb89db65b5ac92b31476c0e9be773d50920ceb62c512d72
-DIST kdeartwork-4.7.2.tar.bz2 122440524 RMD160 72322c1244535ba31b6527375ec40691ea0375dc SHA1 a536d530e1f97d14f11ada47435f3e194e93beae SHA256 e4c0e8fba004273f06a7f7ea3f863273536a571964def6b2520b1b1d7e2d0733
 DIST kdeartwork-4.7.3.tar.bz2 122446083 RMD160 b2cbc3a49c49fb8b768ddbcfc9a2fed2ef0fd5df SHA1 4d3611cbcd6052a7ba7137baa196c654d9d38d4d SHA256 be0847c6c877ce20cf234a1b422283e48e63e2872f46b975379ffb33d932f4a0
diff --git a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.7.2.ebuild b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.7.2.ebuild
deleted file mode 100644
index e3e6c302aeda..000000000000
--- a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:45 alexxy 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-wallpapers/kdeartwork-wallpapers-4.7.3.ebuild b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.7.3.ebuild
index 233019e7c168..3be1fa41af4c 100644
--- a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.7.3.ebuild
+++ b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.7.3.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/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.7.3.ebuild,v 1.1 2011/11/02 20:47:53 alexxy Exp $
+# $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
 
@@ -11,7 +11,7 @@ KMNAME="kdeartwork"
 inherit kde4-meta
 
 DESCRIPTION="Wallpapers from kde"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 KMEXTRA="
diff --git a/kde-base/kdeartwork-weatherwallpapers/Manifest b/kde-base/kdeartwork-weatherwallpapers/Manifest
index 7df451008420..00a526a75522 100644
--- a/kde-base/kdeartwork-weatherwallpapers/Manifest
+++ b/kde-base/kdeartwork-weatherwallpapers/Manifest
@@ -1,4 +1,3 @@
 DIST kdeartwork-4.6.3.tar.bz2 116889676 RMD160 c82f0e792e9dd51ef489970ea8d479df3e91098d SHA1 084834ac3c654ea24257d9ed407c2384bf5aa110 SHA256 5b9865381cdb41901b936745681e3b429b633f019bb9fd8a2ec36a59a4ebfcaa
 DIST kdeartwork-4.6.5.tar.bz2 116890061 RMD160 8cb9b433537cb311fb746cdde897a0c184f0c027 SHA1 9bcf223f7ee2ca0e12f9c8ab8235dcd35f589a8d SHA256 762e6152fb46dac5ccb89db65b5ac92b31476c0e9be773d50920ceb62c512d72
-DIST kdeartwork-4.7.2.tar.bz2 122440524 RMD160 72322c1244535ba31b6527375ec40691ea0375dc SHA1 a536d530e1f97d14f11ada47435f3e194e93beae SHA256 e4c0e8fba004273f06a7f7ea3f863273536a571964def6b2520b1b1d7e2d0733
 DIST kdeartwork-4.7.3.tar.bz2 122446083 RMD160 b2cbc3a49c49fb8b768ddbcfc9a2fed2ef0fd5df SHA1 4d3611cbcd6052a7ba7137baa196c654d9d38d4d SHA256 be0847c6c877ce20cf234a1b422283e48e63e2872f46b975379ffb33d932f4a0
diff --git a/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.7.2.ebuild b/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.7.2.ebuild
deleted file mode 100644
index 6fc417815ed2..000000000000
--- a/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:09 alexxy 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/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.7.3.ebuild b/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.7.3.ebuild
index c312a8590331..f3ce2173db6e 100644
--- a/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.7.3.ebuild
+++ b/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.7.3.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/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.7.3.ebuild,v 1.1 2011/11/02 20:48:19 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMMODULE="WeatherWallpapers"
 inherit kde4-meta
 
 DESCRIPTION="Weather aware wallpapers. Changes with weather outside."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdebase-cursors/Manifest b/kde-base/kdebase-cursors/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/kdebase-cursors/Manifest
+++ b/kde-base/kdebase-cursors/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/kdebase-cursors/kdebase-cursors-4.7.2.ebuild b/kde-base/kdebase-cursors/kdebase-cursors-4.7.2.ebuild
deleted file mode 100644
index d13588637a7d..000000000000
--- a/kde-base/kdebase-cursors/kdebase-cursors-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:53 alexxy 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-cursors/kdebase-cursors-4.7.3.ebuild b/kde-base/kdebase-cursors/kdebase-cursors-4.7.3.ebuild
index bdef4ac5c4df..52f65bf0bc86 100644
--- a/kde-base/kdebase-cursors/kdebase-cursors-4.7.3.ebuild
+++ b/kde-base/kdebase-cursors/kdebase-cursors-4.7.3.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/kde-base/kdebase-cursors/kdebase-cursors-4.7.3.ebuild,v 1.1 2011/11/02 20:48:01 alexxy Exp $
+# $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
 
@@ -10,4 +10,4 @@ inherit kde4-meta
 
 DESCRIPTION="oxygen cursors from kdebase"
 IUSE=""
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/kdebase-data/Manifest
+++ b/kde-base/kdebase-data/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/kdebase-data/kdebase-data-4.7.2.ebuild b/kde-base/kdebase-data/kdebase-data-4.7.2.ebuild
deleted file mode 100644
index feaf24eabdc4..000000000000
--- a/kde-base/kdebase-data/kdebase-data-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:05 alexxy 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-data/kdebase-data-4.7.3.ebuild b/kde-base/kdebase-data/kdebase-data-4.7.3.ebuild
index 963108a5c8f2..63cc77bcaf8f 100644
--- a/kde-base/kdebase-data/kdebase-data-4.7.3.ebuild
+++ b/kde-base/kdebase-data/kdebase-data-4.7.3.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/kde-base/kdebase-data/kdebase-data-4.7.3.ebuild,v 1.1 2011/11/02 20:48:08 alexxy Exp $
+# $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
 
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	wallpapers? ( $(add_kdebase_dep kde-wallpapers) )
diff --git a/kde-base/kdebase-desktoptheme/Manifest b/kde-base/kdebase-desktoptheme/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/kdebase-desktoptheme/Manifest
+++ b/kde-base/kdebase-desktoptheme/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.7.2.ebuild b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.7.2.ebuild
deleted file mode 100644
index 3263631d3074..000000000000
--- a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:09 alexxy 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-desktoptheme/kdebase-desktoptheme-4.7.3.ebuild b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.7.3.ebuild
index 1a9ddfa1db8c..6a30d457cf48 100644
--- a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.7.3.ebuild
+++ b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.7.3.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/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.7.3.ebuild,v 1.1 2011/11/02 20:48:06 alexxy Exp $
+# $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
 
@@ -10,4 +10,4 @@ inherit kde4-meta
 
 DESCRIPTION="Oxygen KDE4 desktop theme."
 IUSE=""
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+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 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/kdebase-kioslaves/Manifest
+++ b/kde-base/kdebase-kioslaves/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.7.2.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.7.2.ebuild
deleted file mode 100644
index d2d42547ade5..000000000000
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.7.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/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.7.2.ebuild,v 1.1 2011/10/06 18:10:46 alexxy 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-kioslaves/kdebase-kioslaves-4.7.3.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.7.3.ebuild
index bc6b68a3a84a..eab49624dac6 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.7.3.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.7.3.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/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.7.3.ebuild,v 1.1 2011/11/02 20:47:54 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kde-runtime"
 KMMODULE="kioslave"
 inherit kde4-meta
 
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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"
 
diff --git a/kde-base/kdebase-menu-icons/Manifest b/kde-base/kdebase-menu-icons/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/kdebase-menu-icons/Manifest
+++ b/kde-base/kdebase-menu-icons/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.7.2.ebuild b/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.7.2.ebuild
deleted file mode 100644
index 8de5c0713e99..000000000000
--- a/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:11 alexxy 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-icons/kdebase-menu-icons-4.7.3.ebuild b/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.7.3.ebuild
index 759058293984..9e81fc060f13 100644
--- 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
@@ -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/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.7.3.ebuild,v 1.1 2011/11/02 20:47:59 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMMODULE="menu"
 inherit kde4-meta
 
 DESCRIPTION="KDE menu icons"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+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 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/kdebase-menu/Manifest
+++ b/kde-base/kdebase-menu/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/kdebase-menu/kdebase-menu-4.7.2.ebuild b/kde-base/kdebase-menu/kdebase-menu-4.7.2.ebuild
deleted file mode 100644
index 2a6f119f9c91..000000000000
--- a/kde-base/kdebase-menu/kdebase-menu-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:51 alexxy 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-menu/kdebase-menu-4.7.3.ebuild b/kde-base/kdebase-menu/kdebase-menu-4.7.3.ebuild
index eb6a2a8eee00..2f781f5922a0 100644
--- a/kde-base/kdebase-menu/kdebase-menu-4.7.3.ebuild
+++ b/kde-base/kdebase-menu/kdebase-menu-4.7.3.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/kde-base/kdebase-menu/kdebase-menu-4.7.3.ebuild,v 1.1 2011/11/02 20:48:22 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMMODULE="kde-menu"
 inherit kde4-meta
 
 DESCRIPTION="KDE Menu query tool."
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+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.2.ebuild b/kde-base/kdebase-meta/kdebase-meta-4.7.2.ebuild
deleted file mode 100644
index d38f5f00cc54..000000000000
--- a/kde-base/kdebase-meta/kdebase-meta-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:56 alexxy 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-meta/kdebase-meta-4.7.3.ebuild b/kde-base/kdebase-meta/kdebase-meta-4.7.3.ebuild
index a70f54f48155..2f72586315fd 100644
--- a/kde-base/kdebase-meta/kdebase-meta-4.7.3.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-4.7.3.ebuild
@@ -1,12 +1,12 @@
 # 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.1 2011/11/02 20:48:05 alexxy Exp $
+# $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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+wallpapers"
 
 RDEPEND="
diff --git a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.7.2.ebuild b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.7.2.ebuild
deleted file mode 100644
index 7d662a04dd75..000000000000
--- a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:02 alexxy 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-runtime-meta/kdebase-runtime-meta-4.7.3.ebuild b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.7.3.ebuild
index e870c23a1df4..1e7ce6f3cf23 100644
--- 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
@@ -1,12 +1,12 @@
 # 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.1 2011/11/02 20:48:03 alexxy Exp $
+# $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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+handbook semantic-desktop"
 
 RDEPEND="
diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/kdebase-startkde/Manifest
+++ b/kde-base/kdebase-startkde/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.7.2.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.7.2.ebuild
deleted file mode 100644
index 89f22080d928..000000000000
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:07 alexxy 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/kdebase-startkde/kdebase-startkde-4.7.3.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.7.3.ebuild
index e9484138d648..cffd201b1fae 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.7.3.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.7.3.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/kde-base/kdebase-startkde/kdebase-startkde-4.7.3.ebuild,v 1.1 2011/11/02 20:48:11 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+wallpapers"
 
 # The KDE apps called from the startkde script.
diff --git a/kde-base/kdebindings-meta/kdebindings-meta-4.7.2.ebuild b/kde-base/kdebindings-meta/kdebindings-meta-4.7.2.ebuild
deleted file mode 100644
index 1ede75f96880..000000000000
--- a/kde-base/kdebindings-meta/kdebindings-meta-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:45 alexxy 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/kdebindings-meta/kdebindings-meta-4.7.3.ebuild b/kde-base/kdebindings-meta/kdebindings-meta-4.7.3.ebuild
index 9049b6c5d570..04b459574ae6 100644
--- a/kde-base/kdebindings-meta/kdebindings-meta-4.7.3.ebuild
+++ b/kde-base/kdebindings-meta/kdebindings-meta-4.7.3.ebuild
@@ -1,12 +1,12 @@
 # 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.1 2011/11/02 20:47:53 alexxy Exp $
+# $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"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="csharp java perl python ruby"
 
 RDEPEND="
diff --git a/kde-base/kdebugdialog/Manifest b/kde-base/kdebugdialog/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/kdebugdialog/Manifest
+++ b/kde-base/kdebugdialog/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/kdebugdialog/kdebugdialog-4.7.2.ebuild b/kde-base/kdebugdialog/kdebugdialog-4.7.2.ebuild
deleted file mode 100644
index e3e16c2ebb10..000000000000
--- a/kde-base/kdebugdialog/kdebugdialog-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:08 alexxy 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/kdebugdialog/kdebugdialog-4.7.3.ebuild b/kde-base/kdebugdialog/kdebugdialog-4.7.3.ebuild
index 7e8f5ea8d016..9ad5bf1f1fac 100644
--- a/kde-base/kdebugdialog/kdebugdialog-4.7.3.ebuild
+++ b/kde-base/kdebugdialog/kdebugdialog-4.7.3.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/kde-base/kdebugdialog/kdebugdialog-4.7.3.ebuild,v 1.1 2011/11/02 20:47:58 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ 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"
+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.2.ebuild b/kde-base/kdeedu-meta/kdeedu-meta-4.7.2.ebuild
deleted file mode 100644
index 2ea8f29e5da4..000000000000
--- a/kde-base/kdeedu-meta/kdeedu-meta-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:03 alexxy 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/kdeedu-meta/kdeedu-meta-4.7.3.ebuild b/kde-base/kdeedu-meta/kdeedu-meta-4.7.3.ebuild
index 8bfffa6d5564..f635c1277161 100644
--- a/kde-base/kdeedu-meta/kdeedu-meta-4.7.3.ebuild
+++ b/kde-base/kdeedu-meta/kdeedu-meta-4.7.3.ebuild
@@ -1,12 +1,12 @@
 # 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.1 2011/11/02 20:48:20 alexxy Exp $
+# $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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdegames-meta/kdegames-meta-4.7.2.ebuild b/kde-base/kdegames-meta/kdegames-meta-4.7.2.ebuild
deleted file mode 100644
index d72cf3808876..000000000000
--- a/kde-base/kdegames-meta/kdegames-meta-4.7.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/kde-base/kdegames-meta/kdegames-meta-4.7.2.ebuild,v 1.1 2011/10/06 18:11:04 alexxy 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/kdegames-meta/kdegames-meta-4.7.3.ebuild b/kde-base/kdegames-meta/kdegames-meta-4.7.3.ebuild
index d92f5fee14f8..5935fcc444b7 100644
--- a/kde-base/kdegames-meta/kdegames-meta-4.7.3.ebuild
+++ b/kde-base/kdegames-meta/kdegames-meta-4.7.3.ebuild
@@ -1,12 +1,12 @@
 # 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.1 2011/11/02 20:48:04 alexxy Exp $
+# $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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="opengl python"
 
 RDEPEND="
diff --git a/kde-base/kdegraphics-meta/kdegraphics-meta-4.7.2.ebuild b/kde-base/kdegraphics-meta/kdegraphics-meta-4.7.2.ebuild
deleted file mode 100644
index 9b91928511b5..000000000000
--- a/kde-base/kdegraphics-meta/kdegraphics-meta-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:46 alexxy 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-meta/kdegraphics-meta-4.7.3.ebuild b/kde-base/kdegraphics-meta/kdegraphics-meta-4.7.3.ebuild
index a3d0fe130cbb..b88f3cdddf61 100644
--- a/kde-base/kdegraphics-meta/kdegraphics-meta-4.7.3.ebuild
+++ b/kde-base/kdegraphics-meta/kdegraphics-meta-4.7.3.ebuild
@@ -1,12 +1,12 @@
 # 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.1 2011/11/02 20:47:54 alexxy Exp $
+# $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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="scanner"
 
 RDEPEND="
diff --git a/kde-base/kdegraphics-strigi-analyzer/Manifest b/kde-base/kdegraphics-strigi-analyzer/Manifest
index f4b5dd9bf259..a4a2e3cc83d9 100644
--- a/kde-base/kdegraphics-strigi-analyzer/Manifest
+++ b/kde-base/kdegraphics-strigi-analyzer/Manifest
@@ -1,4 +1,3 @@
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
 DIST kdegraphics-4.6.5.tar.bz2 5455380 RMD160 75fdf00994bfc2737a754b4ff360ab789cd824b5 SHA1 1e64698993d0754dfae1296d8d16ba9370f9a08c SHA256 5b8a7e54f281ac938d8e22db673b7ddcff8a1d8adfc128282150ad52c80b8c04
-DIST kdegraphics-strigi-analyzer-4.7.2.tar.bz2 42602 RMD160 6ff4304df8fe2c4efcfd6cf014184eda4e3b6ce2 SHA1 6094f33788f619e316efad7bc3eb6178b1b28121 SHA256 32d1aab4bff449a42ed641ef83726aff6ccfff4e607b545a79230bd6c3e13f09
 DIST kdegraphics-strigi-analyzer-4.7.3.tar.bz2 42747 RMD160 63c6b0ac8d47d64874d917f639be45690d31bc58 SHA1 827b18fd902a464162db7a3cd98a22fa211bafc9 SHA256 4a22c3e27be915fadeb9ac1310dba37ecb76162b1c3082d4df0fb883b9f9d9d3
diff --git a/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.7.2.ebuild b/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.7.2.ebuild
deleted file mode 100644
index 59660a39c4fe..000000000000
--- a/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:49 alexxy 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/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.7.3.ebuild b/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.7.3.ebuild
index f322c78a89f5..1c62aad103ef 100644
--- 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
@@ -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/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.7.3.ebuild,v 1.1 2011/11/02 20:47:57 alexxy Exp $
+# $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
 
@@ -8,7 +8,7 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="kdegraphics: strigi plugins"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 3c188171d614..92b4bba84516 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,4 +1,3 @@
 DIST kdelibs-4.6.3.tar.bz2 12916816 RMD160 f7f78ef93fa75d488efcd7c66dcbce6d153f9c28 SHA1 c7fb089c9d52a6b1d9188b9e788753373a3288e4 SHA256 b6ea04dc9014ff3fca0242fd927faeb67dc53288779aeb873d46104aa6109e38
 DIST kdelibs-4.6.5.tar.bz2 12917554 RMD160 cd167d17c4c090b21f7271c84d52bfa6401b8f6c SHA1 9bb948769a3a5d4d5b6c65e84a8cf570bd7bc120 SHA256 d7b0de699f6db29a6309053719a523f2516a08e77b951d15610aeb11ea9d5ba0
-DIST kdelibs-4.7.2.tar.bz2 12066803 RMD160 b887172ac490fa1d69f38eddebc99fbced1c249f SHA1 4b074633cbf69752fda96018514ee771efe8f18b SHA256 bfa70b33d2153c209a21735d73ae061772c59696c1715881191da7a3993f8b38
 DIST kdelibs-4.7.3.tar.bz2 12071229 RMD160 e8bb93554a915d97d6619b8a9bfccdd7175259a0 SHA1 4f1bbd1b4d558f3541057747db9bf7e9dcececb3 SHA256 00ef65295134e998e8bc1123b0bd64245811106e827ab90458378ea4ab5b0e66
diff --git a/kde-base/kdelibs/kdelibs-4.7.2-r1.ebuild b/kde-base/kdelibs/kdelibs-4.7.2-r1.ebuild
deleted file mode 100644
index 4d46481f72d4..000000000000
--- a/kde-base/kdelibs/kdelibs-4.7.2-r1.ebuild
+++ /dev/null
@@ -1,313 +0,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.2-r1.ebuild,v 1.1 2011/10/29 18:30:18 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
-
-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.2-nepomuk-unicode.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/kdelibs/kdelibs-4.7.3-r1.ebuild b/kde-base/kdelibs/kdelibs-4.7.3-r1.ebuild
index f9ac1ed2714b..55de089ff49b 100644
--- a/kde-base/kdelibs/kdelibs-4.7.3-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.7.3-r1.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/kde-base/kdelibs/kdelibs-4.7.3-r1.ebuild,v 1.2 2011/11/29 21:39:30 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.3-r1.ebuild,v 1.4 2011/12/07 22:13:49 hwoarang Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ 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"
+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
diff --git a/kde-base/kdemultimedia-kioslaves/Manifest b/kde-base/kdemultimedia-kioslaves/Manifest
index b74697d7e5ca..299fa5e8456b 100644
--- a/kde-base/kdemultimedia-kioslaves/Manifest
+++ b/kde-base/kdemultimedia-kioslaves/Manifest
@@ -1,4 +1,3 @@
 DIST kdemultimedia-4.6.3.tar.bz2 1611668 RMD160 8824bda18a1f1051dea366a0ff0d6191068476dd SHA1 d5bde19156b65e9b56e0e6de800efc0efe117632 SHA256 b3a6732dead0558610b4b40d3ce28c4b7b5da8869a63436180eacb3aacec533b
 DIST kdemultimedia-4.6.5.tar.bz2 1611493 RMD160 70ca60910f21e464f49e4e106918fbcc1407b0c7 SHA1 081bead5ee758d169f3119c138424929b001d04f SHA256 7ab9afb233538e7065758b32cd13f52fee2b68306f4be3dead729f3ba93c9c58
-DIST kdemultimedia-4.7.2.tar.bz2 1643403 RMD160 3c5510cb381b64290dda9a15a483dff3062037db SHA1 2fc12558284fe95da63e24c73612846c6c1d31e1 SHA256 a5a6e1101f4d8fc278791d63c4c91e261d60e995e67b4e8d901f2f93ba7be800
 DIST kdemultimedia-4.7.3.tar.bz2 1644497 RMD160 de9d9f9341d91bf0d56fa9468c0441226cb6aba2 SHA1 4db44494e6a2ef886e3513b6a2eb4e526741a6ff SHA256 ad96332218b82c4466debcb165061d87051a917e0321bdc34e4024da9c8c30b1
diff --git a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.7.2.ebuild b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.7.2.ebuild
deleted file mode 100644
index b6b734e4b98b..000000000000
--- a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:58 alexxy 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-kioslaves/kdemultimedia-kioslaves-4.7.3.ebuild b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.7.3.ebuild
index 7c274e4305eb..856aa044c7cc 100644
--- a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.7.3.ebuild
+++ b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.7.3.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/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.7.3.ebuild,v 1.1 2011/11/02 20:48:15 alexxy Exp $
+# $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
 
@@ -10,7 +10,7 @@ KMMODULE="kioslave"
 inherit kde4-meta
 
 DESCRIPTION="KDE kioslaves from the kdemultimedia package"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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
diff --git a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.7.2.ebuild b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.7.2.ebuild
deleted file mode 100644
index 09106f5bd47f..000000000000
--- a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:43 alexxy 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/kdemultimedia-meta/kdemultimedia-meta-4.7.3.ebuild b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.7.3.ebuild
index 0c9f5e421ebe..c6e4363c278c 100644
--- a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.7.3.ebuild
+++ b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.7.3.ebuild
@@ -1,12 +1,12 @@
 # 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.1 2011/11/02 20:48:23 alexxy Exp $
+# $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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="ffmpeg +mplayer"
 
 RDEPEND="
diff --git a/kde-base/kdenetwork-filesharing/Manifest b/kde-base/kdenetwork-filesharing/Manifest
index b7cb9e393a5a..f41009a5734a 100644
--- a/kde-base/kdenetwork-filesharing/Manifest
+++ b/kde-base/kdenetwork-filesharing/Manifest
@@ -1,4 +1,3 @@
 DIST kdenetwork-4.6.3.tar.bz2 8693954 RMD160 a70c031107dd56eda618b91482b814e14425cb1d SHA1 6f140dca442be815eda4fb79d51efd9e4588a1f1 SHA256 423424f2bbc18cb6a0bd52305a238a5b7d4b5f483f30c0590f975b0c229be1fb
 DIST kdenetwork-4.6.5.tar.bz2 8685421 RMD160 eaa0e86ac527a7bc7a70c7eeedb651ff2cccf799 SHA1 cc398063da61f9f9ef0db4455dc0c989a4e68a25 SHA256 5029442447524dc83b080d11fbc4a533f3135bbaf7350b1b5f56289d8f913588
-DIST kdenetwork-4.7.2.tar.bz2 9945067 RMD160 50c6703d021db1ffd516f886b42d42291f725d6c SHA1 59e9e3629dff0362cfa2a6d897c77bc9cfbe8d5c SHA256 c61606a0cad9620ac235725594c7d9d0231268dc372e4d16d411f9aff1f3c36f
 DIST kdenetwork-4.7.3.tar.bz2 9947763 RMD160 8d1cdce1dfd5fa4aae6ecb2d55b189e0bcd94981 SHA1 5d8ed6a478d9afdaf19d350f1d2fe7e9dd48b2f7 SHA256 5a5e7bfa7998e38f80667473c590ab11dde8f3dd6a81a5d9e61ca3940354efa4
diff --git a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.7.2.ebuild b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.7.2.ebuild
deleted file mode 100644
index ede285c5ef65..000000000000
--- a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:55 alexxy 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-filesharing/kdenetwork-filesharing-4.7.3.ebuild b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.7.3.ebuild
index 976b84e83e1b..5c7460dc7f9f 100644
--- a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.7.3.ebuild
+++ b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.7.3.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/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.7.3.ebuild,v 1.1 2011/11/02 20:47:55 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMMODULE="filesharing"
 inherit kde4-meta
 
 DESCRIPTION="kcontrol filesharing config module for NFS, SMB etc"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-4.7.2.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-4.7.2.ebuild
deleted file mode 100644
index f477f0a1aac1..000000000000
--- a/kde-base/kdenetwork-meta/kdenetwork-meta-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:45 alexxy 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/kdenetwork-meta/kdenetwork-meta-4.7.3.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-4.7.3.ebuild
index 9eb7f651b804..5b869a25fd2b 100644
--- a/kde-base/kdenetwork-meta/kdenetwork-meta-4.7.3.ebuild
+++ b/kde-base/kdenetwork-meta/kdenetwork-meta-4.7.3.ebuild
@@ -1,12 +1,12 @@
 # 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.1 2011/11/02 20:47:53 alexxy Exp $
+# $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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="ppp"
 
 RDEPEND="
diff --git a/kde-base/kdepasswd/Manifest b/kde-base/kdepasswd/Manifest
index 55198aaad7a5..4d43fae00274 100644
--- a/kde-base/kdepasswd/Manifest
+++ b/kde-base/kdepasswd/Manifest
@@ -1,4 +1,3 @@
-DIST kde-baseapps-4.7.2.tar.bz2 2685060 RMD160 f97994dabe6412065723a8373291f1cf3f7c3290 SHA1 b52937ad8e5e4be884cc76f265c19964f461ac2c SHA256 1104284ad9cfc9757b0bbd2516dfdcbe4119ea6a6e6daf3c9d7eb66c43760bfa
 DIST kde-baseapps-4.7.3.tar.bz2 2685074 RMD160 270f3f3ae7b473651517db8818160f16e4faf544 SHA1 952dc26d0d908b41973a8d7b4d27765bf5128d58 SHA256 e9fb0c5da9e9a255c1a1735dfa518dcadc1ea23c68a467164597ff3dbf51c8df
 DIST kdebase-4.6.3.tar.bz2 2682586 RMD160 38784d7a5a708703f5a22e39dc5f83ef7aecd833 SHA1 69cfba74099cdce27f7f72725288f025979b41f3 SHA256 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
 DIST kdebase-4.6.5.tar.bz2 2639622 RMD160 cef007659a02cbec3bd484aa9eb5a721c5200b4f SHA1 1a902d22956daaf380ceefe68f8db75b8b760ae6 SHA256 542a42fc806673ba46827dcc5616fe53239659107934f1b05bf476e46ecbffd5
diff --git a/kde-base/kdepasswd/kdepasswd-4.7.2.ebuild b/kde-base/kdepasswd/kdepasswd-4.7.2.ebuild
deleted file mode 100644
index 5f6c7af9aa22..000000000000
--- a/kde-base/kdepasswd/kdepasswd-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:48 alexxy 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/kdepasswd/kdepasswd-4.7.3.ebuild b/kde-base/kdepasswd/kdepasswd-4.7.3.ebuild
index ffe1d5b2e61e..789bfcf8a5d8 100644
--- a/kde-base/kdepasswd/kdepasswd-4.7.3.ebuild
+++ b/kde-base/kdepasswd/kdepasswd-4.7.3.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/kde-base/kdepasswd/kdepasswd-4.7.3.ebuild,v 1.1 2011/11/02 20:47:56 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kde-baseapps"
 inherit kde4-meta
 
 DESCRIPTION="KDE GUI for passwd"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kdepim-common-libs/Manifest b/kde-base/kdepim-common-libs/Manifest
index 51674a0836d9..908da1ebad23 100644
--- a/kde-base/kdepim-common-libs/Manifest
+++ b/kde-base/kdepim-common-libs/Manifest
@@ -1,2 +1 @@
-DIST kdepim-4.7.2.tar.bz2 16171209 RMD160 378e7352725dd257617b1af7d2bb98a8d5569808 SHA1 41983556eb54a740a20d274878006ace5bc73c1c SHA256 1635dabfc73b95209466c92a009bd2856ebd73c42f486545ff97e719fec06630
 DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.2.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.2.ebuild
deleted file mode 100644
index a243348fb4a0..000000000000
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.2.ebuild
+++ /dev/null
@@ -1,63 +0,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.2.ebuild,v 1.1 2011/10/06 18:11:03 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdepim"
-KMNOMODULE="true"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="Common libraries for KDE PIM apps"
-KEYWORDS="~amd64 ~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'
-
-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-common-libs/kdepim-common-libs-4.7.3.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.3.ebuild
index ca2710ed8b4f..b83b961b3037 100644
--- 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
@@ -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/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.3.ebuild,v 1.3 2011/12/04 17:54:05 dilfridge Exp $
+# $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
 
@@ -10,7 +10,7 @@ KDE_SCM="git"
 inherit kde4-meta
 
 DESCRIPTION="Common libraries for KDE PIM apps"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kdepim-icons/Manifest b/kde-base/kdepim-icons/Manifest
index 4e48133a3b7c..70a470d0ba9e 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.2.tar.bz2 16171209 RMD160 378e7352725dd257617b1af7d2bb98a8d5569808 SHA1 41983556eb54a740a20d274878006ace5bc73c1c SHA256 1635dabfc73b95209466c92a009bd2856ebd73c42f486545ff97e719fec06630
 DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
diff --git a/kde-base/kdepim-icons/kdepim-icons-4.7.2.ebuild b/kde-base/kdepim-icons/kdepim-icons-4.7.2.ebuild
deleted file mode 100644
index d063d45999c2..000000000000
--- a/kde-base/kdepim-icons/kdepim-icons-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:44 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdepim"
-KMMODULE="icons"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE PIM icons"
-IUSE=""
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="$(add_kdebase_dep kdepimlibs)"
-RDEPEND=""
diff --git a/kde-base/kdepim-icons/kdepim-icons-4.7.3.ebuild b/kde-base/kdepim-icons/kdepim-icons-4.7.3.ebuild
index d858e23b295f..9a3dd9f0dd63 100644
--- a/kde-base/kdepim-icons/kdepim-icons-4.7.3.ebuild
+++ b/kde-base/kdepim-icons/kdepim-icons-4.7.3.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/kde-base/kdepim-icons/kdepim-icons-4.7.3.ebuild,v 1.2 2011/11/05 19:57:25 xarthisius Exp $
+# $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
 
@@ -11,7 +11,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE PIM icons"
 IUSE=""
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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 4e48133a3b7c..70a470d0ba9e 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.2.tar.bz2 16171209 RMD160 378e7352725dd257617b1af7d2bb98a8d5569808 SHA1 41983556eb54a740a20d274878006ace5bc73c1c SHA256 1635dabfc73b95209466c92a009bd2856ebd73c42f486545ff97e719fec06630
 DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-4.7.2.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.7.2.ebuild
deleted file mode 100644
index 30ff32342334..000000000000
--- a/kde-base/kdepim-kresources/kdepim-kresources-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:47 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdepim"
-KMMODULE="kresources"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE PIM groupware plugin collection"
-IUSE="debug"
-KEYWORDS="~amd64 ~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-kresources/kdepim-kresources-4.7.3.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.7.3.ebuild
index 2a96e2ed3669..58564441a705 100644
--- a/kde-base/kdepim-kresources/kdepim-kresources-4.7.3.ebuild
+++ b/kde-base/kdepim-kresources/kdepim-kresources-4.7.3.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/kde-base/kdepim-kresources/kdepim-kresources-4.7.3.ebuild,v 1.2 2011/11/05 19:57:59 xarthisius Exp $
+# $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
 
@@ -11,7 +11,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE PIM groupware plugin collection"
 IUSE="debug"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	$(add_kdebase_dep kdepimlibs)
diff --git a/kde-base/kdepim-l10n/Manifest b/kde-base/kdepim-l10n/Manifest
index d9acc3239ab5..4c66cc4fb72c 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.2.tar.bz2 3593739 RMD160 24db48132c1a59af81c5dc6e89fe325063521ee5 SHA1 04c10068c2d4f6fdf9e1bad475da72ae47053ee7 SHA256 e27db561abfa68464d4662df3afdb969f325ebf5463e2956293998927d68409f
 DIST kde-l10n-ar-4.7.3.tar.bz2 3595175 RMD160 347d0a6f52cb140d5b79c3b09dd2671def15b08a SHA1 6cc066ec6cfdc592918615dca655af9fe25d0f3f SHA256 63d37595e933de20f8d402411274a5bbf7e4492a423f5a97c10e2baa2af76127
 DIST kde-l10n-bg-4.4.5.tar.bz2 2112721 RMD160 846040993c10a4d075000ba5dece25df8faf9c6f SHA1 12758687384de09ea8ba8ae8f5b4460ed2879cab SHA256 214c62e32d7fde793275c9b52813839c48bb181312c038068ca5a4b1d9a2d48c
-DIST kde-l10n-bg-4.7.2.tar.bz2 2155590 RMD160 a26cf27ea73b05e5e41f8f3f92a7e2723ae70bd1 SHA1 6307d79d97e318134336940eee62fa8598f40abe SHA256 6fa70ff01454a303af994222198986cbefddc77db32fb2303cbc6248760979e0
 DIST kde-l10n-bg-4.7.3.tar.bz2 2155895 RMD160 3bddbedbfb86f56f5fc93b6a2e64b60e1272100e SHA1 5552ee00bba8c33a59c1684210e0967213ee3de5 SHA256 5b14c2367e4ac1f08e9587ee16df3157fb40714e3042d5f3d0385041cec91586
-DIST kde-l10n-bs-4.7.2.tar.bz2 2478609 RMD160 649ebdfd9bbcba3817e906409d705ec9676bc48c SHA1 bd03dc7b85a1c02a498d63297039fb2b0942af32 SHA256 fae2418e132a06c4f686a5a1510d781a68e6c05b53f69672b079b8f9abaa0003
 DIST kde-l10n-bs-4.7.3.tar.bz2 2479149 RMD160 f708ec212f24bb28df6f3fbe782d4f3287422279 SHA1 206dd68f06ed7e69fb7850c4c17d8e6084bb4ab3 SHA256 211145eeed46a6a0aa1a6943512aac8a1c2877a5b51d9acd99085447abdd96d8
 DIST kde-l10n-ca-4.4.5.tar.bz2 4915160 RMD160 d07a690738204e6aa93cf50dfc857f160fbc9c03 SHA1 f55e20ed14a306902c3a7bbfd17654428367c628 SHA256 b713ebe738605f6bc803fad3cee23de73b566930aa1f9cf005be328c8e9a89e1
-DIST kde-l10n-ca-4.7.2.tar.bz2 8536283 RMD160 2bd922a08dd8f67dc0bdb065a61cacb9a18eee60 SHA1 04042b7c245dc620d53c2160d0c7f03314cfee72 SHA256 fb916e4676ce68ffb637b9507fd61542adba5ab713c95ec7c01dab190b403dcd
 DIST kde-l10n-ca-4.7.3.tar.bz2 9288467 RMD160 e6cba1b3fd6ab2b06b7ede0a3a84191b99d90beb SHA1 a516d7ef6020083cd746f30effdaa8eb22f75961 SHA256 09a95546e5a671ccd64701c379428b36671e137d0e0cdd2587329e9902a70281
 DIST kde-l10n-ca@valencia-4.4.5.tar.bz2 2384578 RMD160 4dd8976271a93a03ec23d520d85cd13b6cf66386 SHA1 e52409a742274d89dd480e624c840911e7c36b92 SHA256 14b09496721a8348588aa0e7e13dabc7b6fa5aa4c0584f0e1b51b6526e4364f5
-DIST kde-l10n-ca@valencia-4.7.2.tar.bz2 2493540 RMD160 4c7ab5256373d935ec108f1c2ffa247e11ec3458 SHA1 5a11eadd3f1be090f12f768e0041d45c95fcda3b SHA256 029669d7dcbf30d0b11fbbf0501c9ca170a8763fed3007d436d07f9ebba6dd7d
 DIST kde-l10n-ca@valencia-4.7.3.tar.bz2 2494576 RMD160 30abf6c16e92c2a3555ef1130b533802b86ae290 SHA1 58413cf8d0c210d53c9b20dcca9eb14041b9c2df SHA256 397e5deff961894d47aedaeb748b1f4c8192d26ba1a61089ff2a74e1573e79cc
 DIST kde-l10n-cs-4.4.5.tar.bz2 3100186 RMD160 7a1230c62a4d464001690f7c8a3dbaf8a54e0731 SHA1 2406af1274e30e6656f941e3b251d8f27a94c73f SHA256 e87e79f7edc3e8728d520f2e7d52c580e9bb3ab221ed51a3ced96c1d8c572c61
-DIST kde-l10n-cs-4.7.2.tar.bz2 3299309 RMD160 3d0e4589226f4ed3f21b363b7f2ac44a3fdbf390 SHA1 9c8248f3a4cd0d9eebe47bb135f0a5c147b3c59b SHA256 c93053a26648739caef7b24223c4219d035a8b31d04dc6ca29bb71dc2967aca9
 DIST kde-l10n-cs-4.7.3.tar.bz2 3305556 RMD160 823253cbfbb777336e550919dffa9f5b8de829e7 SHA1 1a59b0480bbab0d53660a276aa736f6e8c2c116f SHA256 57825b309f0b923a5dd319fae1d086808af2d4100f66eaadd41816d6978f4c87
 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.2.tar.bz2 14264347 RMD160 43305e6af5fcf92e09e677c533c6b75420be94d3 SHA1 7b35a8bfdc5e33483fbabb2fc22134fde9963b1a SHA256 b1b7c0460952597225aeeed3588813e2caa5c4779fc6423cd59fb3e1ce5e1f34
 DIST kde-l10n-da-4.7.3.tar.bz2 14262565 RMD160 d9dd3d783ce3232fa9173302cf7158e5939e4191 SHA1 e73907144816b795b9be6b245b582719654e8e7d SHA256 18926bc1b3cc632acf94cdd791297244a96d14c3915422f48b71fa9b3d6f76d5
 DIST kde-l10n-de-4.4.5.tar.bz2 21841433 RMD160 7cf873b5c2402e17c468467c3c1ec2681c189a62 SHA1 6dcc6252adaa8a799a854f855221f2c86bcb8f56 SHA256 bd5c2647b26c2e5bdb71c69e0d23929867ca922c060dd61146c4cc3172d6c214
-DIST kde-l10n-de-4.7.2.tar.bz2 37553019 RMD160 656f7cf987848fa3970ac8601853d18571f20caa SHA1 a39a52e38b3215cf0f101350bd196d1520cfe6ce SHA256 8165acd5b6cafc8e2f3ccd9a88c45cba113dde688e2b83b86dbb0160cbdfbf0a
 DIST kde-l10n-de-4.7.3.tar.bz2 37551846 RMD160 6df5289dd6ec0d4096044189dbcb02f9d985cc37 SHA1 d53939327c050b8807779c92965a5fd09cfed25f SHA256 443a06eb80119e8c6c9ea1c3765738237aecba418bd9d2b09e0d1ed4e0944cd8
 DIST kde-l10n-el-4.4.5.tar.bz2 2625049 RMD160 df4dd00f655670303d641a26d9929e75c510e650 SHA1 d906e30fc33d9e3fda7207cf32b3712e92e4d271 SHA256 d296996a738dab0b34cf9ae06f88f03d52bf6aa863bae0ce5e48ac8eae6287e5
-DIST kde-l10n-el-4.7.2.tar.bz2 4770787 RMD160 c345338d2c0022ff5a3ed165d6937ed54c69b3ef SHA1 8c1aefd1f8fcb16f0e7e8ea2f1a7361be179244b SHA256 8462bd0ade28018f9edd1ce9a73b808766c67d11ddf5a7561d39f1f92a02f101
 DIST kde-l10n-el-4.7.3.tar.bz2 4770850 RMD160 305461e294fd64cfc071e18dc59d1adf3bb2333d SHA1 ff082e9bc86e9612fdf496c932a9f329305a2ccb SHA256 ebb825d7e27068785ee82f6735fe10781f3afcce1cede52dd194689c559b9940
 DIST kde-l10n-en_GB-4.4.5.tar.bz2 4082566 RMD160 1bb6503510bf69538485d4bd5a86f690b48bf98e SHA1 161950e2d6d0dc99f45f012440a79fe0b1da8f38 SHA256 c5a7446389d499dca20879a80d5d8d0b09eb48cacb9409d28edb9dd3a501f27e
-DIST kde-l10n-en_GB-4.7.2.tar.bz2 3558348 RMD160 ad39705e670757c0a70398fe8ba2cf4d9eb4708b SHA1 921686d8898da229f773460a06ca0b83055c4c29 SHA256 d95f475e93d0d0c56ad885673b3d699dd63dab7fc043192f73ed3d0dee8dc769
 DIST kde-l10n-en_GB-4.7.3.tar.bz2 3558545 RMD160 4fb5eb3e17241901af8f7b73d72c5be0f78058fb SHA1 56e2de38ef100b600feb4113f022586452f8d014 SHA256 237b6e1ecf42f74157de91161b436b238f322def334630661ccbec3527be1380
 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.2.tar.bz2 29249581 RMD160 e4eff9071526e6de2ee238c1160441bff4391c73 SHA1 ebda75b721beb8fb90e0d4858c7f908c4f94dc9c SHA256 c432acd777020b4c5070d36e58ccdfad301280a24d2b8bc9682aa7d12bffbf2b
 DIST kde-l10n-es-4.7.3.tar.bz2 29253576 RMD160 bd36ac8091c9d5a8f8f18ae03998c02092ab230a SHA1 21ecf5cd219cb55bdee39caa8d86169486912cc4 SHA256 4d49f21686c945aa96636b658ed5fe94378537f1ea4a0875dcb23be78c65b96e
 DIST kde-l10n-et-4.4.5.tar.bz2 9251373 RMD160 36b28f53c2fc3120f10d8744ae9de4d5d40eb4e7 SHA1 7f624d0104057b01b4baa05055da432ef30ede2b SHA256 bf9f286da2eeb0c1f07c1df3cee4e1ea11247cef5b12d1154cd18c91a947f66e
-DIST kde-l10n-et-4.7.2.tar.bz2 5886651 RMD160 792970c19224f7f7cdbefdaf01e72537c42284e3 SHA1 f6b10e802b14d2ab34596f998b32f97a5328fa50 SHA256 8599d85d2b30d73744d2488cfb41fd42962cf50f21b0b9e65cd08ae028cf1720
 DIST kde-l10n-et-4.7.3.tar.bz2 5889791 RMD160 a7c36f944d640135278b7516e0cd6621a5ef8c55 SHA1 43f80846881131adad5a6dfd1e07d6b7e07a0be1 SHA256 a01857d73a55c005967e2cde350f9d39a7a7af7523d93e3b752c7807d0f7c0ae
 DIST kde-l10n-eu-4.4.5.tar.bz2 2166606 RMD160 732f5ceb6eb38fb608ba6af2b7b59449e5967ffa SHA1 8fd27a8d78da4f1229721fe426ca2f100f793780 SHA256 7c9dfb71eef36741680f2aa9cdf456bb4426a0633e2c60e6db4141390e161060
-DIST kde-l10n-eu-4.7.2.tar.bz2 2323350 RMD160 4e8a023c07716bb029fd22aadc40a2d286df6c93 SHA1 8a5f185df2b59a9b7ac03d10903dddd6a9164fa8 SHA256 1f62b63568c8155502c22b839334f5f49d375a8e7decfdb3ddf67edb7b006c6d
 DIST kde-l10n-eu-4.7.3.tar.bz2 2329392 RMD160 50f098aef726ea39feadba63c6f047d4fe0e997b SHA1 9bf412c5993846c14f362caf65ecc2cd39a5229e SHA256 52d673f68124a62ffd18e3b70b7be5da730b5d1fb19dff318f3be7a611c50375
 DIST kde-l10n-fi-4.4.5.tar.bz2 2542878 RMD160 8532d6edfa953ed69df0064e5a2e3a1b5024e1a2 SHA1 11c255ee070519f083ec740ca7ddc2b12681a553 SHA256 fda5d31f17391e1fce91f7eef2845db7776b76928ee2d2abd1dfd22ec77656a5
-DIST kde-l10n-fi-4.7.2.tar.bz2 2902063 RMD160 70d50d42a4e4ac66546e1e8b7ec5b7b87229b0b7 SHA1 1f2b45fb44b9a87b0e49718ccb5c251373a91f13 SHA256 f240005566e42b91dc2908453f22628ee2e0a642b4d8f8076d03f229184c1166
 DIST kde-l10n-fi-4.7.3.tar.bz2 2933099 RMD160 c9eaa36c5321c7786985fa4cc2b78090564810f1 SHA1 5361265d5bd3176f8090b36ae8885706c5529d76 SHA256 6bd3a7ae3ee6bda5fb7f3a222b60200141e4d57d0ca211ab8aaecff2f8d1b48f
 DIST kde-l10n-fr-4.4.5.tar.bz2 22595114 RMD160 ab023f2277b92e78652f3bc8102ddf5aac80a00a SHA1 bc82eec7be3fbfa6def91993aed84732d4655b30 SHA256 7e0fe1f35375ef0d261e7dd616dcbf9850229db66ce4be40c95a6694bfa91f27
-DIST kde-l10n-fr-4.7.2.tar.bz2 21800648 RMD160 19f03369c04747ea83a05186eb95b9b2b9996330 SHA1 5c9218204cc5e91fe04d89b5a569cbe56ecb65fb SHA256 49cab7b8c4a8e2aa1d3609b62cdeb46917cdeaeb107c6923249cc23b769c944b
 DIST kde-l10n-fr-4.7.3.tar.bz2 21833929 RMD160 216a3a3f8dc42e51f5cbb9bf5643761a2599b77e SHA1 68bfcff6d11617ae918be856c4d89de1f4ab9441 SHA256 bd201ee4aacc7b53a1586197d3a4ad2ab17d8f9d0e380bcf98d75b1d7c76a23e
 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.2.tar.bz2 3553634 RMD160 7e74947d02046370d2908e5ab574a8dfca308cdd SHA1 bd771682605ad5dade89c8d4173144fab95fe447 SHA256 6d48720708d165b75eead1a528569231870febefbe084eac155ddbd94f19275b
 DIST kde-l10n-ga-4.7.3.tar.bz2 3553997 RMD160 c50dd4809a38755abdbb1a34ae05d5a49ea010ea SHA1 779ec0cc115bbe8928a74de51b60a063e6e2e12c SHA256 d0a758b50da27a50759ae38ecd918ba8991efcebd73710d7268060ec8b6e6bf3
 DIST kde-l10n-gl-4.4.5.tar.bz2 3977873 RMD160 8401bbed1aa0b3ad649c55f2bdc540beb81c3a3d SHA1 d301df78e7336bf2e4d32b41a42311cb0725f844 SHA256 6ab13105048f544652af84fb58188e3f5a32b9eeab5774403cf29d78f920e452
-DIST kde-l10n-gl-4.7.2.tar.bz2 4304891 RMD160 2c47156910170dd9d5543a9e1274ff5ab14cd9af SHA1 bfc3de42ae7226fa9af78f3cdd7716ef151c12fe SHA256 91c1314e9dfb0476092b2e36f01de57b88f5ab3a30e764cd5db53d617d7776bb
 DIST kde-l10n-gl-4.7.3.tar.bz2 4305543 RMD160 89369943040b9e7a638c59a439d10d5b3183c663 SHA1 43a7a00ab479cdd4600035ec5f23113cc99a1e46 SHA256 1e2e15b29ef086db2b1e76f906f195e72ba5a19118617fd051dd195d52db273c
 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.2.tar.bz2 2361840 RMD160 c4cff9f930a653f4ec3ec1c1a2d1f34029d72d23 SHA1 8e871aca4dba0407ae4279184da81dcfc5e0e55e SHA256 4dff6f873ff090b78997d78b3a3a427837f22a1a3ab69d478730a0a6dce2b9e6
 DIST kde-l10n-he-4.7.3.tar.bz2 2362009 RMD160 3312213d167b23e1ba09d6ca4d8991168c0591d3 SHA1 e4e3a6b8e6fcc354c8d2671db5bce3dc4d03cd46 SHA256 c8c586d02b31bb8912978b39e7f2a66db1594b162991e1eefa7a848ca5b8d75d
 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.2.tar.bz2 2289511 RMD160 1fceebb33d9ad8acf092e6affce33415837dbbf6 SHA1 4f6eef4f7d3be10d25aea264f50ed27715ff7825 SHA256 d04e93b0de3d40864915b6f4c0a41a70f909320948f3f0bacd92e6d09a254370
 DIST kde-l10n-hr-4.7.3.tar.bz2 2289838 RMD160 dcf781294fdaf7e8efb39fac30870cd71b44b037 SHA1 1660184438749efdc34a221052475fd9a10d5043 SHA256 af48137b21a11857f68af94c37fab5c00fcd4da17ce172c45d15f51df3de2888
 DIST kde-l10n-hu-4.4.5.tar.bz2 4674175 RMD160 8d0dceeaa9fb02fb08e2ff6940da427ba84fd88c SHA1 1e3cf4f0cb42b92e84b1eafa521f495b547e6a9d SHA256 47cba402aca2ac8daa5c70698dbe005e19bf96efb37b7d26fe9255c27e0d89fb
-DIST kde-l10n-hu-4.7.2.tar.bz2 4384322 RMD160 0a2238f9baba55154c558a324e97f8097073fab2 SHA1 a9d74c78f49ab3835fe94b4ed31fa25353e31256 SHA256 264d0334825d5752ed2a862a6d27aada3a4aeba7efe36ffac525b2a1b0544a66
 DIST kde-l10n-hu-4.7.3.tar.bz2 4383891 RMD160 2954e7a85e389bfd8c3e00b2a82b26c7470587e4 SHA1 e4b144aa2719e69d5edab20bb2e8c7c29debc390 SHA256 e934d11a4d74b52e3699e838f443fc6f8f36ed3a42ed69de7e5cc3f3cb9826a5
-DIST kde-l10n-ia-4.7.2.tar.bz2 1171903 RMD160 f8115a415a72dda72496d98a6ee0af3cfbdffe29 SHA1 442b307cfc5aa9cc1e303269785b2a17d355ec8e SHA256 897dd28bc11aa2e191d1afe1046718933c4b9b11326852e860d29da9b0b03a97
 DIST kde-l10n-ia-4.7.3.tar.bz2 1182411 RMD160 972e8ffc8b96a70df644639044d84d7f4562cd9f SHA1 80d83ce4316724f5e7e73ad0620141136d848983 SHA256 564715a7bb109cab327d6b2b73a8c5b9e5bdcca90cf14f0fb684525ee671c1de
 DIST kde-l10n-id-4.4.5.tar.bz2 352302 RMD160 b9553241abf3d6c6a6e96ccb37ce25d1c4b8f86e SHA1 da25200677f4141dde63dfdc6c2a08f7a1eb94c7 SHA256 a6932808b1f27fab2c5f05090742854b2524ee832ccad8405be076b21cb344b7
-DIST kde-l10n-id-4.7.2.tar.bz2 535198 RMD160 79329567155302cad65a37ca5095ca593b83129a SHA1 3f11acf5276ea7c63f5e910e973532d5de282633 SHA256 3845392a8d672cec945595095f4407367d218e5d8a19504e60729be9c38e8c36
 DIST kde-l10n-id-4.7.3.tar.bz2 535378 RMD160 8e6788c9f6f4f8c84be016804360b89bc2c2f435 SHA1 aacf9136fff9f10763273cb3333bf0fc996d5d30 SHA256 28148966677b58b232f93241290028ac1ccfc57a5f9b81dfe9dd5d95562b9fc2
 DIST kde-l10n-is-4.4.5.tar.bz2 2009934 RMD160 fa34fef244cc1916e3f3016df29034bed08603ce SHA1 463a5a96de370902ac793cebb367a437411003af SHA256 f2fe02476c05ae2d70a7667b2365331aef3b033f8236eeccc3b3d8e07921bd1f
-DIST kde-l10n-is-4.7.2.tar.bz2 2064476 RMD160 c9c803a6f8c9176d1e3e1448bfd3ebcb61786269 SHA1 0bebbdeddae7b398e5ed4aa19196649e16056f9e SHA256 abc654d1aedb851af327943a14c5b69275e20c86d99ebab6b805084287f81a47
 DIST kde-l10n-is-4.7.3.tar.bz2 2064299 RMD160 c1aab8e5a5c7780c245a5f9a74e1229dab1faf82 SHA1 5392040a07d79189745e629f635a89b51cdbe884 SHA256 615b672b0437173ff47ee950fbbc88ff35ebfb78a295b497164cea2b87f420fe
 DIST kde-l10n-it-4.4.5.tar.bz2 11339894 RMD160 9cd0ec7b31ab67f7c88bb7bf375d99fd2d1c83e7 SHA1 70b4a311f6f9d472878c730804ebc47c3092c6ae SHA256 b906a97d071967816d460d11c28273a9adf14f6a96d5978c2905f6794b0af4a9
-DIST kde-l10n-it-4.7.2.tar.bz2 11593013 RMD160 7f0b3b85d7f5ace50bc1df10c5f1fcb4a2de8279 SHA1 7c7afbb4addc0d3f46981ddde4d83dc78e1fe0b9 SHA256 c02271a23406e06d30969df954cc059efa27637abd399eb3729f346198e0abf6
 DIST kde-l10n-it-4.7.3.tar.bz2 11600838 RMD160 763eae2d0dd9325dbbafee2812d888f9476de491 SHA1 8a5358e6a21a0f1de5dc4ce4e54e90e8391028cc SHA256 68ec0b26ca2c6c62fd4afae7ea26ff06f610936fc29806c8024bb7269373cc3e
 DIST kde-l10n-ja-4.4.5.tar.bz2 2315786 RMD160 524a9a22f7e08a5fea4473bd896683ee558b0eea SHA1 acaa8f510ca7c3476ccd52bc1f42ff584557b9d1 SHA256 654397ec24c4e9f356786e9655dccc2e94fbe6b0a06d3f506eb0ec9b4f50b92b
-DIST kde-l10n-ja-4.7.2.tar.bz2 2424505 RMD160 b8a3c094a4160d5fe15733fec3ba473bc0315523 SHA1 ef5934199ffe9a42b167cb37e2ab216840b7a511 SHA256 c59d305167e4ae01fc411f36ee526c1e385aa1c4b254af9c5ca5d5a3e14e38cb
 DIST kde-l10n-ja-4.7.3.tar.bz2 2424571 RMD160 74bb3c1194116a448b09a24e1fea7b936a0a7d4a SHA1 17597dd170c73dc8ad5165443c222e55c2c8e4c0 SHA256 578f69d7564ad875bf0dd2df5b0b96ea8c992f23dfc6eced93b1b1038243cb81
 DIST kde-l10n-kk-4.4.5.tar.bz2 1690115 RMD160 43787c12e05330581dc360eb2fd0861b4eab8af7 SHA1 8eabc82e2ec9dc7773c1e77b133dffb1bbf4bc25 SHA256 b9bf0d1895bbb9ea3e63c07edd694a15a5169939d4899e16316b399f478974be
-DIST kde-l10n-kk-4.7.2.tar.bz2 2353360 RMD160 a9bcd1cb741bb98f65a726cd562a1475476cbbfa SHA1 939a4c3687349cfb255c076a034e073c88be194f SHA256 c047cc613f4b51e29203e59d0329b1a8b8e604ec72b4f07c0d574a143da2b2b4
 DIST kde-l10n-kk-4.7.3.tar.bz2 2379395 RMD160 a3d5671538ade9d592e9ace51d3df4157cdf7312 SHA1 77ac4645578b68e4100e9dc2dfb3c4c471abbd9e SHA256 e7a43aaadfd149aa7ed27bbf04a540ce410dd3898325515f9a2543d8b62264ee
 DIST kde-l10n-km-4.4.5.tar.bz2 2251377 RMD160 30936e9ff25d3e23f22aa06d99c698f037a5e98e SHA1 12add7476f575adc92a6e0d4a77f3e78fde92f2f SHA256 580dadae3c1124a83c62f88b4629c3b4139820b3a8c09765ca527f604af92304
-DIST kde-l10n-km-4.7.2.tar.bz2 2219178 RMD160 21ad2e9445be0f0fffca7464f250201bb4b27cd6 SHA1 905cabd57cc3b7d19ea9915ecf80ef298cb51636 SHA256 d54a28067e82ae5b0588181b98e8b728358e86bbb60417853f47c7aa2baffdaa
 DIST kde-l10n-km-4.7.3.tar.bz2 2219712 RMD160 83181538b3b01698be2b8e16c42aeda877bfb696 SHA1 d149e90c6732391316fde90c619ba3abf3461c97 SHA256 94ece7de2bdc589025a7039023ac3b49f01712f9c4fbe5d28b22f15c5084dc9b
 DIST kde-l10n-kn-4.4.5.tar.bz2 423253 RMD160 cb9d8af3bd6f2faf3500a66f6e66f64d399af2ef SHA1 4ec0979d1cbdca02d24ad049b72ad8e7678dfffa SHA256 092132b50d806e8c90934448b4420fff84edb01ac3a33fe6b50e064175facf54
-DIST kde-l10n-kn-4.7.2.tar.bz2 532888 RMD160 13433e4db7c393a3d9e07f21eece5c82b443f912 SHA1 bf75a6fd8ace0b52d56710556c0e6f96b1c70c32 SHA256 284855bb35d8ffc1c5481488b97e11ff823dfc6b40fe81ddc15e824e2a69e064
 DIST kde-l10n-kn-4.7.3.tar.bz2 532878 RMD160 5dfd362f3fc3565e2b23280ddfec44c02f637531 SHA1 eef4b7cf1a0e853a6a117b371a88e0c9846951e0 SHA256 8e3974c2e9574a46935908027704990ef36a4d483f651b3883eebc127202c46e
 DIST kde-l10n-ko-4.4.5.tar.bz2 1659705 RMD160 8def5ef2d0d56af1a3fdf4cb88726fb81fd048f9 SHA1 6956de27eba77bd45ef0d29f9f866f509d9aaa5c SHA256 94987aaa0df5c61f5cbdb10edccc1b3dade5b7a87cadb92a078db95282cc6048
-DIST kde-l10n-ko-4.7.2.tar.bz2 1901692 RMD160 5a5786d0cfaee0889b6792385ffe324fd366ca6d SHA1 ec6e6a1159ccd380edc6ce93cb597905456420d6 SHA256 67cbefb4cfc1e33120f25208d4d87f30890fac8e4f74ab5c74e510610dbc227f
 DIST kde-l10n-ko-4.7.3.tar.bz2 1901844 RMD160 05776133bffd0061ace97fbebbbf8162ca14f858 SHA1 6934688e5dee395042903c06bc3a88f982dfe422 SHA256 a2aed9827a17e0a28a3cd2951c43a0a746b298c35675e59a38064c457a9f2144
 DIST kde-l10n-lt-4.4.5.tar.bz2 2140341 RMD160 651e7d73d9cc4b32605782cf0f286e21d63dc3a6 SHA1 e452dfca1f538c0fcadce2396690feb767661d1c SHA256 67c8e464e2caeb45611a3cf7f8226659968ad30c96b336d280732c554db85c83
-DIST kde-l10n-lt-4.7.2.tar.bz2 6791003 RMD160 6c4ad71f2f944012a571c62fcb2553b1f0eff5b6 SHA1 e966cee2d3a6d70ad244171ea018bf164790ca8a SHA256 9e53320c8babff55b53711f334a055b3b7b5bfc10e37a44404cb8465c5f17b8b
 DIST kde-l10n-lt-4.7.3.tar.bz2 6797869 RMD160 8cfa3121bcadb978b7f30fb35d147e4e44420c6b SHA1 92f3cb20bd47594e1d344c36ab3eeac125f0395d SHA256 d04dc95c29f9aef3d88f0ed741a653c64d352426301925f9c661afad3cf59f21
 DIST kde-l10n-lv-4.4.5.tar.bz2 2253462 RMD160 1c7b985f5187ceadbeeba9699850643f74509610 SHA1 f8c93fd4ba76a8a5b743d6eecbfd72b3ed099351 SHA256 4cc2a2d89eed235d2bf49c3882063868d910ed407c0f13dfe8d635c655623e5a
-DIST kde-l10n-lv-4.7.2.tar.bz2 2451927 RMD160 c2c7f2fe4f1c8b4daa1428ea68a3710f20027eb8 SHA1 34d52e7b75bd7601e648066b882c8604c9b0a5d9 SHA256 37f98717b1ce2df7206b26de777d4b13eac9da96e229c140ac9661d8bccd5db5
 DIST kde-l10n-lv-4.7.3.tar.bz2 2452185 RMD160 35644ec7b5f060d64372ae09e76b1c75b84187c6 SHA1 e49072ae22b8280f7ed168e36f8c4db27b4287e2 SHA256 bb29dac7166a565f0f11b85ec9b23429664e94cbf651cec1deb996816cc90fa8
 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.2.tar.bz2 2664001 RMD160 5b86ac80cd1a9fc1a1db5b3c408162ad9fb668b8 SHA1 3d16698e22e71c8912e9c627d7a78c14a1fccb09 SHA256 b5476847690c723c28399380d23d34d41f9618bcdec810909ae6a529da5b53d6
 DIST kde-l10n-nb-4.7.3.tar.bz2 2666049 RMD160 31394129dc1f4a876197b00715a0126e0b3596d1 SHA1 baadcde24f4910f0b8db603c1c9b9a1b4ee6f1f8 SHA256 aedbf33588253f6cf7d33c39eaadd9b3e8ca0bb37fe542685a1aefed4be5a1f9
 DIST kde-l10n-nds-4.4.5.tar.bz2 3883818 RMD160 7d93db7f43a29a95f30e465486400467be67898e SHA1 07294c5713d89927b6942ff8973155423621593c SHA256 8cf2d58d4f97b28bd5d47527cf4d2c146aee0942151a6c4ad30354896c45d64f
-DIST kde-l10n-nds-4.7.2.tar.bz2 4168192 RMD160 6b5ee88786cd58537d28c9c4514374752dfce833 SHA1 fb4015fd41af2ab239c87d5cb344faaced8ce824 SHA256 e9e853c89666942c233e732f0539ae04fc30c7ea9bd41f9b73cbc35bbcfb3e6f
 DIST kde-l10n-nds-4.7.3.tar.bz2 4169394 RMD160 f5511cb220c1e3f4a31785b8172b245a23d18ab6 SHA1 493f1545359d79c53f49ecf11904163bf69d503d SHA256 b9c341fdcf95d59c18e4a1b82835361c79155c5dd636afda5203c4785657075b
 DIST kde-l10n-nl-4.4.5.tar.bz2 14226957 RMD160 f3f8fa9c7ecc92e19145f0799f012d87ae877320 SHA1 eec3379172ed5732abce3992f35dc6c9d18fa3dc SHA256 99eb08aaeb4540f8fc7c36903b5e15e8374315213e16bcd36b1df51de3d6da3a
-DIST kde-l10n-nl-4.7.2.tar.bz2 15679751 RMD160 0d3bbe4012a995a7bc3025370a21df5e1a5bb933 SHA1 f64503b1285ed8c30dcb4408a6ed66466687db81 SHA256 43be18175582d221b63ac35823bce928dca6d4d33243b5b598cc5fca3d88889b
 DIST kde-l10n-nl-4.7.3.tar.bz2 15680330 RMD160 2624218354663fd594badd129dc6232a0749a0be SHA1 21731691f920e2945bf8308a1721107133b612af SHA256 0e8aabf25dc7e0a81950ac95492500f5b3667d24fe9e65f2bd0c923cd33922c4
 DIST kde-l10n-nn-4.4.5.tar.bz2 2202500 RMD160 8214c2f4d8f916740aedfd7ed4e85d9aee6ca408 SHA1 1bc6ed27bb60408d1d2c8af033eb11696a1397d2 SHA256 edddb150563756cd5b5c261f0bc54a7a42385c122c8541dc1b2ddbd0b11cd955
-DIST kde-l10n-nn-4.7.2.tar.bz2 2157488 RMD160 7004fa4b8911638bd3aaf34b14a3781d2f06d701 SHA1 8902af8d1b5e5f2af4043699657a7d93f6697696 SHA256 90056e4949bedb449cd114603c8b9892abe1c1ce951b5bb3586da65864b600cf
 DIST kde-l10n-nn-4.7.3.tar.bz2 2157518 RMD160 c5bd6ae6cfde9619896fdea67aa856941357ed04 SHA1 3510559e378a0705ecc9ccb45458617159b25ee8 SHA256 089b57bbe411a2978bbeaa7363836bb985f453a47f10e128a44a8337cb5ae275
 DIST kde-l10n-pa-4.4.5.tar.bz2 1818030 RMD160 b6f1868837e3df9c1833818303f0acc4554ec2b7 SHA1 68a1c72de7e5d99996684c8a70475ec9dcc1fc81 SHA256 8420037aac0feea5b502d9c88498ea01eb119660baa14664b1cdfe7c158c9129
-DIST kde-l10n-pa-4.7.2.tar.bz2 2016504 RMD160 becc17b6eae214f7d9d22fcde365c7938bf6faa3 SHA1 2a16595b1c381da3eb0483bd6a1e4dab180f20de SHA256 a34890b1e3008dab3ce28ddc92d624c04e7f07d59b2c5cc6aa34a5bc6852b889
 DIST kde-l10n-pa-4.7.3.tar.bz2 2015757 RMD160 dd463b0d43f5ed323d6bd0bd5672379def01ef15 SHA1 e344769783894f64e5b4301f48d2b0830b3efa8b SHA256 d46615532a9c9df6838fed42bdbda78ba248cca9966ae7acde9c26ce98662618
 DIST kde-l10n-pl-4.4.5.tar.bz2 6149268 RMD160 5e41dc78f19b77e45edf370fd3702cbdd4822b0b SHA1 40149ae0d8acfbbd65a948f786d11903a6a77565 SHA256 2ef854306bb58f6043f1361d93437ae2ed8cf71cf54e0518f60e4d20401b06f7
-DIST kde-l10n-pl-4.7.2.tar.bz2 19100076 RMD160 e940233d00c7e609d5c2a9fe1f9809e7a7180107 SHA1 cdb14d35ecee704e76a73d379b7405dc3114c8af SHA256 8113c2086114c7f4e3f9aa5a52e86c7be85c77be3ff41870ce6490b21377ac55
 DIST kde-l10n-pl-4.7.3.tar.bz2 19099476 RMD160 c45d91fe675b217d81e772caebd25f76afe3c28b SHA1 069d44526d2df805910dd9839491c2b6d530d203 SHA256 cfc730e047338f9b2ba70dc1d9e828725d8f920bb378d3cb60df881cf37e8410
 DIST kde-l10n-pt-4.4.5.tar.bz2 6345114 RMD160 0291574d14616d2ec96c3159e0943913040ee0bb SHA1 214a6c0da3ac1718add5a4523d2942047be460cc SHA256 c1863dabddd30f970532ac6ccf50279e063bd449aa021837f3f4f3a373e2752e
-DIST kde-l10n-pt-4.7.2.tar.bz2 6111094 RMD160 78d343a3ce5e358fb41a3badbc3e02c19de62ba2 SHA1 666d6d16fa52577f14911efaef3c71f529bf07a7 SHA256 520c2bc9d053c3f745cb7142f61a0bdf1f1d168191d98137dc1c109096807c21
 DIST kde-l10n-pt-4.7.3.tar.bz2 6110855 RMD160 ccc8b4f5a441926997abb6a9cdeb1417a105d46f SHA1 c49e6715429b8b6193e88186a0e86808f5ecdee3 SHA256 6a60c677074f62023b9f480fbc0a0ff2050109b5ae098ab1a44fbf93e460d34e
 DIST kde-l10n-pt_BR-4.4.5.tar.bz2 17672341 RMD160 7c3a9d066a89ec639487a6529f7d8cd9156cc364 SHA1 b1d772c6a97d387d6eb287dc6550641fc3dbe791 SHA256 6a39e3be25a5d9b923ff2f42d0e7a6ab86831ec8f6d506b26d7e7ba14f2b9eb0
-DIST kde-l10n-pt_BR-4.7.2.tar.bz2 27487773 RMD160 e1b1157132fd4165c69516fc2faabd195694ee6a SHA1 ab26f7da92accc51eb0e8b4b219511bff839d278 SHA256 358286fcc59d993b46531be0020bc3f5d4b3a1a89f64d6f3161ed549f57cbf90
 DIST kde-l10n-pt_BR-4.7.3.tar.bz2 27492912 RMD160 6e7cd8d28d10f9557dc2c8790f9cf519492dedde SHA1 642574d93379ac37c957b77e35ebdc731b22a2eb SHA256 03019fcc4a93c1c8cf5b38dc2afcef28deccf92032aaedabd43c6d2027fac777
 DIST kde-l10n-ro-4.4.5.tar.bz2 3498826 RMD160 48c015061ecda8e7d67cd051baa0ff6be46df60d SHA1 91ca23916edd2a2ea2ddbb7de9de4f2f94320e48 SHA256 dccfbd27d13a099be13031d6b730fe6ddc8145b444de831970a086005441bfd2
-DIST kde-l10n-ro-4.7.2.tar.bz2 3644504 RMD160 a5eab7cb6aca5cefc289875aabf908c0e6efb1a7 SHA1 b0cbe7904f097d4c53080c3fb126c98cc0aa06ab SHA256 d7b4f989229b427b8edffa6f62017abc402d8718ea131aebca72e93ae0417a70
 DIST kde-l10n-ro-4.7.3.tar.bz2 3645293 RMD160 5da3ca2a20f7ef9a6cecf75f88ee95272994185b SHA1 9850302e24ea05dfd513c2c18ec5a96f25aeca55 SHA256 1d2b163b49770b1b68692048b15235a6276194dfed31caecc438c2e94c29f6ec
 DIST kde-l10n-ru-4.4.5.tar.bz2 6429198 RMD160 63f359f69ed3c729244d6c0afad78a231336c5e8 SHA1 6d66712a040bd1e73098a1ee3b1146b7dc21a1a5 SHA256 5b177410efdd1109cb3ec339b9b7e88fd402a257990ba48664608b3948aadc27
-DIST kde-l10n-ru-4.7.2.tar.bz2 13866548 RMD160 de4bbb0f2af554cfe12277c5f343fe9dcea042cb SHA1 9e956a495dcb82286114cd81f301247433947daf SHA256 1bcc89a05c4e4be34c150a1dcb234ead2e861a1543dfab1d15b531f14878adb1
 DIST kde-l10n-ru-4.7.3.tar.bz2 13865682 RMD160 a0fdf091fae02fbe15948e99cc157fd9a7f14553 SHA1 7accd85fed345a5a6c035007c5d2798532ffd5d3 SHA256 a6bbc4356e9d5baa1ea9dbba128f199bf0b0341933e1b90e4333056582e8c6d6
 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.2.tar.bz2 4438315 RMD160 e5fbb631140f46c9d0afeff0cbb8cb21c066c47a SHA1 fffd28d2be4f4a09e2611f49ecc0ca2fa2bc58a3 SHA256 dc9cedae5a76667987cd9606718814ae81d6b6530d81f6d3de68ee1294ab8f72
 DIST kde-l10n-sk-4.7.3.tar.bz2 4437400 RMD160 aec9fa18f9a1ddd003ccc72c9e51ddb995cd2acf SHA1 659279f42e5e1554933307cd5492f6d45671a49b SHA256 3b9546178987d6e38953168645e6e107900b0fb0220263cb03ffcef2e7903b0e
 DIST kde-l10n-sl-4.4.5.tar.bz2 4501882 RMD160 15c45c583d9c7b2a26090ec8bb929237494f20ba SHA1 31d21c9cdc6b4ab12a32382d48dc874a735d4e2a SHA256 2dc5996ffa638fa33f34a238cd21e90a26fdc59d233af3d174f33bff5679e3dc
-DIST kde-l10n-sl-4.7.2.tar.bz2 3674011 RMD160 8bfc1cd000f885e292fb9d879d07e84d9befd3f6 SHA1 5c80a71891a719638f26931ea894abb9040f1828 SHA256 174d2b76c0d9e0a9f994c5a94278671215f17b0147d54fbad00b7687bc21dd9c
 DIST kde-l10n-sl-4.7.3.tar.bz2 3675273 RMD160 6865c2a53afc879d72deed48624c49cf6139c389 SHA1 f3538e94789768a3343136a05adf17f80f2323d9 SHA256 de3006d6fd3d2e619cc38c9f766f483d464c0d1b88e672e0bc1f312b902031fe
 DIST kde-l10n-sr-4.4.5.tar.bz2 8508792 RMD160 dcdcd1a39459169ad27b27d14ebe5ce24036ed15 SHA1 8f4ebaad4c005a47f87a66205f0d2cbac6f00a83 SHA256 31f0b0a9fa13a178ed34ce9d6f7822bc95ac457f6e5bf98762c9de6fb30266b5
-DIST kde-l10n-sr-4.7.2.tar.bz2 11903841 RMD160 70cc6f7d4a8bd36f65067ea7c8cb1b2b93d53544 SHA1 24e58052c8032d212fe1ac600e725003f43639cc SHA256 6568c989357e7ecb5a355be22d8735cd8539543ceafcf1d497fb665fe9eab9eb
 DIST kde-l10n-sr-4.7.3.tar.bz2 11908606 RMD160 9a5f3ca86c18662672f0db0c6c0df75c5087a850 SHA1 333e68638e3a17e345a99457d1c2325013d6d3a6 SHA256 235dcae68053ef7130a4b13d93752c158f93636db10a0ce3b6611d4802f226aa
 DIST kde-l10n-sv-4.4.5.tar.bz2 18802546 RMD160 e14185b0ac996349d05f16f630255628dfe3a7eb SHA1 906c9dd9524a9d6b9344f2e5491f22d5d6cd5f10 SHA256 7800ef1e0a32418283f5da4f70603960e8ac4fdb3750833435be8742147397c6
-DIST kde-l10n-sv-4.7.2.tar.bz2 17629089 RMD160 a103bf85851e151572bd464cdd2dd78f16b64843 SHA1 43bd6660aab8c8701a8262730052447e8dc2b095 SHA256 dd5e75c6636ef5feed621b638fdb03fd47c37ae2fe48df0a6ebe3f5ee03d28da
 DIST kde-l10n-sv-4.7.3.tar.bz2 17642938 RMD160 3373f827c39c769d8a70fc5259548a6e4defceef SHA1 8d464d253269da49c328141191cd6644b05acccc SHA256 625568b37c2037f9bb9b102efb46d1a33201b99d1cf3c5a9c8a12e5bbcd395d3
 DIST kde-l10n-tg-4.4.5.tar.bz2 2083462 RMD160 57d051f03ed6ea8b422e4e7b67e0356a8eb93967 SHA1 f23cf1aa95c52af5e08d0ecaca75381969d0d0fc SHA256 610a2a768bb948ec7323dd2a6919260195c727ac980016664aedd34db1dc1928
-DIST kde-l10n-th-4.7.2.tar.bz2 1885356 RMD160 835dfbb39e135f2bcac1c35cc3cf6d31d91ab514 SHA1 e710294085a23d08a29c765476d6c6e3523639e1 SHA256 d05e785910c6e48ecc93270d44f96040e35adf9489a75fc2bb249cb536b08ea8
 DIST kde-l10n-th-4.7.3.tar.bz2 1884862 RMD160 24edf2231b36924533e3edbb746c7b2e292fb37c SHA1 ca56719eaa6c384fd98c955f0dd73243de40c8f5 SHA256 4f1dc981f781e83531f06e0571585aca957c6f7b7b8fc6a1c1702d0eebb78f1c
 DIST kde-l10n-tr-4.4.5.tar.bz2 2546808 RMD160 b6195304f4a3856e97794c94e276c3c9893657ff SHA1 a4f72d2f078e7b7b4d1ea9c63326f7703ff5ee2c SHA256 050aebf67c7539c312e971adc1ee0c33abf3e55f3d5fecc7842bb9cc770ba4c6
-DIST kde-l10n-tr-4.7.2.tar.bz2 2782384 RMD160 7cd914de5884bf151980743ffc89c43c6fd80d78 SHA1 3c4628d38aaa178518186f028217d36c52be82ff SHA256 dabc24754853b323bc3356586db1f03d209497ad13543e0c8a3541ba4b0ea826
 DIST kde-l10n-tr-4.7.3.tar.bz2 2785265 RMD160 88db07592e65de5dc46cb2b543d047033a5c1717 SHA1 dc72f01f586529fb0e9b9dacabcb1dce0616db01 SHA256 b313b7950fe34e4d8ee7bd299cd48c687a536b060f2d451329a4118956a06931
-DIST kde-l10n-ug-4.7.2.tar.bz2 1772308 RMD160 7add6b2de3aeae97768b0ed052bf60924beaa79b SHA1 80e8221d88ac11767bef8ebfd1a4934d99527e25 SHA256 8f33cf36f64aab65c2bd2887c12709025396503d7b84d2ca275f03c37edb31a4
 DIST kde-l10n-ug-4.7.3.tar.bz2 1781060 RMD160 6cd6b72ba21f926f466329d98298492a65ab7aa6 SHA1 9ab4a55e0f5ef8c99a1656ab859b9570f7e89d6d SHA256 6af2aa6d040c3f6ce0dd849bf21f9bbf894afea24dc32013f8ad1172497d62f8
 DIST kde-l10n-uk-4.4.5.tar.bz2 13957369 RMD160 8432e459af78e494af12eaf388fa3877581348c8 SHA1 afe7cd9305030d1d3112fdb20d7a36769ef08862 SHA256 a279b785fc8e0820e4a1cd7f9ded9833f348c53dd5b6cf87df9bc8b7c60b65c6
-DIST kde-l10n-uk-4.7.2.tar.bz2 16579112 RMD160 ce6b0f63bc7cd8b23e79157e9e3e5b71849742ed SHA1 5a6a96282d5084ab94351109b79382b1e44b1edb SHA256 2e135a77c86345f77c5e0baa3d4ede90a7698edc28145b623e87ef0c47108184
 DIST kde-l10n-uk-4.7.3.tar.bz2 16579041 RMD160 49ec37365006a04736fe73153ce97dd4383c015a SHA1 919584d0aa7b0a54e8e61184ec58063d0dfd2aae SHA256 fd7df6ba7f164f856bb59dea76c10069cab9e140b9280f977c159c97f8fe8bbf
 DIST kde-l10n-wa-4.4.5.tar.bz2 1823756 RMD160 bdbb66c51046763e101c7f72900223009f1d0558 SHA1 a2368b0702216e60f95a8b916e420a8e25c328b5 SHA256 e00d20597e9b691ce23cf80372a4e989d3d6c7290b414231c2ae6f525c469b55
-DIST kde-l10n-wa-4.7.2.tar.bz2 1896540 RMD160 de31a9af907e1171e7cc7a6f8d70328a77305ea0 SHA1 2bdb5f65c80dbb98fbc2d1af6f92d7501cefdeea SHA256 996bd1209191e8582affc6d8ead81af23c6b6908e7257a6bd065fd823f9f9f55
 DIST kde-l10n-wa-4.7.3.tar.bz2 1896487 RMD160 be7f629ba5c29826e55f264f5f531c02296fee71 SHA1 68aab9c979b96dc4a88bf00dcb33fdeef048a7a3 SHA256 b69160326065de01eda71907324396c3fb0f7e7789b20e9ab0bb4743a8992a6c
 DIST kde-l10n-zh_CN-4.4.5.tar.bz2 3609788 RMD160 da11015ab8280ff2fe9fadfd6f594d13d04b2d26 SHA1 0f4671cb2a24fc2161f12e98079df7bc2054ad9b SHA256 4040bed19a37560c8a7407137f81e9bb9db550a363beaa9131e843cb9be98270
-DIST kde-l10n-zh_CN-4.7.2.tar.bz2 3664744 RMD160 0df50bf3da68e53a58747d775dcaf74459e4f48e SHA1 f2f54b4e0e47e9b2b922cff9752b9c9092abafc6 SHA256 3944d5cbd54e51d2ab92860c67832a203acf83b33e3733561d73c0d6409d4565
 DIST kde-l10n-zh_CN-4.7.3.tar.bz2 3666007 RMD160 ced3e4f3f1c888e7a615ef47049e7b9f60b5b187 SHA1 692dae3418a79249fbb9ce7bdf0c6c91da03ea21 SHA256 03ba5dad0ecff0e536bfd7950435fb2053b824b41adfe69a285ed35a8128ea1d
 DIST kde-l10n-zh_TW-4.4.5.tar.bz2 2659802 RMD160 76df1678c654aebd59c8ce5cf2b071bf097892fe SHA1 d5c5a37d0f46d7a7b47846c63d74de0dc6aec84c SHA256 91d1c414ca6ab54d8554a3aceef21036a933622fdc7809835f779ea14f611ba6
-DIST kde-l10n-zh_TW-4.7.2.tar.bz2 2829192 RMD160 a5c6b7a05a1e7420bf737d73ad8212ed6272d733 SHA1 a49a81895dc633a102efbfe4c7e92a823ce0fd50 SHA256 ce33ed59430105b2d015104a98820f218b85ec2edc5a91e4c46a101734046c61
 DIST kde-l10n-zh_TW-4.7.3.tar.bz2 2830325 RMD160 638990af12cbdd9b03baa2d8014f966b1dbbe11e SHA1 7b36964b2362a8b0d172d4170c5992ddda976f12 SHA256 035b05019fa5f4cae8ad17d97a972b4453e46ed7f773e973a9e163b003d7acc3
diff --git a/kde-base/kdepim-l10n/kdepim-l10n-4.7.2.ebuild b/kde-base/kdepim-l10n/kdepim-l10n-4.7.2.ebuild
deleted file mode 100644
index e0cf4321c8ec..000000000000
--- a/kde-base/kdepim-l10n/kdepim-l10n-4.7.2.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.2.ebuild,v 1.1 2011/10/18 22:50:14 dilfridge 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-l10n/kdepim-l10n-4.7.3.ebuild b/kde-base/kdepim-l10n/kdepim-l10n-4.7.3.ebuild
index 53f3d5ebcd2c..f7e866d40e04 100644
--- a/kde-base/kdepim-l10n/kdepim-l10n-4.7.3.ebuild
+++ b/kde-base/kdepim-l10n/kdepim-l10n-4.7.3.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/kde-base/kdepim-l10n/kdepim-l10n-4.7.3.ebuild,v 1.1 2011/11/04 00:22:44 dilfridge Exp $
+# $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
 
@@ -15,7 +15,7 @@ DEPEND="
 "
 RDEPEND=""
 
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.7.2.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.7.2.ebuild
deleted file mode 100644
index f7f34cba05ba..000000000000
--- a/kde-base/kdepim-meta/kdepim-meta-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:58 alexxy Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
-KEYWORDS="~amd64 ~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-meta/kdepim-meta-4.7.3.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.7.3.ebuild
index 325d572457b3..3b97daee9199 100644
--- a/kde-base/kdepim-meta/kdepim-meta-4.7.3.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-4.7.3.ebuild
@@ -1,12 +1,12 @@
 # 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.2 2011/11/05 20:00:15 xarthisius Exp $
+# $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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdepim-runtime/Manifest b/kde-base/kdepim-runtime/Manifest
index b68f9d43fc89..da0a6629eda9 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.2.tar.bz2 1205293 RMD160 7a63949a14b944dc4f475378908f63d5a5a8441e SHA1 f82886a63c48d718f30d60bd76ea7ac97f17a4c3 SHA256 13a4385a930d97ec1d981e1dbd22ef1582d5ae77e1774a5e2c001c88ff4f4801
 DIST kdepim-runtime-4.7.3.tar.bz2 1205585 RMD160 11d52166d2830c3c597f3b843bb10ccdaba38581 SHA1 fa0e336e17f7abea1e36d28d941a4ef79b4e4635 SHA256 4cd505294e7caaf97562961cd989594d4bb9d71490887dba4dad615ed353fcf9
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.7.2-r1.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.7.2-r1.ebuild
deleted file mode 100644
index 64b403eb2d14..000000000000
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.7.2-r1.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/kdepim-runtime/kdepim-runtime-4.7.2-r1.ebuild,v 1.1 2011/10/07 22:05:28 reavertm Exp $
-
-EAPI=4
-
-KMNAME="kdepim-runtime"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE PIM runtime plugin collection"
-KEYWORDS="~amd64 ~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)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-duplicated-folders.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
index e1bc95865b5c..33e1c4e072f4 100644
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.7.3.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.7.3.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/kde-base/kdepim-runtime/kdepim-runtime-4.7.3.ebuild,v 1.2 2011/11/05 19:58:14 xarthisius Exp $
+# $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
 
@@ -9,7 +9,7 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="KDE PIM runtime plugin collection"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RESTRICT="test"
diff --git a/kde-base/kdepim-strigi-analyzer/Manifest b/kde-base/kdepim-strigi-analyzer/Manifest
index 4e48133a3b7c..70a470d0ba9e 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.2.tar.bz2 16171209 RMD160 378e7352725dd257617b1af7d2bb98a8d5569808 SHA1 41983556eb54a740a20d274878006ace5bc73c1c SHA256 1635dabfc73b95209466c92a009bd2856ebd73c42f486545ff97e719fec06630
 DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
diff --git a/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.7.2.ebuild b/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.7.2.ebuild
deleted file mode 100644
index e9e631eee0a4..000000000000
--- a/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:10 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdepim"
-KMMODULE="strigi-analyzer"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="kdepim: strigi plugins"
-KEYWORDS="~amd64 ~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-strigi-analyzer/kdepim-strigi-analyzer-4.7.3.ebuild b/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.7.3.ebuild
index 172185002506..194a2626acd7 100644
--- 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
@@ -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/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.7.3.ebuild,v 1.2 2011/11/05 20:00:00 xarthisius Exp $
+# $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
 
@@ -10,7 +10,7 @@ KDE_SCM="git"
 inherit kde4-meta
 
 DESCRIPTION="kdepim: strigi plugins"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kdepim-wizards/Manifest b/kde-base/kdepim-wizards/Manifest
index 4e48133a3b7c..70a470d0ba9e 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.2.tar.bz2 16171209 RMD160 378e7352725dd257617b1af7d2bb98a8d5569808 SHA1 41983556eb54a740a20d274878006ace5bc73c1c SHA256 1635dabfc73b95209466c92a009bd2856ebd73c42f486545ff97e719fec06630
 DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
diff --git a/kde-base/kdepim-wizards/kdepim-wizards-4.7.2.ebuild b/kde-base/kdepim-wizards/kdepim-wizards-4.7.2.ebuild
deleted file mode 100644
index a280c745ad25..000000000000
--- a/kde-base/kdepim-wizards/kdepim-wizards-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:01 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdepim"
-KMMODULE="wizards"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE PIM wizards"
-IUSE="debug"
-KEYWORDS="~amd64 ~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/kdepim-wizards/kdepim-wizards-4.7.3.ebuild b/kde-base/kdepim-wizards/kdepim-wizards-4.7.3.ebuild
index 95a371bf494c..2baf83d2753e 100644
--- a/kde-base/kdepim-wizards/kdepim-wizards-4.7.3.ebuild
+++ b/kde-base/kdepim-wizards/kdepim-wizards-4.7.3.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/kde-base/kdepim-wizards/kdepim-wizards-4.7.3.ebuild,v 1.2 2011/11/05 19:59:36 xarthisius Exp $
+# $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
 
@@ -11,7 +11,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE PIM wizards"
 IUSE="debug"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	$(add_kdebase_dep kdepimlibs)
diff --git a/kde-base/kdepimlibs/Manifest b/kde-base/kdepimlibs/Manifest
index 3e659d9b3dcc..94db25318cba 100644
--- a/kde-base/kdepimlibs/Manifest
+++ b/kde-base/kdepimlibs/Manifest
@@ -1,4 +1,3 @@
 DIST kdepimlibs-4.6.3.tar.bz2 3202266 RMD160 3e1298c358f82690351d849f977ea6a4464b9dde SHA1 370b4e98ab9e1f8ba18d36630d5c8bbff8da4883 SHA256 abac2ce510f16f0614be6bb07e11f979f427981f17ab674951510c83ea72b95d
 DIST kdepimlibs-4.6.5.tar.bz2 3201672 RMD160 fb3943a0d6c477cd48bf39c3a339c208656475ab SHA1 6bf82a0934d5a16223f193e848bf3696a40e4820 SHA256 f2033feac905a6bcd64060653e8d0d2f8ac28ba8039562ec1b2fad7c708a4477
-DIST kdepimlibs-4.7.2.tar.bz2 3232573 RMD160 ae63b393861dd6f0654c6f2a13af727edd69fcce SHA1 9ad72ec123c2837783e6836e8c79210c658d2536 SHA256 82791f00cc13aa5bbf3b69bd67029e6c040e63a16e10fb77dfec5ffbee57d204
 DIST kdepimlibs-4.7.3.tar.bz2 3233484 RMD160 468d972ea73499c6cca6c10fdb3b6e84cee9aedf SHA1 b95822a3e38587744174308b629336cd3d0444f4 SHA256 11bec0a8d404bab11e0dd54d2c4e007812f675b85b3d9471a82abfcfb4925b87
diff --git a/kde-base/kdepimlibs/kdepimlibs-4.7.2.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.7.2.ebuild
deleted file mode 100644
index 9bf0f3dd6b89..000000000000
--- a/kde-base/kdepimlibs/kdepimlibs-4.7.2.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/kdepimlibs/kdepimlibs-4.7.2.ebuild,v 1.1 2011/10/06 18:10:54 alexxy 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}"
-
-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/kdepimlibs/kdepimlibs-4.7.3.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.7.3.ebuild
index 6fafa4c9390c..2ae8a39f490b 100644
--- a/kde-base/kdepimlibs/kdepimlibs-4.7.3.ebuild
+++ b/kde-base/kdepimlibs/kdepimlibs-4.7.3.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/kde-base/kdepimlibs/kdepimlibs-4.7.3.ebuild,v 1.1 2011/11/02 20:48:03 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.7.3.ebuild,v 1.3 2011/12/07 22:13:42 hwoarang Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 LICENSE="LGPL-2.1"
 IUSE="debug ldap semantic-desktop"
 
diff --git a/kde-base/kdeplasma-addons/Manifest b/kde-base/kdeplasma-addons/Manifest
index 6126f1438f29..6b2280e5666f 100644
--- a/kde-base/kdeplasma-addons/Manifest
+++ b/kde-base/kdeplasma-addons/Manifest
@@ -1,4 +1,3 @@
 DIST kdeplasma-addons-4.6.3.tar.bz2 1935272 RMD160 85c546d4aad35e3785980203d2f8ff0d154cafb6 SHA1 7a43dcfebc0316e681b04d0958d89272620a11b7 SHA256 6f8c11191aecb7cd8477c3c406515dc13991c4f6f73b892c0e25e89b12e58bcf
 DIST kdeplasma-addons-4.6.5.tar.bz2 1936845 RMD160 376beeb3e2bc9835a61f1089e7f2956c8d2912cf SHA1 3bce5e41160ec318dbea9128c3e9104a4428deb8 SHA256 0852f3444706c518fc242d174a614ff7d54b1826c3e5f884b10fbc7fb0755925
-DIST kdeplasma-addons-4.7.2.tar.bz2 1973434 RMD160 3c09f34c49ddd876a33be40cf79bb6f5665f7e9b SHA1 e1504ed7e21da8982610f42e70c3028b77ede6f1 SHA256 71956a99c943728696ba52bd7d0e165ae1d28f940da8c8676d79fdf18e1ec931
 DIST kdeplasma-addons-4.7.3.tar.bz2 1974816 RMD160 3ee4aa11b4dbf9e520d9918638b45edb6472928d SHA1 decdea2d081396c90daabc9af754a233b43a0783 SHA256 c1d0cdb41dc5293ef1ee415d99cda2b7f6c51b776d08199f0904c25b30bc9601
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.2.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.2.ebuild
deleted file mode 100644
index 52dc88a82f57..000000000000
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:09 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/kdeplasma-addons/kdeplasma-addons-4.7.3-r1.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.3-r1.ebuild
index c6e7af590cd5..cde6fa429193 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.3-r1.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.3-r1.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/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.3-r1.ebuild,v 1.1 2011/11/20 16:09:59 dilfridge Exp $
+# $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
 
@@ -11,7 +11,7 @@ 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"
+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
diff --git a/kde-base/kdesdk-kioslaves/Manifest b/kde-base/kdesdk-kioslaves/Manifest
index 8429b87a7c26..c05641549806 100644
--- a/kde-base/kdesdk-kioslaves/Manifest
+++ b/kde-base/kdesdk-kioslaves/Manifest
@@ -1,4 +1,3 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
 DIST kdesdk-4.6.5.tar.bz2 6063147 RMD160 0818eb740cb3f9c83ccf92bb238c4adbdd83b875 SHA1 8cffa0472fbe1096ebfea9bde49aaff76a145b34 SHA256 4b35eb3381bbf06e4d091dea4b38f6c807ce218d45e04d8719ee17ebd1820ff4
-DIST kdesdk-4.7.2.tar.bz2 5265267 RMD160 a8d275fcc858a548c7fe9ce04c0fd11279297174 SHA1 b6259b46fed642c35e1c1d1f90712084141ca441 SHA256 c9377df9429633413c57684574e6405b3dc3b493ac3ab43d9fd429ff3ab920be
 DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
diff --git a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.7.2.ebuild b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.7.2.ebuild
deleted file mode 100644
index d7c05a70a8bb..000000000000
--- a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:01 alexxy 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-kioslaves/kdesdk-kioslaves-4.7.3.ebuild b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.7.3.ebuild
index b763bd7ce333..f4516bef486d 100644
--- a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.7.3.ebuild
+++ b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.7.3.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/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.7.3.ebuild,v 1.1 2011/11/02 20:48:12 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMMODULE="kioslave"
 inherit kde4-meta
 
 DESCRIPTION="kioslaves from kdesdk package"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug subversion"
 
 DEPEND="
diff --git a/kde-base/kdesdk-meta/kdesdk-meta-4.7.2.ebuild b/kde-base/kdesdk-meta/kdesdk-meta-4.7.2.ebuild
deleted file mode 100644
index 79c0bdbf8c49..000000000000
--- a/kde-base/kdesdk-meta/kdesdk-meta-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:43 alexxy 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-meta/kdesdk-meta-4.7.3.ebuild b/kde-base/kdesdk-meta/kdesdk-meta-4.7.3.ebuild
index 44c70f03bed4..903879afd803 100644
--- a/kde-base/kdesdk-meta/kdesdk-meta-4.7.3.ebuild
+++ b/kde-base/kdesdk-meta/kdesdk-meta-4.7.3.ebuild
@@ -1,12 +1,12 @@
 # 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.1 2011/11/02 20:47:52 alexxy Exp $
+# $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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="cvs"
 
 RDEPEND="
diff --git a/kde-base/kdesdk-misc/Manifest b/kde-base/kdesdk-misc/Manifest
index 8429b87a7c26..c05641549806 100644
--- a/kde-base/kdesdk-misc/Manifest
+++ b/kde-base/kdesdk-misc/Manifest
@@ -1,4 +1,3 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
 DIST kdesdk-4.6.5.tar.bz2 6063147 RMD160 0818eb740cb3f9c83ccf92bb238c4adbdd83b875 SHA1 8cffa0472fbe1096ebfea9bde49aaff76a145b34 SHA256 4b35eb3381bbf06e4d091dea4b38f6c807ce218d45e04d8719ee17ebd1820ff4
-DIST kdesdk-4.7.2.tar.bz2 5265267 RMD160 a8d275fcc858a548c7fe9ce04c0fd11279297174 SHA1 b6259b46fed642c35e1c1d1f90712084141ca441 SHA256 c9377df9429633413c57684574e6405b3dc3b493ac3ab43d9fd429ff3ab920be
 DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
diff --git a/kde-base/kdesdk-misc/kdesdk-misc-4.7.2.ebuild b/kde-base/kdesdk-misc/kdesdk-misc-4.7.2.ebuild
deleted file mode 100644
index 45460067c338..000000000000
--- a/kde-base/kdesdk-misc/kdesdk-misc-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:09 alexxy 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-misc/kdesdk-misc-4.7.3.ebuild b/kde-base/kdesdk-misc/kdesdk-misc-4.7.3.ebuild
index 04dd42ee4907..0a87a95ba1da 100644
--- a/kde-base/kdesdk-misc/kdesdk-misc-4.7.3.ebuild
+++ b/kde-base/kdesdk-misc/kdesdk-misc-4.7.3.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/kde-base/kdesdk-misc/kdesdk-misc-4.7.3.ebuild,v 1.1 2011/11/02 20:48:20 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNOMODULE="true"
 inherit kde4-meta
 
 DESCRIPTION="KDE miscellaneous SDK tools"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug extras"
 
 DEPEND="
diff --git a/kde-base/kdesdk-scripts/Manifest b/kde-base/kdesdk-scripts/Manifest
index 8429b87a7c26..c05641549806 100644
--- a/kde-base/kdesdk-scripts/Manifest
+++ b/kde-base/kdesdk-scripts/Manifest
@@ -1,4 +1,3 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
 DIST kdesdk-4.6.5.tar.bz2 6063147 RMD160 0818eb740cb3f9c83ccf92bb238c4adbdd83b875 SHA1 8cffa0472fbe1096ebfea9bde49aaff76a145b34 SHA256 4b35eb3381bbf06e4d091dea4b38f6c807ce218d45e04d8719ee17ebd1820ff4
-DIST kdesdk-4.7.2.tar.bz2 5265267 RMD160 a8d275fcc858a548c7fe9ce04c0fd11279297174 SHA1 b6259b46fed642c35e1c1d1f90712084141ca441 SHA256 c9377df9429633413c57684574e6405b3dc3b493ac3ab43d9fd429ff3ab920be
 DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
diff --git a/kde-base/kdesdk-scripts/kdesdk-scripts-4.7.2.ebuild b/kde-base/kdesdk-scripts/kdesdk-scripts-4.7.2.ebuild
deleted file mode 100644
index 5d31bcf3d0fd..000000000000
--- a/kde-base/kdesdk-scripts/kdesdk-scripts-4.7.2.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/kdesdk-scripts/kdesdk-scripts-4.7.2.ebuild,v 1.1 2011/10/06 18:10:59 alexxy 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
-	media-gfx/optipng
-"
-
-src_prepare() {
-	# bug 275069
-	sed -ie 's:colorsvn::' scripts/CMakeLists.txt || die
-
-	kde4-meta_src_prepare
-}
diff --git a/kde-base/kdesdk-scripts/kdesdk-scripts-4.7.3.ebuild b/kde-base/kdesdk-scripts/kdesdk-scripts-4.7.3.ebuild
index 33cf5823f4e1..513dfaa23d39 100644
--- a/kde-base/kdesdk-scripts/kdesdk-scripts-4.7.3.ebuild
+++ b/kde-base/kdesdk-scripts/kdesdk-scripts-4.7.3.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/kde-base/kdesdk-scripts/kdesdk-scripts-4.7.3.ebuild,v 1.1 2011/11/02 20:48:19 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/kdesdk-scripts-4.7.3.ebuild,v 1.3 2011/12/07 22:13:58 hwoarang Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ KMMODULE="scripts"
 inherit kde4-meta
 
 DESCRIPTION="KDE SDK Scripts"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/kdesdk-strigi-analyzer/Manifest b/kde-base/kdesdk-strigi-analyzer/Manifest
index 8429b87a7c26..c05641549806 100644
--- a/kde-base/kdesdk-strigi-analyzer/Manifest
+++ b/kde-base/kdesdk-strigi-analyzer/Manifest
@@ -1,4 +1,3 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
 DIST kdesdk-4.6.5.tar.bz2 6063147 RMD160 0818eb740cb3f9c83ccf92bb238c4adbdd83b875 SHA1 8cffa0472fbe1096ebfea9bde49aaff76a145b34 SHA256 4b35eb3381bbf06e4d091dea4b38f6c807ce218d45e04d8719ee17ebd1820ff4
-DIST kdesdk-4.7.2.tar.bz2 5265267 RMD160 a8d275fcc858a548c7fe9ce04c0fd11279297174 SHA1 b6259b46fed642c35e1c1d1f90712084141ca441 SHA256 c9377df9429633413c57684574e6405b3dc3b493ac3ab43d9fd429ff3ab920be
 DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
diff --git a/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.7.2.ebuild b/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.7.2.ebuild
deleted file mode 100644
index 3ee8c133f8a0..000000000000
--- a/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:58 alexxy 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/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.7.3.ebuild b/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.7.3.ebuild
index e918a5072bfa..74a5c61edd7d 100644
--- 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
@@ -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/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.7.3.ebuild,v 1.1 2011/11/02 20:48:08 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMMODULE="strigi-analyzer"
 inherit kde4-meta
 
 DESCRIPTION="kdesdk: strigi plugins"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kdesu/Manifest b/kde-base/kdesu/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/kdesu/Manifest
+++ b/kde-base/kdesu/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/kdesu/kdesu-4.7.2.ebuild b/kde-base/kdesu/kdesu-4.7.2.ebuild
deleted file mode 100644
index 808557887220..000000000000
--- a/kde-base/kdesu/kdesu-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:57 alexxy 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/kdesu/kdesu-4.7.3.ebuild b/kde-base/kdesu/kdesu-4.7.3.ebuild
index f421b091e244..8edd794f68d9 100644
--- a/kde-base/kdesu/kdesu-4.7.3.ebuild
+++ b/kde-base/kdesu/kdesu-4.7.3.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/kde-base/kdesu/kdesu-4.7.3.ebuild,v 1.1 2011/11/02 20:48:00 alexxy Exp $
+# $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
 
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 src_configure() {
diff --git a/kde-base/kdetoys-meta/kdetoys-meta-4.7.2.ebuild b/kde-base/kdetoys-meta/kdetoys-meta-4.7.2.ebuild
deleted file mode 100644
index 6a0cadb90d8f..000000000000
--- a/kde-base/kdetoys-meta/kdetoys-meta-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:48 alexxy 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/kdetoys-meta/kdetoys-meta-4.7.3.ebuild b/kde-base/kdetoys-meta/kdetoys-meta-4.7.3.ebuild
index 7f95ab605a44..c664b5dd3008 100644
--- a/kde-base/kdetoys-meta/kdetoys-meta-4.7.3.ebuild
+++ b/kde-base/kdetoys-meta/kdetoys-meta-4.7.3.ebuild
@@ -1,12 +1,12 @@
 # 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.1 2011/11/02 20:48:19 alexxy Exp $
+# $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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdeutils-meta/kdeutils-meta-4.7.2.ebuild b/kde-base/kdeutils-meta/kdeutils-meta-4.7.2.ebuild
deleted file mode 100644
index 20b41c53e714..000000000000
--- a/kde-base/kdeutils-meta/kdeutils-meta-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:54 alexxy 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/kdeutils-meta/kdeutils-meta-4.7.3.ebuild b/kde-base/kdeutils-meta/kdeutils-meta-4.7.3.ebuild
index 951b23fb4eb7..9b5556017014 100644
--- a/kde-base/kdeutils-meta/kdeutils-meta-4.7.3.ebuild
+++ b/kde-base/kdeutils-meta/kdeutils-meta-4.7.3.ebuild
@@ -1,12 +1,12 @@
 # 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.1 2011/11/02 20:48:03 alexxy Exp $
+# $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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="cups floppy"
 
 RDEPEND="
diff --git a/kde-base/kdewebdev-meta/kdewebdev-meta-4.7.2.ebuild b/kde-base/kdewebdev-meta/kdewebdev-meta-4.7.2.ebuild
deleted file mode 100644
index 1cb2fa8a27d9..000000000000
--- a/kde-base/kdewebdev-meta/kdewebdev-meta-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:47 alexxy 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/kdewebdev-meta/kdewebdev-meta-4.7.3.ebuild b/kde-base/kdewebdev-meta/kdewebdev-meta-4.7.3.ebuild
index e61855375a1d..eee17906ffa4 100644
--- a/kde-base/kdewebdev-meta/kdewebdev-meta-4.7.3.ebuild
+++ b/kde-base/kdewebdev-meta/kdewebdev-meta-4.7.3.ebuild
@@ -1,12 +1,12 @@
 # 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.1 2011/11/02 20:48:13 alexxy Exp $
+# $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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdf/Manifest b/kde-base/kdf/Manifest
index 348ce6a51263..65b585b0a481 100644
--- a/kde-base/kdf/Manifest
+++ b/kde-base/kdf/Manifest
@@ -1,4 +1,3 @@
 DIST kdeutils-4.6.3.tar.bz2 3703326 RMD160 1fe6287fed3fa21eef902ee764425171f7345e6c SHA1 1aa735c03689ef49b949278ee31d0d8e8536b7d6 SHA256 d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
 DIST kdeutils-4.6.5.tar.bz2 3699961 RMD160 65293718d8785c8e06e9149465f55f7f5a8718f5 SHA1 1c2ae023d9a6bcf72d3cebd0d7df2e6a175ffdcb SHA256 03de4b7728301414c8e704ba5c8650d8ded053747268ad47c901880fc1bf0b29
-DIST kdeutils-4.7.2.tar.bz2 3800427 RMD160 13fadbd312d70d7de360221facaf506707562fcc SHA1 52ce9b6b5f2c20475f46b6f7378ca4c530df37b4 SHA256 cdea138fc4556b4f6de5e63ee7ccbcb3485a780f372e699c0cb9fd6d65e02f96
 DIST kdeutils-4.7.3.tar.bz2 3802391 RMD160 0e0a73d290baaa289665b49722f04f19ab517dd9 SHA1 23fc9823647152d5d8cc250a55402c8930db4059 SHA256 a8c802f32b9e918d806a4487c25485f86019e4c473f0de6d3086d8ea8e492839
diff --git a/kde-base/kdf/kdf-4.7.2.ebuild b/kde-base/kdf/kdf-4.7.2.ebuild
deleted file mode 100644
index a84a54080b5e..000000000000
--- a/kde-base/kdf/kdf-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:00 alexxy 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/kdf/kdf-4.7.3.ebuild b/kde-base/kdf/kdf-4.7.3.ebuild
index 57821ed40937..f774512d829d 100644
--- a/kde-base/kdf/kdf-4.7.3.ebuild
+++ b/kde-base/kdf/kdf-4.7.3.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/kde-base/kdf/kdf-4.7.3.ebuild,v 1.1 2011/11/02 20:48:12 alexxy Exp $
+# $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
 
@@ -15,7 +15,7 @@ fi
 inherit ${kde_eclass}
 
 DESCRIPTION="KDE free disk space utility"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 src_unpack() {
diff --git a/kde-base/kdialog/Manifest b/kde-base/kdialog/Manifest
index 55198aaad7a5..4d43fae00274 100644
--- a/kde-base/kdialog/Manifest
+++ b/kde-base/kdialog/Manifest
@@ -1,4 +1,3 @@
-DIST kde-baseapps-4.7.2.tar.bz2 2685060 RMD160 f97994dabe6412065723a8373291f1cf3f7c3290 SHA1 b52937ad8e5e4be884cc76f265c19964f461ac2c SHA256 1104284ad9cfc9757b0bbd2516dfdcbe4119ea6a6e6daf3c9d7eb66c43760bfa
 DIST kde-baseapps-4.7.3.tar.bz2 2685074 RMD160 270f3f3ae7b473651517db8818160f16e4faf544 SHA1 952dc26d0d908b41973a8d7b4d27765bf5128d58 SHA256 e9fb0c5da9e9a255c1a1735dfa518dcadc1ea23c68a467164597ff3dbf51c8df
 DIST kdebase-4.6.3.tar.bz2 2682586 RMD160 38784d7a5a708703f5a22e39dc5f83ef7aecd833 SHA1 69cfba74099cdce27f7f72725288f025979b41f3 SHA256 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
 DIST kdebase-4.6.5.tar.bz2 2639622 RMD160 cef007659a02cbec3bd484aa9eb5a721c5200b4f SHA1 1a902d22956daaf380ceefe68f8db75b8b760ae6 SHA256 542a42fc806673ba46827dcc5616fe53239659107934f1b05bf476e46ecbffd5
diff --git a/kde-base/kdialog/kdialog-4.7.2.ebuild b/kde-base/kdialog/kdialog-4.7.2.ebuild
deleted file mode 100644
index 43206e18571d..000000000000
--- a/kde-base/kdialog/kdialog-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:03 alexxy 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/kdialog/kdialog-4.7.3.ebuild b/kde-base/kdialog/kdialog-4.7.3.ebuild
index b3e403e829a1..b62bb68fef35 100644
--- a/kde-base/kdialog/kdialog-4.7.3.ebuild
+++ b/kde-base/kdialog/kdialog-4.7.3.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/kde-base/kdialog/kdialog-4.7.3.ebuild,v 1.1 2011/11/02 20:48:12 alexxy Exp $
+# $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
 
@@ -8,5 +8,5 @@ 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"
+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 300caa131fb0..3da267543cb4 100644
--- a/kde-base/kdiamond/Manifest
+++ b/kde-base/kdiamond/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/kdiamond/kdiamond-4.7.2.ebuild b/kde-base/kdiamond/kdiamond-4.7.2.ebuild
deleted file mode 100644
index c0f9f83c34a4..000000000000
--- a/kde-base/kdiamond/kdiamond-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:13 alexxy 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/kdiamond/kdiamond-4.7.3.ebuild b/kde-base/kdiamond/kdiamond-4.7.3.ebuild
index 21bfe0cb086b..78352a14a0eb 100644
--- a/kde-base/kdiamond/kdiamond-4.7.3.ebuild
+++ b/kde-base/kdiamond/kdiamond-4.7.3.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/kde-base/kdiamond/kdiamond-4.7.3.ebuild,v 1.1 2011/11/02 20:48:23 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="KDE: KDiamond is a three-in-a-row game."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/kdm/kdm-4.7.2-r1.ebuild b/kde-base/kdm/kdm-4.7.2-r1.ebuild
deleted file mode 100644
index 6abe496ddfcd..000000000000
--- a/kde-base/kdm/kdm-4.7.2-r1.ebuild
+++ /dev/null
@@ -1,160 +0,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.2-r1.ebuild,v 1.1 2011/10/28 17:41:15 dilfridge 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"
-)
-
-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/kdm/kdm-4.7.3-r1.ebuild b/kde-base/kdm/kdm-4.7.3-r1.ebuild
index 07864505cdd1..62dbd5e5f40d 100644
--- a/kde-base/kdm/kdm-4.7.3-r1.ebuild
+++ b/kde-base/kdm/kdm-4.7.3-r1.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/kde-base/kdm/kdm-4.7.3-r1.ebuild,v 1.1 2011/11/20 21:49:02 dilfridge Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kde-workspace"
 inherit kde4-meta flag-o-matic
 
 DESCRIPTION="KDE login manager, similar to xdm and gdm"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="+consolekit debug kerberos pam"
 
 DEPEND="
diff --git a/kde-base/kdnssd/Manifest b/kde-base/kdnssd/Manifest
index b7cb9e393a5a..f41009a5734a 100644
--- a/kde-base/kdnssd/Manifest
+++ b/kde-base/kdnssd/Manifest
@@ -1,4 +1,3 @@
 DIST kdenetwork-4.6.3.tar.bz2 8693954 RMD160 a70c031107dd56eda618b91482b814e14425cb1d SHA1 6f140dca442be815eda4fb79d51efd9e4588a1f1 SHA256 423424f2bbc18cb6a0bd52305a238a5b7d4b5f483f30c0590f975b0c229be1fb
 DIST kdenetwork-4.6.5.tar.bz2 8685421 RMD160 eaa0e86ac527a7bc7a70c7eeedb651ff2cccf799 SHA1 cc398063da61f9f9ef0db4455dc0c989a4e68a25 SHA256 5029442447524dc83b080d11fbc4a533f3135bbaf7350b1b5f56289d8f913588
-DIST kdenetwork-4.7.2.tar.bz2 9945067 RMD160 50c6703d021db1ffd516f886b42d42291f725d6c SHA1 59e9e3629dff0362cfa2a6d897c77bc9cfbe8d5c SHA256 c61606a0cad9620ac235725594c7d9d0231268dc372e4d16d411f9aff1f3c36f
 DIST kdenetwork-4.7.3.tar.bz2 9947763 RMD160 8d1cdce1dfd5fa4aae6ecb2d55b189e0bcd94981 SHA1 5d8ed6a478d9afdaf19d350f1d2fe7e9dd48b2f7 SHA256 5a5e7bfa7998e38f80667473c590ab11dde8f3dd6a81a5d9e61ca3940354efa4
diff --git a/kde-base/kdnssd/kdnssd-4.7.2.ebuild b/kde-base/kdnssd/kdnssd-4.7.2.ebuild
deleted file mode 100644
index cb1c8498f0c5..000000000000
--- a/kde-base/kdnssd/kdnssd-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:53 alexxy 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/kdnssd/kdnssd-4.7.3.ebuild b/kde-base/kdnssd/kdnssd-4.7.3.ebuild
index 1baa2eb63d3a..ba9efeb54fb9 100644
--- a/kde-base/kdnssd/kdnssd-4.7.3.ebuild
+++ b/kde-base/kdnssd/kdnssd-4.7.3.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/kde-base/kdnssd/kdnssd-4.7.3.ebuild,v 1.1 2011/11/02 20:47:53 alexxy Exp $
+# $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
 
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug zeroconf"
 
 DEPEND="
diff --git a/kde-base/kdontchangethehostname/Manifest b/kde-base/kdontchangethehostname/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/kdontchangethehostname/Manifest
+++ b/kde-base/kdontchangethehostname/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/kdontchangethehostname/kdontchangethehostname-4.7.2.ebuild b/kde-base/kdontchangethehostname/kdontchangethehostname-4.7.2.ebuild
deleted file mode 100644
index 7f514dd7c551..000000000000
--- a/kde-base/kdontchangethehostname/kdontchangethehostname-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:11 alexxy 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/kdontchangethehostname/kdontchangethehostname-4.7.3.ebuild b/kde-base/kdontchangethehostname/kdontchangethehostname-4.7.3.ebuild
index ebb41a38241e..3ac85ef8ec0f 100644
--- a/kde-base/kdontchangethehostname/kdontchangethehostname-4.7.3.ebuild
+++ b/kde-base/kdontchangethehostname/kdontchangethehostname-4.7.3.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/kde-base/kdontchangethehostname/kdontchangethehostname-4.7.3.ebuild,v 1.1 2011/11/02 20:48:12 alexxy Exp $
+# $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
 
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/keditbookmarks/Manifest b/kde-base/keditbookmarks/Manifest
index 55198aaad7a5..4d43fae00274 100644
--- a/kde-base/keditbookmarks/Manifest
+++ b/kde-base/keditbookmarks/Manifest
@@ -1,4 +1,3 @@
-DIST kde-baseapps-4.7.2.tar.bz2 2685060 RMD160 f97994dabe6412065723a8373291f1cf3f7c3290 SHA1 b52937ad8e5e4be884cc76f265c19964f461ac2c SHA256 1104284ad9cfc9757b0bbd2516dfdcbe4119ea6a6e6daf3c9d7eb66c43760bfa
 DIST kde-baseapps-4.7.3.tar.bz2 2685074 RMD160 270f3f3ae7b473651517db8818160f16e4faf544 SHA1 952dc26d0d908b41973a8d7b4d27765bf5128d58 SHA256 e9fb0c5da9e9a255c1a1735dfa518dcadc1ea23c68a467164597ff3dbf51c8df
 DIST kdebase-4.6.3.tar.bz2 2682586 RMD160 38784d7a5a708703f5a22e39dc5f83ef7aecd833 SHA1 69cfba74099cdce27f7f72725288f025979b41f3 SHA256 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
 DIST kdebase-4.6.5.tar.bz2 2639622 RMD160 cef007659a02cbec3bd484aa9eb5a721c5200b4f SHA1 1a902d22956daaf380ceefe68f8db75b8b760ae6 SHA256 542a42fc806673ba46827dcc5616fe53239659107934f1b05bf476e46ecbffd5
diff --git a/kde-base/keditbookmarks/keditbookmarks-4.7.2.ebuild b/kde-base/keditbookmarks/keditbookmarks-4.7.2.ebuild
deleted file mode 100644
index 3fa1fe21c562..000000000000
--- a/kde-base/keditbookmarks/keditbookmarks-4.7.2.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/keditbookmarks/keditbookmarks-4.7.2.ebuild,v 1.1 2011/10/06 18:11:01 alexxy 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/
-"
diff --git a/kde-base/keditbookmarks/keditbookmarks-4.7.3.ebuild b/kde-base/keditbookmarks/keditbookmarks-4.7.3.ebuild
index 6b6be6eb1ab3..de531f6c985d 100644
--- a/kde-base/keditbookmarks/keditbookmarks-4.7.3.ebuild
+++ b/kde-base/keditbookmarks/keditbookmarks-4.7.3.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/kde-base/keditbookmarks/keditbookmarks-4.7.3.ebuild,v 1.2 2011/12/04 15:59:29 dilfridge Exp $
+# $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
 
@@ -8,7 +8,7 @@ KMNAME="kde-baseapps"
 inherit kde4-meta
 
 DESCRIPTION="KDE's bookmarks editor"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/keditfiletype/Manifest b/kde-base/keditfiletype/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/keditfiletype/Manifest
+++ b/kde-base/keditfiletype/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/keditfiletype/keditfiletype-4.7.2.ebuild b/kde-base/keditfiletype/keditfiletype-4.7.2.ebuild
deleted file mode 100644
index a43f702c12ee..000000000000
--- a/kde-base/keditfiletype/keditfiletype-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:43 alexxy 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/keditfiletype/keditfiletype-4.7.3.ebuild b/kde-base/keditfiletype/keditfiletype-4.7.3.ebuild
index 0acf91a91f57..3f0137847bab 100644
--- a/kde-base/keditfiletype/keditfiletype-4.7.3.ebuild
+++ b/kde-base/keditfiletype/keditfiletype-4.7.3.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/kde-base/keditfiletype/keditfiletype-4.7.3.ebuild,v 1.1 2011/11/02 20:47:51 alexxy Exp $
+# $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
 
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 # test fails, last checked for 4.2.89
diff --git a/kde-base/kephal/Manifest b/kde-base/kephal/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/kephal/Manifest
+++ b/kde-base/kephal/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/kephal/kephal-4.7.2.ebuild b/kde-base/kephal/kephal-4.7.2.ebuild
deleted file mode 100644
index cefe362e7534..000000000000
--- a/kde-base/kephal/kephal-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:53 alexxy 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/kephal/kephal-4.7.3.ebuild b/kde-base/kephal/kephal-4.7.3.ebuild
index 77c70757541c..84e5bd7cb692 100644
--- a/kde-base/kephal/kephal-4.7.3.ebuild
+++ b/kde-base/kephal/kephal-4.7.3.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/kde-base/kephal/kephal-4.7.3.ebuild,v 1.1 2011/11/02 20:48:19 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/kfile/Manifest b/kde-base/kfile/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/kfile/Manifest
+++ b/kde-base/kfile/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/kfile/kfile-4.7.2.ebuild b/kde-base/kfile/kfile-4.7.2.ebuild
deleted file mode 100644
index 260da0c5baf7..000000000000
--- a/kde-base/kfile/kfile-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:57 alexxy 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/kfile/kfile-4.7.3.ebuild b/kde-base/kfile/kfile-4.7.3.ebuild
index 3e16a3fdde45..a0f2a86aa773 100644
--- a/kde-base/kfile/kfile-4.7.3.ebuild
+++ b/kde-base/kfile/kfile-4.7.3.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/kde-base/kfile/kfile-4.7.3.ebuild,v 1.1 2011/11/02 20:48:07 alexxy Exp $
+# $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
 
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="A commandline frontend to KFileMetaInfo"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+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 25233c8cb8af..37a017d5b48c 100644
--- a/kde-base/kfilereplace/Manifest
+++ b/kde-base/kfilereplace/Manifest
@@ -1,4 +1,3 @@
 DIST kdewebdev-4.6.3.tar.bz2 2202203 RMD160 21bd54a6f202ebfd5d829375791c21e0fc80f2dc SHA1 39e72fbaf76ee1c685321c8c3a767c38e63bc2a9 SHA256 f47957e1e05171c7a04668b29791049c0de1f330247fb2e4f3cc4db95695ffe6
 DIST kdewebdev-4.6.5.tar.bz2 2200000 RMD160 bfe9550508c67cdc87b1aff54b93b2afbafcfc3c SHA1 b7ec635c438f865337f5ef1e7bbaca23643ed871 SHA256 858843e38b50399776359b142b85035707820c9dfbc24d1a82fafbadb349b11f
-DIST kdewebdev-4.7.2.tar.bz2 2718631 RMD160 403fd24e5e4cda253af0a9fb36721b3091902db9 SHA1 82910da01dc84e86134d0dbae23b4bf66b565faa SHA256 c7cfd80bf5bf5a50f3b39789bce4277983838d8ccdb48eb64a93ed784fe08e3c
 DIST kdewebdev-4.7.3.tar.bz2 2718880 RMD160 a95a945d7ae2d09dbe009bb573322eeffabcaaf6 SHA1 11108698887d376d00f02cbdfa1496aa3cb268c1 SHA256 20f5c5e7227c00cdf1723b2b48d92c791c6bd06e051e4789c4b9528e71f2ee37
diff --git a/kde-base/kfilereplace/kfilereplace-4.7.2.ebuild b/kde-base/kfilereplace/kfilereplace-4.7.2.ebuild
deleted file mode 100644
index 0861f23bc8fa..000000000000
--- a/kde-base/kfilereplace/kfilereplace-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:45 alexxy 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/kfilereplace/kfilereplace-4.7.3.ebuild b/kde-base/kfilereplace/kfilereplace-4.7.3.ebuild
index 807a7ae0c11d..01d0786fa173 100644
--- a/kde-base/kfilereplace/kfilereplace-4.7.3.ebuild
+++ b/kde-base/kfilereplace/kfilereplace-4.7.3.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/kde-base/kfilereplace/kfilereplace-4.7.3.ebuild,v 1.1 2011/11/02 20:48:04 alexxy Exp $
+# $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"
@@ -8,5 +8,5 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kfind/Manifest b/kde-base/kfind/Manifest
index 55198aaad7a5..4d43fae00274 100644
--- a/kde-base/kfind/Manifest
+++ b/kde-base/kfind/Manifest
@@ -1,4 +1,3 @@
-DIST kde-baseapps-4.7.2.tar.bz2 2685060 RMD160 f97994dabe6412065723a8373291f1cf3f7c3290 SHA1 b52937ad8e5e4be884cc76f265c19964f461ac2c SHA256 1104284ad9cfc9757b0bbd2516dfdcbe4119ea6a6e6daf3c9d7eb66c43760bfa
 DIST kde-baseapps-4.7.3.tar.bz2 2685074 RMD160 270f3f3ae7b473651517db8818160f16e4faf544 SHA1 952dc26d0d908b41973a8d7b4d27765bf5128d58 SHA256 e9fb0c5da9e9a255c1a1735dfa518dcadc1ea23c68a467164597ff3dbf51c8df
 DIST kdebase-4.6.3.tar.bz2 2682586 RMD160 38784d7a5a708703f5a22e39dc5f83ef7aecd833 SHA1 69cfba74099cdce27f7f72725288f025979b41f3 SHA256 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
 DIST kdebase-4.6.5.tar.bz2 2639622 RMD160 cef007659a02cbec3bd484aa9eb5a721c5200b4f SHA1 1a902d22956daaf380ceefe68f8db75b8b760ae6 SHA256 542a42fc806673ba46827dcc5616fe53239659107934f1b05bf476e46ecbffd5
diff --git a/kde-base/kfind/kfind-4.7.2.ebuild b/kde-base/kfind/kfind-4.7.2.ebuild
deleted file mode 100644
index 682beb7817fe..000000000000
--- a/kde-base/kfind/kfind-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:04 alexxy 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/kfind/kfind-4.7.3.ebuild b/kde-base/kfind/kfind-4.7.3.ebuild
index 4e90b9966043..365d46236764 100644
--- a/kde-base/kfind/kfind-4.7.3.ebuild
+++ b/kde-base/kfind/kfind-4.7.3.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/kde-base/kfind/kfind-4.7.3.ebuild,v 1.1 2011/11/02 20:48:15 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kde-baseapps"
 inherit kde4-meta
 
 DESCRIPTION="KDE file finder utility"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kfloppy/Manifest b/kde-base/kfloppy/Manifest
index 348ce6a51263..65b585b0a481 100644
--- a/kde-base/kfloppy/Manifest
+++ b/kde-base/kfloppy/Manifest
@@ -1,4 +1,3 @@
 DIST kdeutils-4.6.3.tar.bz2 3703326 RMD160 1fe6287fed3fa21eef902ee764425171f7345e6c SHA1 1aa735c03689ef49b949278ee31d0d8e8536b7d6 SHA256 d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
 DIST kdeutils-4.6.5.tar.bz2 3699961 RMD160 65293718d8785c8e06e9149465f55f7f5a8718f5 SHA1 1c2ae023d9a6bcf72d3cebd0d7df2e6a175ffdcb SHA256 03de4b7728301414c8e704ba5c8650d8ded053747268ad47c901880fc1bf0b29
-DIST kdeutils-4.7.2.tar.bz2 3800427 RMD160 13fadbd312d70d7de360221facaf506707562fcc SHA1 52ce9b6b5f2c20475f46b6f7378ca4c530df37b4 SHA256 cdea138fc4556b4f6de5e63ee7ccbcb3485a780f372e699c0cb9fd6d65e02f96
 DIST kdeutils-4.7.3.tar.bz2 3802391 RMD160 0e0a73d290baaa289665b49722f04f19ab517dd9 SHA1 23fc9823647152d5d8cc250a55402c8930db4059 SHA256 a8c802f32b9e918d806a4487c25485f86019e4c473f0de6d3086d8ea8e492839
diff --git a/kde-base/kfloppy/kfloppy-4.7.2.ebuild b/kde-base/kfloppy/kfloppy-4.7.2.ebuild
deleted file mode 100644
index 7e5d62783ea9..000000000000
--- a/kde-base/kfloppy/kfloppy-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:05 alexxy 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/kfloppy/kfloppy-4.7.3.ebuild b/kde-base/kfloppy/kfloppy-4.7.3.ebuild
index 4bda4c9bcd78..df5aaaebe0e5 100644
--- a/kde-base/kfloppy/kfloppy-4.7.3.ebuild
+++ b/kde-base/kfloppy/kfloppy-4.7.3.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/kde-base/kfloppy/kfloppy-4.7.3.ebuild,v 1.1 2011/11/02 20:48:19 alexxy Exp $
+# $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
 
@@ -15,5 +15,5 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kfmclient/Manifest b/kde-base/kfmclient/Manifest
index 55198aaad7a5..4d43fae00274 100644
--- a/kde-base/kfmclient/Manifest
+++ b/kde-base/kfmclient/Manifest
@@ -1,4 +1,3 @@
-DIST kde-baseapps-4.7.2.tar.bz2 2685060 RMD160 f97994dabe6412065723a8373291f1cf3f7c3290 SHA1 b52937ad8e5e4be884cc76f265c19964f461ac2c SHA256 1104284ad9cfc9757b0bbd2516dfdcbe4119ea6a6e6daf3c9d7eb66c43760bfa
 DIST kde-baseapps-4.7.3.tar.bz2 2685074 RMD160 270f3f3ae7b473651517db8818160f16e4faf544 SHA1 952dc26d0d908b41973a8d7b4d27765bf5128d58 SHA256 e9fb0c5da9e9a255c1a1735dfa518dcadc1ea23c68a467164597ff3dbf51c8df
 DIST kdebase-4.6.3.tar.bz2 2682586 RMD160 38784d7a5a708703f5a22e39dc5f83ef7aecd833 SHA1 69cfba74099cdce27f7f72725288f025979b41f3 SHA256 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
 DIST kdebase-4.6.5.tar.bz2 2639622 RMD160 cef007659a02cbec3bd484aa9eb5a721c5200b4f SHA1 1a902d22956daaf380ceefe68f8db75b8b760ae6 SHA256 542a42fc806673ba46827dcc5616fe53239659107934f1b05bf476e46ecbffd5
diff --git a/kde-base/kfmclient/kfmclient-4.7.2.ebuild b/kde-base/kfmclient/kfmclient-4.7.2.ebuild
deleted file mode 100644
index 8b42d5e670d1..000000000000
--- a/kde-base/kfmclient/kfmclient-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:05 alexxy 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/kfmclient/kfmclient-4.7.3.ebuild b/kde-base/kfmclient/kfmclient-4.7.3.ebuild
index 81934e7c3f9b..7d22a6301263 100644
--- a/kde-base/kfmclient/kfmclient-4.7.3.ebuild
+++ b/kde-base/kfmclient/kfmclient-4.7.3.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/kde-base/kfmclient/kfmclient-4.7.3.ebuild,v 1.1 2011/11/02 20:48:16 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 KMEXTRACTONLY="
diff --git a/kde-base/kfourinline/Manifest b/kde-base/kfourinline/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/kfourinline/Manifest
+++ b/kde-base/kfourinline/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/kfourinline/kfourinline-4.7.2.ebuild b/kde-base/kfourinline/kfourinline-4.7.2.ebuild
deleted file mode 100644
index 0704bcae0e69..000000000000
--- a/kde-base/kfourinline/kfourinline-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:44 alexxy 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/kfourinline/kfourinline-4.7.3.ebuild b/kde-base/kfourinline/kfourinline-4.7.3.ebuild
index 509725e82048..2ecc898fb821 100644
--- a/kde-base/kfourinline/kfourinline-4.7.3.ebuild
+++ b/kde-base/kfourinline/kfourinline-4.7.3.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/kde-base/kfourinline/kfourinline-4.7.3.ebuild,v 1.1 2011/11/02 20:47:53 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="KDE four-in-a-row game."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kgamma/Manifest b/kde-base/kgamma/Manifest
index 76ad99c145c0..fd00410d1f2d 100644
--- a/kde-base/kgamma/Manifest
+++ b/kde-base/kgamma/Manifest
@@ -1,4 +1,3 @@
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
 DIST kdegraphics-4.6.5.tar.bz2 5455380 RMD160 75fdf00994bfc2737a754b4ff360ab789cd824b5 SHA1 1e64698993d0754dfae1296d8d16ba9370f9a08c SHA256 5b8a7e54f281ac938d8e22db673b7ddcff8a1d8adfc128282150ad52c80b8c04
-DIST kgamma-4.7.2.tar.bz2 28294 RMD160 a4c6a0d352b1063c21aa51c145e7affc0f2bb5a9 SHA1 3f8cf9bf169a0bc058d0de610bfa4910c54ef475 SHA256 e460c7acd51853fd4ecaeec20e7b03f52d6f5d5709a0cb73501f3d4f1befe592
 DIST kgamma-4.7.3.tar.bz2 28365 RMD160 9af87dc8bd015db157ee006111df50c8714b2135 SHA1 d97511574120614ffb85308888c23eb2d3ba1b01 SHA256 5e752fc413fe54b4be59ee580bab01c6005cc861c6962b8a343863d757a7e94f
diff --git a/kde-base/kgamma/kgamma-4.7.2.ebuild b/kde-base/kgamma/kgamma-4.7.2.ebuild
deleted file mode 100644
index fa4cb722ab03..000000000000
--- a/kde-base/kgamma/kgamma-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:02 alexxy 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/kgamma/kgamma-4.7.3.ebuild b/kde-base/kgamma/kgamma-4.7.3.ebuild
index 9c5d38d6ecc8..ef31d1132239 100644
--- a/kde-base/kgamma/kgamma-4.7.3.ebuild
+++ b/kde-base/kgamma/kgamma-4.7.3.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/kde-base/kgamma/kgamma-4.7.3.ebuild,v 1.1 2011/11/02 20:48:15 alexxy Exp $
+# $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
 
@@ -10,7 +10,7 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="KDE screen gamma values kcontrol module"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/kgeography/Manifest b/kde-base/kgeography/Manifest
index e2287ae0d3d4..5edc3924309e 100644
--- a/kde-base/kgeography/Manifest
+++ b/kde-base/kgeography/Manifest
@@ -1,4 +1,3 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
 DIST kdeedu-4.6.5.tar.bz2 71684677 RMD160 78cfdc42f648308477c57bd816f46434bb588449 SHA1 64247eb68b2710a66baaf824d798e46b34ca4d4f SHA256 1306ef6c8654a0a17131b98e16b19d68beb4e03a324749b2147b010f5c45394b
-DIST kgeography-4.7.2.tar.bz2 6936546 RMD160 24f79807fe5eb34575aa276b572103905a3eb5fa SHA1 843322c2dd1131122abf03d226b87ec31217ed36 SHA256 bab70ea76f0897d915fac5b73471e0f383c80d075bdc9d8303542e14f4029584
 DIST kgeography-4.7.3.tar.bz2 6938003 RMD160 82ceafa67d6c772603bd35bc81a4b39779dacea6 SHA1 5f9835994ec6ad9454f7ee19bf003c8457e11d9e SHA256 ce7c30e3fd6ce00b4c3786ed5afa0574fc7a1e4b531c1cf7943bfff70440ed7c
diff --git a/kde-base/kgeography/kgeography-4.7.2.ebuild b/kde-base/kgeography/kgeography-4.7.2.ebuild
deleted file mode 100644
index d8b9b422f6f4..000000000000
--- a/kde-base/kgeography/kgeography-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:02 alexxy 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/kgeography/kgeography-4.7.3.ebuild b/kde-base/kgeography/kgeography-4.7.3.ebuild
index d38efce60a15..71065400cc28 100644
--- a/kde-base/kgeography/kgeography-4.7.3.ebuild
+++ b/kde-base/kgeography/kgeography-4.7.3.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/kde-base/kgeography/kgeography-4.7.3.ebuild,v 1.1 2011/11/02 20:48:13 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="KDE: a geography learning tool"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kget/Manifest b/kde-base/kget/Manifest
index b7cb9e393a5a..f41009a5734a 100644
--- a/kde-base/kget/Manifest
+++ b/kde-base/kget/Manifest
@@ -1,4 +1,3 @@
 DIST kdenetwork-4.6.3.tar.bz2 8693954 RMD160 a70c031107dd56eda618b91482b814e14425cb1d SHA1 6f140dca442be815eda4fb79d51efd9e4588a1f1 SHA256 423424f2bbc18cb6a0bd52305a238a5b7d4b5f483f30c0590f975b0c229be1fb
 DIST kdenetwork-4.6.5.tar.bz2 8685421 RMD160 eaa0e86ac527a7bc7a70c7eeedb651ff2cccf799 SHA1 cc398063da61f9f9ef0db4455dc0c989a4e68a25 SHA256 5029442447524dc83b080d11fbc4a533f3135bbaf7350b1b5f56289d8f913588
-DIST kdenetwork-4.7.2.tar.bz2 9945067 RMD160 50c6703d021db1ffd516f886b42d42291f725d6c SHA1 59e9e3629dff0362cfa2a6d897c77bc9cfbe8d5c SHA256 c61606a0cad9620ac235725594c7d9d0231268dc372e4d16d411f9aff1f3c36f
 DIST kdenetwork-4.7.3.tar.bz2 9947763 RMD160 8d1cdce1dfd5fa4aae6ecb2d55b189e0bcd94981 SHA1 5d8ed6a478d9afdaf19d350f1d2fe7e9dd48b2f7 SHA256 5a5e7bfa7998e38f80667473c590ab11dde8f3dd6a81a5d9e61ca3940354efa4
diff --git a/kde-base/kget/kget-4.7.2.ebuild b/kde-base/kget/kget-4.7.2.ebuild
deleted file mode 100644
index cb132e27b562..000000000000
--- a/kde-base/kget/kget-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:00 alexxy 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/kget/kget-4.7.3.ebuild b/kde-base/kget/kget-4.7.3.ebuild
index ff509a3e20e3..e222db4c34d2 100644
--- a/kde-base/kget/kget-4.7.3.ebuild
+++ b/kde-base/kget/kget-4.7.3.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/kde-base/kget/kget-4.7.3.ebuild,v 1.1 2011/11/02 20:48:11 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kdenetwork"
 inherit kde4-meta
 
 DESCRIPTION="An advanced download manager for KDE"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug bittorrent mms semantic-desktop sqlite webkit"
 
 RDEPEND="
diff --git a/kde-base/kglobalaccel/Manifest b/kde-base/kglobalaccel/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/kglobalaccel/Manifest
+++ b/kde-base/kglobalaccel/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/kglobalaccel/kglobalaccel-4.7.2.ebuild b/kde-base/kglobalaccel/kglobalaccel-4.7.2.ebuild
deleted file mode 100644
index 43783e0022bf..000000000000
--- a/kde-base/kglobalaccel/kglobalaccel-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:52 alexxy 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/kglobalaccel/kglobalaccel-4.7.3.ebuild b/kde-base/kglobalaccel/kglobalaccel-4.7.3.ebuild
index 475773d9b019..a097a4e02d92 100644
--- a/kde-base/kglobalaccel/kglobalaccel-4.7.3.ebuild
+++ b/kde-base/kglobalaccel/kglobalaccel-4.7.3.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/kde-base/kglobalaccel/kglobalaccel-4.7.3.ebuild,v 1.1 2011/11/02 20:48:03 alexxy Exp $
+# $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
 
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE's Global Shortcut Daemon"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 src_configure() {
diff --git a/kde-base/kgoldrunner/Manifest b/kde-base/kgoldrunner/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/kgoldrunner/Manifest
+++ b/kde-base/kgoldrunner/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/kgoldrunner/kgoldrunner-4.7.2.ebuild b/kde-base/kgoldrunner/kgoldrunner-4.7.2.ebuild
deleted file mode 100644
index 01459edf9368..000000000000
--- a/kde-base/kgoldrunner/kgoldrunner-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:12 alexxy 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/kgoldrunner/kgoldrunner-4.7.3.ebuild b/kde-base/kgoldrunner/kgoldrunner-4.7.3.ebuild
index 75f15e5b7f9b..fdf806394896 100644
--- a/kde-base/kgoldrunner/kgoldrunner-4.7.3.ebuild
+++ b/kde-base/kgoldrunner/kgoldrunner-4.7.3.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/kde-base/kgoldrunner/kgoldrunner-4.7.3.ebuild,v 1.1 2011/11/02 20:48:02 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kgpg/Manifest b/kde-base/kgpg/Manifest
index 348ce6a51263..65b585b0a481 100644
--- a/kde-base/kgpg/Manifest
+++ b/kde-base/kgpg/Manifest
@@ -1,4 +1,3 @@
 DIST kdeutils-4.6.3.tar.bz2 3703326 RMD160 1fe6287fed3fa21eef902ee764425171f7345e6c SHA1 1aa735c03689ef49b949278ee31d0d8e8536b7d6 SHA256 d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
 DIST kdeutils-4.6.5.tar.bz2 3699961 RMD160 65293718d8785c8e06e9149465f55f7f5a8718f5 SHA1 1c2ae023d9a6bcf72d3cebd0d7df2e6a175ffdcb SHA256 03de4b7728301414c8e704ba5c8650d8ded053747268ad47c901880fc1bf0b29
-DIST kdeutils-4.7.2.tar.bz2 3800427 RMD160 13fadbd312d70d7de360221facaf506707562fcc SHA1 52ce9b6b5f2c20475f46b6f7378ca4c530df37b4 SHA256 cdea138fc4556b4f6de5e63ee7ccbcb3485a780f372e699c0cb9fd6d65e02f96
 DIST kdeutils-4.7.3.tar.bz2 3802391 RMD160 0e0a73d290baaa289665b49722f04f19ab517dd9 SHA1 23fc9823647152d5d8cc250a55402c8930db4059 SHA256 a8c802f32b9e918d806a4487c25485f86019e4c473f0de6d3086d8ea8e492839
diff --git a/kde-base/kgpg/kgpg-4.7.2.ebuild b/kde-base/kgpg/kgpg-4.7.2.ebuild
deleted file mode 100644
index 8479b6766597..000000000000
--- a/kde-base/kgpg/kgpg-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:47 alexxy 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/kgpg/kgpg-4.7.3.ebuild b/kde-base/kgpg/kgpg-4.7.3.ebuild
index 4ff0cf9fbf84..31b7d47d86e2 100644
--- a/kde-base/kgpg/kgpg-4.7.3.ebuild
+++ b/kde-base/kgpg/kgpg-4.7.3.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/kde-base/kgpg/kgpg-4.7.3.ebuild,v 1.1 2011/11/02 20:48:04 alexxy Exp $
+# $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
 
@@ -15,7 +15,7 @@ fi
 inherit ${kde_eclass}
 
 DESCRIPTION="KDE gpg keyring manager"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/khangman/Manifest b/kde-base/khangman/Manifest
index bbf2c8c72632..e8c5796b2f8f 100644
--- a/kde-base/khangman/Manifest
+++ b/kde-base/khangman/Manifest
@@ -1,4 +1,3 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
 DIST kdeedu-4.6.5.tar.bz2 71684677 RMD160 78cfdc42f648308477c57bd816f46434bb588449 SHA1 64247eb68b2710a66baaf824d798e46b34ca4d4f SHA256 1306ef6c8654a0a17131b98e16b19d68beb4e03a324749b2147b010f5c45394b
-DIST khangman-4.7.2.tar.bz2 1123286 RMD160 e6f83c3b44e72f6e94e340a4520dcee9149910af SHA1 24d3c41b0cf0aaf68ad053b0e701d7bc3df8bd0f SHA256 7a9656b88bd9ac805b2fce7278c78a2b1b3a1e0b80fe65485ddbc14a4d773a1f
 DIST khangman-4.7.3.tar.bz2 1122969 RMD160 87b8f74aa59ac76c48c607e025d5f790c52afcd0 SHA1 aef288a20209a4c1bf5d6f48be689c433049ea83 SHA256 be3af7abe8cc96dff242c8a454fd5789f4d0f458477654dc7620c465d1ee0b6b
diff --git a/kde-base/khangman/khangman-4.7.2.ebuild b/kde-base/khangman/khangman-4.7.2.ebuild
deleted file mode 100644
index b85489e0bb3c..000000000000
--- a/kde-base/khangman/khangman-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:13 alexxy 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/khangman/khangman-4.7.3.ebuild b/kde-base/khangman/khangman-4.7.3.ebuild
index e7a282095d5c..4df5516cd5e2 100644
--- a/kde-base/khangman/khangman-4.7.3.ebuild
+++ b/kde-base/khangman/khangman-4.7.3.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/kde-base/khangman/khangman-4.7.3.ebuild,v 1.1 2011/11/02 20:48:08 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="Classical hangman game for KDE"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/khelpcenter/Manifest b/kde-base/khelpcenter/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/khelpcenter/Manifest
+++ b/kde-base/khelpcenter/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/khelpcenter/khelpcenter-4.7.2.ebuild b/kde-base/khelpcenter/khelpcenter-4.7.2.ebuild
deleted file mode 100644
index 0e48ec4763dc..000000000000
--- a/kde-base/khelpcenter/khelpcenter-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:46 alexxy 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/khelpcenter/khelpcenter-4.7.3.ebuild b/kde-base/khelpcenter/khelpcenter-4.7.3.ebuild
index b25a9108862d..23060ebe2abe 100644
--- a/kde-base/khelpcenter/khelpcenter-4.7.3.ebuild
+++ b/kde-base/khelpcenter/khelpcenter-4.7.3.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/kde-base/khelpcenter/khelpcenter-4.7.3.ebuild,v 1.1 2011/11/02 20:47:54 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="The KDE Help Center"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/khotkeys/Manifest b/kde-base/khotkeys/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/khotkeys/Manifest
+++ b/kde-base/khotkeys/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/khotkeys/khotkeys-4.7.2.ebuild b/kde-base/khotkeys/khotkeys-4.7.2.ebuild
deleted file mode 100644
index 672a4ec99ae4..000000000000
--- a/kde-base/khotkeys/khotkeys-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:04 alexxy 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/khotkeys/khotkeys-4.7.3.ebuild b/kde-base/khotkeys/khotkeys-4.7.3.ebuild
index 1fe6d112de1d..6d632081dfee 100644
--- a/kde-base/khotkeys/khotkeys-4.7.3.ebuild
+++ b/kde-base/khotkeys/khotkeys-4.7.3.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/kde-base/khotkeys/khotkeys-4.7.3.ebuild,v 1.1 2011/11/02 20:48:16 alexxy Exp $
+# $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
 
@@ -8,7 +8,7 @@ KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KDE: hotkey daemon"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kiconfinder/Manifest b/kde-base/kiconfinder/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/kiconfinder/Manifest
+++ b/kde-base/kiconfinder/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/kiconfinder/kiconfinder-4.7.2.ebuild b/kde-base/kiconfinder/kiconfinder-4.7.2.ebuild
deleted file mode 100644
index 895434203440..000000000000
--- a/kde-base/kiconfinder/kiconfinder-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:45 alexxy 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/kiconfinder/kiconfinder-4.7.3.ebuild b/kde-base/kiconfinder/kiconfinder-4.7.3.ebuild
index 0717e715c559..32eaf3c24de1 100644
--- a/kde-base/kiconfinder/kiconfinder-4.7.3.ebuild
+++ b/kde-base/kiconfinder/kiconfinder-4.7.3.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/kde-base/kiconfinder/kiconfinder-4.7.3.ebuild,v 1.1 2011/11/02 20:47:53 alexxy Exp $
+# $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
 
@@ -8,5 +8,5 @@ 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"
+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 c49615aac434..eff7061a282f 100644
--- a/kde-base/kig/Manifest
+++ b/kde-base/kig/Manifest
@@ -1,4 +1,3 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
 DIST kdeedu-4.6.5.tar.bz2 71684677 RMD160 78cfdc42f648308477c57bd816f46434bb588449 SHA1 64247eb68b2710a66baaf824d798e46b34ca4d4f SHA256 1306ef6c8654a0a17131b98e16b19d68beb4e03a324749b2147b010f5c45394b
-DIST kig-4.7.2.tar.bz2 1592483 RMD160 635d9493044204430dd6866cd673162ae1b61035 SHA1 2234ddb85e8c52214f9fdb5eb25f9491e23c7d86 SHA256 765ab5c272b86d738d33dff4e4af7d27961bcb0b136f61b035a16714b0dfc408
 DIST kig-4.7.3.tar.bz2 1592779 RMD160 c8cdf99788b314ab4f996d0e12c8e13cbded74ce SHA1 5a948b641f380e1cc6cf0f91d795a97029464bbb SHA256 218a5084aa9fce7c32978de173358a0b7ddd28ace8dc04dd40d5580dc676fed4
diff --git a/kde-base/kig/kig-4.7.2.ebuild b/kde-base/kig/kig-4.7.2.ebuild
deleted file mode 100644
index cca1275b8789..000000000000
--- a/kde-base/kig/kig-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:55 alexxy 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/kig/kig-4.7.3.ebuild b/kde-base/kig/kig-4.7.3.ebuild
index b4ef65fe1871..49cb4f863e47 100644
--- a/kde-base/kig/kig-4.7.3.ebuild
+++ b/kde-base/kig/kig-4.7.3.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/kde-base/kig/kig-4.7.3.ebuild,v 1.1 2011/11/02 20:48:04 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="KDE Interactive Geometry tool"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug kig-scripting"
 
 DEPEND="
diff --git a/kde-base/kigo/Manifest b/kde-base/kigo/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/kigo/Manifest
+++ b/kde-base/kigo/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/kigo/kigo-4.7.2.ebuild b/kde-base/kigo/kigo-4.7.2.ebuild
deleted file mode 100644
index dace1bc0d821..000000000000
--- a/kde-base/kigo/kigo-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:59 alexxy 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/kigo/kigo-4.7.3.ebuild b/kde-base/kigo/kigo-4.7.3.ebuild
index 662907d5c57f..c0cb4cbfa67a 100644
--- a/kde-base/kigo/kigo-4.7.3.ebuild
+++ b/kde-base/kigo/kigo-4.7.3.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/kde-base/kigo/kigo-4.7.3.ebuild,v 1.1 2011/11/02 20:48:10 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kdegames"
 inherit games-ggz kde4-meta
 
 DESCRIPTION="KDE Go game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/killbots/Manifest b/kde-base/killbots/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/killbots/Manifest
+++ b/kde-base/killbots/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/killbots/killbots-4.7.2.ebuild b/kde-base/killbots/killbots-4.7.2.ebuild
deleted file mode 100644
index 8e31a852c5fa..000000000000
--- a/kde-base/killbots/killbots-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:59 alexxy 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/killbots/killbots-4.7.3.ebuild b/kde-base/killbots/killbots-4.7.3.ebuild
index 924acd53fe67..0f8670864016 100644
--- a/kde-base/killbots/killbots-4.7.3.ebuild
+++ b/kde-base/killbots/killbots-4.7.3.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/kde-base/killbots/killbots-4.7.3.ebuild,v 1.1 2011/11/02 20:48:06 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="Kill the bots or they kill you!"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 # Tests hang, last checked in 4.3.3
diff --git a/kde-base/kimagemapeditor/Manifest b/kde-base/kimagemapeditor/Manifest
index 25233c8cb8af..37a017d5b48c 100644
--- a/kde-base/kimagemapeditor/Manifest
+++ b/kde-base/kimagemapeditor/Manifest
@@ -1,4 +1,3 @@
 DIST kdewebdev-4.6.3.tar.bz2 2202203 RMD160 21bd54a6f202ebfd5d829375791c21e0fc80f2dc SHA1 39e72fbaf76ee1c685321c8c3a767c38e63bc2a9 SHA256 f47957e1e05171c7a04668b29791049c0de1f330247fb2e4f3cc4db95695ffe6
 DIST kdewebdev-4.6.5.tar.bz2 2200000 RMD160 bfe9550508c67cdc87b1aff54b93b2afbafcfc3c SHA1 b7ec635c438f865337f5ef1e7bbaca23643ed871 SHA256 858843e38b50399776359b142b85035707820c9dfbc24d1a82fafbadb349b11f
-DIST kdewebdev-4.7.2.tar.bz2 2718631 RMD160 403fd24e5e4cda253af0a9fb36721b3091902db9 SHA1 82910da01dc84e86134d0dbae23b4bf66b565faa SHA256 c7cfd80bf5bf5a50f3b39789bce4277983838d8ccdb48eb64a93ed784fe08e3c
 DIST kdewebdev-4.7.3.tar.bz2 2718880 RMD160 a95a945d7ae2d09dbe009bb573322eeffabcaaf6 SHA1 11108698887d376d00f02cbdfa1496aa3cb268c1 SHA256 20f5c5e7227c00cdf1723b2b48d92c791c6bd06e051e4789c4b9528e71f2ee37
diff --git a/kde-base/kimagemapeditor/kimagemapeditor-4.7.2.ebuild b/kde-base/kimagemapeditor/kimagemapeditor-4.7.2.ebuild
deleted file mode 100644
index 7b408d15f17b..000000000000
--- a/kde-base/kimagemapeditor/kimagemapeditor-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:00 alexxy 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/kimagemapeditor/kimagemapeditor-4.7.3.ebuild b/kde-base/kimagemapeditor/kimagemapeditor-4.7.3.ebuild
index 23901086eb7b..4512f0fa853f 100644
--- a/kde-base/kimagemapeditor/kimagemapeditor-4.7.3.ebuild
+++ b/kde-base/kimagemapeditor/kimagemapeditor-4.7.3.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/kde-base/kimagemapeditor/kimagemapeditor-4.7.3.ebuild,v 1.1 2011/11/02 20:48:11 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMNAME="kdewebdev"
 inherit kde4-meta
 
 DESCRIPTION="KDE web development - image map editor"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kimono/Manifest b/kde-base/kimono/Manifest
index 93bdb405ac4b..c2f537e2dba7 100644
--- a/kde-base/kimono/Manifest
+++ b/kde-base/kimono/Manifest
@@ -1,2 +1 @@
-DIST kimono-4.7.2.tar.bz2 1005227 RMD160 93c29df2e850485c72135b6b7121a5851afdcd78 SHA1 2c2c331991e2b42101957ecfd13a18fbd4f86a68 SHA256 7665338b7f05cea544b869389b4e3c34a83eab43a481608f5b9977659ac87fde
 DIST kimono-4.7.3.tar.bz2 1005215 RMD160 a245fbff6017f4ef4da71ebd8ca0f599845d3b93 SHA1 d87622d46bce9a5f8b875393ac2292f5a57d5f78 SHA256 f297f97a0efd129311adf9104699a45b343654e371a3f125f6dfcb9033c1bd42
diff --git a/kde-base/kimono/kimono-4.7.2.ebuild b/kde-base/kimono/kimono-4.7.2.ebuild
deleted file mode 100644
index 05e36ca3fb17..000000000000
--- a/kde-base/kimono/kimono-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:51 alexxy 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/kimono/kimono-4.7.3.ebuild b/kde-base/kimono/kimono-4.7.3.ebuild
index 5480ead9d006..2801963b5a36 100644
--- a/kde-base/kimono/kimono-4.7.3.ebuild
+++ b/kde-base/kimono/kimono-4.7.3.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/kde-base/kimono/kimono-4.7.3.ebuild,v 1.1 2011/11/02 20:48:00 alexxy Exp $
+# $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
 
@@ -8,7 +8,7 @@ KDE_SCM="git"
 inherit kde4-base mono
 
 DESCRIPTION="C# bindings for KDE"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="akonadi debug plasma semantic-desktop"
 
 DEPEND="
diff --git a/kde-base/kinfocenter/Manifest b/kde-base/kinfocenter/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/kinfocenter/Manifest
+++ b/kde-base/kinfocenter/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/kinfocenter/kinfocenter-4.7.2.ebuild b/kde-base/kinfocenter/kinfocenter-4.7.2.ebuild
deleted file mode 100644
index 15cda351f0fc..000000000000
--- a/kde-base/kinfocenter/kinfocenter-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:48 alexxy 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/kinfocenter/kinfocenter-4.7.3.ebuild b/kde-base/kinfocenter/kinfocenter-4.7.3.ebuild
index ded92a444ede..f2191efaf6c0 100644
--- a/kde-base/kinfocenter/kinfocenter-4.7.3.ebuild
+++ b/kde-base/kinfocenter/kinfocenter-4.7.3.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/kde-base/kinfocenter/kinfocenter-4.7.3.ebuild,v 1.1 2011/11/02 20:47:56 alexxy Exp $
+# $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
 
@@ -10,7 +10,7 @@ OPENGL_REQUIRED="optional"
 inherit kde4-meta
 
 DESCRIPTION="The KDE Info Center"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug ieee1394"
 
 DEPEND="
diff --git a/kde-base/kioclient/Manifest b/kde-base/kioclient/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/kioclient/Manifest
+++ b/kde-base/kioclient/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/kioclient/kioclient-4.7.2.ebuild b/kde-base/kioclient/kioclient-4.7.2.ebuild
deleted file mode 100644
index a6c1992843af..000000000000
--- a/kde-base/kioclient/kioclient-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:52 alexxy 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/kioclient/kioclient-4.7.3.ebuild b/kde-base/kioclient/kioclient-4.7.3.ebuild
index 4f1cb0bd93e6..5f2ebb59eafc 100644
--- a/kde-base/kioclient/kioclient-4.7.3.ebuild
+++ b/kde-base/kioclient/kioclient-4.7.3.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/kde-base/kioclient/kioclient-4.7.3.ebuild,v 1.1 2011/11/02 20:48:16 alexxy Exp $
+# $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
 
@@ -8,5 +8,5 @@ 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"
+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 300caa131fb0..3da267543cb4 100644
--- a/kde-base/kiriki/Manifest
+++ b/kde-base/kiriki/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/kiriki/kiriki-4.7.2.ebuild b/kde-base/kiriki/kiriki-4.7.2.ebuild
deleted file mode 100644
index db99a952e095..000000000000
--- a/kde-base/kiriki/kiriki-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:58 alexxy 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/kiriki/kiriki-4.7.3.ebuild b/kde-base/kiriki/kiriki-4.7.3.ebuild
index 233b083c57ef..7cefa7134baf 100644
--- a/kde-base/kiriki/kiriki-4.7.3.ebuild
+++ b/kde-base/kiriki/kiriki-4.7.3.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/kde-base/kiriki/kiriki-4.7.3.ebuild,v 1.1 2011/11/02 20:48:15 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="Kiriki - a gtali clone for KDE4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kiten/Manifest b/kde-base/kiten/Manifest
index 9b37a7ce9150..37c86942e283 100644
--- a/kde-base/kiten/Manifest
+++ b/kde-base/kiten/Manifest
@@ -1,4 +1,3 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
 DIST kdeedu-4.6.5.tar.bz2 71684677 RMD160 78cfdc42f648308477c57bd816f46434bb588449 SHA1 64247eb68b2710a66baaf824d798e46b34ca4d4f SHA256 1306ef6c8654a0a17131b98e16b19d68beb4e03a324749b2147b010f5c45394b
-DIST kiten-4.7.2.tar.bz2 4021133 RMD160 a64b3cd5ead14cdcd04970c3acce9b599919b500 SHA1 f6d76b2c15fdf47090db15303413114180358f39 SHA256 b09d06b49062e03268f6c6eb60c860c78ce516e93231e28cbe73d762cb758b32
 DIST kiten-4.7.3.tar.bz2 4021239 RMD160 a6254c969537a7f5aadd2009e0ddbd041a4ddb13 SHA1 5df19802a731b5f7033b43aa9b35e0b20164cd3e SHA256 d01751c73420a6a738e70362acec0643c249ea95b50bb7aba61112cd1dcabe81
diff --git a/kde-base/kiten/kiten-4.7.2.ebuild b/kde-base/kiten/kiten-4.7.2.ebuild
deleted file mode 100644
index 9a41ba6eef03..000000000000
--- a/kde-base/kiten/kiten-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:52 alexxy 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/kiten/kiten-4.7.3.ebuild b/kde-base/kiten/kiten-4.7.3.ebuild
index 45d1d7f529f0..d76a6cd7bab6 100644
--- a/kde-base/kiten/kiten-4.7.3.ebuild
+++ b/kde-base/kiten/kiten-4.7.3.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/kde-base/kiten/kiten-4.7.3.ebuild,v 1.1 2011/11/02 20:48:00 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="KDE Japanese dictionary and reference"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kjots/Manifest b/kde-base/kjots/Manifest
index 4e48133a3b7c..70a470d0ba9e 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.2.tar.bz2 16171209 RMD160 378e7352725dd257617b1af7d2bb98a8d5569808 SHA1 41983556eb54a740a20d274878006ace5bc73c1c SHA256 1635dabfc73b95209466c92a009bd2856ebd73c42f486545ff97e719fec06630
 DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
diff --git a/kde-base/kjots/kjots-4.7.2.ebuild b/kde-base/kjots/kjots-4.7.2.ebuild
deleted file mode 100644
index ddb47696175d..000000000000
--- a/kde-base/kjots/kjots-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:08 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE note taking utility"
-KEYWORDS="~amd64 ~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/kjots/kjots-4.7.3.ebuild b/kde-base/kjots/kjots-4.7.3.ebuild
index ce6bd6d74f18..4614de1e0e13 100644
--- a/kde-base/kjots/kjots-4.7.3.ebuild
+++ b/kde-base/kjots/kjots-4.7.3.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/kde-base/kjots/kjots-4.7.3.ebuild,v 1.2 2011/11/05 19:59:20 xarthisius Exp $
+# $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
 
@@ -10,7 +10,7 @@ KDE_SCM="git"
 inherit kde4-meta
 
 DESCRIPTION="KDE note taking utility"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kjumpingcube/Manifest b/kde-base/kjumpingcube/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/kjumpingcube/Manifest
+++ b/kde-base/kjumpingcube/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/kjumpingcube/kjumpingcube-4.7.2.ebuild b/kde-base/kjumpingcube/kjumpingcube-4.7.2.ebuild
deleted file mode 100644
index 308f7ff7ede5..000000000000
--- a/kde-base/kjumpingcube/kjumpingcube-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:48 alexxy 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/kjumpingcube/kjumpingcube-4.7.3.ebuild b/kde-base/kjumpingcube/kjumpingcube-4.7.3.ebuild
index 446536f7aaa1..3f40a6817421 100644
--- a/kde-base/kjumpingcube/kjumpingcube-4.7.3.ebuild
+++ b/kde-base/kjumpingcube/kjumpingcube-4.7.3.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/kde-base/kjumpingcube/kjumpingcube-4.7.3.ebuild,v 1.1 2011/11/02 20:47:58 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Tactical one or two player game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kleopatra/Manifest b/kde-base/kleopatra/Manifest
index 40c1cee029e7..ed4e420c3f47 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.2.tar.bz2 16171209 RMD160 378e7352725dd257617b1af7d2bb98a8d5569808 SHA1 41983556eb54a740a20d274878006ace5bc73c1c SHA256 1635dabfc73b95209466c92a009bd2856ebd73c42f486545ff97e719fec06630
 DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
 DIST kleopatra-4.4.3-assuan2.patch.bz2 9304 RMD160 fd00c6e28d05b19e89f029338e2e59b81866f415 SHA1 d69d28734c1db16f1af9018ca16de58bf277fa55 SHA256 eee3fb370a0f93bfbfc4c4386e74c026ab8fceba004eac3a1467721e31856c96
diff --git a/kde-base/kleopatra/kleopatra-4.7.2.ebuild b/kde-base/kleopatra/kleopatra-4.7.2.ebuild
deleted file mode 100644
index e3331f98d9c3..000000000000
--- a/kde-base/kleopatra/kleopatra-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:08 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="Kleopatra - KDE X.509 key manager"
-KEYWORDS="~amd64 ~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/kleopatra/kleopatra-4.7.3.ebuild b/kde-base/kleopatra/kleopatra-4.7.3.ebuild
index c2f3bd02e46f..39ae782bb478 100644
--- a/kde-base/kleopatra/kleopatra-4.7.3.ebuild
+++ b/kde-base/kleopatra/kleopatra-4.7.3.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/kde-base/kleopatra/kleopatra-4.7.3.ebuild,v 1.2 2011/11/05 19:59:11 xarthisius Exp $
+# $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
 
@@ -10,7 +10,7 @@ KDE_SCM="git"
 inherit kde4-meta
 
 DESCRIPTION="Kleopatra - KDE X.509 key manager"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/klettres/Manifest b/kde-base/klettres/Manifest
index 9a073d8bad74..cf10153eba9f 100644
--- a/kde-base/klettres/Manifest
+++ b/kde-base/klettres/Manifest
@@ -1,4 +1,3 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
 DIST kdeedu-4.6.5.tar.bz2 71684677 RMD160 78cfdc42f648308477c57bd816f46434bb588449 SHA1 64247eb68b2710a66baaf824d798e46b34ca4d4f SHA256 1306ef6c8654a0a17131b98e16b19d68beb4e03a324749b2147b010f5c45394b
-DIST klettres-4.7.2.tar.bz2 2788319 RMD160 8aa70b6e95f81eb0588213b184cf257601af1dc4 SHA1 44a0fa094b90da19c5b0acc25da1150c0ff02b1a SHA256 cc6c2cdcde70cb48c4b5c8767e64584da46d0b63406ad3dbd7d4643bfad7dc9b
 DIST klettres-4.7.3.tar.bz2 2788924 RMD160 47863203cd2c910c9d0f81f3b97e78decfc362b9 SHA1 da01b1c71d74f634ace0b6c2fc6e0186a08f9974 SHA256 cb78d8fa0f7f1ebb2edb983e161ae0cf56fbb3e5fc9e547b68d5541ae71d9cc5
diff --git a/kde-base/klettres/klettres-4.7.2.ebuild b/kde-base/klettres/klettres-4.7.2.ebuild
deleted file mode 100644
index b73d6cb2959f..000000000000
--- a/kde-base/klettres/klettres-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:59 alexxy 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/klettres/klettres-4.7.3.ebuild b/kde-base/klettres/klettres-4.7.3.ebuild
index 10f539e7241a..b1413a8cc55b 100644
--- a/kde-base/klettres/klettres-4.7.3.ebuild
+++ b/kde-base/klettres/klettres-4.7.3.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/kde-base/klettres/klettres-4.7.3.ebuild,v 1.1 2011/11/02 20:48:13 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/klickety/Manifest b/kde-base/klickety/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/klickety/Manifest
+++ b/kde-base/klickety/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/klickety/klickety-4.7.2.ebuild b/kde-base/klickety/klickety-4.7.2.ebuild
deleted file mode 100644
index 7181677af0d2..000000000000
--- a/kde-base/klickety/klickety-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:54 alexxy 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/klickety/klickety-4.7.3.ebuild b/kde-base/klickety/klickety-4.7.3.ebuild
index 0a41261eca40..72a6142d97c0 100644
--- a/kde-base/klickety/klickety-4.7.3.ebuild
+++ b/kde-base/klickety/klickety-4.7.3.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/kde-base/klickety/klickety-4.7.3.ebuild,v 1.1 2011/11/02 20:48:18 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/klines/Manifest b/kde-base/klines/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/klines/Manifest
+++ b/kde-base/klines/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/klines/klines-4.7.2.ebuild b/kde-base/klines/klines-4.7.2.ebuild
deleted file mode 100644
index f48be9a2a642..000000000000
--- a/kde-base/klines/klines-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:09 alexxy 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/klines/klines-4.7.3.ebuild b/kde-base/klines/klines-4.7.3.ebuild
index 6cede533fc8f..56b0100268ff 100644
--- a/kde-base/klines/klines-4.7.3.ebuild
+++ b/kde-base/klines/klines-4.7.3.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/kde-base/klines/klines-4.7.3.ebuild,v 1.1 2011/11/02 20:48:09 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/klinkstatus/Manifest b/kde-base/klinkstatus/Manifest
index 25233c8cb8af..37a017d5b48c 100644
--- a/kde-base/klinkstatus/Manifest
+++ b/kde-base/klinkstatus/Manifest
@@ -1,4 +1,3 @@
 DIST kdewebdev-4.6.3.tar.bz2 2202203 RMD160 21bd54a6f202ebfd5d829375791c21e0fc80f2dc SHA1 39e72fbaf76ee1c685321c8c3a767c38e63bc2a9 SHA256 f47957e1e05171c7a04668b29791049c0de1f330247fb2e4f3cc4db95695ffe6
 DIST kdewebdev-4.6.5.tar.bz2 2200000 RMD160 bfe9550508c67cdc87b1aff54b93b2afbafcfc3c SHA1 b7ec635c438f865337f5ef1e7bbaca23643ed871 SHA256 858843e38b50399776359b142b85035707820c9dfbc24d1a82fafbadb349b11f
-DIST kdewebdev-4.7.2.tar.bz2 2718631 RMD160 403fd24e5e4cda253af0a9fb36721b3091902db9 SHA1 82910da01dc84e86134d0dbae23b4bf66b565faa SHA256 c7cfd80bf5bf5a50f3b39789bce4277983838d8ccdb48eb64a93ed784fe08e3c
 DIST kdewebdev-4.7.3.tar.bz2 2718880 RMD160 a95a945d7ae2d09dbe009bb573322eeffabcaaf6 SHA1 11108698887d376d00f02cbdfa1496aa3cb268c1 SHA256 20f5c5e7227c00cdf1723b2b48d92c791c6bd06e051e4789c4b9528e71f2ee37
diff --git a/kde-base/klinkstatus/klinkstatus-4.7.2.ebuild b/kde-base/klinkstatus/klinkstatus-4.7.2.ebuild
deleted file mode 100644
index a8feeb11b29e..000000000000
--- a/kde-base/klinkstatus/klinkstatus-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:54 alexxy 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/klinkstatus/klinkstatus-4.7.3.ebuild b/kde-base/klinkstatus/klinkstatus-4.7.3.ebuild
index 6d23898f94e5..3e75c41787a3 100644
--- a/kde-base/klinkstatus/klinkstatus-4.7.3.ebuild
+++ b/kde-base/klinkstatus/klinkstatus-4.7.3.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/kde-base/klinkstatus/klinkstatus-4.7.3.ebuild,v 1.1 2011/11/02 20:48:13 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kdewebdev"
 inherit kde4-meta
 
 DESCRIPTION="KDE web development - link validity checker"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug tidy"
 
 DEPEND="
diff --git a/kde-base/klipper/Manifest b/kde-base/klipper/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/klipper/Manifest
+++ b/kde-base/klipper/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/klipper/klipper-4.7.2.ebuild b/kde-base/klipper/klipper-4.7.2.ebuild
deleted file mode 100644
index 6b780b82e7b5..000000000000
--- a/kde-base/klipper/klipper-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:59 alexxy 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/klipper/klipper-4.7.3.ebuild b/kde-base/klipper/klipper-4.7.3.ebuild
index bc10a9d0e8df..d19c92b20b1a 100644
--- a/kde-base/klipper/klipper-4.7.3.ebuild
+++ b/kde-base/klipper/klipper-4.7.3.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/kde-base/klipper/klipper-4.7.3.ebuild,v 1.1 2011/11/02 20:48:12 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="Applet for KDE and X clipboard management"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kmag/Manifest b/kde-base/kmag/Manifest
index ec42b82314e7..406e47a1919d 100644
--- a/kde-base/kmag/Manifest
+++ b/kde-base/kmag/Manifest
@@ -1,4 +1,3 @@
 DIST kdeaccessibility-4.6.3.tar.bz2 5225058 RMD160 29e3f99600e0670233f87837e8df7923877d3de6 SHA1 8d4053defbf839fd428820d6d1659b6e46ab468a SHA256 e3f64e002d98a2b878abb76897b96945ed3c17ff84ed64ef6f7156bd7e3018f8
 DIST kdeaccessibility-4.6.5.tar.bz2 5223262 RMD160 4b5c2725715a4ad1b73b09771bc7edc4ba3e5988 SHA1 6e40aab7c95671070cad0b5f59507ff887414ce0 SHA256 1cd785a4988727156927d5a6fa610a01c735df6cf2f091308b099aaea084e0c6
-DIST kdeaccessibility-4.7.2.tar.bz2 876861 RMD160 c7bdebf979af67559878b17f2582102c849c1bb2 SHA1 7a2f7ea0e635f0ba79d7d54b118814bcefa4b6a1 SHA256 1a10a2ed98b46a5854c697077cf6329102797cbe9f7660c78b11c8e22b4f339d
 DIST kdeaccessibility-4.7.3.tar.bz2 878030 RMD160 48a77ba186233a8b34e79fd1f3f7e15e250ca882 SHA1 9695d2b8b6f55266e3f76ebf05543f23857b9520 SHA256 d4225fcf207b06506972e0d1e405f7521492106e6b7994145ecb8cc3cd9f60d1
diff --git a/kde-base/kmag/kmag-4.7.2.ebuild b/kde-base/kmag/kmag-4.7.2.ebuild
deleted file mode 100644
index ffafc3347d6f..000000000000
--- a/kde-base/kmag/kmag-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:10 alexxy 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/kmag/kmag-4.7.3.ebuild b/kde-base/kmag/kmag-4.7.3.ebuild
index ec7f47107cde..2da646e01078 100644
--- a/kde-base/kmag/kmag-4.7.3.ebuild
+++ b/kde-base/kmag/kmag-4.7.3.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/kde-base/kmag/kmag-4.7.3.ebuild,v 1.1 2011/11/02 20:48:17 alexxy Exp $
+# $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
 
@@ -15,7 +15,7 @@ fi
 inherit ${kde_eclass}
 
 DESCRIPTION="KDE screen magnifier"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/kmahjongg/Manifest b/kde-base/kmahjongg/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/kmahjongg/Manifest
+++ b/kde-base/kmahjongg/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/kmahjongg/kmahjongg-4.7.2.ebuild b/kde-base/kmahjongg/kmahjongg-4.7.2.ebuild
deleted file mode 100644
index 78aaa4ea027a..000000000000
--- a/kde-base/kmahjongg/kmahjongg-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:03 alexxy 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/kmahjongg/kmahjongg-4.7.3.ebuild b/kde-base/kmahjongg/kmahjongg-4.7.3.ebuild
index 8a2d40f06724..380bc00cc803 100644
--- a/kde-base/kmahjongg/kmahjongg-4.7.3.ebuild
+++ b/kde-base/kmahjongg/kmahjongg-4.7.3.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/kde-base/kmahjongg/kmahjongg-4.7.3.ebuild,v 1.1 2011/11/02 20:48:15 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="Mahjongg for KDE"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest
index 4e48133a3b7c..70a470d0ba9e 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.2.tar.bz2 16171209 RMD160 378e7352725dd257617b1af7d2bb98a8d5569808 SHA1 41983556eb54a740a20d274878006ace5bc73c1c SHA256 1635dabfc73b95209466c92a009bd2856ebd73c42f486545ff97e719fec06630
 DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
diff --git a/kde-base/kmail/kmail-4.7.2.ebuild b/kde-base/kmail/kmail-4.7.2.ebuild
deleted file mode 100644
index 602d89ee5daf..000000000000
--- a/kde-base/kmail/kmail-4.7.2.ebuild
+++ /dev/null
@@ -1,79 +0,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.2.ebuild,v 1.1 2011/10/06 18:11:12 alexxy 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 ~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}"
-
-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/kmail/kmail-4.7.3.ebuild b/kde-base/kmail/kmail-4.7.3.ebuild
index 0a2814a9852c..c8f178135adf 100644
--- a/kde-base/kmail/kmail-4.7.3.ebuild
+++ b/kde-base/kmail/kmail-4.7.3.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/kde-base/kmail/kmail-4.7.3.ebuild,v 1.3 2011/12/04 20:47:47 dilfridge Exp $
+# $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
 
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kmenuedit/Manifest b/kde-base/kmenuedit/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/kmenuedit/Manifest
+++ b/kde-base/kmenuedit/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/kmenuedit/kmenuedit-4.7.2.ebuild b/kde-base/kmenuedit/kmenuedit-4.7.2.ebuild
deleted file mode 100644
index 6757e9badcff..000000000000
--- a/kde-base/kmenuedit/kmenuedit-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:03 alexxy 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/kmenuedit/kmenuedit-4.7.3.ebuild b/kde-base/kmenuedit/kmenuedit-4.7.3.ebuild
index 5b0de00881e0..e42356016d59 100644
--- a/kde-base/kmenuedit/kmenuedit-4.7.3.ebuild
+++ b/kde-base/kmenuedit/kmenuedit-4.7.3.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/kde-base/kmenuedit/kmenuedit-4.7.3.ebuild,v 1.1 2011/11/02 20:48:07 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KDE menu editor"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/kmimetypefinder/Manifest b/kde-base/kmimetypefinder/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/kmimetypefinder/Manifest
+++ b/kde-base/kmimetypefinder/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/kmimetypefinder/kmimetypefinder-4.7.2.ebuild b/kde-base/kmimetypefinder/kmimetypefinder-4.7.2.ebuild
deleted file mode 100644
index 248e9157e24c..000000000000
--- a/kde-base/kmimetypefinder/kmimetypefinder-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:58 alexxy 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/kmimetypefinder/kmimetypefinder-4.7.3.ebuild b/kde-base/kmimetypefinder/kmimetypefinder-4.7.3.ebuild
index d2261ce92e4f..add38352dc20 100644
--- a/kde-base/kmimetypefinder/kmimetypefinder-4.7.3.ebuild
+++ b/kde-base/kmimetypefinder/kmimetypefinder-4.7.3.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/kde-base/kmimetypefinder/kmimetypefinder-4.7.3.ebuild,v 1.1 2011/11/02 20:48:07 alexxy Exp $
+# $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
 
@@ -8,5 +8,5 @@ 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"
+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 300caa131fb0..3da267543cb4 100644
--- a/kde-base/kmines/Manifest
+++ b/kde-base/kmines/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/kmines/kmines-4.7.2.ebuild b/kde-base/kmines/kmines-4.7.2.ebuild
deleted file mode 100644
index 1968772ad780..000000000000
--- a/kde-base/kmines/kmines-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:10 alexxy 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/kmines/kmines-4.7.3.ebuild b/kde-base/kmines/kmines-4.7.3.ebuild
index 76ee61f3a1a7..9d427e1d9185 100644
--- a/kde-base/kmines/kmines-4.7.3.ebuild
+++ b/kde-base/kmines/kmines-4.7.3.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/kde-base/kmines/kmines-4.7.3.ebuild,v 1.1 2011/11/02 20:48:20 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="KMines is a classic mine sweeper game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kmix/Manifest b/kde-base/kmix/Manifest
index b74697d7e5ca..299fa5e8456b 100644
--- a/kde-base/kmix/Manifest
+++ b/kde-base/kmix/Manifest
@@ -1,4 +1,3 @@
 DIST kdemultimedia-4.6.3.tar.bz2 1611668 RMD160 8824bda18a1f1051dea366a0ff0d6191068476dd SHA1 d5bde19156b65e9b56e0e6de800efc0efe117632 SHA256 b3a6732dead0558610b4b40d3ce28c4b7b5da8869a63436180eacb3aacec533b
 DIST kdemultimedia-4.6.5.tar.bz2 1611493 RMD160 70ca60910f21e464f49e4e106918fbcc1407b0c7 SHA1 081bead5ee758d169f3119c138424929b001d04f SHA256 7ab9afb233538e7065758b32cd13f52fee2b68306f4be3dead729f3ba93c9c58
-DIST kdemultimedia-4.7.2.tar.bz2 1643403 RMD160 3c5510cb381b64290dda9a15a483dff3062037db SHA1 2fc12558284fe95da63e24c73612846c6c1d31e1 SHA256 a5a6e1101f4d8fc278791d63c4c91e261d60e995e67b4e8d901f2f93ba7be800
 DIST kdemultimedia-4.7.3.tar.bz2 1644497 RMD160 de9d9f9341d91bf0d56fa9468c0441226cb6aba2 SHA1 4db44494e6a2ef886e3513b6a2eb4e526741a6ff SHA256 ad96332218b82c4466debcb165061d87051a917e0321bdc34e4024da9c8c30b1
diff --git a/kde-base/kmix/kmix-4.7.2.ebuild b/kde-base/kmix/kmix-4.7.2.ebuild
deleted file mode 100644
index 8b4ea74f8e6d..000000000000
--- a/kde-base/kmix/kmix-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:47 alexxy 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/kmix/kmix-4.7.3.ebuild b/kde-base/kmix/kmix-4.7.3.ebuild
index f83448e60e89..41f47ccdf269 100644
--- a/kde-base/kmix/kmix-4.7.3.ebuild
+++ b/kde-base/kmix/kmix-4.7.3.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/kde-base/kmix/kmix-4.7.3.ebuild,v 1.1 2011/11/02 20:47:55 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kdemultimedia"
 inherit kde4-meta
 
 DESCRIPTION="KDE mixer gui"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="alsa debug pulseaudio"
 
 DEPEND="
diff --git a/kde-base/kmousetool/Manifest b/kde-base/kmousetool/Manifest
index ec42b82314e7..406e47a1919d 100644
--- a/kde-base/kmousetool/Manifest
+++ b/kde-base/kmousetool/Manifest
@@ -1,4 +1,3 @@
 DIST kdeaccessibility-4.6.3.tar.bz2 5225058 RMD160 29e3f99600e0670233f87837e8df7923877d3de6 SHA1 8d4053defbf839fd428820d6d1659b6e46ab468a SHA256 e3f64e002d98a2b878abb76897b96945ed3c17ff84ed64ef6f7156bd7e3018f8
 DIST kdeaccessibility-4.6.5.tar.bz2 5223262 RMD160 4b5c2725715a4ad1b73b09771bc7edc4ba3e5988 SHA1 6e40aab7c95671070cad0b5f59507ff887414ce0 SHA256 1cd785a4988727156927d5a6fa610a01c735df6cf2f091308b099aaea084e0c6
-DIST kdeaccessibility-4.7.2.tar.bz2 876861 RMD160 c7bdebf979af67559878b17f2582102c849c1bb2 SHA1 7a2f7ea0e635f0ba79d7d54b118814bcefa4b6a1 SHA256 1a10a2ed98b46a5854c697077cf6329102797cbe9f7660c78b11c8e22b4f339d
 DIST kdeaccessibility-4.7.3.tar.bz2 878030 RMD160 48a77ba186233a8b34e79fd1f3f7e15e250ca882 SHA1 9695d2b8b6f55266e3f76ebf05543f23857b9520 SHA256 d4225fcf207b06506972e0d1e405f7521492106e6b7994145ecb8cc3cd9f60d1
diff --git a/kde-base/kmousetool/kmousetool-4.7.2.ebuild b/kde-base/kmousetool/kmousetool-4.7.2.ebuild
deleted file mode 100644
index e37e4f204250..000000000000
--- a/kde-base/kmousetool/kmousetool-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:05 alexxy 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/kmousetool/kmousetool-4.7.3.ebuild b/kde-base/kmousetool/kmousetool-4.7.3.ebuild
index 750324d7026f..1f8db65f1c83 100644
--- a/kde-base/kmousetool/kmousetool-4.7.3.ebuild
+++ b/kde-base/kmousetool/kmousetool-4.7.3.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/kde-base/kmousetool/kmousetool-4.7.3.ebuild,v 1.1 2011/11/02 20:47:54 alexxy Exp $
+# $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
 
@@ -16,7 +16,7 @@ fi
 inherit ${kde_eclass}
 
 DESCRIPTION="KDE program that clicks the mouse for you."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/kmouth/Manifest b/kde-base/kmouth/Manifest
index ec42b82314e7..406e47a1919d 100644
--- a/kde-base/kmouth/Manifest
+++ b/kde-base/kmouth/Manifest
@@ -1,4 +1,3 @@
 DIST kdeaccessibility-4.6.3.tar.bz2 5225058 RMD160 29e3f99600e0670233f87837e8df7923877d3de6 SHA1 8d4053defbf839fd428820d6d1659b6e46ab468a SHA256 e3f64e002d98a2b878abb76897b96945ed3c17ff84ed64ef6f7156bd7e3018f8
 DIST kdeaccessibility-4.6.5.tar.bz2 5223262 RMD160 4b5c2725715a4ad1b73b09771bc7edc4ba3e5988 SHA1 6e40aab7c95671070cad0b5f59507ff887414ce0 SHA256 1cd785a4988727156927d5a6fa610a01c735df6cf2f091308b099aaea084e0c6
-DIST kdeaccessibility-4.7.2.tar.bz2 876861 RMD160 c7bdebf979af67559878b17f2582102c849c1bb2 SHA1 7a2f7ea0e635f0ba79d7d54b118814bcefa4b6a1 SHA256 1a10a2ed98b46a5854c697077cf6329102797cbe9f7660c78b11c8e22b4f339d
 DIST kdeaccessibility-4.7.3.tar.bz2 878030 RMD160 48a77ba186233a8b34e79fd1f3f7e15e250ca882 SHA1 9695d2b8b6f55266e3f76ebf05543f23857b9520 SHA256 d4225fcf207b06506972e0d1e405f7521492106e6b7994145ecb8cc3cd9f60d1
diff --git a/kde-base/kmouth/kmouth-4.7.2.ebuild b/kde-base/kmouth/kmouth-4.7.2.ebuild
deleted file mode 100644
index d00ef4d74ec6..000000000000
--- a/kde-base/kmouth/kmouth-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:57 alexxy 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/kmouth/kmouth-4.7.3.ebuild b/kde-base/kmouth/kmouth-4.7.3.ebuild
index 2122329b3f5e..c91dfca25908 100644
--- a/kde-base/kmouth/kmouth-4.7.3.ebuild
+++ b/kde-base/kmouth/kmouth-4.7.3.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/kde-base/kmouth/kmouth-4.7.3.ebuild,v 1.1 2011/11/02 20:48:22 alexxy Exp $
+# $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
 
@@ -16,5 +16,5 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kmplot/Manifest b/kde-base/kmplot/Manifest
index 522038bd2ebb..9834bb00b25a 100644
--- a/kde-base/kmplot/Manifest
+++ b/kde-base/kmplot/Manifest
@@ -1,4 +1,3 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
 DIST kdeedu-4.6.5.tar.bz2 71684677 RMD160 78cfdc42f648308477c57bd816f46434bb588449 SHA1 64247eb68b2710a66baaf824d798e46b34ca4d4f SHA256 1306ef6c8654a0a17131b98e16b19d68beb4e03a324749b2147b010f5c45394b
-DIST kmplot-4.7.2.tar.bz2 706828 RMD160 e31139f1815a7254f7d0f5020e6f4e9dfdc25dbe SHA1 dc496d88d6e062f7ecbf6f41187df95aa374fe9b SHA256 7edb57038ff33cf7e0c400d9cb2cc3baed9b032c818ba5fa82e374a67ed2ff78
 DIST kmplot-4.7.3.tar.bz2 707516 RMD160 31902de5ac91a76041b0f9adf2efd860cf600280 SHA1 e98ba022e987b9601ea1b27e97607ff7885ff788 SHA256 a843eee79452beb48b336f7157f7bfb2ac4d4f7209f0ca0d86b52c4d2f7ec7b6
diff --git a/kde-base/kmplot/kmplot-4.7.2.ebuild b/kde-base/kmplot/kmplot-4.7.2.ebuild
deleted file mode 100644
index 61291ea80923..000000000000
--- a/kde-base/kmplot/kmplot-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:49 alexxy 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/kmplot/kmplot-4.7.3.ebuild b/kde-base/kmplot/kmplot-4.7.3.ebuild
index 52ffffe4b51e..aa93bf9d0e4f 100644
--- a/kde-base/kmplot/kmplot-4.7.3.ebuild
+++ b/kde-base/kmplot/kmplot-4.7.3.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/kde-base/kmplot/kmplot-4.7.3.ebuild,v 1.1 2011/11/02 20:48:03 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="Mathematical function plotter for KDE"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/knetattach/Manifest b/kde-base/knetattach/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/knetattach/Manifest
+++ b/kde-base/knetattach/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/knetattach/knetattach-4.7.2.ebuild b/kde-base/knetattach/knetattach-4.7.2.ebuild
deleted file mode 100644
index 9ee30f44666e..000000000000
--- a/kde-base/knetattach/knetattach-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:50 alexxy 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/knetattach/knetattach-4.7.3.ebuild b/kde-base/knetattach/knetattach-4.7.3.ebuild
index 26c5b9db31a7..23bac103d48f 100644
--- a/kde-base/knetattach/knetattach-4.7.3.ebuild
+++ b/kde-base/knetattach/knetattach-4.7.3.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/kde-base/knetattach/knetattach-4.7.3.ebuild,v 1.1 2011/11/02 20:47:59 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE network wizard"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+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 300caa131fb0..3da267543cb4 100644
--- a/kde-base/knetwalk/Manifest
+++ b/kde-base/knetwalk/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/knetwalk/knetwalk-4.7.2.ebuild b/kde-base/knetwalk/knetwalk-4.7.2.ebuild
deleted file mode 100644
index f9c22256a714..000000000000
--- a/kde-base/knetwalk/knetwalk-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:02 alexxy 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/knetwalk/knetwalk-4.7.3.ebuild b/kde-base/knetwalk/knetwalk-4.7.3.ebuild
index 1e38bed41553..5a3b260db4f8 100644
--- a/kde-base/knetwalk/knetwalk-4.7.3.ebuild
+++ b/kde-base/knetwalk/knetwalk-4.7.3.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/kde-base/knetwalk/knetwalk-4.7.3.ebuild,v 1.1 2011/11/02 20:48:00 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/knewstuff/Manifest b/kde-base/knewstuff/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/knewstuff/Manifest
+++ b/kde-base/knewstuff/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/knewstuff/knewstuff-4.7.2.ebuild b/kde-base/knewstuff/knewstuff-4.7.2.ebuild
deleted file mode 100644
index b69c7545fe48..000000000000
--- a/kde-base/knewstuff/knewstuff-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:03 alexxy 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/knewstuff/knewstuff-4.7.3.ebuild b/kde-base/knewstuff/knewstuff-4.7.3.ebuild
index e9175848b0fe..6cdd418715d8 100644
--- a/kde-base/knewstuff/knewstuff-4.7.3.ebuild
+++ b/kde-base/knewstuff/knewstuff-4.7.3.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/kde-base/knewstuff/knewstuff-4.7.3.ebuild,v 1.1 2011/11/02 20:48:11 alexxy Exp $
+# $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
 
@@ -8,5 +8,5 @@ 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"
+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 4e48133a3b7c..70a470d0ba9e 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.2.tar.bz2 16171209 RMD160 378e7352725dd257617b1af7d2bb98a8d5569808 SHA1 41983556eb54a740a20d274878006ace5bc73c1c SHA256 1635dabfc73b95209466c92a009bd2856ebd73c42f486545ff97e719fec06630
 DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
diff --git a/kde-base/knode/knode-4.7.2.ebuild b/kde-base/knode/knode-4.7.2.ebuild
deleted file mode 100644
index c07654073321..000000000000
--- a/kde-base/knode/knode-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:02 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="A newsreader for KDE"
-KEYWORDS="~amd64 ~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/knode/knode-4.7.3.ebuild b/kde-base/knode/knode-4.7.3.ebuild
index ffc35f321245..12f44e013b2b 100644
--- a/kde-base/knode/knode-4.7.3.ebuild
+++ b/kde-base/knode/knode-4.7.3.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/kde-base/knode/knode-4.7.3.ebuild,v 1.2 2011/11/05 19:58:35 xarthisius Exp $
+# $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
 
@@ -10,7 +10,7 @@ KDE_SCM="git"
 inherit kde4-meta
 
 DESCRIPTION="A newsreader for KDE"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 # test fails, last checked for 4.2.96
diff --git a/kde-base/knotes/Manifest b/kde-base/knotes/Manifest
index 4e48133a3b7c..70a470d0ba9e 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.2.tar.bz2 16171209 RMD160 378e7352725dd257617b1af7d2bb98a8d5569808 SHA1 41983556eb54a740a20d274878006ace5bc73c1c SHA256 1635dabfc73b95209466c92a009bd2856ebd73c42f486545ff97e719fec06630
 DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
diff --git a/kde-base/knotes/knotes-4.7.2.ebuild b/kde-base/knotes/knotes-4.7.2.ebuild
deleted file mode 100644
index e614878835bc..000000000000
--- a/kde-base/knotes/knotes-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:12 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE Notes application"
-KEYWORDS="~amd64 ~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/knotes/knotes-4.7.3.ebuild b/kde-base/knotes/knotes-4.7.3.ebuild
index 2734bcf6709f..a42b4e96def6 100644
--- a/kde-base/knotes/knotes-4.7.3.ebuild
+++ b/kde-base/knotes/knotes-4.7.3.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/kde-base/knotes/knotes-4.7.3.ebuild,v 1.2 2011/11/05 19:58:24 xarthisius Exp $
+# $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
 
@@ -10,7 +10,7 @@ KDE_SCM="git"
 inherit kde4-meta
 
 DESCRIPTION="KDE Notes application"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/knotify/Manifest b/kde-base/knotify/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/knotify/Manifest
+++ b/kde-base/knotify/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/knotify/knotify-4.7.2.ebuild b/kde-base/knotify/knotify-4.7.2.ebuild
deleted file mode 100644
index 2674326ea7c2..000000000000
--- a/kde-base/knotify/knotify-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:12 alexxy 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/knotify/knotify-4.7.3.ebuild b/kde-base/knotify/knotify-4.7.3.ebuild
index 8e082ff25aaf..14b1fef9cff1 100644
--- a/kde-base/knotify/knotify-4.7.3.ebuild
+++ b/kde-base/knotify/knotify-4.7.3.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/kde-base/knotify/knotify-4.7.3.ebuild,v 1.1 2011/11/02 20:48:06 alexxy Exp $
+# $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
 
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="The KDE notification daemon."
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+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 300caa131fb0..3da267543cb4 100644
--- a/kde-base/kolf/Manifest
+++ b/kde-base/kolf/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/kolf/kolf-4.7.2.ebuild b/kde-base/kolf/kolf-4.7.2.ebuild
deleted file mode 100644
index 5b287e4fbcd1..000000000000
--- a/kde-base/kolf/kolf-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:55 alexxy 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/kolf/kolf-4.7.3.ebuild b/kde-base/kolf/kolf-4.7.3.ebuild
index f375be3dcab2..192ce0d655ee 100644
--- a/kde-base/kolf/kolf-4.7.3.ebuild
+++ b/kde-base/kolf/kolf-4.7.3.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/kde-base/kolf/kolf-4.7.3.ebuild,v 1.1 2011/11/02 20:48:01 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="KDE Minigolf Game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kollision/Manifest b/kde-base/kollision/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/kollision/Manifest
+++ b/kde-base/kollision/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/kollision/kollision-4.7.2.ebuild b/kde-base/kollision/kollision-4.7.2.ebuild
deleted file mode 100644
index a8c08811f4dc..000000000000
--- a/kde-base/kollision/kollision-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:03 alexxy 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/kollision/kollision-4.7.3.ebuild b/kde-base/kollision/kollision-4.7.3.ebuild
index 72f62f994db6..59be71b8f432 100644
--- a/kde-base/kollision/kollision-4.7.3.ebuild
+++ b/kde-base/kollision/kollision-4.7.3.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/kde-base/kollision/kollision-4.7.3.ebuild,v 1.1 2011/11/02 20:47:57 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="KDE: A simple ball dodging game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kolourpaint/Manifest b/kde-base/kolourpaint/Manifest
index 3098e9fa2de2..31ce687863bc 100644
--- a/kde-base/kolourpaint/Manifest
+++ b/kde-base/kolourpaint/Manifest
@@ -1,4 +1,3 @@
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
 DIST kdegraphics-4.6.5.tar.bz2 5455380 RMD160 75fdf00994bfc2737a754b4ff360ab789cd824b5 SHA1 1e64698993d0754dfae1296d8d16ba9370f9a08c SHA256 5b8a7e54f281ac938d8e22db673b7ddcff8a1d8adfc128282150ad52c80b8c04
-DIST kolourpaint-4.7.2.tar.bz2 1243858 RMD160 10c08c0e523ed4f4e68e659bdae516a4e5e4848c SHA1 d4ec3e463ea3d50731e9fc87cc52eec50bc67ff8 SHA256 a610156075c79240fb69366eb8d1c86aa1cf753ca3cdb7fe0af80a5609875fe8
 DIST kolourpaint-4.7.3.tar.bz2 1244126 RMD160 704b0e021e79839e86588ff19b5ec88f3d3bb359 SHA1 d276d230e76f7fbe91229dd015a6465cb1a6956e SHA256 baca905423abbd8baa678ce5bac7a1c2608d36466541a6864931156e136b1cb6
diff --git a/kde-base/kolourpaint/kolourpaint-4.7.2.ebuild b/kde-base/kolourpaint/kolourpaint-4.7.2.ebuild
deleted file mode 100644
index d9d7bfefcb0c..000000000000
--- a/kde-base/kolourpaint/kolourpaint-4.7.2.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.2.ebuild,v 1.2 2011/10/16 10:06:53 mschiff 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/kolourpaint/kolourpaint-4.7.3.ebuild b/kde-base/kolourpaint/kolourpaint-4.7.3.ebuild
index e406088f3035..fdd24b293fd1 100644
--- a/kde-base/kolourpaint/kolourpaint-4.7.3.ebuild
+++ b/kde-base/kolourpaint/kolourpaint-4.7.3.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/kde-base/kolourpaint/kolourpaint-4.7.3.ebuild,v 1.1 2011/11/02 20:47:57 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="Paint Program for KDE"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD LGPL-2"
 IUSE="debug scanner"
 
diff --git a/kde-base/kommander/Manifest b/kde-base/kommander/Manifest
index 25233c8cb8af..37a017d5b48c 100644
--- a/kde-base/kommander/Manifest
+++ b/kde-base/kommander/Manifest
@@ -1,4 +1,3 @@
 DIST kdewebdev-4.6.3.tar.bz2 2202203 RMD160 21bd54a6f202ebfd5d829375791c21e0fc80f2dc SHA1 39e72fbaf76ee1c685321c8c3a767c38e63bc2a9 SHA256 f47957e1e05171c7a04668b29791049c0de1f330247fb2e4f3cc4db95695ffe6
 DIST kdewebdev-4.6.5.tar.bz2 2200000 RMD160 bfe9550508c67cdc87b1aff54b93b2afbafcfc3c SHA1 b7ec635c438f865337f5ef1e7bbaca23643ed871 SHA256 858843e38b50399776359b142b85035707820c9dfbc24d1a82fafbadb349b11f
-DIST kdewebdev-4.7.2.tar.bz2 2718631 RMD160 403fd24e5e4cda253af0a9fb36721b3091902db9 SHA1 82910da01dc84e86134d0dbae23b4bf66b565faa SHA256 c7cfd80bf5bf5a50f3b39789bce4277983838d8ccdb48eb64a93ed784fe08e3c
 DIST kdewebdev-4.7.3.tar.bz2 2718880 RMD160 a95a945d7ae2d09dbe009bb573322eeffabcaaf6 SHA1 11108698887d376d00f02cbdfa1496aa3cb268c1 SHA256 20f5c5e7227c00cdf1723b2b48d92c791c6bd06e051e4789c4b9528e71f2ee37
diff --git a/kde-base/kommander/kommander-4.7.2.ebuild b/kde-base/kommander/kommander-4.7.2.ebuild
deleted file mode 100644
index 8e19bdd34de7..000000000000
--- a/kde-base/kommander/kommander-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:53 alexxy 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/kommander/kommander-4.7.3.ebuild b/kde-base/kommander/kommander-4.7.3.ebuild
index 669661c69feb..60c2bcc90abd 100644
--- a/kde-base/kommander/kommander-4.7.3.ebuild
+++ b/kde-base/kommander/kommander-4.7.3.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/kde-base/kommander/kommander-4.7.3.ebuild,v 1.1 2011/11/02 20:48:01 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMNAME="kdewebdev"
 inherit kde4-meta
 
 DESCRIPTION="KDE dialog system for scripting"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kompare/Manifest b/kde-base/kompare/Manifest
index 8429b87a7c26..c05641549806 100644
--- a/kde-base/kompare/Manifest
+++ b/kde-base/kompare/Manifest
@@ -1,4 +1,3 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
 DIST kdesdk-4.6.5.tar.bz2 6063147 RMD160 0818eb740cb3f9c83ccf92bb238c4adbdd83b875 SHA1 8cffa0472fbe1096ebfea9bde49aaff76a145b34 SHA256 4b35eb3381bbf06e4d091dea4b38f6c807ce218d45e04d8719ee17ebd1820ff4
-DIST kdesdk-4.7.2.tar.bz2 5265267 RMD160 a8d275fcc858a548c7fe9ce04c0fd11279297174 SHA1 b6259b46fed642c35e1c1d1f90712084141ca441 SHA256 c9377df9429633413c57684574e6405b3dc3b493ac3ab43d9fd429ff3ab920be
 DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
diff --git a/kde-base/kompare/kompare-4.7.2.ebuild b/kde-base/kompare/kompare-4.7.2.ebuild
deleted file mode 100644
index fde323fd84e3..000000000000
--- a/kde-base/kompare/kompare-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:53 alexxy 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/kompare/kompare-4.7.3.ebuild b/kde-base/kompare/kompare-4.7.3.ebuild
index f4f8618265dd..3870c93554b4 100644
--- a/kde-base/kompare/kompare-4.7.3.ebuild
+++ b/kde-base/kompare/kompare-4.7.3.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/kde-base/kompare/kompare-4.7.3.ebuild,v 1.1 2011/11/02 20:48:21 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ 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"
+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 9955b0fce031..cfc998ef745e 100644
--- a/kde-base/konq-plugins/Manifest
+++ b/kde-base/konq-plugins/Manifest
@@ -1,2 +1 @@
-DIST kde-baseapps-4.7.2.tar.bz2 2685060 RMD160 f97994dabe6412065723a8373291f1cf3f7c3290 SHA1 b52937ad8e5e4be884cc76f265c19964f461ac2c SHA256 1104284ad9cfc9757b0bbd2516dfdcbe4119ea6a6e6daf3c9d7eb66c43760bfa
 DIST kde-baseapps-4.7.3.tar.bz2 2685074 RMD160 270f3f3ae7b473651517db8818160f16e4faf544 SHA1 952dc26d0d908b41973a8d7b4d27765bf5128d58 SHA256 e9fb0c5da9e9a255c1a1735dfa518dcadc1ea23c68a467164597ff3dbf51c8df
diff --git a/kde-base/konq-plugins/konq-plugins-4.7.2.ebuild b/kde-base/konq-plugins/konq-plugins-4.7.2.ebuild
deleted file mode 100644
index 4354751b6aac..000000000000
--- a/kde-base/konq-plugins/konq-plugins-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:44 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-baseapps"
-inherit kde4-meta
-
-DESCRIPTION="Various plugins for konqueror"
-HOMEPAGE="http://kde.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~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/konq-plugins/konq-plugins-4.7.3.ebuild b/kde-base/konq-plugins/konq-plugins-4.7.3.ebuild
index 77d5e052e9cd..662b7886722e 100644
--- a/kde-base/konq-plugins/konq-plugins-4.7.3.ebuild
+++ b/kde-base/konq-plugins/konq-plugins-4.7.3.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/kde-base/konq-plugins/konq-plugins-4.7.3.ebuild,v 1.2 2011/11/05 20:06:35 xarthisius Exp $
+# $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
 
@@ -11,7 +11,7 @@ DESCRIPTION="Various plugins for konqueror"
 HOMEPAGE="http://kde.org/"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="debug tidy"
 
 DEPEND="
diff --git a/kde-base/konqueror/Manifest b/kde-base/konqueror/Manifest
index 55198aaad7a5..4d43fae00274 100644
--- a/kde-base/konqueror/Manifest
+++ b/kde-base/konqueror/Manifest
@@ -1,4 +1,3 @@
-DIST kde-baseapps-4.7.2.tar.bz2 2685060 RMD160 f97994dabe6412065723a8373291f1cf3f7c3290 SHA1 b52937ad8e5e4be884cc76f265c19964f461ac2c SHA256 1104284ad9cfc9757b0bbd2516dfdcbe4119ea6a6e6daf3c9d7eb66c43760bfa
 DIST kde-baseapps-4.7.3.tar.bz2 2685074 RMD160 270f3f3ae7b473651517db8818160f16e4faf544 SHA1 952dc26d0d908b41973a8d7b4d27765bf5128d58 SHA256 e9fb0c5da9e9a255c1a1735dfa518dcadc1ea23c68a467164597ff3dbf51c8df
 DIST kdebase-4.6.3.tar.bz2 2682586 RMD160 38784d7a5a708703f5a22e39dc5f83ef7aecd833 SHA1 69cfba74099cdce27f7f72725288f025979b41f3 SHA256 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
 DIST kdebase-4.6.5.tar.bz2 2639622 RMD160 cef007659a02cbec3bd484aa9eb5a721c5200b4f SHA1 1a902d22956daaf380ceefe68f8db75b8b760ae6 SHA256 542a42fc806673ba46827dcc5616fe53239659107934f1b05bf476e46ecbffd5
diff --git a/kde-base/konqueror/konqueror-4.7.2.ebuild b/kde-base/konqueror/konqueror-4.7.2.ebuild
deleted file mode 100644
index 5fcad5becfa0..000000000000
--- a/kde-base/konqueror/konqueror-4.7.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/kde-base/konqueror/konqueror-4.7.2.ebuild,v 1.1 2011/10/06 18:10:49 alexxy 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/konqueror/konqueror-4.7.3.ebuild b/kde-base/konqueror/konqueror-4.7.3.ebuild
index 3b07b90d6bee..438ab221ccba 100644
--- a/kde-base/konqueror/konqueror-4.7.3.ebuild
+++ b/kde-base/konqueror/konqueror-4.7.3.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/kde-base/konqueror/konqueror-4.7.3.ebuild,v 1.1 2011/11/02 20:47:57 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ 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"
+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"
diff --git a/kde-base/konquest/Manifest b/kde-base/konquest/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/konquest/Manifest
+++ b/kde-base/konquest/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/konquest/konquest-4.7.2.ebuild b/kde-base/konquest/konquest-4.7.2.ebuild
deleted file mode 100644
index 26994762f50e..000000000000
--- a/kde-base/konquest/konquest-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:09 alexxy 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/konquest/konquest-4.7.3.ebuild b/kde-base/konquest/konquest-4.7.3.ebuild
index 3878c4c9f034..225d146e5bd3 100644
--- a/kde-base/konquest/konquest-4.7.3.ebuild
+++ b/kde-base/konquest/konquest-4.7.3.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/kde-base/konquest/konquest-4.7.3.ebuild,v 1.1 2011/11/02 20:48:05 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="Galactic Strategy KDE Game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/konsole/Manifest b/kde-base/konsole/Manifest
index fe7e303d6efc..4933b9f867f4 100644
--- a/kde-base/konsole/Manifest
+++ b/kde-base/konsole/Manifest
@@ -1,4 +1,3 @@
 DIST kdebase-4.6.3.tar.bz2 2682586 RMD160 38784d7a5a708703f5a22e39dc5f83ef7aecd833 SHA1 69cfba74099cdce27f7f72725288f025979b41f3 SHA256 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
 DIST kdebase-4.6.5.tar.bz2 2639622 RMD160 cef007659a02cbec3bd484aa9eb5a721c5200b4f SHA1 1a902d22956daaf380ceefe68f8db75b8b760ae6 SHA256 542a42fc806673ba46827dcc5616fe53239659107934f1b05bf476e46ecbffd5
-DIST konsole-4.7.2.tar.bz2 462175 RMD160 13b74217bb8a1adc87b76860dbff7e05ea624fae SHA1 20150963cc5ebd2f2c13a617a37e018440e0f18c SHA256 4a5c7f8ad9258f61809a7ef587029021315f36c8877e09b1c740e1cc1ce76d38
 DIST konsole-4.7.3.tar.bz2 462846 RMD160 1cc3c2816c8b2ab6c23624b02dda5a1ffd1f3457 SHA1 ecf5d1cc087d78ba049fe65e06ee992a2fadcc19 SHA256 e18d838ce3a34a60ad61b9fa21b2ba07466491ea81649efa4dff3b96291a4f00
diff --git a/kde-base/konsole/konsole-4.7.2.ebuild b/kde-base/konsole/konsole-4.7.2.ebuild
deleted file mode 100644
index 9d055c39cafa..000000000000
--- a/kde-base/konsole/konsole-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:12 alexxy 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/konsole/konsole-4.7.3.ebuild b/kde-base/konsole/konsole-4.7.3.ebuild
index ce47b3530841..8e529ebdf6d2 100644
--- a/kde-base/konsole/konsole-4.7.3.ebuild
+++ b/kde-base/konsole/konsole-4.7.3.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/kde-base/konsole/konsole-4.7.3.ebuild,v 1.1 2011/11/02 20:48:19 alexxy Exp $
+# $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
 
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 COMMONDEPEND="
diff --git a/kde-base/konsolekalendar/Manifest b/kde-base/konsolekalendar/Manifest
index 4e48133a3b7c..70a470d0ba9e 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.2.tar.bz2 16171209 RMD160 378e7352725dd257617b1af7d2bb98a8d5569808 SHA1 41983556eb54a740a20d274878006ace5bc73c1c SHA256 1635dabfc73b95209466c92a009bd2856ebd73c42f486545ff97e719fec06630
 DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
diff --git a/kde-base/konsolekalendar/konsolekalendar-4.7.2.ebuild b/kde-base/konsolekalendar/konsolekalendar-4.7.2.ebuild
deleted file mode 100644
index ed670f84bd02..000000000000
--- a/kde-base/konsolekalendar/konsolekalendar-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:11 alexxy 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 ~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/konsolekalendar/konsolekalendar-4.7.3.ebuild b/kde-base/konsolekalendar/konsolekalendar-4.7.3.ebuild
index 8d6ac55f46ee..f32457b44576 100644
--- a/kde-base/konsolekalendar/konsolekalendar-4.7.3.ebuild
+++ b/kde-base/konsolekalendar/konsolekalendar-4.7.3.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/kde-base/konsolekalendar/konsolekalendar-4.7.3.ebuild,v 1.2 2011/11/05 19:57:39 xarthisius Exp $
+# $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
 
@@ -11,7 +11,7 @@ KDE_SCM="git"
 inherit kde4-meta
 
 DESCRIPTION="A command line interface to KDE calendars"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kontact/Manifest b/kde-base/kontact/Manifest
index 4e48133a3b7c..70a470d0ba9e 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.2.tar.bz2 16171209 RMD160 378e7352725dd257617b1af7d2bb98a8d5569808 SHA1 41983556eb54a740a20d274878006ace5bc73c1c SHA256 1635dabfc73b95209466c92a009bd2856ebd73c42f486545ff97e719fec06630
 DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
diff --git a/kde-base/kontact/kontact-4.7.2.ebuild b/kde-base/kontact/kontact-4.7.2.ebuild
deleted file mode 100644
index 2cbe95c180d7..000000000000
--- a/kde-base/kontact/kontact-4.7.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/kde-base/kontact/kontact-4.7.2.ebuild,v 1.1 2011/10/06 18:11:13 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE personal information manager"
-KEYWORDS="~amd64 ~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/kontact/kontact-4.7.3.ebuild b/kde-base/kontact/kontact-4.7.3.ebuild
index d60275f295f3..946a2fcf3d7f 100644
--- a/kde-base/kontact/kontact-4.7.3.ebuild
+++ b/kde-base/kontact/kontact-4.7.3.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/kde-base/kontact/kontact-4.7.3.ebuild,v 1.2 2011/11/05 19:56:59 xarthisius Exp $
+# $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
 
@@ -10,7 +10,7 @@ KDE_SCM="git"
 inherit kde4-meta
 
 DESCRIPTION="KDE personal information manager"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index b7cb9e393a5a..f41009a5734a 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -1,4 +1,3 @@
 DIST kdenetwork-4.6.3.tar.bz2 8693954 RMD160 a70c031107dd56eda618b91482b814e14425cb1d SHA1 6f140dca442be815eda4fb79d51efd9e4588a1f1 SHA256 423424f2bbc18cb6a0bd52305a238a5b7d4b5f483f30c0590f975b0c229be1fb
 DIST kdenetwork-4.6.5.tar.bz2 8685421 RMD160 eaa0e86ac527a7bc7a70c7eeedb651ff2cccf799 SHA1 cc398063da61f9f9ef0db4455dc0c989a4e68a25 SHA256 5029442447524dc83b080d11fbc4a533f3135bbaf7350b1b5f56289d8f913588
-DIST kdenetwork-4.7.2.tar.bz2 9945067 RMD160 50c6703d021db1ffd516f886b42d42291f725d6c SHA1 59e9e3629dff0362cfa2a6d897c77bc9cfbe8d5c SHA256 c61606a0cad9620ac235725594c7d9d0231268dc372e4d16d411f9aff1f3c36f
 DIST kdenetwork-4.7.3.tar.bz2 9947763 RMD160 8d1cdce1dfd5fa4aae6ecb2d55b189e0bcd94981 SHA1 5d8ed6a478d9afdaf19d350f1d2fe7e9dd48b2f7 SHA256 5a5e7bfa7998e38f80667473c590ab11dde8f3dd6a81a5d9e61ca3940354efa4
diff --git a/kde-base/kopete/kopete-4.7.2.ebuild b/kde-base/kopete/kopete-4.7.2.ebuild
deleted file mode 100644
index 9ceae8171cad..000000000000
--- a/kde-base/kopete/kopete-4.7.2.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.2.ebuild,v 1.2 2011/10/30 15:34:32 ssuominen 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/kopete/kopete-4.7.3.ebuild b/kde-base/kopete/kopete-4.7.3.ebuild
index 6af441791348..42ddaa766f50 100644
--- a/kde-base/kopete/kopete-4.7.3.ebuild
+++ b/kde-base/kopete/kopete-4.7.3.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/kde-base/kopete/kopete-4.7.3.ebuild,v 1.1 2011/11/02 20:47:53 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kdenetwork"
 inherit kde4-meta
 
 DESCRIPTION="KDE multi-protocol IM client"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug ssl v4l"
 
 # tests hang, last checked for 4.2.96
diff --git a/kde-base/korganizer/Manifest b/kde-base/korganizer/Manifest
index 4e48133a3b7c..70a470d0ba9e 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.2.tar.bz2 16171209 RMD160 378e7352725dd257617b1af7d2bb98a8d5569808 SHA1 41983556eb54a740a20d274878006ace5bc73c1c SHA256 1635dabfc73b95209466c92a009bd2856ebd73c42f486545ff97e719fec06630
 DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
diff --git a/kde-base/korganizer/korganizer-4.7.2.ebuild b/kde-base/korganizer/korganizer-4.7.2.ebuild
deleted file mode 100644
index e8b249fcabdc..000000000000
--- a/kde-base/korganizer/korganizer-4.7.2.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/kde-base/korganizer/korganizer-4.7.2.ebuild,v 1.2 2011/10/21 23:13:22 dilfridge Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="A Personal Organizer for KDE"
-KEYWORDS="~amd64 ~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)
-"
-
-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/korganizer/korganizer-4.7.3.ebuild b/kde-base/korganizer/korganizer-4.7.3.ebuild
index 1bc4354d0111..560efcc4ab52 100644
--- a/kde-base/korganizer/korganizer-4.7.3.ebuild
+++ b/kde-base/korganizer/korganizer-4.7.3.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/kde-base/korganizer/korganizer-4.7.3.ebuild,v 1.3 2011/12/04 20:50:06 dilfridge Exp $
+# $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
 
@@ -10,7 +10,7 @@ KDE_SCM="git"
 inherit kde4-meta
 
 DESCRIPTION="A Personal Organizer for KDE"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/korundum/Manifest b/kde-base/korundum/Manifest
index 5fb58ab464d8..3690a267c330 100644
--- a/kde-base/korundum/Manifest
+++ b/kde-base/korundum/Manifest
@@ -1,2 +1 @@
-DIST korundum-4.7.2.tar.bz2 180137 RMD160 ed38d67c49a253752491e77b3f7069362891b681 SHA1 091cfd121e41d4edf38eab31e2dca65656e7349d SHA256 cb787541100e29470926f1a7dd7bd5be497fdedadc8ecdfd86da272415cd24b5
 DIST korundum-4.7.3.tar.bz2 180120 RMD160 145a61fcafa79a3af6d57bfbc3302a99eb7c35b7 SHA1 bf41817298a8b18ba3542e45256c1c6ddb08c900 SHA256 79a0eb94137cb3f8620ec9bc8676d1e1f9d0ae217af6fd106f921d80d8b6ffd7
diff --git a/kde-base/korundum/korundum-4.7.2.ebuild b/kde-base/korundum/korundum-4.7.2.ebuild
deleted file mode 100644
index b286becf899f..000000000000
--- a/kde-base/korundum/korundum-4.7.2.ebuild
+++ /dev/null
@@ -1,76 +0,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.2.ebuild,v 1.1 2011/10/06 18:10:53 alexxy 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 semantic-desktop"
-
-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)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-	)
-	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/korundum/korundum-4.7.3.ebuild b/kde-base/korundum/korundum-4.7.3.ebuild
index bf8d5f68f30d..8890f970f149 100644
--- a/kde-base/korundum/korundum-4.7.3.ebuild
+++ b/kde-base/korundum/korundum-4.7.3.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/kde-base/korundum/korundum-4.7.3.ebuild,v 1.1 2011/11/02 20:48:03 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/korundum-4.7.3.ebuild,v 1.3 2011/12/07 22:13:42 hwoarang Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ USE_RUBY="ruby18"
 inherit kde4-base ruby-ng
 
 DESCRIPTION="KDE Ruby bindings"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="akonadi debug kate okular semantic-desktop"
 
 DEPEND="
diff --git a/kde-base/kpasswdserver/Manifest b/kde-base/kpasswdserver/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/kpasswdserver/Manifest
+++ b/kde-base/kpasswdserver/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/kpasswdserver/kpasswdserver-4.7.2.ebuild b/kde-base/kpasswdserver/kpasswdserver-4.7.2.ebuild
deleted file mode 100644
index 825b8fe26b2c..000000000000
--- a/kde-base/kpasswdserver/kpasswdserver-4.7.2.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/kpasswdserver/kpasswdserver-4.7.2.ebuild,v 1.1 2011/10/06 18:10:53 alexxy 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"
diff --git a/kde-base/kpasswdserver/kpasswdserver-4.7.3.ebuild b/kde-base/kpasswdserver/kpasswdserver-4.7.3.ebuild
index 3c89c4538d03..6001d88383f1 100644
--- a/kde-base/kpasswdserver/kpasswdserver-4.7.3.ebuild
+++ b/kde-base/kpasswdserver/kpasswdserver-4.7.3.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/kde-base/kpasswdserver/kpasswdserver-4.7.3.ebuild,v 1.2 2011/12/04 17:04:39 dilfridge Exp $
+# $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
 
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDED Password Module"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RESTRICT="test"
diff --git a/kde-base/kpat/Manifest b/kde-base/kpat/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/kpat/Manifest
+++ b/kde-base/kpat/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/kpat/kpat-4.7.2.ebuild b/kde-base/kpat/kpat-4.7.2.ebuild
deleted file mode 100644
index 35bfd82fe0bb..000000000000
--- a/kde-base/kpat/kpat-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:45 alexxy 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/kpat/kpat-4.7.3.ebuild b/kde-base/kpat/kpat-4.7.3.ebuild
index 06ef9bf019a2..962ab84d65eb 100644
--- a/kde-base/kpat/kpat-4.7.3.ebuild
+++ b/kde-base/kpat/kpat-4.7.3.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/kde-base/kpat/kpat-4.7.3.ebuild,v 1.1 2011/11/02 20:48:18 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="KDE patience game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kppp/Manifest b/kde-base/kppp/Manifest
index b7cb9e393a5a..f41009a5734a 100644
--- a/kde-base/kppp/Manifest
+++ b/kde-base/kppp/Manifest
@@ -1,4 +1,3 @@
 DIST kdenetwork-4.6.3.tar.bz2 8693954 RMD160 a70c031107dd56eda618b91482b814e14425cb1d SHA1 6f140dca442be815eda4fb79d51efd9e4588a1f1 SHA256 423424f2bbc18cb6a0bd52305a238a5b7d4b5f483f30c0590f975b0c229be1fb
 DIST kdenetwork-4.6.5.tar.bz2 8685421 RMD160 eaa0e86ac527a7bc7a70c7eeedb651ff2cccf799 SHA1 cc398063da61f9f9ef0db4455dc0c989a4e68a25 SHA256 5029442447524dc83b080d11fbc4a533f3135bbaf7350b1b5f56289d8f913588
-DIST kdenetwork-4.7.2.tar.bz2 9945067 RMD160 50c6703d021db1ffd516f886b42d42291f725d6c SHA1 59e9e3629dff0362cfa2a6d897c77bc9cfbe8d5c SHA256 c61606a0cad9620ac235725594c7d9d0231268dc372e4d16d411f9aff1f3c36f
 DIST kdenetwork-4.7.3.tar.bz2 9947763 RMD160 8d1cdce1dfd5fa4aae6ecb2d55b189e0bcd94981 SHA1 5d8ed6a478d9afdaf19d350f1d2fe7e9dd48b2f7 SHA256 5a5e7bfa7998e38f80667473c590ab11dde8f3dd6a81a5d9e61ca3940354efa4
diff --git a/kde-base/kppp/kppp-4.7.2.ebuild b/kde-base/kppp/kppp-4.7.2.ebuild
deleted file mode 100644
index 3f2186eb1b48..000000000000
--- a/kde-base/kppp/kppp-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:46 alexxy 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/kppp/kppp-4.7.3.ebuild b/kde-base/kppp/kppp-4.7.3.ebuild
index 575d11eacf5b..2eb31061104f 100644
--- a/kde-base/kppp/kppp-4.7.3.ebuild
+++ b/kde-base/kppp/kppp-4.7.3.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/kde-base/kppp/kppp-4.7.3.ebuild,v 1.1 2011/11/02 20:48:15 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kdenetwork"
 inherit kde4-meta
 
 DESCRIPTION="KDE: A dialer and front-end to pppd."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/kquitapp/Manifest b/kde-base/kquitapp/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/kquitapp/Manifest
+++ b/kde-base/kquitapp/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/kquitapp/kquitapp-4.7.2.ebuild b/kde-base/kquitapp/kquitapp-4.7.2.ebuild
deleted file mode 100644
index f322c3a02eff..000000000000
--- a/kde-base/kquitapp/kquitapp-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:54 alexxy 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/kquitapp/kquitapp-4.7.3.ebuild b/kde-base/kquitapp/kquitapp-4.7.3.ebuild
index 306643621c4e..221bc528fa9d 100644
--- a/kde-base/kquitapp/kquitapp-4.7.3.ebuild
+++ b/kde-base/kquitapp/kquitapp-4.7.3.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/kde-base/kquitapp/kquitapp-4.7.3.ebuild,v 1.1 2011/11/02 20:47:57 alexxy Exp $
+# $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
 
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="A CLI application quitter"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+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 b7cb9e393a5a..f41009a5734a 100644
--- a/kde-base/krdc/Manifest
+++ b/kde-base/krdc/Manifest
@@ -1,4 +1,3 @@
 DIST kdenetwork-4.6.3.tar.bz2 8693954 RMD160 a70c031107dd56eda618b91482b814e14425cb1d SHA1 6f140dca442be815eda4fb79d51efd9e4588a1f1 SHA256 423424f2bbc18cb6a0bd52305a238a5b7d4b5f483f30c0590f975b0c229be1fb
 DIST kdenetwork-4.6.5.tar.bz2 8685421 RMD160 eaa0e86ac527a7bc7a70c7eeedb651ff2cccf799 SHA1 cc398063da61f9f9ef0db4455dc0c989a4e68a25 SHA256 5029442447524dc83b080d11fbc4a533f3135bbaf7350b1b5f56289d8f913588
-DIST kdenetwork-4.7.2.tar.bz2 9945067 RMD160 50c6703d021db1ffd516f886b42d42291f725d6c SHA1 59e9e3629dff0362cfa2a6d897c77bc9cfbe8d5c SHA256 c61606a0cad9620ac235725594c7d9d0231268dc372e4d16d411f9aff1f3c36f
 DIST kdenetwork-4.7.3.tar.bz2 9947763 RMD160 8d1cdce1dfd5fa4aae6ecb2d55b189e0bcd94981 SHA1 5d8ed6a478d9afdaf19d350f1d2fe7e9dd48b2f7 SHA256 5a5e7bfa7998e38f80667473c590ab11dde8f3dd6a81a5d9e61ca3940354efa4
diff --git a/kde-base/krdc/krdc-4.7.2.ebuild b/kde-base/krdc/krdc-4.7.2.ebuild
deleted file mode 100644
index 6246dc150a2b..000000000000
--- a/kde-base/krdc/krdc-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:52 alexxy 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/krdc/krdc-4.7.3.ebuild b/kde-base/krdc/krdc-4.7.3.ebuild
index a2e3b0288520..83b92107a927 100644
--- a/kde-base/krdc/krdc-4.7.3.ebuild
+++ b/kde-base/krdc/krdc-4.7.3.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/kde-base/krdc/krdc-4.7.3.ebuild,v 1.1 2011/11/02 20:48:00 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kdenetwork"
 inherit kde4-meta
 
 DESCRIPTION="KDE remote desktop connection (RDP and VNC) client"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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
diff --git a/kde-base/kreadconfig/Manifest b/kde-base/kreadconfig/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/kreadconfig/Manifest
+++ b/kde-base/kreadconfig/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/kreadconfig/kreadconfig-4.7.2.ebuild b/kde-base/kreadconfig/kreadconfig-4.7.2.ebuild
deleted file mode 100644
index 3ca1f27f996c..000000000000
--- a/kde-base/kreadconfig/kreadconfig-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:49 alexxy 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/kreadconfig/kreadconfig-4.7.3.ebuild b/kde-base/kreadconfig/kreadconfig-4.7.3.ebuild
index 5d4f2a592049..810697e42356 100644
--- a/kde-base/kreadconfig/kreadconfig-4.7.3.ebuild
+++ b/kde-base/kreadconfig/kreadconfig-4.7.3.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/kde-base/kreadconfig/kreadconfig-4.7.3.ebuild,v 1.1 2011/11/02 20:47:56 alexxy Exp $
+# $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
 
@@ -8,5 +8,5 @@ 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"
+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 348ce6a51263..65b585b0a481 100644
--- a/kde-base/kremotecontrol/Manifest
+++ b/kde-base/kremotecontrol/Manifest
@@ -1,4 +1,3 @@
 DIST kdeutils-4.6.3.tar.bz2 3703326 RMD160 1fe6287fed3fa21eef902ee764425171f7345e6c SHA1 1aa735c03689ef49b949278ee31d0d8e8536b7d6 SHA256 d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
 DIST kdeutils-4.6.5.tar.bz2 3699961 RMD160 65293718d8785c8e06e9149465f55f7f5a8718f5 SHA1 1c2ae023d9a6bcf72d3cebd0d7df2e6a175ffdcb SHA256 03de4b7728301414c8e704ba5c8650d8ded053747268ad47c901880fc1bf0b29
-DIST kdeutils-4.7.2.tar.bz2 3800427 RMD160 13fadbd312d70d7de360221facaf506707562fcc SHA1 52ce9b6b5f2c20475f46b6f7378ca4c530df37b4 SHA256 cdea138fc4556b4f6de5e63ee7ccbcb3485a780f372e699c0cb9fd6d65e02f96
 DIST kdeutils-4.7.3.tar.bz2 3802391 RMD160 0e0a73d290baaa289665b49722f04f19ab517dd9 SHA1 23fc9823647152d5d8cc250a55402c8930db4059 SHA256 a8c802f32b9e918d806a4487c25485f86019e4c473f0de6d3086d8ea8e492839
diff --git a/kde-base/kremotecontrol/kremotecontrol-4.7.2.ebuild b/kde-base/kremotecontrol/kremotecontrol-4.7.2.ebuild
deleted file mode 100644
index 91f4ea0bcd4f..000000000000
--- a/kde-base/kremotecontrol/kremotecontrol-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:06 alexxy 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/kremotecontrol/kremotecontrol-4.7.3.ebuild b/kde-base/kremotecontrol/kremotecontrol-4.7.3.ebuild
index 1868309942c5..f6fc72e0e5bf 100644
--- a/kde-base/kremotecontrol/kremotecontrol-4.7.3.ebuild
+++ b/kde-base/kremotecontrol/kremotecontrol-4.7.3.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/kde-base/kremotecontrol/kremotecontrol-4.7.3.ebuild,v 1.1 2011/11/02 20:48:17 alexxy Exp $
+# $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
 
@@ -15,7 +15,7 @@ fi
 inherit ${kde_eclass}
 
 DESCRIPTION="KDE frontend for remote controls"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kreversi/Manifest b/kde-base/kreversi/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/kreversi/Manifest
+++ b/kde-base/kreversi/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/kreversi/kreversi-4.7.2.ebuild b/kde-base/kreversi/kreversi-4.7.2.ebuild
deleted file mode 100644
index f1e1889e574c..000000000000
--- a/kde-base/kreversi/kreversi-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:01 alexxy 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/kreversi/kreversi-4.7.3.ebuild b/kde-base/kreversi/kreversi-4.7.3.ebuild
index 53f311f94475..b85cef362bf8 100644
--- a/kde-base/kreversi/kreversi-4.7.3.ebuild
+++ b/kde-base/kreversi/kreversi-4.7.3.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/kde-base/kreversi/kreversi-4.7.3.ebuild,v 1.1 2011/11/02 20:48:13 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kdegames"
 inherit games-ggz kde4-meta
 
 DESCRIPTION="KDE Board Game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 src_prepare() {
diff --git a/kde-base/krfb/Manifest b/kde-base/krfb/Manifest
index b7cb9e393a5a..f41009a5734a 100644
--- a/kde-base/krfb/Manifest
+++ b/kde-base/krfb/Manifest
@@ -1,4 +1,3 @@
 DIST kdenetwork-4.6.3.tar.bz2 8693954 RMD160 a70c031107dd56eda618b91482b814e14425cb1d SHA1 6f140dca442be815eda4fb79d51efd9e4588a1f1 SHA256 423424f2bbc18cb6a0bd52305a238a5b7d4b5f483f30c0590f975b0c229be1fb
 DIST kdenetwork-4.6.5.tar.bz2 8685421 RMD160 eaa0e86ac527a7bc7a70c7eeedb651ff2cccf799 SHA1 cc398063da61f9f9ef0db4455dc0c989a4e68a25 SHA256 5029442447524dc83b080d11fbc4a533f3135bbaf7350b1b5f56289d8f913588
-DIST kdenetwork-4.7.2.tar.bz2 9945067 RMD160 50c6703d021db1ffd516f886b42d42291f725d6c SHA1 59e9e3629dff0362cfa2a6d897c77bc9cfbe8d5c SHA256 c61606a0cad9620ac235725594c7d9d0231268dc372e4d16d411f9aff1f3c36f
 DIST kdenetwork-4.7.3.tar.bz2 9947763 RMD160 8d1cdce1dfd5fa4aae6ecb2d55b189e0bcd94981 SHA1 5d8ed6a478d9afdaf19d350f1d2fe7e9dd48b2f7 SHA256 5a5e7bfa7998e38f80667473c590ab11dde8f3dd6a81a5d9e61ca3940354efa4
diff --git a/kde-base/krfb/krfb-4.7.2.ebuild b/kde-base/krfb/krfb-4.7.2.ebuild
deleted file mode 100644
index 0d45f0a1fb71..000000000000
--- a/kde-base/krfb/krfb-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:05 alexxy 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/krfb/krfb-4.7.3.ebuild b/kde-base/krfb/krfb-4.7.3.ebuild
index a9751153a1fe..9fe039347166 100644
--- a/kde-base/krfb/krfb-4.7.3.ebuild
+++ b/kde-base/krfb/krfb-4.7.3.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/kde-base/krfb/krfb-4.7.3.ebuild,v 1.1 2011/11/02 20:48:20 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kdenetwork"
 inherit kde4-meta
 
 DESCRIPTION="VNC-compatible server to share KDE desktops"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/krossjava/Manifest b/kde-base/krossjava/Manifest
index 7ca963cb8eb6..63fb5fc67101 100644
--- a/kde-base/krossjava/Manifest
+++ b/kde-base/krossjava/Manifest
@@ -1,4 +1,3 @@
 DIST kdebindings-4.6.3.tar.bz2 7078095 RMD160 f62d84df4957f4449695486bfb117df917f17da9 SHA1 4ecc6ac378c241472aa75680abfafd8d57672653 SHA256 13cf7fc54132303a7bcaf0c03b696d05a07405f51d2cb5ba14e56d35c0762be3
 DIST kdebindings-4.6.5.tar.bz2 7078088 RMD160 4a4fa7233708233a6fdbac203c55cfb6df9892af SHA1 e63a0b0eec92320df2c2c539b916c5ee9425a689 SHA256 b87cf7ccd30a75121b032311c5f625d0a4d44c8c7b1f08c45b9292451da8ff91
-DIST kross-interpreters-4.7.2.tar.bz2 134896 RMD160 824580c25b3a98f0e1394bc8c82fc5de9f23f51b SHA1 7dba16c2e5e18c955d2fc40536d6a40bc4872cff SHA256 4235dfee6adc37d693ffdb4664bb4c13c15fe104e615cb1a57df225983946f34
 DIST kross-interpreters-4.7.3.tar.bz2 135118 RMD160 5c355292fdff4eb385976d53dd323775b59165de SHA1 3e31b85d1a27a273450652d9f5a33f2c3c035329 SHA256 ad44804d4fe2785c33ef9866bc005cfa6a5c14f34393f63f6960914328498220
diff --git a/kde-base/krossjava/krossjava-4.7.2.ebuild b/kde-base/krossjava/krossjava-4.7.2.ebuild
deleted file mode 100644
index 860cbdf48a37..000000000000
--- a/kde-base/krossjava/krossjava-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:52 alexxy 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/krossjava/krossjava-4.7.3.ebuild b/kde-base/krossjava/krossjava-4.7.3.ebuild
index 08fd29f614e3..9ad9d083acd7 100644
--- a/kde-base/krossjava/krossjava-4.7.3.ebuild
+++ b/kde-base/krossjava/krossjava-4.7.3.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/kde-base/krossjava/krossjava-4.7.3.ebuild,v 1.1 2011/11/02 20:48:15 alexxy Exp $
+# $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
 
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/krosspython/Manifest b/kde-base/krosspython/Manifest
index 7ca963cb8eb6..63fb5fc67101 100644
--- a/kde-base/krosspython/Manifest
+++ b/kde-base/krosspython/Manifest
@@ -1,4 +1,3 @@
 DIST kdebindings-4.6.3.tar.bz2 7078095 RMD160 f62d84df4957f4449695486bfb117df917f17da9 SHA1 4ecc6ac378c241472aa75680abfafd8d57672653 SHA256 13cf7fc54132303a7bcaf0c03b696d05a07405f51d2cb5ba14e56d35c0762be3
 DIST kdebindings-4.6.5.tar.bz2 7078088 RMD160 4a4fa7233708233a6fdbac203c55cfb6df9892af SHA1 e63a0b0eec92320df2c2c539b916c5ee9425a689 SHA256 b87cf7ccd30a75121b032311c5f625d0a4d44c8c7b1f08c45b9292451da8ff91
-DIST kross-interpreters-4.7.2.tar.bz2 134896 RMD160 824580c25b3a98f0e1394bc8c82fc5de9f23f51b SHA1 7dba16c2e5e18c955d2fc40536d6a40bc4872cff SHA256 4235dfee6adc37d693ffdb4664bb4c13c15fe104e615cb1a57df225983946f34
 DIST kross-interpreters-4.7.3.tar.bz2 135118 RMD160 5c355292fdff4eb385976d53dd323775b59165de SHA1 3e31b85d1a27a273450652d9f5a33f2c3c035329 SHA256 ad44804d4fe2785c33ef9866bc005cfa6a5c14f34393f63f6960914328498220
diff --git a/kde-base/krosspython/krosspython-4.7.2-r1.ebuild b/kde-base/krosspython/krosspython-4.7.2-r1.ebuild
deleted file mode 100644
index 485f41931695..000000000000
--- a/kde-base/krosspython/krosspython-4.7.2-r1.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.2-r1.ebuild,v 1.1 2011/10/28 19:53:47 abcd 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/krosspython/krosspython-4.7.3.ebuild b/kde-base/krosspython/krosspython-4.7.3.ebuild
index 159c9f4f9db0..1a107f785d7e 100644
--- a/kde-base/krosspython/krosspython-4.7.3.ebuild
+++ b/kde-base/krosspython/krosspython-4.7.3.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/kde-base/krosspython/krosspython-4.7.3.ebuild,v 1.1 2011/11/02 20:48:15 alexxy Exp $
+# $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
 
@@ -11,7 +11,7 @@ PYTHON_DEPEND="2"
 inherit python kde4-meta
 
 DESCRIPTION="Kross scripting framework: Python interpreter"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 pkg_setup() {
diff --git a/kde-base/krossruby/Manifest b/kde-base/krossruby/Manifest
index ebbd97407f47..dc8a6e31d848 100644
--- a/kde-base/krossruby/Manifest
+++ b/kde-base/krossruby/Manifest
@@ -1,2 +1 @@
-DIST kross-interpreters-4.7.2.tar.bz2 134896 RMD160 824580c25b3a98f0e1394bc8c82fc5de9f23f51b SHA1 7dba16c2e5e18c955d2fc40536d6a40bc4872cff SHA256 4235dfee6adc37d693ffdb4664bb4c13c15fe104e615cb1a57df225983946f34
 DIST kross-interpreters-4.7.3.tar.bz2 135118 RMD160 5c355292fdff4eb385976d53dd323775b59165de SHA1 3e31b85d1a27a273450652d9f5a33f2c3c035329 SHA256 ad44804d4fe2785c33ef9866bc005cfa6a5c14f34393f63f6960914328498220
diff --git a/kde-base/krossruby/krossruby-4.7.2.ebuild b/kde-base/krossruby/krossruby-4.7.2.ebuild
deleted file mode 100644
index 8fe1bef13778..000000000000
--- a/kde-base/krossruby/krossruby-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:57 alexxy 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/krossruby/krossruby-4.7.3.ebuild b/kde-base/krossruby/krossruby-4.7.3.ebuild
index dfc43cf200a6..ffadb48eb0f6 100644
--- a/kde-base/krossruby/krossruby-4.7.3.ebuild
+++ b/kde-base/krossruby/krossruby-4.7.3.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/kde-base/krossruby/krossruby-4.7.3.ebuild,v 1.1 2011/11/02 20:48:09 alexxy Exp $
+# $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
 
@@ -18,7 +18,7 @@ USE_RUBY="ruby18"
 inherit kde4-meta ruby-ng
 
 DESCRIPTION="Kross scripting framework: Ruby interpreter"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND=""
diff --git a/kde-base/kruler/Manifest b/kde-base/kruler/Manifest
index 760fb1590658..aad9c9e0a3fa 100644
--- a/kde-base/kruler/Manifest
+++ b/kde-base/kruler/Manifest
@@ -1,4 +1,3 @@
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
 DIST kdegraphics-4.6.5.tar.bz2 5455380 RMD160 75fdf00994bfc2737a754b4ff360ab789cd824b5 SHA1 1e64698993d0754dfae1296d8d16ba9370f9a08c SHA256 5b8a7e54f281ac938d8e22db673b7ddcff8a1d8adfc128282150ad52c80b8c04
-DIST kruler-4.7.2.tar.bz2 139998 RMD160 73657de772e1bc48282d3dece1a1b2fab12ee691 SHA1 acd3b77bf68fb409f456322d8a68a9d59d1014cb SHA256 3c5a0bb613d032683d7495dc4bbc73c67e2f3b5d2c93e3e41498ad6f16b867bd
 DIST kruler-4.7.3.tar.bz2 139849 RMD160 869ac316248bd70b7d1f343c90fe3c537dd5367e SHA1 2cc0b9d31248604ab570404a0c67ef325e8ed00e SHA256 fc323ef362249e933c84205d98a19b8e9e9f88e7c8584bc95687b69590a3e203
diff --git a/kde-base/kruler/kruler-4.7.2.ebuild b/kde-base/kruler/kruler-4.7.2.ebuild
deleted file mode 100644
index 6b3258f24fa7..000000000000
--- a/kde-base/kruler/kruler-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:54 alexxy 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/kruler/kruler-4.7.3.ebuild b/kde-base/kruler/kruler-4.7.3.ebuild
index 03dbed0f63b4..bf39bcb5938e 100644
--- a/kde-base/kruler/kruler-4.7.3.ebuild
+++ b/kde-base/kruler/kruler-4.7.3.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/kde-base/kruler/kruler-4.7.3.ebuild,v 1.1 2011/11/02 20:48:14 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="A screen ruler for KDE"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/krunner/Manifest b/kde-base/krunner/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/krunner/Manifest
+++ b/kde-base/krunner/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/krunner/krunner-4.7.2.ebuild b/kde-base/krunner/krunner-4.7.2.ebuild
deleted file mode 100644
index 2929707c2d91..000000000000
--- a/kde-base/krunner/krunner-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:07 alexxy 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/krunner/krunner-4.7.3.ebuild b/kde-base/krunner/krunner-4.7.3.ebuild
index 8d04414a1455..d9f14811a4fc 100644
--- a/kde-base/krunner/krunner-4.7.3.ebuild
+++ b/kde-base/krunner/krunner-4.7.3.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/kde-base/krunner/krunner-4.7.3.ebuild,v 1.1 2011/11/02 20:48:18 alexxy Exp $
+# $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
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE Command Runner"
 IUSE="debug"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 COMMONDEPEND="
 	$(add_kdebase_dep kcheckpass)
diff --git a/kde-base/ksaneplugin/Manifest b/kde-base/ksaneplugin/Manifest
index 86cb6a102952..d92a6583d5b6 100644
--- a/kde-base/ksaneplugin/Manifest
+++ b/kde-base/ksaneplugin/Manifest
@@ -1,4 +1,3 @@
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
 DIST kdegraphics-4.6.5.tar.bz2 5455380 RMD160 75fdf00994bfc2737a754b4ff360ab789cd824b5 SHA1 1e64698993d0754dfae1296d8d16ba9370f9a08c SHA256 5b8a7e54f281ac938d8e22db673b7ddcff8a1d8adfc128282150ad52c80b8c04
-DIST ksaneplugin-4.7.2.tar.bz2 13274 RMD160 cbb05ee76e61978e2c9e83e508c750e648a0eb5c SHA1 0a35cd7818089b31772dc974dc01a936e91c7d80 SHA256 2aebad0cafbabb0510f0f886e339cd2e22d669417338b3f2d753d76e57f49f12
 DIST ksaneplugin-4.7.3.tar.bz2 13307 RMD160 f80433ce0d97969d5b9d2ebf74ebdcce2d3a1a6e SHA1 547c298e2f3f7b8f651e3402bf18507321d4a7ce SHA256 b6af933711ed0c99f06f1f09c3db61befa818e28a6429ad31db4529e676e51d8
diff --git a/kde-base/ksaneplugin/ksaneplugin-4.7.2.ebuild b/kde-base/ksaneplugin/ksaneplugin-4.7.2.ebuild
deleted file mode 100644
index 487a2e370c66..000000000000
--- a/kde-base/ksaneplugin/ksaneplugin-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:48 alexxy 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/ksaneplugin/ksaneplugin-4.7.3.ebuild b/kde-base/ksaneplugin/ksaneplugin-4.7.3.ebuild
index 07e20b8b8941..2c9f2e0a3017 100644
--- a/kde-base/ksaneplugin/ksaneplugin-4.7.3.ebuild
+++ b/kde-base/ksaneplugin/ksaneplugin-4.7.3.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/kde-base/ksaneplugin/ksaneplugin-4.7.3.ebuild,v 1.1 2011/11/02 20:48:06 alexxy Exp $
+# $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
 
@@ -11,7 +11,7 @@ DESCRIPTION="SANE Plugin for KDE"
 HOMEPAGE="http://www.kipi-plugins.org"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kscd/Manifest b/kde-base/kscd/Manifest
index b74697d7e5ca..299fa5e8456b 100644
--- a/kde-base/kscd/Manifest
+++ b/kde-base/kscd/Manifest
@@ -1,4 +1,3 @@
 DIST kdemultimedia-4.6.3.tar.bz2 1611668 RMD160 8824bda18a1f1051dea366a0ff0d6191068476dd SHA1 d5bde19156b65e9b56e0e6de800efc0efe117632 SHA256 b3a6732dead0558610b4b40d3ce28c4b7b5da8869a63436180eacb3aacec533b
 DIST kdemultimedia-4.6.5.tar.bz2 1611493 RMD160 70ca60910f21e464f49e4e106918fbcc1407b0c7 SHA1 081bead5ee758d169f3119c138424929b001d04f SHA256 7ab9afb233538e7065758b32cd13f52fee2b68306f4be3dead729f3ba93c9c58
-DIST kdemultimedia-4.7.2.tar.bz2 1643403 RMD160 3c5510cb381b64290dda9a15a483dff3062037db SHA1 2fc12558284fe95da63e24c73612846c6c1d31e1 SHA256 a5a6e1101f4d8fc278791d63c4c91e261d60e995e67b4e8d901f2f93ba7be800
 DIST kdemultimedia-4.7.3.tar.bz2 1644497 RMD160 de9d9f9341d91bf0d56fa9468c0441226cb6aba2 SHA1 4db44494e6a2ef886e3513b6a2eb4e526741a6ff SHA256 ad96332218b82c4466debcb165061d87051a917e0321bdc34e4024da9c8c30b1
diff --git a/kde-base/kscd/kscd-4.7.2.ebuild b/kde-base/kscd/kscd-4.7.2.ebuild
deleted file mode 100644
index 1393a213e4e7..000000000000
--- a/kde-base/kscd/kscd-4.7.2.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/kscd/kscd-4.7.2.ebuild,v 1.1 2011/10/06 18:11:03 alexxy 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}"
-
-KMEXTRACTONLY="
-	libkcompactdisc/
-"
-
-src_unpack() {
-	use handbook && KMEXTRA="doc/kcontrol/cddbretrieval"
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-base/kscd/kscd-4.7.3.ebuild b/kde-base/kscd/kscd-4.7.3.ebuild
index 08d22c7c6649..7f7d92bfa9dc 100644
--- a/kde-base/kscd/kscd-4.7.3.ebuild
+++ b/kde-base/kscd/kscd-4.7.3.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/kde-base/kscd/kscd-4.7.3.ebuild,v 1.2 2011/12/04 20:57:38 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-4.7.3.ebuild,v 1.4 2011/12/07 22:13:55 hwoarang Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ KMNAME="kdemultimedia"
 inherit kde4-meta
 
 DESCRIPTION="KDE CD player"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kscreensaver/Manifest b/kde-base/kscreensaver/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/kscreensaver/Manifest
+++ b/kde-base/kscreensaver/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/kscreensaver/kscreensaver-4.7.2.ebuild b/kde-base/kscreensaver/kscreensaver-4.7.2.ebuild
deleted file mode 100644
index 17a8789e7fee..000000000000
--- a/kde-base/kscreensaver/kscreensaver-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:05 alexxy 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/kscreensaver/kscreensaver-4.7.3.ebuild b/kde-base/kscreensaver/kscreensaver-4.7.3.ebuild
index 0b48f4a578f0..c99ee9063b5d 100644
--- a/kde-base/kscreensaver/kscreensaver-4.7.3.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-4.7.3.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/kde-base/kscreensaver/kscreensaver-4.7.3.ebuild,v 1.1 2011/11/02 20:47:53 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ OPENGL_REQUIRED="optional"
 inherit kde4-meta
 
 DESCRIPTION="KDE screensaver framework"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug pam"
 
 RDEPEND="
diff --git a/kde-base/kshisen/Manifest b/kde-base/kshisen/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/kshisen/Manifest
+++ b/kde-base/kshisen/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/kshisen/kshisen-4.7.2.ebuild b/kde-base/kshisen/kshisen-4.7.2.ebuild
deleted file mode 100644
index 8b2a59ac9f35..000000000000
--- a/kde-base/kshisen/kshisen-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:07 alexxy 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/kshisen/kshisen-4.7.3.ebuild b/kde-base/kshisen/kshisen-4.7.3.ebuild
index dcce58e564c5..97cbe0f3d658 100644
--- a/kde-base/kshisen/kshisen-4.7.3.ebuild
+++ b/kde-base/kshisen/kshisen-4.7.3.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/kde-base/kshisen/kshisen-4.7.3.ebuild,v 1.1 2011/11/02 20:48:22 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="A KDE game similiar to Mahjongg"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/ksirk/Manifest b/kde-base/ksirk/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/ksirk/Manifest
+++ b/kde-base/ksirk/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/ksirk/ksirk-4.7.2.ebuild b/kde-base/ksirk/ksirk-4.7.2.ebuild
deleted file mode 100644
index 844ca61b7508..000000000000
--- a/kde-base/ksirk/ksirk-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:02 alexxy 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/ksirk/ksirk-4.7.3.ebuild b/kde-base/ksirk/ksirk-4.7.3.ebuild
index afef4e341275..0816ce72a168 100644
--- a/kde-base/ksirk/ksirk-4.7.3.ebuild
+++ b/kde-base/ksirk/ksirk-4.7.3.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/kde-base/ksirk/ksirk-4.7.3.ebuild,v 1.1 2011/11/02 20:48:13 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/ksmserver/Manifest b/kde-base/ksmserver/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/ksmserver/Manifest
+++ b/kde-base/ksmserver/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/ksmserver/ksmserver-4.7.2.ebuild b/kde-base/ksmserver/ksmserver-4.7.2.ebuild
deleted file mode 100644
index d12184823234..000000000000
--- a/kde-base/ksmserver/ksmserver-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:50 alexxy 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/ksmserver/ksmserver-4.7.3.ebuild b/kde-base/ksmserver/ksmserver-4.7.3.ebuild
index aa8dc763edfe..3d525a77676a 100644
--- a/kde-base/ksmserver/ksmserver-4.7.3.ebuild
+++ b/kde-base/ksmserver/ksmserver-4.7.3.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/kde-base/ksmserver/ksmserver-4.7.3.ebuild,v 1.1 2011/11/02 20:48:22 alexxy Exp $
+# $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
 
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/ksnapshot/Manifest b/kde-base/ksnapshot/Manifest
index 9a985a034e4f..c226a2f88575 100644
--- a/kde-base/ksnapshot/Manifest
+++ b/kde-base/ksnapshot/Manifest
@@ -1,4 +1,3 @@
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
 DIST kdegraphics-4.6.5.tar.bz2 5455380 RMD160 75fdf00994bfc2737a754b4ff360ab789cd824b5 SHA1 1e64698993d0754dfae1296d8d16ba9370f9a08c SHA256 5b8a7e54f281ac938d8e22db673b7ddcff8a1d8adfc128282150ad52c80b8c04
-DIST ksnapshot-4.7.2.tar.bz2 273849 RMD160 5ac8baee784ff892ceb698c0134fc311dd6a965c SHA1 b6b3978639f7f3c06cf5b5653d9a367e38a70cec SHA256 a9c800191391539f357d7583c0817a2c553521b5fad40c5c8f07ab2ef24e7f67
 DIST ksnapshot-4.7.3.tar.bz2 273946 RMD160 0c14f75eb73665f3eff559af1fb7ec96545908c7 SHA1 e0dd6e093cd487fa6604077371122d84b3e8efb7 SHA256 2768ee54cb6b72c40fa41afb2470bd87d5ce02bcd29108510e71adce34bedcd7
diff --git a/kde-base/ksnapshot/ksnapshot-4.7.2.ebuild b/kde-base/ksnapshot/ksnapshot-4.7.2.ebuild
deleted file mode 100644
index f2427b7511d5..000000000000
--- a/kde-base/ksnapshot/ksnapshot-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:00 alexxy 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/ksnapshot/ksnapshot-4.7.3.ebuild b/kde-base/ksnapshot/ksnapshot-4.7.3.ebuild
index 6789699cfa95..31d3464d2f83 100644
--- a/kde-base/ksnapshot/ksnapshot-4.7.3.ebuild
+++ b/kde-base/ksnapshot/ksnapshot-4.7.3.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/kde-base/ksnapshot/ksnapshot-4.7.3.ebuild,v 1.1 2011/11/02 20:48:11 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="KDE Screenshot Utility"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug kipi"
 
 DEPEND="
diff --git a/kde-base/kspaceduel/Manifest b/kde-base/kspaceduel/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/kspaceduel/Manifest
+++ b/kde-base/kspaceduel/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/kspaceduel/kspaceduel-4.7.2.ebuild b/kde-base/kspaceduel/kspaceduel-4.7.2.ebuild
deleted file mode 100644
index 37e02ca2a274..000000000000
--- a/kde-base/kspaceduel/kspaceduel-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:06 alexxy 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/kspaceduel/kspaceduel-4.7.3.ebuild b/kde-base/kspaceduel/kspaceduel-4.7.3.ebuild
index db0be7523a19..bcf4892c27df 100644
--- a/kde-base/kspaceduel/kspaceduel-4.7.3.ebuild
+++ b/kde-base/kspaceduel/kspaceduel-4.7.3.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/kde-base/kspaceduel/kspaceduel-4.7.3.ebuild,v 1.1 2011/11/02 20:48:01 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="KDE Space Game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/ksplash/Manifest b/kde-base/ksplash/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/ksplash/Manifest
+++ b/kde-base/ksplash/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/ksplash/ksplash-4.7.2.ebuild b/kde-base/ksplash/ksplash-4.7.2.ebuild
deleted file mode 100644
index 167f7287ecad..000000000000
--- a/kde-base/ksplash/ksplash-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:01 alexxy 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/ksplash/ksplash-4.7.3.ebuild b/kde-base/ksplash/ksplash-4.7.3.ebuild
index 1243df33bf9a..fded21d81413 100644
--- a/kde-base/ksplash/ksplash-4.7.3.ebuild
+++ b/kde-base/ksplash/ksplash-4.7.3.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/kde-base/ksplash/ksplash-4.7.3.ebuild,v 1.1 2011/11/02 20:48:09 alexxy Exp $
+# $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
 
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="3dnow altivec debug mmx sse sse2 xinerama"
 
 COMMONDEPEND="
diff --git a/kde-base/ksquares/Manifest b/kde-base/ksquares/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/ksquares/Manifest
+++ b/kde-base/ksquares/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/ksquares/ksquares-4.7.2.ebuild b/kde-base/ksquares/ksquares-4.7.2.ebuild
deleted file mode 100644
index becbdd25b1bb..000000000000
--- a/kde-base/ksquares/ksquares-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:48 alexxy 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/ksquares/ksquares-4.7.3.ebuild b/kde-base/ksquares/ksquares-4.7.3.ebuild
index bba948091fc0..72a0c06bdaa8 100644
--- a/kde-base/ksquares/ksquares-4.7.3.ebuild
+++ b/kde-base/ksquares/ksquares-4.7.3.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/kde-base/ksquares/ksquares-4.7.3.ebuild,v 1.1 2011/11/02 20:47:56 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 src_prepare() {
diff --git a/kde-base/kstars/Manifest b/kde-base/kstars/Manifest
index 3bd2fa0549d2..05af1e08c891 100644
--- a/kde-base/kstars/Manifest
+++ b/kde-base/kstars/Manifest
@@ -1,4 +1,3 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
 DIST kdeedu-4.6.5.tar.bz2 71684677 RMD160 78cfdc42f648308477c57bd816f46434bb588449 SHA1 64247eb68b2710a66baaf824d798e46b34ca4d4f SHA256 1306ef6c8654a0a17131b98e16b19d68beb4e03a324749b2147b010f5c45394b
-DIST kstars-4.7.2.tar.bz2 13123677 RMD160 c1d74d91c650b2e0fce6e42a02c917eb6bd9c7a4 SHA1 bc51179a16fc2337d1dacab4c1d291042fc0b69c SHA256 dd27e35642710dc34d59c4f12635f628243cf280e573cf7cf24ce6035f5cad8f
 DIST kstars-4.7.3.tar.bz2 13122885 RMD160 6edce0d470d6c9ee0169ffa4bb1632dbb045b2a5 SHA1 41d333f726d9752a7ddb48f98817d91744adb7b0 SHA256 433e7dc6edad8cd39c0bf7ce8379771a09e83b167f3139953b3811d683b1223c
diff --git a/kde-base/kstars/kstars-4.7.2.ebuild b/kde-base/kstars/kstars-4.7.2.ebuild
deleted file mode 100644
index 0e32c7334d0a..000000000000
--- a/kde-base/kstars/kstars-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:03 alexxy 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/kstars/kstars-4.7.3.ebuild b/kde-base/kstars/kstars-4.7.3.ebuild
index 8949bfaf9722..85b460083b01 100644
--- a/kde-base/kstars/kstars-4.7.3.ebuild
+++ b/kde-base/kstars/kstars-4.7.3.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/kde-base/kstars/kstars-4.7.3.ebuild,v 1.1 2011/11/02 20:48:14 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="KDE Desktop Planetarium"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug fits indi"
 
 DEPEND="
diff --git a/kde-base/kstart/Manifest b/kde-base/kstart/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/kstart/Manifest
+++ b/kde-base/kstart/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/kstart/kstart-4.7.2.ebuild b/kde-base/kstart/kstart-4.7.2.ebuild
deleted file mode 100644
index 00f53788736e..000000000000
--- a/kde-base/kstart/kstart-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:58 alexxy 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/kstart/kstart-4.7.3.ebuild b/kde-base/kstart/kstart-4.7.3.ebuild
index ee1de81947da..f0a61b12cc83 100644
--- a/kde-base/kstart/kstart-4.7.3.ebuild
+++ b/kde-base/kstart/kstart-4.7.3.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/kde-base/kstart/kstart-4.7.3.ebuild,v 1.1 2011/11/02 20:48:09 alexxy Exp $
+# $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
 
@@ -8,5 +8,5 @@ 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"
+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 8429b87a7c26..c05641549806 100644
--- a/kde-base/kstartperf/Manifest
+++ b/kde-base/kstartperf/Manifest
@@ -1,4 +1,3 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
 DIST kdesdk-4.6.5.tar.bz2 6063147 RMD160 0818eb740cb3f9c83ccf92bb238c4adbdd83b875 SHA1 8cffa0472fbe1096ebfea9bde49aaff76a145b34 SHA256 4b35eb3381bbf06e4d091dea4b38f6c807ce218d45e04d8719ee17ebd1820ff4
-DIST kdesdk-4.7.2.tar.bz2 5265267 RMD160 a8d275fcc858a548c7fe9ce04c0fd11279297174 SHA1 b6259b46fed642c35e1c1d1f90712084141ca441 SHA256 c9377df9429633413c57684574e6405b3dc3b493ac3ab43d9fd429ff3ab920be
 DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
diff --git a/kde-base/kstartperf/kstartperf-4.7.2.ebuild b/kde-base/kstartperf/kstartperf-4.7.2.ebuild
deleted file mode 100644
index 18c4103ddade..000000000000
--- a/kde-base/kstartperf/kstartperf-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:50 alexxy 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/kstartperf/kstartperf-4.7.3.ebuild b/kde-base/kstartperf/kstartperf-4.7.3.ebuild
index aa1f224ced0d..6a14ac7f23b1 100644
--- a/kde-base/kstartperf/kstartperf-4.7.3.ebuild
+++ b/kde-base/kstartperf/kstartperf-4.7.3.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/kde-base/kstartperf/kstartperf-4.7.3.ebuild,v 1.1 2011/11/02 20:47:57 alexxy Exp $
+# $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
 
@@ -8,5 +8,5 @@ KMNAME="kdesdk"
 inherit kde4-meta
 
 DESCRIPTION="Measures starting performance of applications"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kstartupconfig/Manifest b/kde-base/kstartupconfig/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/kstartupconfig/Manifest
+++ b/kde-base/kstartupconfig/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/kstartupconfig/kstartupconfig-4.7.2.ebuild b/kde-base/kstartupconfig/kstartupconfig-4.7.2.ebuild
deleted file mode 100644
index 41ef4e06e6be..000000000000
--- a/kde-base/kstartupconfig/kstartupconfig-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:44 alexxy 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/kstartupconfig/kstartupconfig-4.7.3.ebuild b/kde-base/kstartupconfig/kstartupconfig-4.7.3.ebuild
index 5737e66ee319..81ae01d3322f 100644
--- a/kde-base/kstartupconfig/kstartupconfig-4.7.3.ebuild
+++ b/kde-base/kstartupconfig/kstartupconfig-4.7.3.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/kde-base/kstartupconfig/kstartupconfig-4.7.3.ebuild,v 1.1 2011/11/02 20:48:13 alexxy Exp $
+# $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
 
@@ -8,5 +8,5 @@ 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"
+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 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/kstyles/Manifest
+++ b/kde-base/kstyles/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/kstyles/kstyles-4.7.2.ebuild b/kde-base/kstyles/kstyles-4.7.2.ebuild
deleted file mode 100644
index 05b3f1946551..000000000000
--- a/kde-base/kstyles/kstyles-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:05 alexxy 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/kstyles/kstyles-4.7.3.ebuild b/kde-base/kstyles/kstyles-4.7.3.ebuild
index 0855e0e036f3..177aca620729 100644
--- a/kde-base/kstyles/kstyles-4.7.3.ebuild
+++ b/kde-base/kstyles/kstyles-4.7.3.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/kde-base/kstyles/kstyles-4.7.3.ebuild,v 1.1 2011/11/02 20:48:03 alexxy Exp $
+# $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
 
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/ksudoku/Manifest b/kde-base/ksudoku/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/ksudoku/Manifest
+++ b/kde-base/ksudoku/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/ksudoku/ksudoku-4.7.2.ebuild b/kde-base/ksudoku/ksudoku-4.7.2.ebuild
deleted file mode 100644
index df0ce19ab348..000000000000
--- a/kde-base/ksudoku/ksudoku-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:47 alexxy 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/ksudoku/ksudoku-4.7.3.ebuild b/kde-base/ksudoku/ksudoku-4.7.3.ebuild
index edf9c39c735d..76a74eeb0dc1 100644
--- a/kde-base/ksudoku/ksudoku-4.7.3.ebuild
+++ b/kde-base/ksudoku/ksudoku-4.7.3.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/kde-base/ksudoku/ksudoku-4.7.3.ebuild,v 1.1 2011/11/02 20:47:55 alexxy Exp $
+# $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
 
@@ -10,5 +10,5 @@ OPENGL_REQUIRED="always"
 inherit kde4-meta
 
 DESCRIPTION="KDE Sudoku"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/ksysguard/Manifest b/kde-base/ksysguard/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/ksysguard/Manifest
+++ b/kde-base/ksysguard/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/ksysguard/ksysguard-4.7.2.ebuild b/kde-base/ksysguard/ksysguard-4.7.2.ebuild
deleted file mode 100644
index 627ddbd555f4..000000000000
--- a/kde-base/ksysguard/ksysguard-4.7.2.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/ksysguard/ksysguard-4.7.2.ebuild,v 1.1 2011/10/06 18:10:51 alexxy 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}"
-
-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/ksysguard/ksysguard-4.7.3.ebuild b/kde-base/ksysguard/ksysguard-4.7.3.ebuild
index 14f879e24f41..4b99a808470c 100644
--- a/kde-base/ksysguard/ksysguard-4.7.3.ebuild
+++ b/kde-base/ksysguard/ksysguard-4.7.3.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/kde-base/ksysguard/ksysguard-4.7.3.ebuild,v 1.2 2011/12/04 16:06:38 dilfridge Exp $
+# $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
 
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug lm_sensors test"
 
 COMMONDEPEND="
diff --git a/kde-base/ksystemlog/Manifest b/kde-base/ksystemlog/Manifest
index 8972cd6bec5d..fff74e88e259 100644
--- a/kde-base/ksystemlog/Manifest
+++ b/kde-base/ksystemlog/Manifest
@@ -1,4 +1,3 @@
 DIST kdeadmin-4.6.3.tar.bz2 792325 RMD160 b36d9a7c983f5da9e6a3524d3cde1f28464d1580 SHA1 141e8e794ebd5341940d2d22986b7376a2abefbf SHA256 1db65d3f5afb83affdad921ee034f33d7aeb1aac7fe9a55f4b1d26c385577076
 DIST kdeadmin-4.6.5.tar.bz2 790804 RMD160 5eea0659691e0870e3646ebb33b98e84173781e8 SHA1 010912294a12461a8a0bfdce69c5373b37342cb6 SHA256 a1ef6784a00cd714eb30147e64c56f66e15d712fe7b9fc49c5dfad2ccc5c3ed7
-DIST kdeadmin-4.7.2.tar.bz2 806180 RMD160 154f11d28d86fffd929dd16804d0fca5f0caddb4 SHA1 c96ddd94a4903b035e73b3e958e6b189ca173fe9 SHA256 f7085433fa3f180575549340a6a360c6d67e21efdbfc9a40c3eb09de11e0cc57
 DIST kdeadmin-4.7.3.tar.bz2 806208 RMD160 5aefc3021a1fea4725295ebe97ba8486a09f2768 SHA1 b2d6d210bc40e8731a9ae8409673f3d71b57de0a SHA256 00b32dfb17a8edd89cdd01083df71b1b177e79c7a6ab7fce679a3d0246647029
diff --git a/kde-base/ksystemlog/ksystemlog-4.7.2.ebuild b/kde-base/ksystemlog/ksystemlog-4.7.2.ebuild
deleted file mode 100644
index ac6de234a8ec..000000000000
--- a/kde-base/ksystemlog/ksystemlog-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:57 alexxy 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/ksystemlog/ksystemlog-4.7.3.ebuild b/kde-base/ksystemlog/ksystemlog-4.7.3.ebuild
index 613103b4bccd..6c4f4e49873a 100644
--- a/kde-base/ksystemlog/ksystemlog-4.7.3.ebuild
+++ b/kde-base/ksystemlog/ksystemlog-4.7.3.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/kde-base/ksystemlog/ksystemlog-4.7.3.ebuild,v 1.1 2011/11/02 20:48:07 alexxy Exp $
+# $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
 
@@ -11,7 +11,7 @@ VIRTUALX_REQUIRED=test
 inherit kde4-meta
 
 DESCRIPTION="KDE system log viewer"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug test"
 
 RESTRICT=test
diff --git a/kde-base/ksystraycmd/Manifest b/kde-base/ksystraycmd/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/ksystraycmd/Manifest
+++ b/kde-base/ksystraycmd/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/ksystraycmd/ksystraycmd-4.7.2.ebuild b/kde-base/ksystraycmd/ksystraycmd-4.7.2.ebuild
deleted file mode 100644
index 7dc7c577d19e..000000000000
--- a/kde-base/ksystraycmd/ksystraycmd-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:04 alexxy 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/ksystraycmd/ksystraycmd-4.7.3.ebuild b/kde-base/ksystraycmd/ksystraycmd-4.7.3.ebuild
index 0dd140e8dfda..a2b401258a21 100644
--- a/kde-base/ksystraycmd/ksystraycmd-4.7.3.ebuild
+++ b/kde-base/ksystraycmd/ksystraycmd-4.7.3.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/kde-base/ksystraycmd/ksystraycmd-4.7.3.ebuild,v 1.1 2011/11/02 20:47:57 alexxy Exp $
+# $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
 
@@ -8,5 +8,5 @@ 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"
+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 c745b76a6b5e..2da998f1482f 100644
--- a/kde-base/kteatime/Manifest
+++ b/kde-base/kteatime/Manifest
@@ -1,4 +1,3 @@
 DIST kdetoys-4.6.3.tar.bz2 402892 RMD160 e17cf18bf95fab96814ba77bee7493a7d1901229 SHA1 07eaf12ccabc9209bd5de6a3f0e4ff6c70fca8b0 SHA256 ebbf38ac02a36bfebd8231c3c0d9e94193e98a947d04869e825e3bc404fad7b6
 DIST kdetoys-4.6.5.tar.bz2 402205 RMD160 94b7f5c9d81b1b3d6cb990440b54879b25641e67 SHA1 0ce43a76f5b7005d60430692ae87421661281f1f SHA256 4d4cc99a6117c1e330b7153d33d2157d6770969f17cf1d72593e86b4f8436c96
-DIST kdetoys-4.7.2.tar.bz2 413467 RMD160 b4540d47ee89d2fb23c01d44cfdbf85020244808 SHA1 51213ffadf0326863aad82d9d581a2c9997dda58 SHA256 61992a336e82528c929196c2cbfc8492dec76358a56bbeb4e107fc4633b9a969
 DIST kdetoys-4.7.3.tar.bz2 413419 RMD160 f082336f17e1fc3234e6a00c1109c7bec2eaf4b6 SHA1 93d6f0a92c805de51fc68469f940f38858f81fbe SHA256 edff03b9ae91b6c79e09a15a136ba4854c5c73c9be9ab4bfffe6ed8684dd6c31
diff --git a/kde-base/kteatime/kteatime-4.7.2.ebuild b/kde-base/kteatime/kteatime-4.7.2.ebuild
deleted file mode 100644
index 4a4165b283d3..000000000000
--- a/kde-base/kteatime/kteatime-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:08 alexxy 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/kteatime/kteatime-4.7.3.ebuild b/kde-base/kteatime/kteatime-4.7.3.ebuild
index 84fd3115731e..216e780f1126 100644
--- a/kde-base/kteatime/kteatime-4.7.3.ebuild
+++ b/kde-base/kteatime/kteatime-4.7.3.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/kde-base/kteatime/kteatime-4.7.3.ebuild,v 1.1 2011/11/02 20:48:19 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMNAME="kdetoys"
 inherit kde4-meta
 
 DESCRIPTION="KDE utility for making a fine cup of tea"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/ktimer/Manifest b/kde-base/ktimer/Manifest
index 348ce6a51263..65b585b0a481 100644
--- a/kde-base/ktimer/Manifest
+++ b/kde-base/ktimer/Manifest
@@ -1,4 +1,3 @@
 DIST kdeutils-4.6.3.tar.bz2 3703326 RMD160 1fe6287fed3fa21eef902ee764425171f7345e6c SHA1 1aa735c03689ef49b949278ee31d0d8e8536b7d6 SHA256 d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
 DIST kdeutils-4.6.5.tar.bz2 3699961 RMD160 65293718d8785c8e06e9149465f55f7f5a8718f5 SHA1 1c2ae023d9a6bcf72d3cebd0d7df2e6a175ffdcb SHA256 03de4b7728301414c8e704ba5c8650d8ded053747268ad47c901880fc1bf0b29
-DIST kdeutils-4.7.2.tar.bz2 3800427 RMD160 13fadbd312d70d7de360221facaf506707562fcc SHA1 52ce9b6b5f2c20475f46b6f7378ca4c530df37b4 SHA256 cdea138fc4556b4f6de5e63ee7ccbcb3485a780f372e699c0cb9fd6d65e02f96
 DIST kdeutils-4.7.3.tar.bz2 3802391 RMD160 0e0a73d290baaa289665b49722f04f19ab517dd9 SHA1 23fc9823647152d5d8cc250a55402c8930db4059 SHA256 a8c802f32b9e918d806a4487c25485f86019e4c473f0de6d3086d8ea8e492839
diff --git a/kde-base/ktimer/ktimer-4.7.2.ebuild b/kde-base/ktimer/ktimer-4.7.2.ebuild
deleted file mode 100644
index a6953f0a0d39..000000000000
--- a/kde-base/ktimer/ktimer-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:01 alexxy 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/ktimer/ktimer-4.7.3.ebuild b/kde-base/ktimer/ktimer-4.7.3.ebuild
index 5a81109bbbe0..172d634a601d 100644
--- a/kde-base/ktimer/ktimer-4.7.3.ebuild
+++ b/kde-base/ktimer/ktimer-4.7.3.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/kde-base/ktimer/ktimer-4.7.3.ebuild,v 1.1 2011/11/02 20:48:06 alexxy Exp $
+# $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
 
@@ -15,5 +15,5 @@ fi
 inherit ${kde_eclass}
 
 DESCRIPTION="KDE Timer"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/ktimetracker/Manifest b/kde-base/ktimetracker/Manifest
index 4e48133a3b7c..70a470d0ba9e 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.2.tar.bz2 16171209 RMD160 378e7352725dd257617b1af7d2bb98a8d5569808 SHA1 41983556eb54a740a20d274878006ace5bc73c1c SHA256 1635dabfc73b95209466c92a009bd2856ebd73c42f486545ff97e719fec06630
 DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
diff --git a/kde-base/ktimetracker/ktimetracker-4.7.2.ebuild b/kde-base/ktimetracker/ktimetracker-4.7.2.ebuild
deleted file mode 100644
index 3b464be9fea9..000000000000
--- a/kde-base/ktimetracker/ktimetracker-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:12 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KTimeTracker tracks time spent on various tasks."
-KEYWORDS="~amd64 ~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/ktimetracker/ktimetracker-4.7.3.ebuild b/kde-base/ktimetracker/ktimetracker-4.7.3.ebuild
index 3ead8a29e897..6b625e13011a 100644
--- a/kde-base/ktimetracker/ktimetracker-4.7.3.ebuild
+++ b/kde-base/ktimetracker/ktimetracker-4.7.3.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/kde-base/ktimetracker/ktimetracker-4.7.3.ebuild,v 1.2 2011/11/05 19:55:18 xarthisius Exp $
+# $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
 
@@ -10,7 +10,7 @@ KDE_SCM="git"
 inherit kde4-meta
 
 DESCRIPTION="KTimeTracker tracks time spent on various tasks."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/ktimezoned/Manifest b/kde-base/ktimezoned/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/ktimezoned/Manifest
+++ b/kde-base/ktimezoned/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/ktimezoned/ktimezoned-4.7.2.ebuild b/kde-base/ktimezoned/ktimezoned-4.7.2.ebuild
deleted file mode 100644
index d76b1ef538c5..000000000000
--- a/kde-base/ktimezoned/ktimezoned-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:45 alexxy 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/ktimezoned/ktimezoned-4.7.3.ebuild b/kde-base/ktimezoned/ktimezoned-4.7.3.ebuild
index 4b662b4e5f92..e7f512e88d03 100644
--- a/kde-base/ktimezoned/ktimezoned-4.7.3.ebuild
+++ b/kde-base/ktimezoned/ktimezoned-4.7.3.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/kde-base/ktimezoned/ktimezoned-4.7.3.ebuild,v 1.1 2011/11/02 20:48:03 alexxy Exp $
+# $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
 
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Timezone daemon"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+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 f8104fb5a6e3..4f0e26c4dce3 100644
--- a/kde-base/ktouch/Manifest
+++ b/kde-base/ktouch/Manifest
@@ -1,4 +1,3 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
 DIST kdeedu-4.6.5.tar.bz2 71684677 RMD160 78cfdc42f648308477c57bd816f46434bb588449 SHA1 64247eb68b2710a66baaf824d798e46b34ca4d4f SHA256 1306ef6c8654a0a17131b98e16b19d68beb4e03a324749b2147b010f5c45394b
-DIST ktouch-4.7.2.tar.bz2 1916666 RMD160 581c566b0a339ab55f03e859107b1bbcaf363572 SHA1 d5e0abd7defece0f455818c7bc53c50730419c46 SHA256 845546fa4969432011874a282b3fbed2f7580c424dd84234de250db351e1bf77
 DIST ktouch-4.7.3.tar.bz2 1916710 RMD160 43a51fb81cc09a586338efa7dd5e14392f4e7a5f SHA1 46b865ece6e14d4476297d4a3b400d5fab6564ea SHA256 2134bd158c961b7e87fbf52cdae4255438506e518bf42a8724f44a531a8eca2c
diff --git a/kde-base/ktouch/ktouch-4.7.2.ebuild b/kde-base/ktouch/ktouch-4.7.2.ebuild
deleted file mode 100644
index 3496bf30ff60..000000000000
--- a/kde-base/ktouch/ktouch-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:43 alexxy 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/ktouch/ktouch-4.7.3.ebuild b/kde-base/ktouch/ktouch-4.7.3.ebuild
index 49312c622b1e..572411dc9b8a 100644
--- a/kde-base/ktouch/ktouch-4.7.3.ebuild
+++ b/kde-base/ktouch/ktouch-4.7.3.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/kde-base/ktouch/ktouch-4.7.3.ebuild,v 1.1 2011/11/02 20:47:52 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/ktraderclient/Manifest b/kde-base/ktraderclient/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/ktraderclient/Manifest
+++ b/kde-base/ktraderclient/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/ktraderclient/ktraderclient-4.7.2.ebuild b/kde-base/ktraderclient/ktraderclient-4.7.2.ebuild
deleted file mode 100644
index dd561a319237..000000000000
--- a/kde-base/ktraderclient/ktraderclient-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:04 alexxy 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/ktraderclient/ktraderclient-4.7.3.ebuild b/kde-base/ktraderclient/ktraderclient-4.7.3.ebuild
index 4ac27e1def61..d5fc85c22b15 100644
--- a/kde-base/ktraderclient/ktraderclient-4.7.3.ebuild
+++ b/kde-base/ktraderclient/ktraderclient-4.7.3.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/kde-base/ktraderclient/ktraderclient-4.7.3.ebuild,v 1.1 2011/11/02 20:47:54 alexxy Exp $
+# $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
 
@@ -9,4 +9,4 @@ 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"
+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 300caa131fb0..3da267543cb4 100644
--- a/kde-base/ktron/Manifest
+++ b/kde-base/ktron/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/ktron/ktron-4.7.2.ebuild b/kde-base/ktron/ktron-4.7.2.ebuild
deleted file mode 100644
index 5c6fab9189f7..000000000000
--- a/kde-base/ktron/ktron-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:50 alexxy 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/ktron/ktron-4.7.3.ebuild b/kde-base/ktron/ktron-4.7.3.ebuild
index 5821f0ad3865..caa226bbc0f0 100644
--- a/kde-base/ktron/ktron-4.7.3.ebuild
+++ b/kde-base/ktron/ktron-4.7.3.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/kde-base/ktron/ktron-4.7.3.ebuild,v 1.1 2011/11/02 20:48:12 alexxy Exp $
+# $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
 
@@ -8,5 +8,5 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="KDE Tron game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/ktuberling/Manifest b/kde-base/ktuberling/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/ktuberling/Manifest
+++ b/kde-base/ktuberling/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/ktuberling/ktuberling-4.7.2.ebuild b/kde-base/ktuberling/ktuberling-4.7.2.ebuild
deleted file mode 100644
index c23c2d43cd72..000000000000
--- a/kde-base/ktuberling/ktuberling-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:10 alexxy 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/ktuberling/ktuberling-4.7.3.ebuild b/kde-base/ktuberling/ktuberling-4.7.3.ebuild
index 207575457ea9..e1ee5f74f8eb 100644
--- a/kde-base/ktuberling/ktuberling-4.7.3.ebuild
+++ b/kde-base/ktuberling/ktuberling-4.7.3.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/kde-base/ktuberling/ktuberling-4.7.3.ebuild,v 1.1 2011/11/02 20:48:23 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="KDE: potato game for kids"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kturtle/Manifest b/kde-base/kturtle/Manifest
index 0bb2f2478d16..e15f10fd47ea 100644
--- a/kde-base/kturtle/Manifest
+++ b/kde-base/kturtle/Manifest
@@ -1,4 +1,3 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
 DIST kdeedu-4.6.5.tar.bz2 71684677 RMD160 78cfdc42f648308477c57bd816f46434bb588449 SHA1 64247eb68b2710a66baaf824d798e46b34ca4d4f SHA256 1306ef6c8654a0a17131b98e16b19d68beb4e03a324749b2147b010f5c45394b
-DIST kturtle-4.7.2.tar.bz2 227232 RMD160 80304e93de992f9c1cfc6ef4627c04e4e278397b SHA1 cc86eb08310e8ff591ebb394d08ffc214c264206 SHA256 0a29fd66443c1332978ade3fa9f384e5635f8d1e508b7a3d483a44cf7ff00ca2
 DIST kturtle-4.7.3.tar.bz2 227298 RMD160 593734d41f41796d59f9ab3ab23ddf15692dfbf0 SHA1 07d5ad5c1b8308c2c8c2ff48e2c0c18adfd051ca SHA256 a77c1fe2cb127363581668cb415ba32713b312414c17bb524c1cdf7f66dd2da8
diff --git a/kde-base/kturtle/kturtle-4.7.2.ebuild b/kde-base/kturtle/kturtle-4.7.2.ebuild
deleted file mode 100644
index 1ed1c2abebcf..000000000000
--- a/kde-base/kturtle/kturtle-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:56 alexxy 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/kturtle/kturtle-4.7.3.ebuild b/kde-base/kturtle/kturtle-4.7.3.ebuild
index c11a9012c064..52bb3e8fdc28 100644
--- a/kde-base/kturtle/kturtle-4.7.3.ebuild
+++ b/kde-base/kturtle/kturtle-4.7.3.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/kde-base/kturtle/kturtle-4.7.3.ebuild,v 1.1 2011/11/02 20:48:02 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/ktux/Manifest b/kde-base/ktux/Manifest
index c745b76a6b5e..2da998f1482f 100644
--- a/kde-base/ktux/Manifest
+++ b/kde-base/ktux/Manifest
@@ -1,4 +1,3 @@
 DIST kdetoys-4.6.3.tar.bz2 402892 RMD160 e17cf18bf95fab96814ba77bee7493a7d1901229 SHA1 07eaf12ccabc9209bd5de6a3f0e4ff6c70fca8b0 SHA256 ebbf38ac02a36bfebd8231c3c0d9e94193e98a947d04869e825e3bc404fad7b6
 DIST kdetoys-4.6.5.tar.bz2 402205 RMD160 94b7f5c9d81b1b3d6cb990440b54879b25641e67 SHA1 0ce43a76f5b7005d60430692ae87421661281f1f SHA256 4d4cc99a6117c1e330b7153d33d2157d6770969f17cf1d72593e86b4f8436c96
-DIST kdetoys-4.7.2.tar.bz2 413467 RMD160 b4540d47ee89d2fb23c01d44cfdbf85020244808 SHA1 51213ffadf0326863aad82d9d581a2c9997dda58 SHA256 61992a336e82528c929196c2cbfc8492dec76358a56bbeb4e107fc4633b9a969
 DIST kdetoys-4.7.3.tar.bz2 413419 RMD160 f082336f17e1fc3234e6a00c1109c7bec2eaf4b6 SHA1 93d6f0a92c805de51fc68469f940f38858f81fbe SHA256 edff03b9ae91b6c79e09a15a136ba4854c5c73c9be9ab4bfffe6ed8684dd6c31
diff --git a/kde-base/ktux/ktux-4.7.2.ebuild b/kde-base/ktux/ktux-4.7.2.ebuild
deleted file mode 100644
index 1f9c5693300e..000000000000
--- a/kde-base/ktux/ktux-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:45 alexxy 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/ktux/ktux-4.7.3.ebuild b/kde-base/ktux/ktux-4.7.3.ebuild
index fe15ac08d1cb..8e288e9b5d93 100644
--- a/kde-base/ktux/ktux-4.7.3.ebuild
+++ b/kde-base/ktux/ktux-4.7.3.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/kde-base/ktux/ktux-4.7.3.ebuild,v 1.1 2011/11/02 20:47:53 alexxy Exp $
+# $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
 
@@ -8,7 +8,7 @@ KMNAME="kdetoys"
 inherit kde4-meta
 
 DESCRIPTION="KDE: screensaver featuring the Space-Faring Tux"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 # libkworkspace - only as a stub to provide KDE4Workspace config
diff --git a/kde-base/kubrick/Manifest b/kde-base/kubrick/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/kubrick/Manifest
+++ b/kde-base/kubrick/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/kubrick/kubrick-4.7.2.ebuild b/kde-base/kubrick/kubrick-4.7.2.ebuild
deleted file mode 100644
index 23e1446aa3d5..000000000000
--- a/kde-base/kubrick/kubrick-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:11 alexxy 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/kubrick/kubrick-4.7.3.ebuild b/kde-base/kubrick/kubrick-4.7.3.ebuild
index 13d0aa96ea73..20c38f8ae158 100644
--- a/kde-base/kubrick/kubrick-4.7.3.ebuild
+++ b/kde-base/kubrick/kubrick-4.7.3.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/kde-base/kubrick/kubrick-4.7.3.ebuild,v 1.1 2011/11/02 20:48:15 alexxy Exp $
+# $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
 
@@ -10,5 +10,5 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kuiserver/Manifest b/kde-base/kuiserver/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/kuiserver/Manifest
+++ b/kde-base/kuiserver/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/kuiserver/kuiserver-4.7.2.ebuild b/kde-base/kuiserver/kuiserver-4.7.2.ebuild
deleted file mode 100644
index d82ce7fd3538..000000000000
--- a/kde-base/kuiserver/kuiserver-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:49 alexxy 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/kuiserver/kuiserver-4.7.3.ebuild b/kde-base/kuiserver/kuiserver-4.7.3.ebuild
index 9c0bbca595c9..bca16d6b756e 100644
--- a/kde-base/kuiserver/kuiserver-4.7.3.ebuild
+++ b/kde-base/kuiserver/kuiserver-4.7.3.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/kde-base/kuiserver/kuiserver-4.7.3.ebuild,v 1.1 2011/11/02 20:47:56 alexxy Exp $
+# $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
 
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Progress Info UI server"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+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 8429b87a7c26..c05641549806 100644
--- a/kde-base/kuiviewer/Manifest
+++ b/kde-base/kuiviewer/Manifest
@@ -1,4 +1,3 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
 DIST kdesdk-4.6.5.tar.bz2 6063147 RMD160 0818eb740cb3f9c83ccf92bb238c4adbdd83b875 SHA1 8cffa0472fbe1096ebfea9bde49aaff76a145b34 SHA256 4b35eb3381bbf06e4d091dea4b38f6c807ce218d45e04d8719ee17ebd1820ff4
-DIST kdesdk-4.7.2.tar.bz2 5265267 RMD160 a8d275fcc858a548c7fe9ce04c0fd11279297174 SHA1 b6259b46fed642c35e1c1d1f90712084141ca441 SHA256 c9377df9429633413c57684574e6405b3dc3b493ac3ab43d9fd429ff3ab920be
 DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
diff --git a/kde-base/kuiviewer/kuiviewer-4.7.2.ebuild b/kde-base/kuiviewer/kuiviewer-4.7.2.ebuild
deleted file mode 100644
index fe10b4817584..000000000000
--- a/kde-base/kuiviewer/kuiviewer-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:01 alexxy 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/kuiviewer/kuiviewer-4.7.3.ebuild b/kde-base/kuiviewer/kuiviewer-4.7.3.ebuild
index d1ba9b09cde7..49749851fc77 100644
--- a/kde-base/kuiviewer/kuiviewer-4.7.3.ebuild
+++ b/kde-base/kuiviewer/kuiviewer-4.7.3.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/kde-base/kuiviewer/kuiviewer-4.7.3.ebuild,v 1.1 2011/11/02 20:48:12 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ 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"
+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 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/kurifilter-plugins/Manifest
+++ b/kde-base/kurifilter-plugins/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/kurifilter-plugins/kurifilter-plugins-4.7.2.ebuild b/kde-base/kurifilter-plugins/kurifilter-plugins-4.7.2.ebuild
deleted file mode 100644
index f2a3112c12c7..000000000000
--- a/kde-base/kurifilter-plugins/kurifilter-plugins-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:13 alexxy 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/kurifilter-plugins/kurifilter-plugins-4.7.3.ebuild b/kde-base/kurifilter-plugins/kurifilter-plugins-4.7.3.ebuild
index 99a0b4c9e8ad..5a345f57ebe3 100644
--- a/kde-base/kurifilter-plugins/kurifilter-plugins-4.7.3.ebuild
+++ b/kde-base/kurifilter-plugins/kurifilter-plugins-4.7.3.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/kde-base/kurifilter-plugins/kurifilter-plugins-4.7.3.ebuild,v 1.1 2011/11/02 20:48:20 alexxy Exp $
+# $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
 
@@ -8,6 +8,6 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Plugins to manage filtering URIs."
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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 8972cd6bec5d..fff74e88e259 100644
--- a/kde-base/kuser/Manifest
+++ b/kde-base/kuser/Manifest
@@ -1,4 +1,3 @@
 DIST kdeadmin-4.6.3.tar.bz2 792325 RMD160 b36d9a7c983f5da9e6a3524d3cde1f28464d1580 SHA1 141e8e794ebd5341940d2d22986b7376a2abefbf SHA256 1db65d3f5afb83affdad921ee034f33d7aeb1aac7fe9a55f4b1d26c385577076
 DIST kdeadmin-4.6.5.tar.bz2 790804 RMD160 5eea0659691e0870e3646ebb33b98e84173781e8 SHA1 010912294a12461a8a0bfdce69c5373b37342cb6 SHA256 a1ef6784a00cd714eb30147e64c56f66e15d712fe7b9fc49c5dfad2ccc5c3ed7
-DIST kdeadmin-4.7.2.tar.bz2 806180 RMD160 154f11d28d86fffd929dd16804d0fca5f0caddb4 SHA1 c96ddd94a4903b035e73b3e958e6b189ca173fe9 SHA256 f7085433fa3f180575549340a6a360c6d67e21efdbfc9a40c3eb09de11e0cc57
 DIST kdeadmin-4.7.3.tar.bz2 806208 RMD160 5aefc3021a1fea4725295ebe97ba8486a09f2768 SHA1 b2d6d210bc40e8731a9ae8409673f3d71b57de0a SHA256 00b32dfb17a8edd89cdd01083df71b1b177e79c7a6ab7fce679a3d0246647029
diff --git a/kde-base/kuser/kuser-4.7.2.ebuild b/kde-base/kuser/kuser-4.7.2.ebuild
deleted file mode 100644
index 3e1b4ac858f9..000000000000
--- a/kde-base/kuser/kuser-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:49 alexxy 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/kuser/kuser-4.7.3.ebuild b/kde-base/kuser/kuser-4.7.3.ebuild
index a88e72763c62..d02f953f48f4 100644
--- a/kde-base/kuser/kuser-4.7.3.ebuild
+++ b/kde-base/kuser/kuser-4.7.3.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/kde-base/kuser/kuser-4.7.3.ebuild,v 1.1 2011/11/02 20:48:15 alexxy Exp $
+# $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
 
@@ -10,7 +10,7 @@ KMNAME="kdeadmin"
 inherit kde4-meta
 
 DESCRIPTION="KDE application that helps you manage system users"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kwallet/Manifest b/kde-base/kwallet/Manifest
index 348ce6a51263..65b585b0a481 100644
--- a/kde-base/kwallet/Manifest
+++ b/kde-base/kwallet/Manifest
@@ -1,4 +1,3 @@
 DIST kdeutils-4.6.3.tar.bz2 3703326 RMD160 1fe6287fed3fa21eef902ee764425171f7345e6c SHA1 1aa735c03689ef49b949278ee31d0d8e8536b7d6 SHA256 d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
 DIST kdeutils-4.6.5.tar.bz2 3699961 RMD160 65293718d8785c8e06e9149465f55f7f5a8718f5 SHA1 1c2ae023d9a6bcf72d3cebd0d7df2e6a175ffdcb SHA256 03de4b7728301414c8e704ba5c8650d8ded053747268ad47c901880fc1bf0b29
-DIST kdeutils-4.7.2.tar.bz2 3800427 RMD160 13fadbd312d70d7de360221facaf506707562fcc SHA1 52ce9b6b5f2c20475f46b6f7378ca4c530df37b4 SHA256 cdea138fc4556b4f6de5e63ee7ccbcb3485a780f372e699c0cb9fd6d65e02f96
 DIST kdeutils-4.7.3.tar.bz2 3802391 RMD160 0e0a73d290baaa289665b49722f04f19ab517dd9 SHA1 23fc9823647152d5d8cc250a55402c8930db4059 SHA256 a8c802f32b9e918d806a4487c25485f86019e4c473f0de6d3086d8ea8e492839
diff --git a/kde-base/kwallet/kwallet-4.7.2.ebuild b/kde-base/kwallet/kwallet-4.7.2.ebuild
deleted file mode 100644
index 42c4e891f9d8..000000000000
--- a/kde-base/kwallet/kwallet-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:50 alexxy 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/kwallet/kwallet-4.7.3.ebuild b/kde-base/kwallet/kwallet-4.7.3.ebuild
index b43361bfd0a8..a4adbfb30aee 100644
--- a/kde-base/kwallet/kwallet-4.7.3.ebuild
+++ b/kde-base/kwallet/kwallet-4.7.3.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/kde-base/kwallet/kwallet-4.7.3.ebuild,v 1.1 2011/11/02 20:48:20 alexxy Exp $
+# $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
 
@@ -15,5 +15,5 @@ fi
 inherit ${kde_eclass}
 
 DESCRIPTION="KDE Wallet Management Tool"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/kwalletd/Manifest
+++ b/kde-base/kwalletd/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/kwalletd/kwalletd-4.7.2.ebuild b/kde-base/kwalletd/kwalletd-4.7.2.ebuild
deleted file mode 100644
index 945fb6a869d5..000000000000
--- a/kde-base/kwalletd/kwalletd-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:52 alexxy 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/kwalletd/kwalletd-4.7.3.ebuild b/kde-base/kwalletd/kwalletd-4.7.3.ebuild
index ce734aacc0b8..de4ac917ba3a 100644
--- a/kde-base/kwalletd/kwalletd-4.7.3.ebuild
+++ b/kde-base/kwalletd/kwalletd-4.7.3.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/kde-base/kwalletd/kwalletd-4.7.3.ebuild,v 1.1 2011/11/02 20:48:01 alexxy Exp $
+# $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
 
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE Password Server"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+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 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/kwin/kwin-4.7.2.ebuild b/kde-base/kwin/kwin-4.7.2.ebuild
deleted file mode 100644
index b0e3a0c12a00..000000000000
--- a/kde-base/kwin/kwin-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:49 alexxy 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/kwin/kwin-4.7.3.ebuild b/kde-base/kwin/kwin-4.7.3.ebuild
index 68a21562fc57..2bef2cd60c59 100644
--- a/kde-base/kwin/kwin-4.7.3.ebuild
+++ b/kde-base/kwin/kwin-4.7.3.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/kde-base/kwin/kwin-4.7.3.ebuild,v 1.1 2011/11/02 20:48:12 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ OPENGL_REQUIRED="optional"
 inherit kde4-meta
 
 DESCRIPTION="KDE window manager"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug gles xinerama"
 
 COMMONDEPEND="
diff --git a/kde-base/kwordquiz/Manifest b/kde-base/kwordquiz/Manifest
index e44844fb931e..fd8b1dd9bc00 100644
--- a/kde-base/kwordquiz/Manifest
+++ b/kde-base/kwordquiz/Manifest
@@ -1,4 +1,3 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
 DIST kdeedu-4.6.5.tar.bz2 71684677 RMD160 78cfdc42f648308477c57bd816f46434bb588449 SHA1 64247eb68b2710a66baaf824d798e46b34ca4d4f SHA256 1306ef6c8654a0a17131b98e16b19d68beb4e03a324749b2147b010f5c45394b
-DIST kwordquiz-4.7.2.tar.bz2 1298834 RMD160 8f258400920ecde0a7319d7f4e3cd2156725651e SHA1 f9450b1b7f539955e55877d96b37424c8abe576e SHA256 48ca5cea5f95670b996fa1369b72077fff2c4052eb339490ce19a38f4a0b82fe
 DIST kwordquiz-4.7.3.tar.bz2 1298968 RMD160 8b55c51b3bae4ac406d00e5b5b65d3dac94812b4 SHA1 616c16a94066ec2930bc0795f8053be221c871e5 SHA256 8b499dc5d763ee28a52f6b6d271cae24640706735c3641d843aef187207cd508
diff --git a/kde-base/kwordquiz/kwordquiz-4.7.2.ebuild b/kde-base/kwordquiz/kwordquiz-4.7.2.ebuild
deleted file mode 100644
index fe0c73afd56e..000000000000
--- a/kde-base/kwordquiz/kwordquiz-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:06 alexxy 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/kwordquiz/kwordquiz-4.7.3.ebuild b/kde-base/kwordquiz/kwordquiz-4.7.3.ebuild
index b1cdc857f70b..edfc26902c57 100644
--- a/kde-base/kwordquiz/kwordquiz-4.7.3.ebuild
+++ b/kde-base/kwordquiz/kwordquiz-4.7.3.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/kde-base/kwordquiz/kwordquiz-4.7.3.ebuild,v 1.1 2011/11/02 20:48:17 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="KDE: A powerful flashcard and vocabulary learning program"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kwrite/Manifest b/kde-base/kwrite/Manifest
index 0006e1f94c7f..56ab6e228390 100644
--- a/kde-base/kwrite/Manifest
+++ b/kde-base/kwrite/Manifest
@@ -1,4 +1,3 @@
-DIST kate-4.7.2.tar.bz2 2035600 RMD160 1f89a9f160de2b3c9b46cd51d03aca1b9be73846 SHA1 467b0558f1f86d0b210abd2d78c94cbe63b8579d SHA256 04cb8855bb787fcbf7356a21160742d66668ec76fd8ba6615244ef1926641be2
 DIST kate-4.7.3.tar.bz2 2038690 RMD160 c5809a4b915dc6b2c55d1bef9d1ebfa16606e5c7 SHA1 d67e871a49d426246f2e555ace0ad5a303c41045 SHA256 154dd3dfc16745ea567834eac7d082990d2251a79c6161c9fc4d34566936fc95
 DIST kdebase-4.6.3.tar.bz2 2682586 RMD160 38784d7a5a708703f5a22e39dc5f83ef7aecd833 SHA1 69cfba74099cdce27f7f72725288f025979b41f3 SHA256 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
 DIST kdebase-4.6.5.tar.bz2 2639622 RMD160 cef007659a02cbec3bd484aa9eb5a721c5200b4f SHA1 1a902d22956daaf380ceefe68f8db75b8b760ae6 SHA256 542a42fc806673ba46827dcc5616fe53239659107934f1b05bf476e46ecbffd5
diff --git a/kde-base/kwrite/kwrite-4.7.2.ebuild b/kde-base/kwrite/kwrite-4.7.2.ebuild
deleted file mode 100644
index 7df50495edfb..000000000000
--- a/kde-base/kwrite/kwrite-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:10 alexxy 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/kwrite/kwrite-4.7.3.ebuild b/kde-base/kwrite/kwrite-4.7.3.ebuild
index 4f83be15e23c..d3762ea57487 100644
--- a/kde-base/kwrite/kwrite-4.7.3.ebuild
+++ b/kde-base/kwrite/kwrite-4.7.3.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/kde-base/kwrite/kwrite-4.7.3.ebuild,v 1.1 2011/11/02 20:48:18 alexxy Exp $
+# $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
 
@@ -10,7 +10,7 @@ KDE_SCM="git"
 inherit kde4-meta
 
 DESCRIPTION="KDE MDI editor/IDE"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/kwrited/Manifest b/kde-base/kwrited/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/kwrited/Manifest
+++ b/kde-base/kwrited/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/kwrited/kwrited-4.7.2.ebuild b/kde-base/kwrited/kwrited-4.7.2.ebuild
deleted file mode 100644
index 07d28cdd296b..000000000000
--- a/kde-base/kwrited/kwrited-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:11 alexxy 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/kwrited/kwrited-4.7.3.ebuild b/kde-base/kwrited/kwrited-4.7.3.ebuild
index 551c29843cd8..2175c665d21b 100644
--- a/kde-base/kwrited/kwrited-4.7.3.ebuild
+++ b/kde-base/kwrited/kwrited-4.7.3.ebuild
@@ -1,13 +1,13 @@
 # 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.1 2011/11/02 20:48:17 alexxy Exp $
+# $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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/libkcddb/Manifest b/kde-base/libkcddb/Manifest
index b74697d7e5ca..299fa5e8456b 100644
--- a/kde-base/libkcddb/Manifest
+++ b/kde-base/libkcddb/Manifest
@@ -1,4 +1,3 @@
 DIST kdemultimedia-4.6.3.tar.bz2 1611668 RMD160 8824bda18a1f1051dea366a0ff0d6191068476dd SHA1 d5bde19156b65e9b56e0e6de800efc0efe117632 SHA256 b3a6732dead0558610b4b40d3ce28c4b7b5da8869a63436180eacb3aacec533b
 DIST kdemultimedia-4.6.5.tar.bz2 1611493 RMD160 70ca60910f21e464f49e4e106918fbcc1407b0c7 SHA1 081bead5ee758d169f3119c138424929b001d04f SHA256 7ab9afb233538e7065758b32cd13f52fee2b68306f4be3dead729f3ba93c9c58
-DIST kdemultimedia-4.7.2.tar.bz2 1643403 RMD160 3c5510cb381b64290dda9a15a483dff3062037db SHA1 2fc12558284fe95da63e24c73612846c6c1d31e1 SHA256 a5a6e1101f4d8fc278791d63c4c91e261d60e995e67b4e8d901f2f93ba7be800
 DIST kdemultimedia-4.7.3.tar.bz2 1644497 RMD160 de9d9f9341d91bf0d56fa9468c0441226cb6aba2 SHA1 4db44494e6a2ef886e3513b6a2eb4e526741a6ff SHA256 ad96332218b82c4466debcb165061d87051a917e0321bdc34e4024da9c8c30b1
diff --git a/kde-base/libkcddb/libkcddb-4.7.2.ebuild b/kde-base/libkcddb/libkcddb-4.7.2.ebuild
deleted file mode 100644
index 438153aab222..000000000000
--- a/kde-base/libkcddb/libkcddb-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:04 alexxy 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/libkcddb/libkcddb-4.7.3.ebuild b/kde-base/libkcddb/libkcddb-4.7.3.ebuild
index 8e79facb45b4..b20868e4592d 100644
--- a/kde-base/libkcddb/libkcddb-4.7.3.ebuild
+++ b/kde-base/libkcddb/libkcddb-4.7.3.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/kde-base/libkcddb/libkcddb-4.7.3.ebuild,v 1.1 2011/11/02 20:48:06 alexxy Exp $
+# $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
 
@@ -8,7 +8,7 @@ KMNAME="kdemultimedia"
 inherit kde4-meta
 
 DESCRIPTION="KDE library for CDDB"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug musicbrainz"
 
 # tests require network access and compare static data with online data
diff --git a/kde-base/libkcompactdisc/Manifest b/kde-base/libkcompactdisc/Manifest
index b74697d7e5ca..299fa5e8456b 100644
--- a/kde-base/libkcompactdisc/Manifest
+++ b/kde-base/libkcompactdisc/Manifest
@@ -1,4 +1,3 @@
 DIST kdemultimedia-4.6.3.tar.bz2 1611668 RMD160 8824bda18a1f1051dea366a0ff0d6191068476dd SHA1 d5bde19156b65e9b56e0e6de800efc0efe117632 SHA256 b3a6732dead0558610b4b40d3ce28c4b7b5da8869a63436180eacb3aacec533b
 DIST kdemultimedia-4.6.5.tar.bz2 1611493 RMD160 70ca60910f21e464f49e4e106918fbcc1407b0c7 SHA1 081bead5ee758d169f3119c138424929b001d04f SHA256 7ab9afb233538e7065758b32cd13f52fee2b68306f4be3dead729f3ba93c9c58
-DIST kdemultimedia-4.7.2.tar.bz2 1643403 RMD160 3c5510cb381b64290dda9a15a483dff3062037db SHA1 2fc12558284fe95da63e24c73612846c6c1d31e1 SHA256 a5a6e1101f4d8fc278791d63c4c91e261d60e995e67b4e8d901f2f93ba7be800
 DIST kdemultimedia-4.7.3.tar.bz2 1644497 RMD160 de9d9f9341d91bf0d56fa9468c0441226cb6aba2 SHA1 4db44494e6a2ef886e3513b6a2eb4e526741a6ff SHA256 ad96332218b82c4466debcb165061d87051a917e0321bdc34e4024da9c8c30b1
diff --git a/kde-base/libkcompactdisc/libkcompactdisc-4.7.2.ebuild b/kde-base/libkcompactdisc/libkcompactdisc-4.7.2.ebuild
deleted file mode 100644
index b7070006408c..000000000000
--- a/kde-base/libkcompactdisc/libkcompactdisc-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:00 alexxy 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/libkcompactdisc/libkcompactdisc-4.7.3.ebuild b/kde-base/libkcompactdisc/libkcompactdisc-4.7.3.ebuild
index 7500a5f8747b..8a0f0af00b2c 100644
--- a/kde-base/libkcompactdisc/libkcompactdisc-4.7.3.ebuild
+++ b/kde-base/libkcompactdisc/libkcompactdisc-4.7.3.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/kde-base/libkcompactdisc/libkcompactdisc-4.7.3.ebuild,v 1.1 2011/11/02 20:48:11 alexxy Exp $
+# $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
 
@@ -8,7 +8,7 @@ KMNAME="kdemultimedia"
 inherit kde4-meta
 
 DESCRIPTION="KDE library for playing & ripping CDs"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="alsa debug"
 
 src_configure() {
diff --git a/kde-base/libkdcraw/Manifest b/kde-base/libkdcraw/Manifest
index 0b495a04795d..72ae4642efbb 100644
--- a/kde-base/libkdcraw/Manifest
+++ b/kde-base/libkdcraw/Manifest
@@ -1,4 +1,3 @@
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
 DIST kdegraphics-4.6.5.tar.bz2 5455380 RMD160 75fdf00994bfc2737a754b4ff360ab789cd824b5 SHA1 1e64698993d0754dfae1296d8d16ba9370f9a08c SHA256 5b8a7e54f281ac938d8e22db673b7ddcff8a1d8adfc128282150ad52c80b8c04
-DIST libkdcraw-4.7.2.tar.bz2 287724 RMD160 741557f214fd815916f9e7f6f6414c90e69fce7c SHA1 9e32ee20a1d201e55aacc5a1fb1de87ad50f3579 SHA256 53175f7319bf4e06ba1bb96fd37f003543fcefb6f73b1d069d38bfcf8a51f153
 DIST libkdcraw-4.7.3.tar.bz2 287684 RMD160 fb3b58e1dccaa8eb6b7d64626c1fa10d744335c1 SHA1 084f6aff760957d2005dd571dad178ca685abb68 SHA256 0c41ac80b0ab9a278c0975b3ec995cdf5c79458bcf8df738bddda6be91f31182
diff --git a/kde-base/libkdcraw/libkdcraw-4.7.2.ebuild b/kde-base/libkdcraw/libkdcraw-4.7.2.ebuild
deleted file mode 100644
index 7f7d15ff914b..000000000000
--- a/kde-base/libkdcraw/libkdcraw-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:00 alexxy 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/libkdcraw/libkdcraw-4.7.3.ebuild b/kde-base/libkdcraw/libkdcraw-4.7.3.ebuild
index 0acf5226da99..ab6be939864b 100644
--- a/kde-base/libkdcraw/libkdcraw-4.7.3.ebuild
+++ b/kde-base/libkdcraw/libkdcraw-4.7.3.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/kde-base/libkdcraw/libkdcraw-4.7.3.ebuild,v 1.1 2011/11/02 20:47:59 alexxy Exp $
+# $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
 
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/libkdeedu/Manifest b/kde-base/libkdeedu/Manifest
index 88f94c5c2069..392b6ca03e98 100644
--- a/kde-base/libkdeedu/Manifest
+++ b/kde-base/libkdeedu/Manifest
@@ -1,4 +1,3 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
 DIST kdeedu-4.6.5.tar.bz2 71684677 RMD160 78cfdc42f648308477c57bd816f46434bb588449 SHA1 64247eb68b2710a66baaf824d798e46b34ca4d4f SHA256 1306ef6c8654a0a17131b98e16b19d68beb4e03a324749b2147b010f5c45394b
-DIST libkdeedu-4.7.2.tar.bz2 222956 RMD160 c2d000e650f15abe9a860ffdab13ddb684bb0deb SHA1 51f8ce8847b71674244f7620536939ba4f36d476 SHA256 7058d7eaa789adf08b0c137c469fa6f15cad3d985bb3588a630c01b2447241ae
 DIST libkdeedu-4.7.3.tar.bz2 223286 RMD160 35f0212af28d33cb43132b47b082c5a6ab78e77b SHA1 d2a1e88c6135fa23cea7670dfbb7c8634dc9c870 SHA256 c653d473199d6871fbbe4cdd029e1c92dcb523e6e32693aa858b8c0ba9bf24e6
diff --git a/kde-base/libkdeedu/libkdeedu-4.7.2.ebuild b/kde-base/libkdeedu/libkdeedu-4.7.2.ebuild
deleted file mode 100644
index d1a7ecc6a0ae..000000000000
--- a/kde-base/libkdeedu/libkdeedu-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:53 alexxy 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/libkdeedu/libkdeedu-4.7.3.ebuild b/kde-base/libkdeedu/libkdeedu-4.7.3.ebuild
index c3636f1de438..105409fe25fd 100644
--- a/kde-base/libkdeedu/libkdeedu-4.7.3.ebuild
+++ b/kde-base/libkdeedu/libkdeedu-4.7.3.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/kde-base/libkdeedu/libkdeedu-4.7.3.ebuild,v 1.1 2011/11/02 20:48:02 alexxy Exp $
+# $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
 
@@ -8,7 +8,7 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="Common library for KDE educational apps"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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,
diff --git a/kde-base/libkdegames/Manifest b/kde-base/libkdegames/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/libkdegames/Manifest
+++ b/kde-base/libkdegames/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/libkdegames/libkdegames-4.7.2.ebuild b/kde-base/libkdegames/libkdegames-4.7.2.ebuild
deleted file mode 100644
index 356298d5731a..000000000000
--- a/kde-base/libkdegames/libkdegames-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:53 alexxy 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/libkdegames/libkdegames-4.7.3.ebuild b/kde-base/libkdegames/libkdegames-4.7.3.ebuild
index a2d6d23717fa..3b42c3c0acd9 100644
--- a/kde-base/libkdegames/libkdegames-4.7.3.ebuild
+++ b/kde-base/libkdegames/libkdegames-4.7.3.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/kde-base/libkdegames/libkdegames-4.7.3.ebuild,v 1.1 2011/11/02 20:48:08 alexxy Exp $
+# $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
 
@@ -8,7 +8,7 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="Base library common to many KDE games."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/libkexiv2/Manifest b/kde-base/libkexiv2/Manifest
index 511056f44610..94a2858a3174 100644
--- a/kde-base/libkexiv2/Manifest
+++ b/kde-base/libkexiv2/Manifest
@@ -1,4 +1,3 @@
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
 DIST kdegraphics-4.6.5.tar.bz2 5455380 RMD160 75fdf00994bfc2737a754b4ff360ab789cd824b5 SHA1 1e64698993d0754dfae1296d8d16ba9370f9a08c SHA256 5b8a7e54f281ac938d8e22db673b7ddcff8a1d8adfc128282150ad52c80b8c04
-DIST libkexiv2-4.7.2.tar.bz2 132538 RMD160 affe49911ae07ff7fcfb07b54946bb90317d563f SHA1 fbd158168c219cbe1009019d2a33376fca951a5e SHA256 e1657dc9e488d17ef1b0240f5b272fe18a1e7cbf3a0967e671cc2466ead4df71
 DIST libkexiv2-4.7.3.tar.bz2 132528 RMD160 d30f6dc5e98d952e444ba6f5805a1ad11448e69e SHA1 daaf507f75855660ae9f1af00158c2746c574902 SHA256 5bf5bcb302fc0630cc8f6f1fa538894dd2f1a06271beff4f1ce90c72e86c3c94
diff --git a/kde-base/libkexiv2/libkexiv2-4.7.2.ebuild b/kde-base/libkexiv2/libkexiv2-4.7.2.ebuild
deleted file mode 100644
index b75b4979d7d2..000000000000
--- a/kde-base/libkexiv2/libkexiv2-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:56 alexxy 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/libkexiv2/libkexiv2-4.7.3.ebuild b/kde-base/libkexiv2/libkexiv2-4.7.3.ebuild
index 5bd2f684fc0a..3d466d8e005d 100644
--- a/kde-base/libkexiv2/libkexiv2-4.7.3.ebuild
+++ b/kde-base/libkexiv2/libkexiv2-4.7.3.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/kde-base/libkexiv2/libkexiv2-4.7.3.ebuild,v 1.1 2011/11/02 20:48:04 alexxy Exp $
+# $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
 
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/libkipi/Manifest b/kde-base/libkipi/Manifest
index 16df5838d980..16869bd38f8f 100644
--- a/kde-base/libkipi/Manifest
+++ b/kde-base/libkipi/Manifest
@@ -1,4 +1,3 @@
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
 DIST kdegraphics-4.6.5.tar.bz2 5455380 RMD160 75fdf00994bfc2737a754b4ff360ab789cd824b5 SHA1 1e64698993d0754dfae1296d8d16ba9370f9a08c SHA256 5b8a7e54f281ac938d8e22db673b7ddcff8a1d8adfc128282150ad52c80b8c04
-DIST libkipi-4.7.2.tar.bz2 78147 RMD160 72a52d68283997c86c15510c5ad3288c568439a3 SHA1 a75cd016c2d9faa71b2867cb4b3eed40edfb3b85 SHA256 3e70e25fe62b1cd19a74cd5637f14b2c57137b59ca0bba1cac942a714167c959
 DIST libkipi-4.7.3.tar.bz2 78152 RMD160 b3659716ba622d3ead7008236a518fca791ee940 SHA1 9c6d4406a1292cfe81fa27508ffe4d96633417bf SHA256 3dd71c84f8e0c78e7c470134a7328bbaee084023fc2c1da51f8850e0553f0785
diff --git a/kde-base/libkipi/libkipi-4.7.2.ebuild b/kde-base/libkipi/libkipi-4.7.2.ebuild
deleted file mode 100644
index 5cd646e4b0ac..000000000000
--- a/kde-base/libkipi/libkipi-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:50 alexxy 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/libkipi/libkipi-4.7.3.ebuild b/kde-base/libkipi/libkipi-4.7.3.ebuild
index 0479687c51fb..a4a17238db40 100644
--- a/kde-base/libkipi/libkipi-4.7.3.ebuild
+++ b/kde-base/libkipi/libkipi-4.7.3.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/kde-base/libkipi/libkipi-4.7.3.ebuild,v 1.1 2011/11/02 20:47:59 alexxy Exp $
+# $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
 
@@ -11,5 +11,5 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/libkmahjongg/Manifest b/kde-base/libkmahjongg/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/libkmahjongg/Manifest
+++ b/kde-base/libkmahjongg/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/libkmahjongg/libkmahjongg-4.7.2.ebuild b/kde-base/libkmahjongg/libkmahjongg-4.7.2.ebuild
deleted file mode 100644
index 76965f6b1bd0..000000000000
--- a/kde-base/libkmahjongg/libkmahjongg-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:55 alexxy 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/libkmahjongg/libkmahjongg-4.7.3.ebuild b/kde-base/libkmahjongg/libkmahjongg-4.7.3.ebuild
index d02b624e9dc3..f2dcf5e41c6d 100644
--- a/kde-base/libkmahjongg/libkmahjongg-4.7.3.ebuild
+++ b/kde-base/libkmahjongg/libkmahjongg-4.7.3.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/kde-base/libkmahjongg/libkmahjongg-4.7.3.ebuild,v 1.1 2011/11/02 20:47:57 alexxy Exp $
+# $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
 
@@ -8,7 +8,7 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="LibKMahjongg for KDE"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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 55198aaad7a5..4d43fae00274 100644
--- a/kde-base/libkonq/Manifest
+++ b/kde-base/libkonq/Manifest
@@ -1,4 +1,3 @@
-DIST kde-baseapps-4.7.2.tar.bz2 2685060 RMD160 f97994dabe6412065723a8373291f1cf3f7c3290 SHA1 b52937ad8e5e4be884cc76f265c19964f461ac2c SHA256 1104284ad9cfc9757b0bbd2516dfdcbe4119ea6a6e6daf3c9d7eb66c43760bfa
 DIST kde-baseapps-4.7.3.tar.bz2 2685074 RMD160 270f3f3ae7b473651517db8818160f16e4faf544 SHA1 952dc26d0d908b41973a8d7b4d27765bf5128d58 SHA256 e9fb0c5da9e9a255c1a1735dfa518dcadc1ea23c68a467164597ff3dbf51c8df
 DIST kdebase-4.6.3.tar.bz2 2682586 RMD160 38784d7a5a708703f5a22e39dc5f83ef7aecd833 SHA1 69cfba74099cdce27f7f72725288f025979b41f3 SHA256 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
 DIST kdebase-4.6.5.tar.bz2 2639622 RMD160 cef007659a02cbec3bd484aa9eb5a721c5200b4f SHA1 1a902d22956daaf380ceefe68f8db75b8b760ae6 SHA256 542a42fc806673ba46827dcc5616fe53239659107934f1b05bf476e46ecbffd5
diff --git a/kde-base/libkonq/libkonq-4.7.2.ebuild b/kde-base/libkonq/libkonq-4.7.2.ebuild
deleted file mode 100644
index 99a1ec2abdd1..000000000000
--- a/kde-base/libkonq/libkonq-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:50 alexxy 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/libkonq/libkonq-4.7.3.ebuild b/kde-base/libkonq/libkonq-4.7.3.ebuild
index ee6872c35248..e0787f4a5d28 100644
--- a/kde-base/libkonq/libkonq-4.7.3.ebuild
+++ b/kde-base/libkonq/libkonq-4.7.3.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/kde-base/libkonq/libkonq-4.7.3.ebuild,v 1.1 2011/11/02 20:47:58 alexxy Exp $
+# $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
 
@@ -10,7 +10,7 @@ CPPUNIT_REQUIRED="optional"
 inherit kde4-meta
 
 DESCRIPTION="The embeddable part of konqueror"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 RESTRICT="test"
 
diff --git a/kde-base/libksane/Manifest b/kde-base/libksane/Manifest
index 319721fe0e45..bd1ed4d3606a 100644
--- a/kde-base/libksane/Manifest
+++ b/kde-base/libksane/Manifest
@@ -1,4 +1,3 @@
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
 DIST kdegraphics-4.6.5.tar.bz2 5455380 RMD160 75fdf00994bfc2737a754b4ff360ab789cd824b5 SHA1 1e64698993d0754dfae1296d8d16ba9370f9a08c SHA256 5b8a7e54f281ac938d8e22db673b7ddcff8a1d8adfc128282150ad52c80b8c04
-DIST libksane-4.7.2.tar.bz2 82823 RMD160 5aea6d14b048f47f78f917b2fa1fcf887beb6873 SHA1 223182cf23fc29a10ff2f1ce7756aecf4258b41c SHA256 cc1b3f32797c6107d98129ecd78728c394926b3dd4d899af1451e8def97e5e7d
 DIST libksane-4.7.3.tar.bz2 82840 RMD160 390f9596a211db51190eadcfb9246f25e4ffa524 SHA1 d1efdd1f5f7f99ba173ddcc88b2ddee343ecf96b SHA256 3516663048f4401ef8b14323b6a5fc8324c5b51500258a28e2d2faaaa68f193a
diff --git a/kde-base/libksane/libksane-4.7.2.ebuild b/kde-base/libksane/libksane-4.7.2.ebuild
deleted file mode 100644
index c9f707127aed..000000000000
--- a/kde-base/libksane/libksane-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:02 alexxy 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/libksane/libksane-4.7.3.ebuild b/kde-base/libksane/libksane-4.7.3.ebuild
index 8609eba095ac..041333a63728 100644
--- a/kde-base/libksane/libksane-4.7.3.ebuild
+++ b/kde-base/libksane/libksane-4.7.3.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/kde-base/libksane/libksane-4.7.3.ebuild,v 1.1 2011/11/02 20:48:14 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="SANE Library interface for KDE"
 HOMEPAGE="http://www.kipi-plugins.org"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 LICENSE="LGPL-2"
 
diff --git a/kde-base/libkworkspace/Manifest b/kde-base/libkworkspace/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/libkworkspace/Manifest
+++ b/kde-base/libkworkspace/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/libkworkspace/libkworkspace-4.7.2.ebuild b/kde-base/libkworkspace/libkworkspace-4.7.2.ebuild
deleted file mode 100644
index 45401c9a3233..000000000000
--- a/kde-base/libkworkspace/libkworkspace-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:04 alexxy 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/libkworkspace/libkworkspace-4.7.3.ebuild b/kde-base/libkworkspace/libkworkspace-4.7.3.ebuild
index d3b43586d5d1..3634650dece1 100644
--- a/kde-base/libkworkspace/libkworkspace-4.7.3.ebuild
+++ b/kde-base/libkworkspace/libkworkspace-4.7.3.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/kde-base/libkworkspace/libkworkspace-4.7.3.ebuild,v 1.1 2011/11/02 20:48:21 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/libkworkspace-4.7.3.ebuild,v 1.3 2011/12/07 22:14:01 hwoarang Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 KMEXTRACTONLY="
diff --git a/kde-base/liboxygenstyle/Manifest b/kde-base/liboxygenstyle/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/liboxygenstyle/Manifest
+++ b/kde-base/liboxygenstyle/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/liboxygenstyle/liboxygenstyle-4.7.2.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-4.7.2.ebuild
deleted file mode 100644
index a29506903a28..000000000000
--- a/kde-base/liboxygenstyle/liboxygenstyle-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:06 alexxy 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.3.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-4.7.3.ebuild
index 37ae7eb97f84..5d12656d1e8c 100644
--- a/kde-base/liboxygenstyle/liboxygenstyle-4.7.3.ebuild
+++ b/kde-base/liboxygenstyle/liboxygenstyle-4.7.3.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/kde-base/liboxygenstyle/liboxygenstyle-4.7.3.ebuild,v 1.1 2011/11/02 20:48:02 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ 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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/libplasmaclock/Manifest b/kde-base/libplasmaclock/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/libplasmaclock/Manifest
+++ b/kde-base/libplasmaclock/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/libplasmaclock/libplasmaclock-4.7.2.ebuild b/kde-base/libplasmaclock/libplasmaclock-4.7.2.ebuild
deleted file mode 100644
index dbf8c471f29e..000000000000
--- a/kde-base/libplasmaclock/libplasmaclock-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:07 alexxy 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/libplasmaclock/libplasmaclock-4.7.3.ebuild b/kde-base/libplasmaclock/libplasmaclock-4.7.3.ebuild
index 4100289e3d1c..9039ecac3e79 100644
--- a/kde-base/libplasmaclock/libplasmaclock-4.7.3.ebuild
+++ b/kde-base/libplasmaclock/libplasmaclock-4.7.3.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/kde-base/libplasmaclock/libplasmaclock-4.7.3.ebuild,v 1.1 2011/11/02 20:48:11 alexxy Exp $
+# $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
 
@@ -10,7 +10,7 @@ OPENGL_REQUIRED="optional"
 inherit kde4-meta
 
 DESCRIPTION="Libraries for KDE Plasma's clocks"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug +holidays"
 
 DEPEND="
diff --git a/kde-base/libplasmagenericshell/Manifest b/kde-base/libplasmagenericshell/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/libplasmagenericshell/Manifest
+++ b/kde-base/libplasmagenericshell/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/libplasmagenericshell/libplasmagenericshell-4.7.2.ebuild b/kde-base/libplasmagenericshell/libplasmagenericshell-4.7.2.ebuild
deleted file mode 100644
index 655233046413..000000000000
--- a/kde-base/libplasmagenericshell/libplasmagenericshell-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:51 alexxy 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/libplasmagenericshell/libplasmagenericshell-4.7.3.ebuild b/kde-base/libplasmagenericshell/libplasmagenericshell-4.7.3.ebuild
index 90a799578828..65ea28c469e5 100644
--- a/kde-base/libplasmagenericshell/libplasmagenericshell-4.7.3.ebuild
+++ b/kde-base/libplasmagenericshell/libplasmagenericshell-4.7.3.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/kde-base/libplasmagenericshell/libplasmagenericshell-4.7.3.ebuild,v 1.1 2011/11/02 20:48:21 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMMODULE="libs/plasmagenericshell"
 inherit kde4-meta
 
 DESCRIPTION="Libraries for the KDE Plasma shell"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug test"
 
 DEPEND="
diff --git a/kde-base/libtaskmanager/Manifest b/kde-base/libtaskmanager/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/libtaskmanager/Manifest
+++ b/kde-base/libtaskmanager/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/libtaskmanager/libtaskmanager-4.7.2.ebuild b/kde-base/libtaskmanager/libtaskmanager-4.7.2.ebuild
deleted file mode 100644
index e014cb0edc4d..000000000000
--- a/kde-base/libtaskmanager/libtaskmanager-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:57 alexxy 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/libtaskmanager/libtaskmanager-4.7.3.ebuild b/kde-base/libtaskmanager/libtaskmanager-4.7.3.ebuild
index 4cbf84fd1e89..de901636afce 100644
--- a/kde-base/libtaskmanager/libtaskmanager-4.7.3.ebuild
+++ b/kde-base/libtaskmanager/libtaskmanager-4.7.3.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/kde-base/libtaskmanager/libtaskmanager-4.7.3.ebuild,v 1.1 2011/11/02 20:47:52 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMMODULE="libs/taskmanager"
 inherit kde4-meta
 
 DESCRIPTION="A library that provides basic taskmanager functionality"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/lokalize/Manifest b/kde-base/lokalize/Manifest
index 8429b87a7c26..c05641549806 100644
--- a/kde-base/lokalize/Manifest
+++ b/kde-base/lokalize/Manifest
@@ -1,4 +1,3 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
 DIST kdesdk-4.6.5.tar.bz2 6063147 RMD160 0818eb740cb3f9c83ccf92bb238c4adbdd83b875 SHA1 8cffa0472fbe1096ebfea9bde49aaff76a145b34 SHA256 4b35eb3381bbf06e4d091dea4b38f6c807ce218d45e04d8719ee17ebd1820ff4
-DIST kdesdk-4.7.2.tar.bz2 5265267 RMD160 a8d275fcc858a548c7fe9ce04c0fd11279297174 SHA1 b6259b46fed642c35e1c1d1f90712084141ca441 SHA256 c9377df9429633413c57684574e6405b3dc3b493ac3ab43d9fd429ff3ab920be
 DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
diff --git a/kde-base/lokalize/lokalize-4.7.2-r1.ebuild b/kde-base/lokalize/lokalize-4.7.2-r1.ebuild
deleted file mode 100644
index f72873834073..000000000000
--- a/kde-base/lokalize/lokalize-4.7.2-r1.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.2-r1.ebuild,v 1.1 2011/10/28 19:56:28 abcd 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() {
-	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}${PREFIX}/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/lokalize/lokalize-4.7.3.ebuild b/kde-base/lokalize/lokalize-4.7.3.ebuild
index 3c361effc7b8..3263bc0a8a94 100644
--- a/kde-base/lokalize/lokalize-4.7.3.ebuild
+++ b/kde-base/lokalize/lokalize-4.7.3.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/kde-base/lokalize/lokalize-4.7.3.ebuild,v 1.1 2011/11/02 20:48:06 alexxy Exp $
+# $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
 
@@ -10,7 +10,7 @@ PYTHON_DEPEND="2"
 inherit python kde4-meta
 
 DESCRIPTION="KDE4 translation tool"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug semantic-desktop"
 
 DEPEND="
diff --git a/kde-base/lskat/Manifest b/kde-base/lskat/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/lskat/Manifest
+++ b/kde-base/lskat/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/lskat/lskat-4.7.2.ebuild b/kde-base/lskat/lskat-4.7.2.ebuild
deleted file mode 100644
index 4dc260866a24..000000000000
--- a/kde-base/lskat/lskat-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:57 alexxy 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/lskat/lskat-4.7.3.ebuild b/kde-base/lskat/lskat-4.7.3.ebuild
index 5ee6acadccc6..6a1706eebc99 100644
--- a/kde-base/lskat/lskat-4.7.3.ebuild
+++ b/kde-base/lskat/lskat-4.7.3.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/kde-base/lskat/lskat-4.7.3.ebuild,v 1.1 2011/11/02 20:47:58 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="Skat game for KDE"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/marble/Manifest b/kde-base/marble/Manifest
index bd9f5250de89..91e4f7d3a666 100644
--- a/kde-base/marble/Manifest
+++ b/kde-base/marble/Manifest
@@ -1,4 +1,3 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
 DIST kdeedu-4.6.5.tar.bz2 71684677 RMD160 78cfdc42f648308477c57bd816f46434bb588449 SHA1 64247eb68b2710a66baaf824d798e46b34ca4d4f SHA256 1306ef6c8654a0a17131b98e16b19d68beb4e03a324749b2147b010f5c45394b
-DIST marble-4.7.2.tar.bz2 21066804 RMD160 db4236fa5a304675fe3c458f960ec27b77a18964 SHA1 2b6353ff589d66dcf95a3eb79059275f620e03b2 SHA256 d9d9d8f522f6fead4c2a13afd1f76ec03ee87a37d4b8d35a6b20cf6fa11633c4
 DIST marble-4.7.3.tar.bz2 21068336 RMD160 3518116c5e6f3d3bfa68e80f6eec7dfaed69193f SHA1 980a8dae9c7a0f8483fde5dc839fae834763933a SHA256 9d39da22c4094e6265e884451fe5efc5e34166772ccff37c63c18a2f4d48a557
diff --git a/kde-base/marble/marble-4.7.2-r1.ebuild b/kde-base/marble/marble-4.7.2-r1.ebuild
deleted file mode 100644
index 48d36522ef7a..000000000000
--- a/kde-base/marble/marble-4.7.2-r1.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/marble/marble-4.7.2-r1.ebuild,v 1.3 2011/11/03 10:52:25 tampakrap 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}
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.7-magic-r1.patch"
-)
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-	kde4-base_pkg_setup
-}
-
-src_prepare() {
-	kde4-base_src_prepare
-	python_convert_shebangs -r $(python_get_version) .
-}
-
-src_configure() {
-	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)
-		-DWITH_liblocation=0
-	)
-	use kde || mycmakeargs=(
-		-DQTONLY=ON
-		${mycmakeargs[@]}
-	)
-	use kde && mycmakeargs=(
-		$(cmake-utils_use_with plasma)
-		$(cmake-utils_use_with python PyKDE4)
-		${mycmakeargs[@]}
-	)
-
-	find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'
-
-	kde4-base_src_configure
-}
diff --git a/kde-base/marble/marble-4.7.3.ebuild b/kde-base/marble/marble-4.7.3.ebuild
index 02ea0b3ed681..b48ceeaf1221 100644
--- a/kde-base/marble/marble-4.7.3.ebuild
+++ b/kde-base/marble/marble-4.7.3.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/kde-base/marble/marble-4.7.3.ebuild,v 1.2 2011/11/03 10:52:25 tampakrap Exp $
+# $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
 
@@ -12,7 +12,7 @@ KDE_SCM="git"
 inherit kde4-base python
 
 DESCRIPTION="Generic geographical map widget"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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
diff --git a/kde-base/mplayerthumbs/Manifest b/kde-base/mplayerthumbs/Manifest
index b74697d7e5ca..299fa5e8456b 100644
--- a/kde-base/mplayerthumbs/Manifest
+++ b/kde-base/mplayerthumbs/Manifest
@@ -1,4 +1,3 @@
 DIST kdemultimedia-4.6.3.tar.bz2 1611668 RMD160 8824bda18a1f1051dea366a0ff0d6191068476dd SHA1 d5bde19156b65e9b56e0e6de800efc0efe117632 SHA256 b3a6732dead0558610b4b40d3ce28c4b7b5da8869a63436180eacb3aacec533b
 DIST kdemultimedia-4.6.5.tar.bz2 1611493 RMD160 70ca60910f21e464f49e4e106918fbcc1407b0c7 SHA1 081bead5ee758d169f3119c138424929b001d04f SHA256 7ab9afb233538e7065758b32cd13f52fee2b68306f4be3dead729f3ba93c9c58
-DIST kdemultimedia-4.7.2.tar.bz2 1643403 RMD160 3c5510cb381b64290dda9a15a483dff3062037db SHA1 2fc12558284fe95da63e24c73612846c6c1d31e1 SHA256 a5a6e1101f4d8fc278791d63c4c91e261d60e995e67b4e8d901f2f93ba7be800
 DIST kdemultimedia-4.7.3.tar.bz2 1644497 RMD160 de9d9f9341d91bf0d56fa9468c0441226cb6aba2 SHA1 4db44494e6a2ef886e3513b6a2eb4e526741a6ff SHA256 ad96332218b82c4466debcb165061d87051a917e0321bdc34e4024da9c8c30b1
diff --git a/kde-base/mplayerthumbs/mplayerthumbs-4.7.2.ebuild b/kde-base/mplayerthumbs/mplayerthumbs-4.7.2.ebuild
deleted file mode 100644
index d4fcc0a47b9e..000000000000
--- a/kde-base/mplayerthumbs/mplayerthumbs-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:43 alexxy 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/mplayerthumbs/mplayerthumbs-4.7.3.ebuild b/kde-base/mplayerthumbs/mplayerthumbs-4.7.3.ebuild
index 424006410fc1..defb5b26c9b0 100644
--- a/kde-base/mplayerthumbs/mplayerthumbs-4.7.3.ebuild
+++ b/kde-base/mplayerthumbs/mplayerthumbs-4.7.3.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/kde-base/mplayerthumbs/mplayerthumbs-4.7.3.ebuild,v 1.1 2011/11/02 20:47:51 alexxy Exp $
+# $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
 
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/nepomuk/Manifest b/kde-base/nepomuk/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/nepomuk/Manifest
+++ b/kde-base/nepomuk/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/nepomuk/nepomuk-4.7.2.ebuild b/kde-base/nepomuk/nepomuk-4.7.2.ebuild
deleted file mode 100644
index 858bdc7101a4..000000000000
--- a/kde-base/nepomuk/nepomuk-4.7.2.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/nepomuk/nepomuk-4.7.2.ebuild,v 1.1 2011/10/06 18:11:04 alexxy 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}"
diff --git a/kde-base/nepomuk/nepomuk-4.7.3.ebuild b/kde-base/nepomuk/nepomuk-4.7.3.ebuild
index 0bce3feac2d5..767408b35978 100644
--- a/kde-base/nepomuk/nepomuk-4.7.3.ebuild
+++ b/kde-base/nepomuk/nepomuk-4.7.3.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/kde-base/nepomuk/nepomuk-4.7.3.ebuild,v 1.2 2011/12/03 16:38:22 dilfridge Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Nepomuk KDE4 client"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/nsplugins/Manifest b/kde-base/nsplugins/Manifest
index 55198aaad7a5..4d43fae00274 100644
--- a/kde-base/nsplugins/Manifest
+++ b/kde-base/nsplugins/Manifest
@@ -1,4 +1,3 @@
-DIST kde-baseapps-4.7.2.tar.bz2 2685060 RMD160 f97994dabe6412065723a8373291f1cf3f7c3290 SHA1 b52937ad8e5e4be884cc76f265c19964f461ac2c SHA256 1104284ad9cfc9757b0bbd2516dfdcbe4119ea6a6e6daf3c9d7eb66c43760bfa
 DIST kde-baseapps-4.7.3.tar.bz2 2685074 RMD160 270f3f3ae7b473651517db8818160f16e4faf544 SHA1 952dc26d0d908b41973a8d7b4d27765bf5128d58 SHA256 e9fb0c5da9e9a255c1a1735dfa518dcadc1ea23c68a467164597ff3dbf51c8df
 DIST kdebase-4.6.3.tar.bz2 2682586 RMD160 38784d7a5a708703f5a22e39dc5f83ef7aecd833 SHA1 69cfba74099cdce27f7f72725288f025979b41f3 SHA256 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
 DIST kdebase-4.6.5.tar.bz2 2639622 RMD160 cef007659a02cbec3bd484aa9eb5a721c5200b4f SHA1 1a902d22956daaf380ceefe68f8db75b8b760ae6 SHA256 542a42fc806673ba46827dcc5616fe53239659107934f1b05bf476e46ecbffd5
diff --git a/kde-base/nsplugins/nsplugins-4.7.2.ebuild b/kde-base/nsplugins/nsplugins-4.7.2.ebuild
deleted file mode 100644
index 327aad3dea00..000000000000
--- a/kde-base/nsplugins/nsplugins-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:48 alexxy 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.3.ebuild b/kde-base/nsplugins/nsplugins-4.7.3.ebuild
index cb33de66f7b6..33f0539da67a 100644
--- a/kde-base/nsplugins/nsplugins-4.7.3.ebuild
+++ b/kde-base/nsplugins/nsplugins-4.7.3.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/kde-base/nsplugins/nsplugins-4.7.3.ebuild,v 1.1 2011/11/02 20:47:57 alexxy Exp $
+# $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
 
@@ -8,7 +8,7 @@ KMNAME="kde-baseapps"
 inherit kde4-meta
 
 DESCRIPTION="Netscape plugins support for Konqueror."
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/okteta/Manifest b/kde-base/okteta/Manifest
index 8429b87a7c26..c05641549806 100644
--- a/kde-base/okteta/Manifest
+++ b/kde-base/okteta/Manifest
@@ -1,4 +1,3 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
 DIST kdesdk-4.6.5.tar.bz2 6063147 RMD160 0818eb740cb3f9c83ccf92bb238c4adbdd83b875 SHA1 8cffa0472fbe1096ebfea9bde49aaff76a145b34 SHA256 4b35eb3381bbf06e4d091dea4b38f6c807ce218d45e04d8719ee17ebd1820ff4
-DIST kdesdk-4.7.2.tar.bz2 5265267 RMD160 a8d275fcc858a548c7fe9ce04c0fd11279297174 SHA1 b6259b46fed642c35e1c1d1f90712084141ca441 SHA256 c9377df9429633413c57684574e6405b3dc3b493ac3ab43d9fd429ff3ab920be
 DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
diff --git a/kde-base/okteta/okteta-4.7.2.ebuild b/kde-base/okteta/okteta-4.7.2.ebuild
deleted file mode 100644
index 1a046b63b7be..000000000000
--- a/kde-base/okteta/okteta-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:04 alexxy 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/okteta/okteta-4.7.3.ebuild b/kde-base/okteta/okteta-4.7.3.ebuild
index 87315d411b1d..f33a50ddb4d1 100644
--- a/kde-base/okteta/okteta-4.7.3.ebuild
+++ b/kde-base/okteta/okteta-4.7.3.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/kde-base/okteta/okteta-4.7.3.ebuild,v 1.1 2011/11/02 20:48:17 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kdesdk"
 inherit kde4-meta
 
 DESCRIPTION="KDE hexeditor"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/okular/Manifest b/kde-base/okular/Manifest
index 0a0e09cf1f35..e970b5f9fd4d 100644
--- a/kde-base/okular/Manifest
+++ b/kde-base/okular/Manifest
@@ -1,4 +1,3 @@
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
 DIST kdegraphics-4.6.5.tar.bz2 5455380 RMD160 75fdf00994bfc2737a754b4ff360ab789cd824b5 SHA1 1e64698993d0754dfae1296d8d16ba9370f9a08c SHA256 5b8a7e54f281ac938d8e22db673b7ddcff8a1d8adfc128282150ad52c80b8c04
-DIST okular-4.7.2.tar.bz2 1172539 RMD160 a9273f56ff8968c49b09c44d801d23dadfbafd31 SHA1 5bc14efec8d00429a45a807a5bc839ffc783a10f SHA256 fdd8b07263f2a7f3e60d2c7869d25b8553a7c90f340083c2f4e8303672f754e1
 DIST okular-4.7.3.tar.bz2 1172549 RMD160 e0b0ede6523e2bb472657f8a77ae3c6cccbb3ea9 SHA1 a14700386f386cc50f7dd6785eeb93dae10a0362 SHA256 4cf762b04e9ba28edf4b83c05b0299eb6d078de416a19dd1d745551478a476f1
diff --git a/kde-base/okular/okular-4.7.2.ebuild b/kde-base/okular/okular-4.7.2.ebuild
deleted file mode 100644
index fa1e8d723d05..000000000000
--- a/kde-base/okular/okular-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:09 alexxy 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/okular/okular-4.7.3.ebuild b/kde-base/okular/okular-4.7.3.ebuild
index 49dda70b1b5a..1a6579817b18 100644
--- a/kde-base/okular/okular-4.7.3.ebuild
+++ b/kde-base/okular/okular-4.7.3.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/kde-base/okular/okular-4.7.3.ebuild,v 1.1 2011/11/02 20:48:10 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="chm crypt debug djvu ebook +jpeg +ps +pdf +tiff"
 
 DEPEND="
diff --git a/kde-base/oxygen-icons/oxygen-icons-4.7.2.ebuild b/kde-base/oxygen-icons/oxygen-icons-4.7.2.ebuild
deleted file mode 100644
index 0c1be1f7d32b..000000000000
--- a/kde-base/oxygen-icons/oxygen-icons-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:13 alexxy 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/oxygen-icons/oxygen-icons-4.7.3.ebuild b/kde-base/oxygen-icons/oxygen-icons-4.7.3.ebuild
index 86ade93e4574..b1113546c30d 100644
--- a/kde-base/oxygen-icons/oxygen-icons-4.7.3.ebuild
+++ b/kde-base/oxygen-icons/oxygen-icons-4.7.3.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/kde-base/oxygen-icons/oxygen-icons-4.7.3.ebuild,v 1.1 2011/11/02 20:48:21 alexxy Exp $
+# $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
 
@@ -26,7 +26,7 @@ SRC_URI="
 "
 
 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="aqua bindist"
 
 DEPEND="
diff --git a/kde-base/palapeli/Manifest b/kde-base/palapeli/Manifest
index 300caa131fb0..3da267543cb4 100644
--- a/kde-base/palapeli/Manifest
+++ b/kde-base/palapeli/Manifest
@@ -1,4 +1,3 @@
 DIST kdegames-4.6.3.tar.bz2 59304199 RMD160 af582f466a2dc35e6d2917190cba9d61ea624fc7 SHA1 472cb9541f389a8869a496f715d48587db568dda SHA256 beec752db9ced1d04e0a4736dd9ce37598b259bf14e3c010d5bfc7bd07e5b4a9
 DIST kdegames-4.6.5.tar.bz2 59294365 RMD160 ed847d3723dd3ba8946d48222ec891f0479984e6 SHA1 28c4908439f493fa30436875a77de01a21e88f4c SHA256 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-DIST kdegames-4.7.2.tar.bz2 62950912 RMD160 9f47027a00adde4eb84ed87ea4fa33519d58c892 SHA1 a84be8406fce38cf5b172c320904bb1cbe59e729 SHA256 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
 DIST kdegames-4.7.3.tar.bz2 62945699 RMD160 148bfb98732e9b81cf5a631e5b1ec4d516386c0d SHA1 abd90be42fa67cd6d6be1defe90dcd0408e94445 SHA256 2bf17c5264147adfb1bc731c25610518e574707ffe5bc16260a9679bbf210a90
diff --git a/kde-base/palapeli/palapeli-4.7.2.ebuild b/kde-base/palapeli/palapeli-4.7.2.ebuild
deleted file mode 100644
index 879c9ead7983..000000000000
--- a/kde-base/palapeli/palapeli-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:51 alexxy 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/palapeli/palapeli-4.7.3.ebuild b/kde-base/palapeli/palapeli-4.7.3.ebuild
index a1e42c0dd557..3b9076ac32db 100644
--- a/kde-base/palapeli/palapeli-4.7.3.ebuild
+++ b/kde-base/palapeli/palapeli-4.7.3.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/kde-base/palapeli/palapeli-4.7.3.ebuild,v 1.1 2011/11/02 20:48:21 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMNAME="kdegames"
 inherit kde4-meta
 
 DESCRIPTION="KDE jigsaw puzzle game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/parley/Manifest b/kde-base/parley/Manifest
index 6001e0aa8bc8..575c8a6ed5bf 100644
--- a/kde-base/parley/Manifest
+++ b/kde-base/parley/Manifest
@@ -1,4 +1,3 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
 DIST kdeedu-4.6.5.tar.bz2 71684677 RMD160 78cfdc42f648308477c57bd816f46434bb588449 SHA1 64247eb68b2710a66baaf824d798e46b34ca4d4f SHA256 1306ef6c8654a0a17131b98e16b19d68beb4e03a324749b2147b010f5c45394b
-DIST parley-4.7.2.tar.bz2 10476578 RMD160 42579cce563f5adaa9a75fca6423b7f354babf7e SHA1 65fab5b04f2b0a3598c764ab138acb3c335cbb48 SHA256 c5cc40cf4d6900f9b1aaeb2cc29272fedaa1ff0edfd96c4a3b7bd9e9c69e9383
 DIST parley-4.7.3.tar.bz2 10557966 RMD160 b827c70b5324139baa55613cf07c430b6c989e21 SHA1 a5d06f373976554d58c8aae279e411a6be028826 SHA256 aa39114fcccb9c4f99d7d38e96da6f368bec75d33c4eb64346a59bf007faf04f
diff --git a/kde-base/parley/parley-4.7.2.ebuild b/kde-base/parley/parley-4.7.2.ebuild
deleted file mode 100644
index 256438283e52..000000000000
--- a/kde-base/parley/parley-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:07 alexxy 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/parley/parley-4.7.3.ebuild b/kde-base/parley/parley-4.7.3.ebuild
index 6e000498b3b2..da7fa8549314 100644
--- a/kde-base/parley/parley-4.7.3.ebuild
+++ b/kde-base/parley/parley-4.7.3.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/kde-base/parley/parley-4.7.3.ebuild,v 1.1 2011/11/02 20:48:16 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="KDE Educational: vocabulary trainer"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug +plasma"
 
 DEPEND="
diff --git a/kde-base/perlkde/Manifest b/kde-base/perlkde/Manifest
index 4160702fc47f..57c874ca25de 100644
--- a/kde-base/perlkde/Manifest
+++ b/kde-base/perlkde/Manifest
@@ -1,2 +1 @@
-DIST perlkde-4.7.2.tar.bz2 40149 RMD160 06dd0d81ea4b66169260dff11944e54943f846b6 SHA1 a355563b55dc2dd004373a39853af38cda0d005d SHA256 22ddffaef8a64c43204e3a126c8f8ec842e3c2d6c9b1742e4fabed8be07e49fd
 DIST perlkde-4.7.3.tar.bz2 40153 RMD160 938a7c83053ac1efc00c74ac8cef6152bcdfcb4f SHA1 e0cc0d644084f1c71b6afc30d5467c49ba9a9fab SHA256 0309b3fea6cf5be8540a60d190e87510329543ca5408b3f836e62d55eca2ddf9
diff --git a/kde-base/perlkde/perlkde-4.7.2-r1.ebuild b/kde-base/perlkde/perlkde-4.7.2-r1.ebuild
deleted file mode 100644
index efa831045e33..000000000000
--- a/kde-base/perlkde/perlkde-4.7.2-r1.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.2-r1.ebuild,v 1.1 2011/10/19 20:44:22 dilfridge 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/perlkde/perlkde-4.7.3.ebuild b/kde-base/perlkde/perlkde-4.7.3.ebuild
index 9f8623ac4615..e482310101e5 100644
--- a/kde-base/perlkde/perlkde-4.7.3.ebuild
+++ b/kde-base/perlkde/perlkde-4.7.3.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/kde-base/perlkde/perlkde-4.7.3.ebuild,v 1.1 2011/11/02 20:48:08 alexxy Exp $
+# $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
 
@@ -8,7 +8,7 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="KDE Perl bindings"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="akonadi attica debug kate okular semantic-desktop test"
 
 RDEPEND="
diff --git a/kde-base/perlqt/Manifest b/kde-base/perlqt/Manifest
index 0601685ca21f..b57134533cfd 100644
--- a/kde-base/perlqt/Manifest
+++ b/kde-base/perlqt/Manifest
@@ -1,2 +1 @@
-DIST perlqt-4.7.2.tar.bz2 1956024 RMD160 e7272df5b6a45153a6c6a559127f610650af5848 SHA1 cde0c6b325e62d26ee6bd2f3f25d01e0563197c9 SHA256 caa9e848a7d2f724859b4fca7815dca43339cd92cf65ccb68e5c88a58f6b36f6
 DIST perlqt-4.7.3.tar.bz2 1955899 RMD160 bce317a5ae53af3bb029698c7605044f3d41496d SHA1 6e69719edccb23e3ced7ba30b72e88d214d6f54e SHA256 59c7eb34b5812caca5ce7667c4e2e6d1e442b573429b3f6ca3c8d4a574cfeef5
diff --git a/kde-base/perlqt/perlqt-4.7.2-r1.ebuild b/kde-base/perlqt/perlqt-4.7.2-r1.ebuild
deleted file mode 100644
index 2308b64520d3..000000000000
--- a/kde-base/perlqt/perlqt-4.7.2-r1.ebuild
+++ /dev/null
@@ -1,45 +0,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.2-r1.ebuild,v 1.2 2011/12/01 22:07:39 dilfridge 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
-
-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/perlqt/perlqt-4.7.3.ebuild b/kde-base/perlqt/perlqt-4.7.3.ebuild
index 5855e7e00dc5..aa9a8dc86c20 100644
--- a/kde-base/perlqt/perlqt-4.7.3.ebuild
+++ b/kde-base/perlqt/perlqt-4.7.3.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/kde-base/perlqt/perlqt-4.7.3.ebuild,v 1.3 2011/12/03 16:00:04 dilfridge Exp $
+# $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
 
@@ -13,7 +13,7 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="Qt Perl bindings"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug phonon qimageblitz qscintilla qwt webkit"
 
 RDEPEND="
diff --git a/kde-base/phonon-kde/Manifest b/kde-base/phonon-kde/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/phonon-kde/Manifest
+++ b/kde-base/phonon-kde/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/phonon-kde/phonon-kde-4.7.2.ebuild b/kde-base/phonon-kde/phonon-kde-4.7.2.ebuild
deleted file mode 100644
index ee8c7e4081f1..000000000000
--- a/kde-base/phonon-kde/phonon-kde-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:04 alexxy 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/phonon-kde/phonon-kde-4.7.3.ebuild b/kde-base/phonon-kde/phonon-kde-4.7.3.ebuild
index bf5144503406..734855860634 100644
--- a/kde-base/phonon-kde/phonon-kde-4.7.3.ebuild
+++ b/kde-base/phonon-kde/phonon-kde-4.7.3.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/kde-base/phonon-kde/phonon-kde-4.7.3.ebuild,v 1.1 2011/11/02 20:48:12 alexxy Exp $
+# $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
 
@@ -11,7 +11,7 @@ inherit kde4-meta
 DESCRIPTION="Phonon KDE Integration"
 HOMEPAGE="http://phonon.kde.org"
 
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-2"
 IUSE="alsa debug xine pulseaudio"
 
diff --git a/kde-base/plasma-apps/Manifest b/kde-base/plasma-apps/Manifest
index 55198aaad7a5..4d43fae00274 100644
--- a/kde-base/plasma-apps/Manifest
+++ b/kde-base/plasma-apps/Manifest
@@ -1,4 +1,3 @@
-DIST kde-baseapps-4.7.2.tar.bz2 2685060 RMD160 f97994dabe6412065723a8373291f1cf3f7c3290 SHA1 b52937ad8e5e4be884cc76f265c19964f461ac2c SHA256 1104284ad9cfc9757b0bbd2516dfdcbe4119ea6a6e6daf3c9d7eb66c43760bfa
 DIST kde-baseapps-4.7.3.tar.bz2 2685074 RMD160 270f3f3ae7b473651517db8818160f16e4faf544 SHA1 952dc26d0d908b41973a8d7b4d27765bf5128d58 SHA256 e9fb0c5da9e9a255c1a1735dfa518dcadc1ea23c68a467164597ff3dbf51c8df
 DIST kdebase-4.6.3.tar.bz2 2682586 RMD160 38784d7a5a708703f5a22e39dc5f83ef7aecd833 SHA1 69cfba74099cdce27f7f72725288f025979b41f3 SHA256 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
 DIST kdebase-4.6.5.tar.bz2 2639622 RMD160 cef007659a02cbec3bd484aa9eb5a721c5200b4f SHA1 1a902d22956daaf380ceefe68f8db75b8b760ae6 SHA256 542a42fc806673ba46827dcc5616fe53239659107934f1b05bf476e46ecbffd5
diff --git a/kde-base/plasma-apps/plasma-apps-4.7.2.ebuild b/kde-base/plasma-apps/plasma-apps-4.7.2.ebuild
deleted file mode 100644
index 9ba11db73785..000000000000
--- a/kde-base/plasma-apps/plasma-apps-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:59 alexxy 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-apps/plasma-apps-4.7.3.ebuild b/kde-base/plasma-apps/plasma-apps-4.7.3.ebuild
index 74039b7381d6..3ee88ab29e48 100644
--- a/kde-base/plasma-apps/plasma-apps-4.7.3.ebuild
+++ b/kde-base/plasma-apps/plasma-apps-4.7.3.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/kde-base/plasma-apps/plasma-apps-4.7.3.ebuild,v 1.1 2011/11/02 20:48:02 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMMODULE="plasma"
 inherit kde4-meta
 
 DESCRIPTION="Additional Applets for Plasma"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/plasma-runtime/Manifest b/kde-base/plasma-runtime/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/plasma-runtime/Manifest
+++ b/kde-base/plasma-runtime/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/plasma-runtime/plasma-runtime-4.7.2.ebuild b/kde-base/plasma-runtime/plasma-runtime-4.7.2.ebuild
deleted file mode 100644
index 76fbbce03a7f..000000000000
--- a/kde-base/plasma-runtime/plasma-runtime-4.7.2.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/plasma-runtime/plasma-runtime-4.7.2.ebuild,v 1.1 2011/10/06 18:10:57 alexxy 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"
diff --git a/kde-base/plasma-runtime/plasma-runtime-4.7.3.ebuild b/kde-base/plasma-runtime/plasma-runtime-4.7.3.ebuild
index 864985e6ae08..5e5511499b3e 100644
--- a/kde-base/plasma-runtime/plasma-runtime-4.7.3.ebuild
+++ b/kde-base/plasma-runtime/plasma-runtime-4.7.3.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/kde-base/plasma-runtime/plasma-runtime-4.7.3.ebuild,v 1.1 2011/11/02 20:48:05 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-runtime/plasma-runtime-4.7.3.ebuild,v 1.3 2011/12/07 22:13:47 hwoarang Exp $
 
 EAPI=4
 
@@ -10,5 +10,5 @@ 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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.7.2-r1.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.7.2-r1.ebuild
deleted file mode 100644
index 37ffedc85d63..000000000000
--- a/kde-base/plasma-workspace/plasma-workspace-4.7.2-r1.ebuild
+++ /dev/null
@@ -1,144 +0,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.2-r1.ebuild,v 1.1 2011/10/28 20:00:45 abcd 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"
-)
-
-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/plasma-workspace/plasma-workspace-4.7.3-r7.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.7.3-r7.ebuild
index daecec894ddd..cc2b16afbb71 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.7.3-r7.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.7.3-r7.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/kde-base/plasma-workspace/plasma-workspace-4.7.3-r7.ebuild,v 1.1 2011/11/29 21:49:08 dilfridge Exp $
+# $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
 
@@ -11,7 +11,7 @@ PYTHON_DEPEND="python? 2"
 inherit python kde4-meta
 
 DESCRIPTION="Plasma: KDE desktop framework"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug google-gadgets gps python qalculate +rss semantic-desktop xinerama"
 
 COMMONDEPEND="
diff --git a/kde-base/powerdevil/Manifest b/kde-base/powerdevil/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/powerdevil/Manifest
+++ b/kde-base/powerdevil/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/powerdevil/powerdevil-4.7.2.ebuild b/kde-base/powerdevil/powerdevil-4.7.2.ebuild
deleted file mode 100644
index 2df620e5953d..000000000000
--- a/kde-base/powerdevil/powerdevil-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:43 alexxy 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/powerdevil/powerdevil-4.7.3.ebuild b/kde-base/powerdevil/powerdevil-4.7.3.ebuild
index 6179c8b880d7..2f88bf486547 100644
--- a/kde-base/powerdevil/powerdevil-4.7.3.ebuild
+++ b/kde-base/powerdevil/powerdevil-4.7.3.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/kde-base/powerdevil/powerdevil-4.7.3.ebuild,v 1.1 2011/11/02 20:47:51 alexxy Exp $
+# $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
 
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug +pm-utils"
 
 DEPEND="
diff --git a/kde-base/printer-applet/Manifest b/kde-base/printer-applet/Manifest
index 348ce6a51263..65b585b0a481 100644
--- a/kde-base/printer-applet/Manifest
+++ b/kde-base/printer-applet/Manifest
@@ -1,4 +1,3 @@
 DIST kdeutils-4.6.3.tar.bz2 3703326 RMD160 1fe6287fed3fa21eef902ee764425171f7345e6c SHA1 1aa735c03689ef49b949278ee31d0d8e8536b7d6 SHA256 d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
 DIST kdeutils-4.6.5.tar.bz2 3699961 RMD160 65293718d8785c8e06e9149465f55f7f5a8718f5 SHA1 1c2ae023d9a6bcf72d3cebd0d7df2e6a175ffdcb SHA256 03de4b7728301414c8e704ba5c8650d8ded053747268ad47c901880fc1bf0b29
-DIST kdeutils-4.7.2.tar.bz2 3800427 RMD160 13fadbd312d70d7de360221facaf506707562fcc SHA1 52ce9b6b5f2c20475f46b6f7378ca4c530df37b4 SHA256 cdea138fc4556b4f6de5e63ee7ccbcb3485a780f372e699c0cb9fd6d65e02f96
 DIST kdeutils-4.7.3.tar.bz2 3802391 RMD160 0e0a73d290baaa289665b49722f04f19ab517dd9 SHA1 23fc9823647152d5d8cc250a55402c8930db4059 SHA256 a8c802f32b9e918d806a4487c25485f86019e4c473f0de6d3086d8ea8e492839
diff --git a/kde-base/printer-applet/printer-applet-4.7.2.ebuild b/kde-base/printer-applet/printer-applet-4.7.2.ebuild
deleted file mode 100644
index fea5f97345ef..000000000000
--- a/kde-base/printer-applet/printer-applet-4.7.2.ebuild
+++ /dev/null
@@ -1,54 +0,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.2.ebuild,v 1.1 2011/10/06 18:10:45 alexxy Exp $
-
-EAPI=3
-
-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
-}
-
-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/printer-applet/printer-applet-4.7.3.ebuild b/kde-base/printer-applet/printer-applet-4.7.3.ebuild
index bb0b40de5a9f..bbff0abe30ac 100644
--- a/kde-base/printer-applet/printer-applet-4.7.3.ebuild
+++ b/kde-base/printer-applet/printer-applet-4.7.3.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/kde-base/printer-applet/printer-applet-4.7.3.ebuild,v 1.1 2011/11/02 20:48:04 alexxy Exp $
+# $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
 
@@ -16,7 +16,7 @@ fi
 inherit python ${kde_eclass}
 
 DESCRIPTION="KDE printer system tray utility"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index 6ebebc94f258..7c8460723a3f 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -1,4 +1,3 @@
 DIST kdebindings-4.6.3.tar.bz2 7078095 RMD160 f62d84df4957f4449695486bfb117df917f17da9 SHA1 4ecc6ac378c241472aa75680abfafd8d57672653 SHA256 13cf7fc54132303a7bcaf0c03b696d05a07405f51d2cb5ba14e56d35c0762be3
 DIST kdebindings-4.6.5.tar.bz2 7078088 RMD160 4a4fa7233708233a6fdbac203c55cfb6df9892af SHA1 e63a0b0eec92320df2c2c539b916c5ee9425a689 SHA256 b87cf7ccd30a75121b032311c5f625d0a4d44c8c7b1f08c45b9292451da8ff91
-DIST pykde4-4.7.2.tar.bz2 2106075 RMD160 7e26ccbe24a7461f10748f218e0a88610a645695 SHA1 cc7844851110697f06da60cf4a1ee527eda76087 SHA256 4ec71a9e3fc799118742ce7eec14ffab5ea94a008126bb0ab5878836890557e1
 DIST pykde4-4.7.3.tar.bz2 2106262 RMD160 251b979fc6d4e2186278f8eb84b332a59aff2cdd SHA1 16063793d39fdc9f5b9916cab49236103ce79da2 SHA256 c580432d645361355400c27e84779d3ca1209d979624b147ffd742c986665aca
diff --git a/kde-base/pykde4/pykde4-4.7.2-r1.ebuild b/kde-base/pykde4/pykde4-4.7.2-r1.ebuild
deleted file mode 100644
index 620335e82f30..000000000000
--- a/kde-base/pykde4/pykde4-4.7.2-r1.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.2-r1.ebuild,v 1.1 2011/10/28 20:03:04 abcd 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 || die "emake install failed for Python ${PYTHON_ABI}"
-	}
-	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/pykde4/pykde4-4.7.3.ebuild b/kde-base/pykde4/pykde4-4.7.3.ebuild
index 00aaf2fe578f..0516e4e42b13 100644
--- a/kde-base/pykde4/pykde4-4.7.3.ebuild
+++ b/kde-base/pykde4/pykde4-4.7.3.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/kde-base/pykde4/pykde4-4.7.3.ebuild,v 1.1 2011/11/02 20:48:13 alexxy Exp $
+# $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
 
@@ -14,7 +14,7 @@ KDE_SCM="git"
 inherit python portability kde4-base
 
 DESCRIPTION="Python bindings for KDE4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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
diff --git a/kde-base/qguiplatformplugin_kde/Manifest b/kde-base/qguiplatformplugin_kde/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/qguiplatformplugin_kde/Manifest
+++ b/kde-base/qguiplatformplugin_kde/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.7.2.ebuild b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.7.2.ebuild
deleted file mode 100644
index eb4b909b5893..000000000000
--- a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:52 alexxy 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/qguiplatformplugin_kde/qguiplatformplugin_kde-4.7.3.ebuild b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.7.3.ebuild
index 36cafef75aa5..2c455c6e3833 100644
--- a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.7.3.ebuild
+++ b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.7.3.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/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.7.3.ebuild,v 1.1 2011/11/02 20:48:16 alexxy Exp $
+# $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
 
@@ -8,5 +8,5 @@ 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"
+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 784f36e659f0..6bf12005bccf 100644
--- a/kde-base/qtruby/Manifest
+++ b/kde-base/qtruby/Manifest
@@ -1,2 +1 @@
-DIST qtruby-4.7.2.tar.bz2 613635 RMD160 50f4f2ac61d159f53b24873a3ad015580ef02aca SHA1 1d13c0dd79a2c90c9e964e23fee3573c9397bd4d SHA256 c4be0d334b77360ce0cdc2c4d5bbf421ee232ad520ad7711a2b3e4ef260e2edc
 DIST qtruby-4.7.3.tar.bz2 614672 RMD160 32527ca6ebf76a8e1f9e76a6fdc031b2d4a3d8d7 SHA1 2e3b36ece9039ccd39be76145575015503c6283c SHA256 f2a467a96180e1684a83cb2db365c6003f006e2a23a5086ceb2975289e8aee24
diff --git a/kde-base/qtruby/qtruby-4.7.2.ebuild b/kde-base/qtruby/qtruby-4.7.2.ebuild
deleted file mode 100644
index aa8da9c5a165..000000000000
--- a/kde-base/qtruby/qtruby-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:51 alexxy 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/qtruby/qtruby-4.7.3.ebuild b/kde-base/qtruby/qtruby-4.7.3.ebuild
index e4b0192b1cbb..5e75d1d2d6f6 100644
--- a/kde-base/qtruby/qtruby-4.7.3.ebuild
+++ b/kde-base/qtruby/qtruby-4.7.3.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/kde-base/qtruby/qtruby-4.7.3.ebuild,v 1.1 2011/11/02 20:48:09 alexxy Exp $
+# $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
 
@@ -18,7 +18,7 @@ USE_RUBY="ruby18"
 inherit kde4-base ruby-ng
 
 DESCRIPTION="Qt Ruby bindings"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug phonon qscintilla qwt webkit"
 
 DEPEND="
diff --git a/kde-base/qyoto/Manifest b/kde-base/qyoto/Manifest
index 01f7e5546470..3254ba9af0dc 100644
--- a/kde-base/qyoto/Manifest
+++ b/kde-base/qyoto/Manifest
@@ -1,2 +1 @@
-DIST qyoto-4.7.2.tar.bz2 553409 RMD160 8af04e55fdb96bb0f11ab96436ce3986c506f894 SHA1 f002a31fcdcaa94af02bbf5e368e79463974e467 SHA256 e0e1ffd56b3d7e960fc98f7a3910ddf818aec63658c12f9c4582678d314c69f9
 DIST qyoto-4.7.3.tar.bz2 553569 RMD160 13cc1bfdba8f34cff4a939fee2837abe5958d785 SHA1 676042633b8c426adf1f47ad143f5db20ae257ef SHA256 c4bfc59c5bbd5c33c5e9668384e851407a980247b1a1e880dbb0fa102c7c26ba
diff --git a/kde-base/qyoto/qyoto-4.7.2.ebuild b/kde-base/qyoto/qyoto-4.7.2.ebuild
deleted file mode 100644
index dc66a4498de8..000000000000
--- a/kde-base/qyoto/qyoto-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:51 alexxy 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/qyoto/qyoto-4.7.3.ebuild b/kde-base/qyoto/qyoto-4.7.3.ebuild
index dcc73baaf2ee..f823f0e85fd3 100644
--- a/kde-base/qyoto/qyoto-4.7.3.ebuild
+++ b/kde-base/qyoto/qyoto-4.7.3.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/kde-base/qyoto/qyoto-4.7.3.ebuild,v 1.1 2011/11/02 20:47:52 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KDE_SCM="git"
 inherit kde4-base mono
 
 DESCRIPTION="C# bindings for Qt"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug +phonon qscintilla webkit"
 
 DEPEND="
diff --git a/kde-base/renamedlg-plugins/Manifest b/kde-base/renamedlg-plugins/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/renamedlg-plugins/Manifest
+++ b/kde-base/renamedlg-plugins/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/renamedlg-plugins/renamedlg-plugins-4.7.2.ebuild b/kde-base/renamedlg-plugins/renamedlg-plugins-4.7.2.ebuild
deleted file mode 100644
index 64567f9d472c..000000000000
--- a/kde-base/renamedlg-plugins/renamedlg-plugins-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:49 alexxy 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/renamedlg-plugins/renamedlg-plugins-4.7.3.ebuild b/kde-base/renamedlg-plugins/renamedlg-plugins-4.7.3.ebuild
index 241ae8a1ac12..e75c461047a3 100644
--- a/kde-base/renamedlg-plugins/renamedlg-plugins-4.7.3.ebuild
+++ b/kde-base/renamedlg-plugins/renamedlg-plugins-4.7.3.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/kde-base/renamedlg-plugins/renamedlg-plugins-4.7.3.ebuild,v 1.1 2011/11/02 20:47:58 alexxy Exp $
+# $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
 
@@ -9,5 +9,5 @@ KMMODULE="renamedlgplugins"
 inherit kde4-meta
 
 DESCRIPTION="KDE RenameDlg plugins"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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 36a989a6ba93..1296fc14429a 100644
--- a/kde-base/rocs/Manifest
+++ b/kde-base/rocs/Manifest
@@ -1,4 +1,3 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
 DIST kdeedu-4.6.5.tar.bz2 71684677 RMD160 78cfdc42f648308477c57bd816f46434bb588449 SHA1 64247eb68b2710a66baaf824d798e46b34ca4d4f SHA256 1306ef6c8654a0a17131b98e16b19d68beb4e03a324749b2147b010f5c45394b
-DIST rocs-4.7.2.tar.bz2 344088 RMD160 30119cab98a37cca454e2acc4b7af04b936e67b5 SHA1 19f2bf19dfe7a0787180c3fc9d1f32c14316f985 SHA256 3f08af8f569e357fec557122b63fec945cbbe85ad5ea8f0d65063f0f38dff3d3
 DIST rocs-4.7.3.tar.bz2 344842 RMD160 d8dfc43d23c693bea9c7372c088a1647aa88051e SHA1 5c7d4115f029e09a006912bf816d4ce396a9b49a SHA256 1b3ef7226c98debdb7f27457fef8b913f8312ee4c54710a0bd293fcc41e57c2c
diff --git a/kde-base/rocs/rocs-4.7.2.ebuild b/kde-base/rocs/rocs-4.7.2.ebuild
deleted file mode 100644
index 6cf458dffe49..000000000000
--- a/kde-base/rocs/rocs-4.7.2.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/rocs/rocs-4.7.2.ebuild,v 1.1 2011/10/06 18:11:13 alexxy 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
-"
-
-RESTRICT="test"
-# bug 376909
diff --git a/kde-base/rocs/rocs-4.7.3.ebuild b/kde-base/rocs/rocs-4.7.3.ebuild
index 95af72e11623..8b49dd368124 100644
--- a/kde-base/rocs/rocs-4.7.3.ebuild
+++ b/kde-base/rocs/rocs-4.7.3.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/kde-base/rocs/rocs-4.7.3.ebuild,v 1.2 2011/11/20 13:40:02 dilfridge Exp $
+# $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
 
@@ -9,7 +9,7 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="KDE4 interface to work with Graph Theory"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="dev-libs/boost"
diff --git a/kde-base/smokegen/Manifest b/kde-base/smokegen/Manifest
index 1f60f88a3f32..b0044996c055 100644
--- a/kde-base/smokegen/Manifest
+++ b/kde-base/smokegen/Manifest
@@ -1,2 +1 @@
-DIST smokegen-4.7.2.tar.bz2 149069 RMD160 bc08eb9ed60ef28cff6e31b9270688e4c6855ca6 SHA1 f2f605b2ca40403529b9065e745ebb1d9b7e0fcb SHA256 b30947d42c637921c00bb42eb50cfcf8e30f8ce61dcf7e12663bfa86ace16879
 DIST smokegen-4.7.3.tar.bz2 149081 RMD160 cb6b1a3a654c242da74e5d4a02f60b26a5b13cd7 SHA1 ede4095fdb190b3bef13b246111e7d79903ad77e SHA256 2562497763b913d8d03c7dbad02bf0bc8b6ecd140e7954230984ac2d3b6a4853
diff --git a/kde-base/smokegen/smokegen-4.7.2.ebuild b/kde-base/smokegen/smokegen-4.7.2.ebuild
deleted file mode 100644
index 58caddf1ef9a..000000000000
--- a/kde-base/smokegen/smokegen-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:47 alexxy 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/smokegen/smokegen-4.7.3.ebuild b/kde-base/smokegen/smokegen-4.7.3.ebuild
index d4f8f57a0994..1b727be0e5db 100644
--- a/kde-base/smokegen/smokegen-4.7.3.ebuild
+++ b/kde-base/smokegen/smokegen-4.7.3.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/kde-base/smokegen/smokegen-4.7.3.ebuild,v 1.1 2011/11/02 20:47:54 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="Scripting Meta Object Kompiler Engine - generators"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="aqua debug"
 
 DEPEND="
diff --git a/kde-base/smokekde/Manifest b/kde-base/smokekde/Manifest
index 1402d5ada1f9..5c099c45d3d3 100644
--- a/kde-base/smokekde/Manifest
+++ b/kde-base/smokekde/Manifest
@@ -1,2 +1 @@
-DIST smokekde-4.7.2.tar.bz2 37533 RMD160 97dc17b787f3dc27732da77cf9894a13567adcc3 SHA1 8874744db367dd5c9d7a8783f662b6283b69dc1f SHA256 b1ce3d39ee2d181f56156e29aa77b6240c0b80f05bec734e676cdfb6fa0b15ff
 DIST smokekde-4.7.3.tar.bz2 37506 RMD160 370a5c752944d412e6584257b2e148f608329678 SHA1 a25114d92c540f16af9022366ca2b5da447a1531 SHA256 9a4b0d54b60ac5e86de9e7e469022d97de22848d6b2fdd60068ebc975bea5750
diff --git a/kde-base/smokekde/smokekde-4.7.2.ebuild b/kde-base/smokekde/smokekde-4.7.2.ebuild
deleted file mode 100644
index 34509c8a66a8..000000000000
--- a/kde-base/smokekde/smokekde-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:46 alexxy 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/smokekde/smokekde-4.7.3.ebuild b/kde-base/smokekde/smokekde-4.7.3.ebuild
index dc91a80eb1a7..4ec5e483ee21 100644
--- a/kde-base/smokekde/smokekde-4.7.3.ebuild
+++ b/kde-base/smokekde/smokekde-4.7.3.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/kde-base/smokekde/smokekde-4.7.3.ebuild,v 1.1 2011/11/02 20:48:18 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="Scripting Meta Object Kompiler Engine - KDE bindings"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="akonadi attica debug kate okular semantic-desktop"
 
 DEPEND="
diff --git a/kde-base/smokeqt/Manifest b/kde-base/smokeqt/Manifest
index c136f9521622..1ea5594a8e57 100644
--- a/kde-base/smokeqt/Manifest
+++ b/kde-base/smokeqt/Manifest
@@ -1,2 +1 @@
-DIST smokeqt-4.7.2.tar.bz2 29847 RMD160 2f685ab1cd5e372452c971fd6661cb7599419c9f SHA1 93bf50c340e5188f2432da97c5a3ff7e2928eb3e SHA256 2700ba5426d03250f419c3b3e3c0b3ecfbbefa2690d9fdd6ab6e0ef093d71362
 DIST smokeqt-4.7.3.tar.bz2 29848 RMD160 9b4c84b76d1978ebea253efcf50c6f67bbf0836d SHA1 cf1c4b7116695f0842972b2985eca65f6b63702e SHA256 2bbef76c46d1e3498063c09c426d3fbd74c907cd6d55df15f0aaf45ef5c8b997
diff --git a/kde-base/smokeqt/smokeqt-4.7.2.ebuild b/kde-base/smokeqt/smokeqt-4.7.2.ebuild
deleted file mode 100644
index a47edab4e889..000000000000
--- a/kde-base/smokeqt/smokeqt-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:48 alexxy 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/smokeqt/smokeqt-4.7.3.ebuild b/kde-base/smokeqt/smokeqt-4.7.3.ebuild
index 8b0b52302760..01b5d14ab039 100644
--- a/kde-base/smokeqt/smokeqt-4.7.3.ebuild
+++ b/kde-base/smokeqt/smokeqt-4.7.3.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/kde-base/smokeqt/smokeqt-4.7.3.ebuild,v 1.1 2011/11/02 20:47:55 alexxy Exp $
+# $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
 
@@ -15,7 +15,7 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="Scripting Meta Object Kompiler Engine - Qt bindings"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug +phonon qimageblitz qscintilla qwt webkit"
 
 # Maybe make more of Qt optional?
diff --git a/kde-base/solid-runtime/Manifest b/kde-base/solid-runtime/Manifest
index 6cd9483aa9d4..3135870fd8af 100644
--- a/kde-base/solid-runtime/Manifest
+++ b/kde-base/solid-runtime/Manifest
@@ -1,4 +1,3 @@
-DIST kde-runtime-4.7.2.tar.bz2 6026223 RMD160 245c458164435e85aaabd1a9a6fa675a7de9796d SHA1 4d0b1883a2f65cc9472c4788c24e6b241f3b8828 SHA256 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf2a84126082 SHA1 75cf1993b42cbada44b8c3ca2d5b99e6ac48594c SHA256 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
diff --git a/kde-base/solid-runtime/solid-runtime-4.7.2.ebuild b/kde-base/solid-runtime/solid-runtime-4.7.2.ebuild
deleted file mode 100644
index 44f32022c2a5..000000000000
--- a/kde-base/solid-runtime/solid-runtime-4.7.2.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/solid-runtime/solid-runtime-4.7.2.ebuild,v 1.1 2011/10/06 18:10:46 alexxy 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/
-"
diff --git a/kde-base/solid-runtime/solid-runtime-4.7.3.ebuild b/kde-base/solid-runtime/solid-runtime-4.7.3.ebuild
index 5132acb6eaa8..97a545718eb9 100644
--- a/kde-base/solid-runtime/solid-runtime-4.7.3.ebuild
+++ b/kde-base/solid-runtime/solid-runtime-4.7.3.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/kde-base/solid-runtime/solid-runtime-4.7.3.ebuild,v 1.1 2011/11/02 20:47:54 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid-runtime/solid-runtime-4.7.3.ebuild,v 1.3 2011/12/07 22:13:34 hwoarang Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 KMEXTRA="
diff --git a/kde-base/solid/Manifest b/kde-base/solid/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/solid/Manifest
+++ b/kde-base/solid/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/solid/solid-4.7.2.ebuild b/kde-base/solid/solid-4.7.2.ebuild
deleted file mode 100644
index e493ed855a10..000000000000
--- a/kde-base/solid/solid-4.7.2.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.2.ebuild,v 1.3 2011/10/21 23:56:15 dilfridge 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/solid/solid-4.7.3.ebuild b/kde-base/solid/solid-4.7.3.ebuild
index 9cf2d33fc370..940d41d5360e 100644
--- a/kde-base/solid/solid-4.7.3.ebuild
+++ b/kde-base/solid/solid-4.7.3.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/kde-base/solid/solid-4.7.3.ebuild,v 1.1 2011/11/02 20:48:01 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ CPPUNIT_REQUIRED="test"
 inherit kde4-meta
 
 DESCRIPTION="Solid: the KDE hardware library"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug bluetooth networkmanager wicd"
 
 DEPEND="
diff --git a/kde-base/step/Manifest b/kde-base/step/Manifest
index 11e4b6a4e2a6..4d370462a0cd 100644
--- a/kde-base/step/Manifest
+++ b/kde-base/step/Manifest
@@ -1,4 +1,3 @@
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
 DIST kdeedu-4.6.5.tar.bz2 71684677 RMD160 78cfdc42f648308477c57bd816f46434bb588449 SHA1 64247eb68b2710a66baaf824d798e46b34ca4d4f SHA256 1306ef6c8654a0a17131b98e16b19d68beb4e03a324749b2147b010f5c45394b
-DIST step-4.7.2.tar.bz2 398371 RMD160 57351f795f0da36e562f4a0c501458191628f098 SHA1 642f24c49990181ab2cc2d1ad974bcdc3d47ed46 SHA256 c16334583fc52858ec6d08933c5a6d466fcd975526d9d09f2e4a347d7ea00d06
 DIST step-4.7.3.tar.bz2 398824 RMD160 9f368272807845dc5e767466338ea18792463b8f SHA1 411695882916a8a1d0db86426a0d8f935fab21ad SHA256 3482aa002356d1e95a11492cc1adca1aabc4d97432c7fc099fe5611fe1059adb
diff --git a/kde-base/step/step-4.7.2.ebuild b/kde-base/step/step-4.7.2.ebuild
deleted file mode 100644
index ce10b16363b0..000000000000
--- a/kde-base/step/step-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:58 alexxy 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/step/step-4.7.3.ebuild b/kde-base/step/step-4.7.3.ebuild
index 9f41efed4747..b56046e91297 100644
--- a/kde-base/step/step-4.7.3.ebuild
+++ b/kde-base/step/step-4.7.3.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/kde-base/step/step-4.7.3.ebuild,v 1.1 2011/11/02 20:48:20 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="The KDE physics simulator"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug +gsl +qalculate"
 
 DEPEND="
diff --git a/kde-base/superkaramba/Manifest b/kde-base/superkaramba/Manifest
index 348ce6a51263..65b585b0a481 100644
--- a/kde-base/superkaramba/Manifest
+++ b/kde-base/superkaramba/Manifest
@@ -1,4 +1,3 @@
 DIST kdeutils-4.6.3.tar.bz2 3703326 RMD160 1fe6287fed3fa21eef902ee764425171f7345e6c SHA1 1aa735c03689ef49b949278ee31d0d8e8536b7d6 SHA256 d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
 DIST kdeutils-4.6.5.tar.bz2 3699961 RMD160 65293718d8785c8e06e9149465f55f7f5a8718f5 SHA1 1c2ae023d9a6bcf72d3cebd0d7df2e6a175ffdcb SHA256 03de4b7728301414c8e704ba5c8650d8ded053747268ad47c901880fc1bf0b29
-DIST kdeutils-4.7.2.tar.bz2 3800427 RMD160 13fadbd312d70d7de360221facaf506707562fcc SHA1 52ce9b6b5f2c20475f46b6f7378ca4c530df37b4 SHA256 cdea138fc4556b4f6de5e63ee7ccbcb3485a780f372e699c0cb9fd6d65e02f96
 DIST kdeutils-4.7.3.tar.bz2 3802391 RMD160 0e0a73d290baaa289665b49722f04f19ab517dd9 SHA1 23fc9823647152d5d8cc250a55402c8930db4059 SHA256 a8c802f32b9e918d806a4487c25485f86019e4c473f0de6d3086d8ea8e492839
diff --git a/kde-base/superkaramba/superkaramba-4.7.2-r1.ebuild b/kde-base/superkaramba/superkaramba-4.7.2-r1.ebuild
deleted file mode 100644
index 2a6b1fd9c237..000000000000
--- a/kde-base/superkaramba/superkaramba-4.7.2-r1.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.2-r1.ebuild,v 1.1 2011/10/28 20:04:53 abcd 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/superkaramba/superkaramba-4.7.3.ebuild b/kde-base/superkaramba/superkaramba-4.7.3.ebuild
index c9cde87866d5..61fb067f63ae 100644
--- a/kde-base/superkaramba/superkaramba-4.7.3.ebuild
+++ b/kde-base/superkaramba/superkaramba-4.7.3.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/kde-base/superkaramba/superkaramba-4.7.3.ebuild,v 1.1 2011/11/02 20:48:04 alexxy Exp $
+# $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
 
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug python"
 
 DEPEND="
diff --git a/kde-base/svgpart/Manifest b/kde-base/svgpart/Manifest
index 95d7a1b7d070..d58afdbf1f20 100644
--- a/kde-base/svgpart/Manifest
+++ b/kde-base/svgpart/Manifest
@@ -1,4 +1,3 @@
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
 DIST kdegraphics-4.6.5.tar.bz2 5455380 RMD160 75fdf00994bfc2737a754b4ff360ab789cd824b5 SHA1 1e64698993d0754dfae1296d8d16ba9370f9a08c SHA256 5b8a7e54f281ac938d8e22db673b7ddcff8a1d8adfc128282150ad52c80b8c04
-DIST svgpart-4.7.2.tar.bz2 9157 RMD160 666213ce094916cc6cd1a2ea8e1f7c8b7d70180b SHA1 fe17a4f801ef94356a6bbc629affadc28a203b72 SHA256 e363b2d183d465a3557f6566dd9fb5333f35b8600dd75af032617614924c2914
 DIST svgpart-4.7.3.tar.bz2 9161 RMD160 1951c2462490d445613a224e50ec9e8459f0cfb2 SHA1 fa7f8cac53f6041f18a2bee09c2aa3885e27f7c7 SHA256 2310151ffdf5dd8d970b329d9c67e393a7bcafc5a4dadd8adbd50f3d20e1c9f3
diff --git a/kde-base/svgpart/svgpart-4.7.2.ebuild b/kde-base/svgpart/svgpart-4.7.2.ebuild
deleted file mode 100644
index c82b2ebc7295..000000000000
--- a/kde-base/svgpart/svgpart-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:00 alexxy 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/svgpart/svgpart-4.7.3.ebuild b/kde-base/svgpart/svgpart-4.7.3.ebuild
index 7fd63e70bebc..6c44eefb3c22 100644
--- a/kde-base/svgpart/svgpart-4.7.3.ebuild
+++ b/kde-base/svgpart/svgpart-4.7.3.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/kde-base/svgpart/svgpart-4.7.3.ebuild,v 1.1 2011/11/02 20:47:59 alexxy Exp $
+# $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
 
@@ -8,5 +8,5 @@ KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="Svgpart is a kpart for viewing SVGs"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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 348ce6a51263..65b585b0a481 100644
--- a/kde-base/sweeper/Manifest
+++ b/kde-base/sweeper/Manifest
@@ -1,4 +1,3 @@
 DIST kdeutils-4.6.3.tar.bz2 3703326 RMD160 1fe6287fed3fa21eef902ee764425171f7345e6c SHA1 1aa735c03689ef49b949278ee31d0d8e8536b7d6 SHA256 d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196
 DIST kdeutils-4.6.5.tar.bz2 3699961 RMD160 65293718d8785c8e06e9149465f55f7f5a8718f5 SHA1 1c2ae023d9a6bcf72d3cebd0d7df2e6a175ffdcb SHA256 03de4b7728301414c8e704ba5c8650d8ded053747268ad47c901880fc1bf0b29
-DIST kdeutils-4.7.2.tar.bz2 3800427 RMD160 13fadbd312d70d7de360221facaf506707562fcc SHA1 52ce9b6b5f2c20475f46b6f7378ca4c530df37b4 SHA256 cdea138fc4556b4f6de5e63ee7ccbcb3485a780f372e699c0cb9fd6d65e02f96
 DIST kdeutils-4.7.3.tar.bz2 3802391 RMD160 0e0a73d290baaa289665b49722f04f19ab517dd9 SHA1 23fc9823647152d5d8cc250a55402c8930db4059 SHA256 a8c802f32b9e918d806a4487c25485f86019e4c473f0de6d3086d8ea8e492839
diff --git a/kde-base/sweeper/sweeper-4.7.2.ebuild b/kde-base/sweeper/sweeper-4.7.2.ebuild
deleted file mode 100644
index acfab50e783a..000000000000
--- a/kde-base/sweeper/sweeper-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:13 alexxy 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/sweeper/sweeper-4.7.3.ebuild b/kde-base/sweeper/sweeper-4.7.3.ebuild
index 12fb95769c61..b8fd8ace268f 100644
--- a/kde-base/sweeper/sweeper-4.7.3.ebuild
+++ b/kde-base/sweeper/sweeper-4.7.3.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/kde-base/sweeper/sweeper-4.7.3.ebuild,v 1.1 2011/11/02 20:48:23 alexxy Exp $
+# $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
 
@@ -15,5 +15,5 @@ fi
 inherit ${kde_eclass}
 
 DESCRIPTION="KDE Privacy Settings Widget"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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 8972cd6bec5d..fff74e88e259 100644
--- a/kde-base/system-config-printer-kde/Manifest
+++ b/kde-base/system-config-printer-kde/Manifest
@@ -1,4 +1,3 @@
 DIST kdeadmin-4.6.3.tar.bz2 792325 RMD160 b36d9a7c983f5da9e6a3524d3cde1f28464d1580 SHA1 141e8e794ebd5341940d2d22986b7376a2abefbf SHA256 1db65d3f5afb83affdad921ee034f33d7aeb1aac7fe9a55f4b1d26c385577076
 DIST kdeadmin-4.6.5.tar.bz2 790804 RMD160 5eea0659691e0870e3646ebb33b98e84173781e8 SHA1 010912294a12461a8a0bfdce69c5373b37342cb6 SHA256 a1ef6784a00cd714eb30147e64c56f66e15d712fe7b9fc49c5dfad2ccc5c3ed7
-DIST kdeadmin-4.7.2.tar.bz2 806180 RMD160 154f11d28d86fffd929dd16804d0fca5f0caddb4 SHA1 c96ddd94a4903b035e73b3e958e6b189ca173fe9 SHA256 f7085433fa3f180575549340a6a360c6d67e21efdbfc9a40c3eb09de11e0cc57
 DIST kdeadmin-4.7.3.tar.bz2 806208 RMD160 5aefc3021a1fea4725295ebe97ba8486a09f2768 SHA1 b2d6d210bc40e8731a9ae8409673f3d71b57de0a SHA256 00b32dfb17a8edd89cdd01083df71b1b177e79c7a6ab7fce679a3d0246647029
diff --git a/kde-base/system-config-printer-kde/system-config-printer-kde-4.7.2-r1.ebuild b/kde-base/system-config-printer-kde/system-config-printer-kde-4.7.2-r1.ebuild
deleted file mode 100644
index d38002e1b3c9..000000000000
--- a/kde-base/system-config-printer-kde/system-config-printer-kde-4.7.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/system-config-printer-kde/system-config-printer-kde-4.7.2-r1.ebuild,v 1.2 2011/10/28 20:07:57 abcd 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/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
index a67e0846ec23..ddc95359781b 100644
--- 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
@@ -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/kde-base/system-config-printer-kde/system-config-printer-kde-4.7.3.ebuild,v 1.1 2011/11/02 20:48:07 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ PYTHON_DEPEND="2"
 inherit python kde4-meta
 
 DESCRIPTION="KDE port of Red Hat's Gnome system-config-printer"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-base/systemsettings/Manifest b/kde-base/systemsettings/Manifest
index 1fbd6a78957f..8fb000e4b304 100644
--- a/kde-base/systemsettings/Manifest
+++ b/kde-base/systemsettings/Manifest
@@ -1,4 +1,3 @@
-DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
diff --git a/kde-base/systemsettings/systemsettings-4.7.2.ebuild b/kde-base/systemsettings/systemsettings-4.7.2.ebuild
deleted file mode 100644
index 22d84f0d57c0..000000000000
--- a/kde-base/systemsettings/systemsettings-4.7.2.ebuild
+++ /dev/null
@@ -1,91 +0,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.2.ebuild,v 1.1 2011/10/06 18:10:54 alexxy 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 )
-"
-
-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.3.ebuild b/kde-base/systemsettings/systemsettings-4.7.3.ebuild
index 225c764bdd2a..d52938df83f0 100644
--- a/kde-base/systemsettings/systemsettings-4.7.3.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.7.3.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/kde-base/systemsettings/systemsettings-4.7.3.ebuild,v 1.2 2011/12/04 18:02:50 dilfridge Exp $
+# $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
 
@@ -11,7 +11,7 @@ inherit kde4-meta
 
 DESCRIPTION="System settings utility"
 IUSE="debug gtk +usb xinerama"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 COMMONDEPEND="
 	dev-libs/glib:2
diff --git a/kde-base/thumbnailers/Manifest b/kde-base/thumbnailers/Manifest
index e479e47ef112..e254a09afe59 100644
--- a/kde-base/thumbnailers/Manifest
+++ b/kde-base/thumbnailers/Manifest
@@ -1,4 +1,3 @@
 DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
 DIST kdegraphics-4.6.5.tar.bz2 5455380 RMD160 75fdf00994bfc2737a754b4ff360ab789cd824b5 SHA1 1e64698993d0754dfae1296d8d16ba9370f9a08c SHA256 5b8a7e54f281ac938d8e22db673b7ddcff8a1d8adfc128282150ad52c80b8c04
-DIST kdegraphics-thumbnailers-4.7.2.tar.bz2 43170 RMD160 c7a6fcb265abe5348afeab1aa367e771cb8012a9 SHA1 281c84bcec1ce4b02148caf164c28fbc47d9b11b SHA256 8879ffe65f935d6a6363b210e20305237e91d51cc185048d487b0b6b4725e46a
 DIST kdegraphics-thumbnailers-4.7.3.tar.bz2 43201 RMD160 e91207861507643c2161335ea16bea93034d763e SHA1 219fd55d94d695cee8c7b650dbe8088cc9807e5c SHA256 d07734479fa9cc96cdab0671e51c8f3b256769014e5a68849b292698be5ff287
diff --git a/kde-base/thumbnailers/thumbnailers-4.7.2.ebuild b/kde-base/thumbnailers/thumbnailers-4.7.2.ebuild
deleted file mode 100644
index ed03b33aebb9..000000000000
--- a/kde-base/thumbnailers/thumbnailers-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:10:50 alexxy 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/thumbnailers/thumbnailers-4.7.3.ebuild b/kde-base/thumbnailers/thumbnailers-4.7.3.ebuild
index e207c77a4b2d..87284aaa871f 100644
--- a/kde-base/thumbnailers/thumbnailers-4.7.3.ebuild
+++ b/kde-base/thumbnailers/thumbnailers-4.7.3.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/kde-base/thumbnailers/thumbnailers-4.7.3.ebuild,v 1.1 2011/11/02 20:47:59 alexxy Exp $
+# $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
 
@@ -9,7 +9,7 @@ KMNAME="kdegraphics-thumbnailers"
 inherit kde4-base
 
 DESCRIPTION="KDE 4 thumbnail generators for PDF/PS files"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/umbrello/Manifest b/kde-base/umbrello/Manifest
index 8429b87a7c26..c05641549806 100644
--- a/kde-base/umbrello/Manifest
+++ b/kde-base/umbrello/Manifest
@@ -1,4 +1,3 @@
 DIST kdesdk-4.6.3.tar.bz2 6075435 RMD160 4bc6d47f75584bf593ab9e8cb9aadf7b822dbdab SHA1 6faecbd828fda6cf0aced642287d982d3541d746 SHA256 b5f41dba8fc4281975776f2996965ec9a9b51d95c9aea62db924f80fb3bfc4f8
 DIST kdesdk-4.6.5.tar.bz2 6063147 RMD160 0818eb740cb3f9c83ccf92bb238c4adbdd83b875 SHA1 8cffa0472fbe1096ebfea9bde49aaff76a145b34 SHA256 4b35eb3381bbf06e4d091dea4b38f6c807ce218d45e04d8719ee17ebd1820ff4
-DIST kdesdk-4.7.2.tar.bz2 5265267 RMD160 a8d275fcc858a548c7fe9ce04c0fd11279297174 SHA1 b6259b46fed642c35e1c1d1f90712084141ca441 SHA256 c9377df9429633413c57684574e6405b3dc3b493ac3ab43d9fd429ff3ab920be
 DIST kdesdk-4.7.3.tar.bz2 5266193 RMD160 b958a05aec5115441328c0351b645de439651d50 SHA1 c0afae643345c92bce387ceafbcea59d3fbd812e SHA256 503c7f8a99f2c07c4167516828e97d3af72ebe51a79aba94e8bf1dd093222c7e
diff --git a/kde-base/umbrello/umbrello-4.7.2.ebuild b/kde-base/umbrello/umbrello-4.7.2.ebuild
deleted file mode 100644
index 38c467d0434c..000000000000
--- a/kde-base/umbrello/umbrello-4.7.2.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.2.ebuild,v 1.1 2011/10/06 18:11:01 alexxy 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-base/umbrello/umbrello-4.7.3.ebuild b/kde-base/umbrello/umbrello-4.7.3.ebuild
index d300508b7422..a051c3b37230 100644
--- a/kde-base/umbrello/umbrello-4.7.3.ebuild
+++ b/kde-base/umbrello/umbrello-4.7.3.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/kde-base/umbrello/umbrello-4.7.3.ebuild,v 1.1 2011/11/02 20:48:12 alexxy Exp $
+# $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
 
@@ -10,7 +10,7 @@ KMNAME="kdesdk"
 inherit kde4-meta
 
 DESCRIPTION="KDE UML Modeller"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/licenses/EPL b/licenses/ErlPL-1.1
similarity index 99%
rename from licenses/EPL
rename to licenses/ErlPL-1.1
index 3642b77de2c4..729d139db49d 100644
--- a/licenses/EPL
+++ b/licenses/ErlPL-1.1
@@ -284,5 +284,3 @@ under the License.
 The Initial Developer of the Original Code is Ericsson Utvecklings AB.
 Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
 AB. All Rights Reserved.''
-
-
diff --git a/mail-filter/policyd/policyd-1.82-r1.ebuild b/mail-filter/policyd/policyd-1.82-r1.ebuild
index b83ecd385937..9cbc37141533 100644
--- a/mail-filter/policyd/policyd-1.82-r1.ebuild
+++ b/mail-filter/policyd/policyd-1.82-r1.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/mail-filter/policyd/policyd-1.82-r1.ebuild,v 1.2 2011/12/07 07:42:00 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/policyd/policyd-1.82-r1.ebuild,v 1.3 2011/12/07 18:19:08 jer Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://policyd.sf.net/"
 SRC_URI="http://policyd.sourceforge.net/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="~amd64 ~hppa x86"
 IUSE=""
 DEPEND="virtual/mysql
 		dev-libs/openssl"
diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest
new file mode 100644
index 000000000000..c562415db303
--- /dev/null
+++ b/media-gfx/converseen/Manifest
@@ -0,0 +1 @@
+DIST converseen-0.4.7.tar.bz2 214327 RMD160 186c27bc2c8c154c1404a425eb5c88f3e030fb4b SHA1 d006ed0270578e8e23a2c5218374090628279576 SHA256 29454b53d0c8e2ecbb9886c4365a1e45ff4d1a08f2271dfa750d0036e23798fa
diff --git a/media-gfx/converseen/converseen-0.4.7.ebuild b/media-gfx/converseen/converseen-0.4.7.ebuild
new file mode 100644
index 000000000000..9ab8226a6598
--- /dev/null
+++ b/media-gfx/converseen/converseen-0.4.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/converseen/converseen-0.4.7.ebuild,v 1.1 2011/12/07 20:31:27 maksbotan Exp $
+
+EAPI="4"
+LANGSLONG="cs_CZ de_DE fr_FR hu_HU it_IT pl_PL pt_BR tr_TR"
+LANGS="es_CL"
+
+inherit cmake-utils
+
+DESCRIPTION="Batch image converter and resizer based on ImageMagick"
+HOMEPAGE="http://converseen.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	x11-libs/qt-gui:4
+	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+"
+DEPEND="${RDEPEND}"
+
+DOCS="README"
+
+src_prepare() {
+	for x in ${LANGSLONG}; do
+		if use !linguas_${x%_*}; then
+			rm -f "loc/${PN}_${x}."* || die
+			sed -i -e "\,/${PN}_${x}\...,d" CMakeLists.txt || die
+		fi
+	done
+	for x in ${LANGS}; do
+		if use !linguas_${x}; then
+			rm -f "loc/${PN}_${x}."* || die
+			sed -i -e "\,/${PN}_${x}\...,d" CMakeLists.txt || die
+		fi
+	done
+}
diff --git a/media-gfx/converseen/metadata.xml b/media-gfx/converseen/metadata.xml
new file mode 100644
index 000000000000..0ba33bf6c0d7
--- /dev/null
+++ b/media-gfx/converseen/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>nikoli@lavabit.com</email>
+		<name>Nikoli</name>
+	</maintainer>
+	<maintainer>
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-gfx/digikam/digikam-2.3.0.ebuild b/media-gfx/digikam/digikam-2.3.0.ebuild
index 5870b590618b..56aeccb2c8a0 100644
--- a/media-gfx/digikam/digikam-2.3.0.ebuild
+++ b/media-gfx/digikam/digikam-2.3.0.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-gfx/digikam/digikam-2.3.0.ebuild,v 1.2 2011/11/12 23:24:07 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.3.0.ebuild,v 1.4 2011/12/07 22:08:39 hwoarang Exp $
 
 EAPI=4
 
@@ -23,7 +23,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2
 	handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="4"
 IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video"
 
diff --git a/media-gfx/mypaint/mypaint-1.0.0-r1.ebuild b/media-gfx/mypaint/mypaint-1.0.0-r1.ebuild
index 157e2f1fa302..7abb785bef16 100644
--- a/media-gfx/mypaint/mypaint-1.0.0-r1.ebuild
+++ b/media-gfx/mypaint/mypaint-1.0.0-r1.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-gfx/mypaint/mypaint-1.0.0-r1.ebuild,v 1.2 2011/12/05 10:14:04 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/mypaint/mypaint-1.0.0-r1.ebuild,v 1.3 2011/12/07 20:40:09 maksbotan Exp $
 
 EAPI=4
 
@@ -26,8 +26,8 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 pkg_setup(){
-	python_pkg_setup
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {
diff --git a/media-libs/freeverb3/Manifest b/media-libs/freeverb3/Manifest
index b87c8ee68009..3aa636be7db9 100644
--- a/media-libs/freeverb3/Manifest
+++ b/media-libs/freeverb3/Manifest
@@ -11,3 +11,4 @@ DIST freeverb3-2.5.21.tar.gz 6193499 RMD160 f439abc2ce3b2d4230f23ed58e5c1fd1fae9
 DIST freeverb3-2.5.22.tar.gz 6190780 RMD160 cbbd80103edb3ff09b25dd9fd6186efa32f04e04 SHA1 01362bb59d828ccfa83caa249f716e76cf380086 SHA256 5c4061d18d1681534f4ade2a2485c94fb32e29588b43d081eaa5c11e381d24b8
 DIST freeverb3-2.5.6.tar.gz 6137361 RMD160 541c4231e5dc3baf6f7c7dd2bef4611d122a8361 SHA1 ee5cadff734374fdde7652aa8e3aedbaf7fb7cc7 SHA256 5ca572ecc53e02ffbb8da6cdaae9364c4a3afacb63f764f1f12b9cf800be663f
 DIST freeverb3-2.5.8.tar.gz 6136819 RMD160 df74bc8e20c016843c5d828192931d1e125714f6 SHA1 5a5e47e5eec08ebb26fcf5a5168fdd17e9c0d046 SHA256 ad489744caf0e83145eae7bc38fb88130bb86c35cf13dab7ffebc57369d31126
+DIST freeverb3-2.6.0.tar.gz 6196592 RMD160 0d64c6c81a80717bffb5e8829aa04a9aa28fafe9 SHA1 cd61930850eab190c0c130d4b0b1cd5a6cb7c2a4 SHA256 d403ba0f90a8bcadcb16fa79d82f6db1684a599d1b3646f724e93f89ff10a483
diff --git a/media-libs/freeverb3/freeverb3-2.6.0.ebuild b/media-libs/freeverb3/freeverb3-2.6.0.ebuild
new file mode 100644
index 000000000000..b20a60e31310
--- /dev/null
+++ b/media-libs/freeverb3/freeverb3-2.6.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeverb3/freeverb3-2.6.0.ebuild,v 1.1 2011/12/07 21:47:37 sping Exp $
+
+EAPI=2
+inherit multilib versionator
+
+DESCRIPTION="High Quality Reverb and Impulse Response Convolution library including XMMS/Audacious Effect plugins"
+HOMEPAGE="http://freeverb3.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="audacious avx jack plugdouble sse sse2 sse3 sse4 3dnow forcefpu"
+
+RDEPEND=">=sci-libs/fftw-3.0.1
+	audacious? ( <media-sound/audacious-3
+		media-libs/libsndfile )
+	jack? ( media-sound/jack-audio-connection-kit
+		media-libs/libsndfile )"
+DEPEND=${RDEPEND}
+
+S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
+
+src_configure() {
+	# TODO: Expose --enable-pthread (of >=2.6.0) to the outside
+	econf \
+		--enable-release \
+		--disable-bmp \
+		--disable-pluginit \
+		$(use_enable audacious) \
+		$(use_enable jack) \
+		$(use_enable plugdouble) \
+		--disable-autocflags \
+		$(use_enable 3dnow) \
+		$(use_enable sse) \
+		$(use_enable sse2) \
+		$(use_enable sse3) \
+		$(use_enable sse4) \
+		$(use_enable avx) \
+		--disable-fma \
+		--disable-fma4 \
+		$(use_enable forcefpu) \
+		|| die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc ChangeLog README || die 'dodoc failed'
+
+	if use audacious ; then
+		find "${D}/usr/$(get_libdir)/audacious/" -name '*.la' -print -delete || die
+	fi
+
+	insinto /usr/share/${PN}/samples/IR
+	doins samples/IR/*.wav || die
+}
diff --git a/media-libs/herqq/herqq-1.0.0-r1.ebuild b/media-libs/herqq/herqq-1.0.0-r1.ebuild
index 5626e15c8943..364931376c78 100644
--- a/media-libs/herqq/herqq-1.0.0-r1.ebuild
+++ b/media-libs/herqq/herqq-1.0.0-r1.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-libs/herqq/herqq-1.0.0-r1.ebuild,v 1.4 2011/11/05 20:17:57 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/herqq/herqq-1.0.0-r1.ebuild,v 1.5 2011/12/07 22:08:19 hwoarang Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/hupnp/${P}.zip"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc"
 
 # no release of QtSolutions using bundled libQtSolutions_SOAP
diff --git a/media-libs/libaacplus/libaacplus-2.0.2.ebuild b/media-libs/libaacplus/libaacplus-2.0.2.ebuild
index 0628c42df81b..b6554cdc22d0 100644
--- a/media-libs/libaacplus/libaacplus-2.0.2.ebuild
+++ b/media-libs/libaacplus/libaacplus-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libaacplus/libaacplus-2.0.2.ebuild,v 1.2 2011/12/06 20:27:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libaacplus/libaacplus-2.0.2.ebuild,v 1.3 2011/12/07 17:30:59 aballier Exp $
 
 EAPI=4
 
@@ -20,7 +20,7 @@ SRC_URI="http://dev.gentoo.org/~aballier/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa"
+KEYWORDS="~amd64 ~hppa ~x86-fbsd"
 IUSE="bindist fftw static-libs"
 RESTRICT="mirror"
 REQUIRED_USE="!bindist"
diff --git a/media-libs/libkface/libkface-2.3.0.ebuild b/media-libs/libkface/libkface-2.3.0.ebuild
index 69377bdf2621..6bf1940e7ef9 100644
--- a/media-libs/libkface/libkface-2.3.0.ebuild
+++ b/media-libs/libkface/libkface-2.3.0.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-libs/libkface/libkface-2.3.0.ebuild,v 1.1 2011/11/08 20:50:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libkface/libkface-2.3.0.ebuild,v 1.3 2011/12/07 22:08:52 hwoarang Exp $
 
 EAPI=4
 
@@ -20,7 +20,7 @@ HOMEPAGE="http://www.digikam.org/"
 SRC_URI="mirror://sourceforge/${DIGIKAMPN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 SLOT=4
 
diff --git a/media-libs/libkgeomap/libkgeomap-2.3.0.ebuild b/media-libs/libkgeomap/libkgeomap-2.3.0.ebuild
index 4d573f38ed0b..521ccb12f637 100644
--- a/media-libs/libkgeomap/libkgeomap-2.3.0.ebuild
+++ b/media-libs/libkgeomap/libkgeomap-2.3.0.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-libs/libkgeomap/libkgeomap-2.3.0.ebuild,v 1.1 2011/11/08 20:57:32 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libkgeomap/libkgeomap-2.3.0.ebuild,v 1.3 2011/12/07 22:09:04 hwoarang Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.digikam.org/"
 SRC_URI="mirror://sourceforge/${DIGIKAMPN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 SLOT=4
 
diff --git a/media-libs/libmediawiki/libmediawiki-2.3.0.ebuild b/media-libs/libmediawiki/libmediawiki-2.3.0.ebuild
index 61fd08ea9873..cd9ed986d169 100644
--- a/media-libs/libmediawiki/libmediawiki-2.3.0.ebuild
+++ b/media-libs/libmediawiki/libmediawiki-2.3.0.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-libs/libmediawiki/libmediawiki-2.3.0.ebuild,v 1.1 2011/11/09 02:44:06 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediawiki/libmediawiki-2.3.0.ebuild,v 1.3 2011/12/07 22:09:44 hwoarang Exp $
 
 EAPI=4
 
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.digikam.org/"
 SRC_URI="mirror://sourceforge/${DIGIKAMPN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 SLOT=4
 
diff --git a/media-libs/libpgf/libpgf-6.11.32.ebuild b/media-libs/libpgf/libpgf-6.11.32.ebuild
index c4a4e6b07223..b47da13b5189 100644
--- a/media-libs/libpgf/libpgf-6.11.32.ebuild
+++ b/media-libs/libpgf/libpgf-6.11.32.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-libs/libpgf/libpgf-6.11.32.ebuild,v 1.1 2011/09/11 20:03:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpgf/libpgf-6.11.32.ebuild,v 1.3 2011/12/07 22:09:18 hwoarang Exp $
 
 EAPI=4
 inherit autotools
@@ -11,7 +11,7 @@ SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libzen/libzen-0.4.23.ebuild b/media-libs/libzen/libzen-0.4.23.ebuild
index ad61d81613c9..04e283774414 100644
--- a/media-libs/libzen/libzen-0.4.23.ebuild
+++ b/media-libs/libzen/libzen-0.4.23.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-libs/libzen/libzen-0.4.23.ebuild,v 1.4 2011/11/28 03:05:25 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libzen/libzen-0.4.23.ebuild,v 1.5 2011/12/07 19:36:24 radhermit Exp $
 
 EAPI="4"
 
@@ -26,6 +26,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.4.21-no-tinyxml.patch
 )
 
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
 src_prepare() {
 	autotools-utils_src_prepare
 	sed -i -e "s:-O2::" configure.ac
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
new file mode 100644
index 000000000000..a311dd12f5f9
--- /dev/null
+++ b/media-libs/lilv/Manifest
@@ -0,0 +1 @@
+DIST lilv-0.5.0.tar.bz2 155752 RMD160 7c2ca19a86c8c5d1fc5d602bd38f709068f95b83 SHA1 a84785a9f11cac35b62dce5935346c5db6fa38aa SHA256 3540b1f27f126f20222159bdf519a09631804e1011e2e1f063bff90d328333cd
diff --git a/media-libs/lilv/files/ldconfig.patch b/media-libs/lilv/files/ldconfig.patch
new file mode 100644
index 000000000000..80567b1dc77e
--- /dev/null
+++ b/media-libs/lilv/files/ldconfig.patch
@@ -0,0 +1,12 @@
+Index: serd-0.4.2/wscript
+===================================================================
+--- serd-0.4.2.orig/wscript
++++ serd-0.4.2/wscript
+@@ -125,7 +125,6 @@ def build(bld):
+     # Man page
+     bld.install_files('${MANDIR}/man1', 'doc/serdi.1')
+ 
+-    bld.add_post_fun(autowaf.run_ldconfig)
+     if bld.env['DOCS']:
+         bld.add_post_fun(fix_docs)
+ 
diff --git a/media-libs/lilv/lilv-0.5.0.ebuild b/media-libs/lilv/lilv-0.5.0.ebuild
new file mode 100644
index 000000000000..291a0c72457f
--- /dev/null
+++ b/media-libs/lilv/lilv-0.5.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lilv/lilv-0.5.0.ebuild,v 1.2 2011/12/07 13:45:19 aballier Exp $
+
+EAPI=4
+
+inherit base waf-utils
+
+DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications"
+HOMEPAGE="http://drobilla.net/software/lilv/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+RDEPEND=">=media-libs/lv2core-6
+	>=dev-libs/serd-0.5
+	>=dev-libs/sord-0.5"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	dev-util/pkgconfig"
+
+PATCHES=( "${FILESDIR}/ldconfig.patch" )
+DOCS=( "AUTHORS" "README" "ChangeLog" )
+
+src_configure() {
+	waf-utils_src_configure \
+		"--mandir=/usr/share/man" \
+		"--docdir=/usr/share/doc/${PF}" \
+		$(use test && echo "--test") \
+		$(use doc && echo "--docs")
+	#$(use dyn-manifest && echo "--dyn-manifest") \
+}
+
+src_test() {
+	./waf test || die
+}
diff --git a/media-libs/lilv/metadata.xml b/media-libs/lilv/metadata.xml
new file mode 100644
index 000000000000..640383e7be81
--- /dev/null
+++ b/media-libs/lilv/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proaudio</herd>
+<longdescription lang="en">
+	Lilv is a library to make the use of LV2 plugins as simple as possible for applications. Lilv is the successor to SLV2, rewritten to be significantly faster and have minimal dependencies.
+</longdescription>
+</pkgmetadata>
diff --git a/media-libs/lv2core/Manifest b/media-libs/lv2core/Manifest
index c61639772bf2..d0df0e61ac1d 100644
--- a/media-libs/lv2core/Manifest
+++ b/media-libs/lv2core/Manifest
@@ -1,2 +1,3 @@
 DIST lv2core-3.0.tar.bz2 104167 RMD160 d36e64d5b1cc1d3eaa6aad4411674c6ce4ffb45b SHA1 6f277b32b1ce60e211db95bf37b71045d505b55d SHA256 7b209b6d5f8a9a597dae0c76f077be19db0fd2f764e9970cfbf87f3406c50172
 DIST lv2core-4.0.tar.gz 129749 RMD160 1069e04983df42f9af5359c85b04d485dc1fdc82 SHA1 a4c94a1c292c6eef85ffcc1cce696209bec1318e SHA256 a37c6b915c4f6ef8414f83ac356a1f802ab97badf3b58cd469ad9d1f7583d08f
+DIST lv2core-6.0.tar.bz2 106475 RMD160 09ae02dadfd240ebc0420e537ebf86f59a32fc68 SHA1 e57949ed9951ba4f6893137261887b07ef20c11d SHA256 b05429f1cade75ad559a72d65d78a927f9718e074e3aeb9698510403a4e52309
diff --git a/media-libs/lv2core/lv2core-6.0.ebuild b/media-libs/lv2core/lv2core-6.0.ebuild
new file mode 100644
index 000000000000..ac1e38e4f5fe
--- /dev/null
+++ b/media-libs/lv2core/lv2core-6.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lv2core/lv2core-6.0.ebuild,v 1.2 2011/12/07 13:48:22 aballier Exp $
+
+EAPI=4
+
+inherit waf-utils
+
+DESCRIPTION="LV2 is a simple but extensible successor of LADSPA"
+HOMEPAGE="http://lv2plug.in/"
+SRC_URI="http://lv2plug.in/spec/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!<media-libs/slv2-0.4.2"
+DOCS=( "AUTHORS" "README" "NEWS" )
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.1.ebuild
index 8a749d6e3a54..3ec4d63a5d56 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
 # 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.5 2011/11/15 18:27:02 jer Exp $
+# $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 $
 
 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"
 
diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index 03301add89ea..7afac8611edd 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -1,4 +1,4 @@
-DIST digikam-2.2.0.tar.bz2 54181796 RMD160 5053a1f63e242d841f94ce707e235a5ccacb8698 SHA1 b4ce7c8b17978f3c76b107a1535cd4b21d3bb6fb SHA256 d7597d8817d2ebd363def6042022b25b665e91ea59c431ead3def4634221b616
 DIST digikam-2.3.0.tar.bz2 54522109 RMD160 304bce5841f5d36a72a064784c90c91960c9a7c3 SHA1 15b8b16d7cce6ac50fb958d30166214f2f2b83ee SHA256 29ddf83a160817314e9274a35d678678da58006e41d961dcebc6afb0ab200a33
+DIST digikam-2.4.1.tar.bz2 54531119 RMD160 2a07c061927e7cec7a0128a68e60f9d7c6d1e78b SHA1 2ec3a20225462d277d5f0c3aa17b1ecfbb61f98c SHA256 aca967a4cc5312923cb2340502eb10a571684c14cf63896a68a1796d0483de3b
 DIST kipi-plugins-1.9.0.tar.bz2 5775775 RMD160 9bc1ae309e556335fa770e20b31b2527ddc4856b SHA1 fc12c018f4f73f7a7d025d7af2af99d4ae2dedc5 SHA256 d52466586725492788514c1b8d7bbea02f95c9deb744a0814d221c99c34e934c
 DIST kipi-plugins-doc-1.5.0.tar.bz2 1689039 RMD160 f4342798caf14817b96afdb11959f53ab175ae1d SHA1 55a57e1fffbd291ed2f31dbbe840ccd85cb499cc SHA256 13dfda13a1f5e276020dbae3f7c2227f5cc1ac4264070250eeff0a3eb59b67cf
diff --git a/media-plugins/kipi-plugins/kipi-plugins-2.3.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-2.3.0.ebuild
index d25216791ab8..2a49f003d662 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-2.3.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-2.3.0.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/kipi-plugins/kipi-plugins-2.3.0.ebuild,v 1.1 2011/11/09 03:03:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-2.3.0.ebuild,v 1.3 2011/12/07 22:04:08 hwoarang Exp $
 
 EAPI=4
 
@@ -25,7 +25,7 @@ SRC_URI="mirror://sourceforge/digikam/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2
 	handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="4"
 IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod +mediawiki mjpeg panorama redeyes scanner vkontakte"
 
diff --git a/media-plugins/kipi-plugins/kipi-plugins-2.2.0-r1.ebuild b/media-plugins/kipi-plugins/kipi-plugins-2.4.1.ebuild
similarity index 92%
rename from media-plugins/kipi-plugins/kipi-plugins-2.2.0-r1.ebuild
rename to media-plugins/kipi-plugins/kipi-plugins-2.4.1.ebuild
index 377affca711d..b2e96be4518b 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-2.2.0-r1.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-2.4.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/kipi-plugins/kipi-plugins-2.2.0-r1.ebuild,v 1.1 2011/11/05 19:26:07 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-2.4.1.ebuild,v 1.1 2011/12/07 21:51:18 dilfridge Exp $
 
 EAPI=4
 
@@ -27,7 +27,7 @@ LICENSE="GPL-2
 	handbook? ( FDL-1.2 )"
 KEYWORDS="~amd64 ~x86"
 SLOT="4"
-IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod +mediawiki mjpeg panorama redeyes scanner vkontakte"
+IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod mjpeg panorama redeyes scanner vkontakte"
 
 DEPEND="
 	$(add_kdebase_dep libkipi)
@@ -38,7 +38,6 @@ DEPEND="
 	dev-libs/libxslt
 	dev-libs/qjson
 	gpssync?	( >=media-libs/libkgeomap-${PV} )
-	mediawiki?	( >=media-libs/libmediawiki-${PV} )
 	media-libs/libpng
 	media-libs/tiff
 	virtual/jpeg
@@ -53,7 +52,7 @@ DEPEND="
 			  $(add_kdebase_dep libksane)
 			  media-gfx/sane-backends
 			)
-	vkontakte?	( net-libs/libkvkontakte )
+	vkontakte?	( >=net-libs/libkvkontakte-${PV} )
 "
 RDEPEND="${DEPEND}
 	cdr? 		( app-cdr/k3b )
@@ -104,7 +103,6 @@ src_configure() {
 		$(cmake-utils_use_with ipod Gdk)
 		$(cmake-utils_use_with ipod Gpod)
 		$(cmake-utils_use_with calendar KdepimLibs)
-		$(cmake-utils_use_with mediawiki Mediawiki)
 		$(cmake-utils_use_with gpssync KGeoMap)
 		$(cmake-utils_use_with redeyes OpenCV)
 		$(cmake-utils_use_with opengl OpenGL)
diff --git a/media-sound/audacious/audacious-3.1.ebuild b/media-sound/audacious/audacious-3.1.ebuild
index 75dcfdee1a48..6f7278e8c88b 100644
--- a/media-sound/audacious/audacious-3.1.ebuild
+++ b/media-sound/audacious/audacious-3.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-sound/audacious/audacious-3.1.ebuild,v 1.3 2011/11/15 18:27:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-3.1.ebuild,v 1.4 2011/12/07 13:47:38 phajdan.jr Exp $
 
 EAPI=4
 
@@ -13,7 +13,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
diff --git a/media-sound/flacon/Manifest b/media-sound/flacon/Manifest
index 0d7f2befc485..dc8fd324559a 100644
--- a/media-sound/flacon/Manifest
+++ b/media-sound/flacon/Manifest
@@ -1 +1,2 @@
 DIST flacon-0.5.7.tgz 115518 RMD160 f8ab50283d71c49266af8172b1f45bc1325ee25c SHA1 cb9e6a37aef1e2b359dab3501ae0f1ca583e948b SHA256 46a2c50d37e9c67cba7ce458430217963e7f48d05b3f2b8e2bdb054cddfd0063
+DIST flacon-0.6.0.tgz 168541 RMD160 fba89c15dcb5a52aec6ad578545a2dfd96496b39 SHA1 7e210797d178f27de74063e0833c88f2cb31df4c SHA256 243113f9d9f922caf2f27a2bcf4e5603ca69ce03929f915642e9064d2ec13d04
diff --git a/media-sound/flacon/flacon-0.6.0.ebuild b/media-sound/flacon/flacon-0.6.0.ebuild
new file mode 100644
index 000000000000..c58cb1c35b37
--- /dev/null
+++ b/media-sound/flacon/flacon-0.6.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/flacon/flacon-0.6.0.ebuild,v 1.1 2011/12/07 20:11:31 maksbotan Exp $
+
+EAPI="4"
+
+PYTHON_DEPEND="2"
+
+inherit python
+
+DESCRIPTION="Extracts audio tracks from audio CD image to separate tracks"
+HOMEPAGE="https://code.google.com/p/flacon/"
+SRC_URI="https://flacon.googlecode.com/files/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flac mac mp3 mp4 ogg replaygain tta wavpack"
+
+RDEPEND="
+	dev-python/PyQt4[X]
+	media-sound/shntool[mac?]
+	flac? ( media-libs/flac )
+	mac? ( media-sound/mac )
+	mp3? ( media-sound/lame )
+	mp4? ( media-libs/faac )
+	ogg? ( media-sound/vorbis-tools )
+	tta? ( media-sound/ttaenc )
+	wavpack? ( media-sound/wavpack )
+	replaygain? (
+		mp3? ( media-sound/mp3gain )
+		ogg? ( media-sound/vorbisgain )
+	)
+"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	python_convert_shebangs -r 2 .
+
+	sed -e '/cd $(INST_DIR) && python -mcompileall ./d' -i Makefile || die
+}
+
+src_compile() { :; }
+
+pkg_postinst() {
+	python_mod_optimize /usr/share/${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/share/${PN}
+}
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index 56805766db78..6831edd4f3b4 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1,2 +1 @@
-DIST tomahawk-0.3.0.tar.bz2 4602076 RMD160 4b1c1c27384378d6a408fcd4f11e947ccfe8210f SHA1 51651e41b8b01e6e2f90a5942b02d97abb52243e SHA256 207c27ae7d5a6735911587b07d38af0e84a76082b211e7fbf245de323e1cee6f
-DIST tomahawk-0.3.2.tar.bz2 4635563 RMD160 8d399b1467a974ea0efc05ba73d83435f5e227f3 SHA1 6559985ebb875f2ebd63320e46b11ba1666b703d SHA256 9835011e6dd6d065a8b8df78f1e9586d3c6b3842f238fd6ea92da417819567f2
+DIST tomahawk-0.3.3.tar.bz2 4651817 RMD160 d8eae3c37e2915904a096e0ef64e488ff9fec8bf SHA1 e83bbac581daad8a21c639e4ed68e1499a07ac73 SHA256 a69c68e688469aedace8665f5c882c614338d23cf24697ca3284e048fdce7c51
diff --git a/media-sound/tomahawk/files/tomahawk-0.3.0-clucene.patch b/media-sound/tomahawk/files/tomahawk-0.3.0-clucene.patch
deleted file mode 100644
index ff1bc0becbfb..000000000000
--- a/media-sound/tomahawk/files/tomahawk-0.3.0-clucene.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-diff -upr tomahawk.orig//CMakeModules/FindCLucene.cmake tomahawk/CMakeModules/FindCLucene.cmake
---- tomahawk.orig//CMakeModules/FindCLucene.cmake	2011-11-04 14:42:01.000000000 +0100
-+++ tomahawk/CMakeModules/FindCLucene.cmake	2011-07-26 19:12:39.000000000 +0200
-@@ -4,7 +4,7 @@
- #
- # CLUCENE_INCLUDE_DIR  = where CLucene/StdHeader.h can be found
- # CLUCENE_LIBRARY_DIR  = where CLucene/clucene-config.h can be found
--# CLUCENE_LIBRARIES    = the libraries to link against CLucene
-+# CLUCENE_LIBRARY      = the library to link against CLucene
- # CLUCENE_VERSION      = The CLucene version string
- # CLucene_FOUND        = set to 1 if clucene is found
- #
-@@ -12,20 +12,9 @@
- INCLUDE(CheckSymbolExists)
- INCLUDE(FindLibraryWithDebug)
- 
--# try to locate a patched unstable version (for comp's sake *sigh*) first
--FIND_PACKAGE(CLuceneUnstable)
--IF(CLUCENEUNSTABLE_FOUND)
--    SET(CLucene_FOUND TRUE)
--    SET(CLUCENE_INCLUDE_DIR ${CLUCENE_UNSTABLE_INCLUDE_DIRS})
--    SET(CLUCENE_LIBRARIES ${CLUCENE_UNSTABLE_LIBS})
--
--    #MESSAGE(FATAL_ERROR NARF)
--ELSE(CLUCENEUNSTABLE_FOUND)
--IF(CLucene_FIND_VERSION)
--  SET(CLUCENE_MIN_VERSION ${CLucene_FIND_VERSION})
--ELSEIF()
--  SET(CLUCENE_MIN_VERSION "0.9.23")
--ENDIF(CLucene_FIND_VERSION)
-+if(NOT CLUCENE_MIN_VERSION)
-+  set(CLUCENE_MIN_VERSION "0.9.19")
-+endif(NOT CLUCENE_MIN_VERSION)
- 
- IF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
-   INCLUDE(${PROJECT_CMAKE}/CLuceneConfig.cmake)
-@@ -34,11 +23,12 @@ ENDIF(EXISTS ${PROJECT_CMAKE}/CLuceneCon
- SET(TRIAL_LIBRARY_PATHS
-   $ENV{CLUCENE_HOME}/lib${LIB_SUFFIX}
-   ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
-+  ${CMAKE_LIBRARY_PATH}
-   /usr/local/lib${LIB_SUFFIX}
-+  /opt/local/lib${LIB_SUFFIX}
-   /usr/lib${LIB_SUFFIX}
-   /sw/lib${LIB_SUFFIX}
-   /usr/pkg/lib${LIB_SUFFIX}
--  /usr/lib64
-   )
- SET(TRIAL_INCLUDE_PATHS
-   $ENV{CLUCENE_HOME}/include
-@@ -48,25 +38,13 @@ SET(TRIAL_INCLUDE_PATHS
-   /sw/include
-   /usr/pkg/include
-   )
--FIND_LIBRARY_WITH_DEBUG(CLUCENE_CORE_LIBRARY
-+FIND_LIBRARY_WITH_DEBUG(CLUCENE_LIBRARY
-   WIN32_DEBUG_POSTFIX d
--  NAMES clucene-core
-+  NAMES clucene clucene-core
-   PATHS ${TRIAL_LIBRARY_PATHS})
--IF (CLUCENE_CORE_LIBRARY)
--  MESSAGE(STATUS "Found CLucene core library: ${CLUCENE_CORE_LIBRARY}")
--ENDIF (CLUCENE_CORE_LIBRARY)
--FIND_LIBRARY_WITH_DEBUG(CLUCENE_SHARED_LIBRARY
--  WIN32_DEBUG_POSTFIX d
--  NAMES clucene-shared
--  PATHS ${TRIAL_LIBRARY_PATHS})
--IF (CLUCENE_SHARED_LIBRARY)
--  MESSAGE(STATUS "Found CLucene shared library: ${CLUCENE_SHARED_LIBRARY}")
--ENDIF (CLUCENE_SHARED_LIBRARY)
--
--IF(CLUCENE_CORE_LIBRARY AND CLUCENE_SHARED_LIBRARY)
--  SET(CLUCENE_LIBRARIES ${CLUCENE_CORE_LIBRARY} ${CLUCENE_SHARED_LIBRARY})
--ENDIF(CLUCENE_CORE_LIBRARY AND CLUCENE_SHARED_LIBRARY)
--
-+IF (CLUCENE_LIBRARY)
-+  MESSAGE(STATUS "Found CLucene library: ${CLUCENE_LIBRARY}")
-+ENDIF (CLUCENE_LIBRARY)
- FIND_PATH(CLUCENE_INCLUDE_DIR
-   NAMES CLucene.h
-   PATHS ${TRIAL_INCLUDE_PATHS})
-@@ -81,37 +59,35 @@ ENDIF(WIN32)
- 
- SET(CLUCENE_GOOD_VERSION TRUE)
- 
-+GET_FILENAME_COMPONENT(_CLUCENE_LIBDIR ${CLUCENE_LIBRARY} PATH)
- FIND_PATH(CLUCENE_LIBRARY_DIR
--	NAMES CLuceneConfig.cmake/CLuceneConfig.cmake CLucene/CLuceneConfig.cmake
--       	PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH)
-+  NAMES CLucene/clucene-config.h PATHS ${CLUCENE_INCLUDE_DIR} ${_CLUCENE_LIBDIR} NO_DEFAULT_PATH)
- IF (CLUCENE_LIBRARY_DIR)
-   MESSAGE(STATUS "Found CLucene library dir: ${CLUCENE_LIBRARY_DIR}")
--  # include CLuceneConfig/CLuceneConfig.cmake
--  IF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake)
--        INCLUDE(${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake)
--  ENDIF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake)
--  # include CLucene/CLuceneConfig.cmake
--  IF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake)
--        INCLUDE(${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake)
--  ENDIF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake)
--  IF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
--    MESSAGE(ERROR " CLucene version ${CLUCENE_VERSION} is less than the required minimum ${CLUCENE_MIN_VERSION}")
--    SET(CLUCENE_GOOD_VERSION FALSE)
--  ENDIF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
--  IF (CLUCENE_VERSION STREQUAL "0.9.17")
--    MESSAGE(ERROR "CLucene version 0.9.17 is not supported.")
--    SET(CLUCENE_GOOD_VERSION FALSE)
--  ENDIF (CLUCENE_VERSION STREQUAL "0.9.17")
-+  FILE(READ ${CLUCENE_LIBRARY_DIR}/CLucene/clucene-config.h CLCONTENT)
-+  STRING(REGEX MATCH "_CL_VERSION +\".*\"" CLMATCH ${CLCONTENT})
-+  IF (CLMATCH)
-+    STRING(REGEX REPLACE "_CL_VERSION +\"(.*)\"" "\\1" CLUCENE_VERSION ${CLMATCH})
-+	IF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
-+	  MESSAGE(ERROR " CLucene version ${CLUCENE_VERSION} is less than the required minimum ${CLUCENE_MIN_VERSION}")
-+      SET(CLUCENE_GOOD_VERSION FALSE)
-+	ENDIF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
-+	IF (CLUCENE_VERSION STREQUAL "0.9.17")
-+	  MESSAGE(ERROR "CLucene version 0.9.17 is not supported.")
-+      SET(CLUCENE_GOOD_VERSION FALSE)
-+	ENDIF (CLUCENE_VERSION STREQUAL "0.9.17")
-+  ENDIF (CLMATCH)
-+ELSE (CLUCENE_LIBRARY_DIR)
-+  MESSAGE(STATUS "CLucene library dir not found.")
- ENDIF (CLUCENE_LIBRARY_DIR)
- 
--IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARIES AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
-+IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
-   SET(CLucene_FOUND TRUE)
--ENDIF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARIES AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
--ENDIF(CLUCENEUNSTABLE_FOUND)
-+ENDIF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
- 
- IF(CLucene_FOUND)
-   IF(NOT CLucene_FIND_QUIETLY)
--    MESSAGE(STATUS "Found CLucene: ${CLUCENE_LIBRARIES} version ${CLUCENE_VERSION}")
-+    MESSAGE(STATUS "Found CLucene: ${CLUCENE_LIBRARY}")
-   ENDIF(NOT CLucene_FIND_QUIETLY)
- ELSE(CLucene_FOUND)
-   IF(CLucene_FIND_REQUIRED)
-@@ -122,5 +98,5 @@ ENDIF(CLucene_FOUND)
- MARK_AS_ADVANCED(
-   CLUCENE_INCLUDE_DIR 
-   CLUCENE_LIBRARY_DIR 
--  CLUCENE_LIBRARIES
-+  CLUCENE_LIBRARY 
-   )
-diff -upr tomahawk.orig//src/libtomahawk/CMakeLists.txt tomahawk/src/libtomahawk/CMakeLists.txt
---- tomahawk.orig//src/libtomahawk/CMakeLists.txt	2011-11-04 14:41:57.000000000 +0100
-+++ tomahawk/src/libtomahawk/CMakeLists.txt	2011-11-04 14:53:44.000000000 +0100
-@@ -612,7 +612,7 @@ TARGET_LINK_LIBRARIES( tomahawklib
-     ${QJSON_LIBRARIES}
-     ${PHONON_LIBS}
-     ${TAGLIB_LIBRARIES}
--    ${CLUCENE_LIBRARIES}
-+    ${CLUCENE_LIBRARY}
-     ${LIBECHONEST_LIBRARY}
-     ${QT_QTUITOOLS_LIBRARY}
-     ${QT_LIBRARIES}
diff --git a/media-sound/tomahawk/files/tomahawk-0.3.0-remove-quazip.patch b/media-sound/tomahawk/files/tomahawk-0.3.0-remove-quazip.patch
deleted file mode 100644
index b36a2dee7fde..000000000000
--- a/media-sound/tomahawk/files/tomahawk-0.3.0-remove-quazip.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -upr tomahawk.orig//CMakeLists.txt tomahawk//CMakeLists.txt
---- tomahawk.orig//CMakeLists.txt	2011-11-10 14:30:31.000000000 +0100
-+++ tomahawk//CMakeLists.txt	2011-11-10 14:32:49.000000000 +0100
-@@ -110,17 +110,6 @@ macro_log_feature(LIBATTICA_FOUND "libat
- macro_optional_find_package(QuaZip)
- macro_log_feature(QuaZip_FOUND "QuaZip" "Provides support for extracting downloaded resolvers autmatically. Will build internal copy instead." "http://quazip.sourceforge.net/" FALSE "" "")
- 
--IF( NOT QuaZip_FOUND )
--    add_subdirectory( ${CMAKE_SOURCE_DIR}/src/libtomahawk/thirdparty/quazip )
--    SET( QuaZip_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/libtomahawk/thirdparty/quazip )
--    SET( QuaZip_LIBRARY quazip )
--    SET( QuaZip_LIBRARIES ${QuaZip_LIBRARY} )
--    SET( QuaZip_FOUND true )
--
--    # copy headers to build/quazip so we can use proper includes inside the code
--    FILE( COPY ${CMAKE_SOURCE_DIR}/src/libtomahawk/thirdparty/quazip/quazip/ DESTINATION ${CMAKE_BINARY_DIR}/libtomahawk/thirdparty/quazip )
--ENDIF()
--
- # required
- #While we distribute our own liblastfm2, don't need to look for it
- #macro_optional_find_package(LibLastFm 0.3.3)
diff --git a/media-sound/tomahawk/tomahawk-0.3.0.ebuild b/media-sound/tomahawk/tomahawk-0.3.0.ebuild
deleted file mode 100644
index 960d6583940a..000000000000
--- a/media-sound/tomahawk/tomahawk-0.3.0.ebuild
+++ /dev/null
@@ -1,86 +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/tomahawk/tomahawk-0.3.0.ebuild,v 1.2 2011/12/01 22:18:34 dilfridge Exp $
-
-EAPI=4
-
-QT_MINIMAL="4.7.0"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	GIT_ECLASS="git-2"
-	EGIT_REPO_URI="git://github.com/tomahawk-player/tomahawk.git"
-	KEYWORDS=""
-fi
-
-inherit cmake-utils qt4-r2 ${GIT_ECLASS}
-
-DESCRIPTION="Qt playdar social music player"
-HOMEPAGE="http://tomahawk-player.org/"
-
-LICENSE="GPL-3 BSD"
-SLOT="0"
-IUSE="debug fftw jabber libsamplerate +resolver twitter"
-
-DEPEND="
-	>=dev-cpp/clucene-2.3.3.4
-	>=dev-libs/boost-1.41
-	>=dev-libs/qjson-0.7.1
-	>=media-libs/libechonest-1.1.10
-	>=media-libs/phonon-4.5.0
-	media-libs/taglib
-	>=x11-libs/qt-core-${QT_MINIMAL}:4
-	>=x11-libs/qt-gui-${QT_MINIMAL}:4
-	>=x11-libs/qt-sql-${QT_MINIMAL}:4[sqlite]
-	>=x11-libs/qt-webkit-${QT_MINIMAL}:4
-	>=x11-libs/qt-xmlpatterns-${QT_MINIMAL}:4
-	fftw? ( sci-libs/fftw:3.0 )
-	jabber? ( net-libs/jreen )
-	libsamplerate? ( media-libs/libsamplerate )
-	resolver? (
-		dev-libs/libattica
-		>=dev-libs/quazip-0.4.3
-	)
-	twitter? ( net-libs/qtweetlib )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-clucene.patch"
-	"${FILESDIR}/${P}-remove-quazip.patch"
-)
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with jabber Jreen)
-		$(cmake-utils_use_with resolver LibAttica)
-		$(cmake-utils_use_with resolver QuaZip)
-		$(cmake-utils_use_with twitter QTweetLib)
-		-DINTERNAL_JREEN=OFF
-	)
-
-	if [[ ${PV} != *9999* ]]; then
-		mycmakeargs+=(	-DBUILD_RELEASE=ON )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	if ! use resolver; then
-		echo
-		elog "Information on how to get more resolvers for ${PN}"
-		elog "is available at ${HOMEPAGE}resolvers"
-		echo
-	fi
-}
diff --git a/media-sound/tomahawk/tomahawk-0.3.2.ebuild b/media-sound/tomahawk/tomahawk-0.3.3.ebuild
similarity index 97%
rename from media-sound/tomahawk/tomahawk-0.3.2.ebuild
rename to media-sound/tomahawk/tomahawk-0.3.3.ebuild
index 726286f683ff..7798156e57ca 100644
--- a/media-sound/tomahawk/tomahawk-0.3.2.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.3.3.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-sound/tomahawk/tomahawk-0.3.2.ebuild,v 1.2 2011/12/01 22:18:34 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.3.3.ebuild,v 1.1 2011/12/08 00:58:58 johu Exp $
 
 EAPI=4
 
diff --git a/media-video/bombono-dvd/bombono-dvd-1.2.0-r2.ebuild b/media-video/bombono-dvd/bombono-dvd-1.2.0-r2.ebuild
index 0596f20b27b6..d370f4d58b4e 100644
--- a/media-video/bombono-dvd/bombono-dvd-1.2.0-r2.ebuild
+++ b/media-video/bombono-dvd/bombono-dvd-1.2.0-r2.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-video/bombono-dvd/bombono-dvd-1.2.0-r2.ebuild,v 1.1 2011/12/06 22:34:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/bombono-dvd-1.2.0-r2.ebuild,v 1.2 2011/12/07 16:12:42 mr_bones_ Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="0.96.1"
@@ -46,7 +46,7 @@ PATCHES=(
 )
 
 src_configure() {
-	append-flags -DBOOST_SYSTEM_NO_DEPRECATED -DBOOST_FILESYSTEM_VERSION=2 
+	append-flags -DBOOST_SYSTEM_NO_DEPRECATED -DBOOST_FILESYSTEM_VERSION=2
 	myesconsargs=(
 		CC="$(tc-getCC)"
 		CXX="$(tc-getCXX)"
diff --git a/media-video/parole/Manifest b/media-video/parole/Manifest
index fe7594d7b2c7..420a5c050059 100644
--- a/media-video/parole/Manifest
+++ b/media-video/parole/Manifest
@@ -1,2 +1 @@
-DIST parole-0.2.0.2.tar.bz2 644981 RMD160 6d2b5162107a15a8965d1693d33c6ad2e2b8c440 SHA1 4c5b640876c9c4ecd4fc96c29a8b29ae19d61f7a SHA256 c6b669cda652ccfb4b5c6c4aab882bf67bb0a8bd3ee4abe42a9b8fb3e6860195
 DIST parole-0.2.0.6.tar.bz2 652946 RMD160 667d3d9b855f26d42ef666d518ac0940c89531a1 SHA1 72f6bd8f20ce62586553a653fe6d698d424179c4 SHA256 1bfcb6ca34eb496bc08ce3ac803a20b4fea566bddca4ce4400d3edf7b25804b6
diff --git a/media-video/parole/files/parole-0.2.0.2-64bit.patch b/media-video/parole/files/parole-0.2.0.2-64bit.patch
deleted file mode 100644
index 0e87aa653745..000000000000
--- a/media-video/parole/files/parole-0.2.0.2-64bit.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/gst/parole-gst.c b/gst/parole-gst.c
-index 2a51a35..6676675 100644
---- a/gst/parole-gst.c
-+++ b/gst/parole-gst.c
-@@ -655,7 +655,7 @@ parole_gst_query_duration (ParoleGst *gst)
- 	duration =  absolute_duration / GST_SECOND;
- 	live = ( absolute_duration == 0 );
- 	
--	TRACE ("Duration %lld is_live=%d", duration, live);
-+	TRACE ("Duration %" G_GINT64_FORMAT "is_live=%d", duration, live);
- 	
- 	g_object_set (G_OBJECT (gst->priv->stream),
- 		      "absolute-duration", absolute_duration,
-@@ -2169,7 +2169,7 @@ gint parole_gst_get_current_cdda_track (ParoleGst *gst)
-     
-     if ( gst_element_query_position (gst->priv->playbin, &format, &pos) )
-     {
--	TRACE ("Pos %lld", pos);
-+	TRACE ("Pos %" G_GINT64_FORMAT, pos);
- 	ret_val = (gint) pos;
-     }
- 	
diff --git a/media-video/parole/files/parole-0.2.0.2-libnotify-0.7.patch b/media-video/parole/files/parole-0.2.0.2-libnotify-0.7.patch
deleted file mode 100644
index 1fb2a2d8eeae..000000000000
--- a/media-video/parole/files/parole-0.2.0.2-libnotify-0.7.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-http://bugzilla.xfce.org/show_bug.cgi?id=7239
-
---- plugins/tray/tray-provider.c
-+++ plugins/tray/tray-provider.c
-@@ -29,6 +29,9 @@
- 
- #ifdef HAVE_LIBNOTIFY
- #include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- #endif
- 
- #include <libxfcegui4/libxfcegui4.h>
-@@ -260,8 +263,11 @@
-     }
-     
-     message = g_strdup_printf ("%s %s %s %s", _("<b>Playing:</b>"), title, _("<b>Duration:</b>"), timestring);
--    
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+    tray->n = notify_notification_new (title, message, NULL);
-+#else
-     tray->n = notify_notification_new (title, message, NULL, NULL);
-+#endif
-     g_free (title);
-     g_free (message);
-     
diff --git a/media-video/parole/parole-0.2.0.2-r1.ebuild b/media-video/parole/parole-0.2.0.2-r1.ebuild
deleted file mode 100644
index 1650d50f2129..000000000000
--- a/media-video/parole/parole-0.2.0.2-r1.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/media-video/parole/parole-0.2.0.2-r1.ebuild,v 1.7 2011/05/19 22:28:49 ssuominen Exp $
-
-EAPI=4
-inherit multilib nsplugins xfconf
-
-DESCRIPTION="a simple media player based on the GStreamer framework for the Xfce4 desktop"
-HOMEPAGE="http://goodies.xfce.org/projects/applications/parole/"
-SRC_URI="mirror://xfce/src/apps/${PN}/0.2/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug libnotify nsplugin taglib"
-
-RDEPEND=">=x11-libs/gtk+-2.16:2
-	>=dev-libs/glib-2.16:2
-	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/libxfcegui4-4.8
-	>=dev-libs/dbus-glib-0.88
-	>=media-libs/gstreamer-0.10.11:0.10
-	>=media-libs/gst-plugins-base-0.10.11:0.10
-	media-plugins/gst-plugins-meta:0.10
-	libnotify? ( >=x11-libs/libnotify-0.4.5 )
-	taglib? ( >=media-libs/taglib-1.4 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig
-	x11-proto/xproto"
-
-pkg_setup() {
-	export BROWSER_PLUGIN_DIR="/usr/$(get_libdir)/${PLUGINS_DIR}" #333517
-
-	PATCHES=(
-		"${FILESDIR}"/${P}-64bit.patch
-		"${FILESDIR}"/${P}-libnotify-0.7.patch
-		)
-
-	XFCONF=(
-		$(use_enable libnotify)
-		$(use_enable taglib)
-		$(use_enable nsplugin browser-plugin)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog README THANKS TODO )
-}
diff --git a/media-video/vlc/vlc-1.2.9999.ebuild b/media-video/vlc/vlc-1.2.9999.ebuild
new file mode 100644
index 000000000000..f65d10cae605
--- /dev/null
+++ b/media-video/vlc/vlc-1.2.9999.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.2.9999.ebuild,v 1.1 2011/12/07 12:07:19 aballier Exp $
+
+EAPI="4"
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then
+	SCM=git-2
+	EGIT_BOOTSTRAP="bootstrap"
+	if [ "${PV%.9999}" != "${PV}" ] ; then
+		EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
+	else
+		EGIT_REPO_URI="git://git.videolan.org/vlc.git"
+	fi
+fi
+
+inherit eutils multilib autotools toolchain-funcs flag-o-matic ${SCM}
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+
+PATCHLEVEL="101"
+DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="http://www.videolan.org/vlc/"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+elif [[ "${MY_P}" == "${P}" ]]; then
+	SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+else
+	SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
+fi
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+else
+	KEYWORDS=""
+fi
+IUSE="a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec
+	+avformat bidi bluray cdda cddb dbus dc1394 debug dirac direct2d
+	directfb directx dshow dts dvb dvd dxva2 elibc_glibc egl +encode
+	fbosd fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
+	growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify
+	libproxy libsamplerate libtiger libv4l2 linsys libtar lirc live lua +macosx
+	+macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
+	+macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg
+	mtp musepack ncurses neon ogg omxil opengl optimisememory oss png portaudio
+	+postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba schroedinger
+	sdl sdl-image shine shout sid skins speex sqlite sse svg +swscale switcher
+	taglib theora truetype twolame udev upnp vaapi vcdx vlm vorbis waveout
+	win32codecs wingdi wma-fixed +X x264 +xcb xml xosd xv zvbi"
+
+RDEPEND="
+		>=sys-libs/zlib-1.2.5.1-r2[minizip]
+		a52? ( >=media-libs/a52dec-0.7.4-r3 )
+		aalib? ( media-libs/aalib )
+		aac? ( >=media-libs/faad2-2.6.1 )
+		alsa? ( >=media-libs/alsa-lib-1.0.23 )
+		avahi? ( >=net-dns/avahi-0.6[dbus] )
+		avcodec? ( virtual/ffmpeg )
+		avformat? ( virtual/ffmpeg )
+		bidi? ( >=dev-libs/fribidi-0.10.4 )
+		bluray? ( >=media-libs/libbluray-0.2.1 )
+		cddb? ( >=media-libs/libcddb-1.2.0 )
+		dbus? ( >=sys-apps/dbus-1.0.2 )
+		dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 )
+		dirac? ( >=media-video/dirac-0.10.0 )
+		directfb? ( dev-libs/DirectFB sys-libs/zlib )
+		dts? ( media-libs/libdca )
+		dvb? ( >=media-libs/libdvbpsi-0.1.6 )
+		dvd? (	media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 )
+		egl? ( virtual/opengl )
+		elibc_glibc? ( >=sys-libs/glibc-2.8 )
+		flac? ( media-libs/libogg >=media-libs/flac-1.1.2 )
+		fluidsynth? ( media-sound/fluidsynth )
+		fontconfig? ( media-libs/fontconfig )
+		gcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
+		gme? ( media-libs/game-music-emu )
+		gnome? ( gnome-base/gnome-vfs )
+		gnutls? ( >=net-libs/gnutls-2.0.0 )
+		ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 )
+		ios-vout? ( virtual/opengl )
+		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
+		kate? ( >=media-libs/libkate-0.1.1 )
+		libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig )
+		libcaca? ( >=media-libs/libcaca-0.99_beta14 )
+		libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 )
+		libproxy? ( net-libs/libproxy )
+		libsamplerate? ( media-libs/libsamplerate )
+		libtar? ( >=dev-libs/libtar-1.2.11-r3 )
+		libtiger? ( media-libs/libtiger )
+		linsys? ( >=media-libs/zvbi-0.2.28 )
+		lirc? ( app-misc/lirc )
+		live? ( >=media-plugins/live-2010.10.15 )
+		lua? ( >=dev-lang/lua-5.1 )
+		macosx-vout? ( virtual/opengl )
+		matroska? (	>=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 )
+		modplug? ( >=media-libs/libmodplug-0.8.8.1 )
+		mp3? ( media-libs/libmad )
+		mpeg? ( >=media-libs/libmpeg2-0.3.2 )
+		mtp? ( >=media-libs/libmtp-1.0.0 )
+		musepack? ( >=media-sound/musepack-tools-444 )
+		ncurses? ( sys-libs/ncurses )
+		ogg? ( media-libs/libogg )
+		opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 )
+		png? ( media-libs/libpng sys-libs/zlib )
+		portaudio? ( >=media-libs/portaudio-19_pre )
+		postproc? ( virtual/ffmpeg )
+		projectm? ( media-libs/libprojectm )
+		pulseaudio? ( >=media-sound/pulseaudio-0.9.22 )
+		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
+		samba? ( >=net-fs/samba-3.4.6[smbclient] )
+		schroedinger? ( >=media-libs/schroedinger-1.0.10 )
+		sdl? ( >=media-libs/libsdl-1.2.8
+			sdl-image? ( media-libs/sdl-image sys-libs/zlib	) )
+		shout? ( media-libs/libshout )
+		sid? ( media-libs/libsidplay:2 )
+		skins? ( x11-libs/libXext x11-libs/libXpm )
+		speex? ( media-libs/speex )
+		sqlite? ( >=dev-db/sqlite-3.6.0:3 )
+		svg? ( >=gnome-base/librsvg-2.9.0 )
+		swscale? ( virtual/ffmpeg )
+		taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
+		theora? ( >=media-libs/libtheora-1.0_beta3 )
+		truetype? ( media-libs/freetype virtual/ttf-fonts
+			!fontconfig? ( media-fonts/dejavu ) )
+		twolame? ( media-sound/twolame )
+		udev? ( >=sys-fs/udev-142 )
+		upnp? ( net-libs/libupnp )
+		libv4l2? ( media-libs/libv4l )
+		vaapi? ( x11-libs/libva )
+		vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
+		vorbis? ( media-libs/libvorbis )
+		win32codecs? ( media-libs/win32codecs )
+		X? ( x11-libs/libX11 )
+		x264? ( >=media-libs/x264-0.0.20090923 )
+		xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 )
+		xml? ( dev-libs/libxml2 )
+		xosd? ( x11-libs/xosd )
+		zvbi? ( >=media-libs/zvbi-0.2.25 )
+		"
+
+DEPEND="${RDEPEND}
+	alsa? ( >=media-sound/alsa-headers-1.0.23 )
+	fbosd? ( sys-kernel/linux-headers )
+	kde? ( >=kde-base/kdelibs-4 )
+	xcb? ( x11-proto/xproto )
+	app-arch/xz-utils
+	dev-util/pkgconfig"
+
+REQUIRED_USE="
+	aalib? ( X )
+	bidi? ( truetype )
+	cddb? ( cdda )
+	dxva2? ( avcodec )
+	egl? ( X )
+	ffmpeg? ( avcodec avformat postproc swscale )
+	fontconfig? ( truetype )
+	gnutls? ( gcrypt )
+	libtar? ( skins )
+	libtiger? ( kate )
+	media-library? ( sqlite )
+	qt4? ( X )
+	sdl? ( X )
+	skins? ( truetype qt4 X )
+	switcher? ( avcodec )
+	vaapi? ( avcodec X )
+	vlm? ( encode )
+	xv? ( xcb )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	if [ "${PV%9999}" != "${PV}" ] ; then
+		git-2_src_unpack
+	fi
+}
+
+src_prepare() {
+	# Make it build with libtool 1.5
+	rm -f m4/lt* m4/libtool.m4
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	eautoreconf
+}
+
+src_configure() {
+	# needs libresid-builder from libsidplay:2 which is in another directory...
+	# FIXME!
+	use sid && append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable a52) \
+		$(use_enable aalib aa) \
+		$(use_enable aac faad) \
+		$(use_enable alsa) \
+		$(use_enable altivec) \
+		$(use_enable atmo) \
+		$(use_enable audioqueue) \
+		$(use_enable avahi bonjour) \
+		$(use_enable avcodec) \
+		$(use_enable avformat) \
+		$(use_enable bidi fribidi) \
+		$(use_enable bluray) \
+		$(use_enable cdda vcd) \
+		$(use_enable cddb libcddb) \
+		$(use_enable dbus) $(use_enable dbus dbus-control) \
+		$(use_enable dirac) \
+		$(use_enable direct2d) \
+		$(use_enable directfb) \
+		$(use_enable directx) \
+		$(use_enable dc1394) \
+		$(use_enable debug) \
+		$(use_enable dshow) \
+		$(use_enable dts dca) \
+		$(use_enable dvb dvbpsi) \
+		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
+		$(use_enable dxva2) \
+		$(use_enable egl) \
+		$(use_enable encode sout) \
+		$(use_enable fbosd) \
+		$(use_enable flac) \
+		$(use_enable fluidsynth) \
+		$(use_enable fontconfig) \
+		$(use_enable gcrypt libgcrypt) \
+		$(use_enable gme) \
+		$(use_enable gnome gnomevfs) \
+		$(use_enable gnutls) \
+		$(use_enable growl) \
+		$(use_enable httpd) \
+		$(use_enable ieee1394 dv) \
+		$(use_enable ios-vout) \
+		$(use_enable jack) \
+		$(use_enable kate) \
+		$(use_with kde kde-solid) \
+		$(use_enable libass) \
+		$(use_enable libcaca caca) \
+		$(use_enable libnotify notify) \
+		$(use_enable libproxy) \
+		$(use_enable libsamplerate samplerate) \
+		$(use_enable libtar) \
+		$(use_enable libtiger tiger) \
+		$(use_enable libv4l2) \
+		$(use_enable linsys) \
+		$(use_enable lirc) \
+		$(use_enable live live555) \
+		$(use_enable lua) \
+		$(use_enable macosx-audio) \
+		$(use_enable macosx-dialog-provider) \
+		$(use_enable macosx-eyetv) \
+		$(use_enable macosx-qtkit) \
+		$(use_enable macosx-quartztext) \
+		$(use_enable macosx-vout) \
+		$(use_enable matroska mkv) \
+		$(use_enable media-library) \
+		$(use_enable mmx) \
+		$(use_enable modplug mod) \
+		$(use_enable mp3 mad) \
+		$(use_enable mpeg libmpeg2) \
+		$(use_enable mtp) \
+		$(use_enable musepack mpc) \
+		$(use_enable ncurses) \
+		$(use_enable neon) \
+		$(use_enable ogg) \
+		$(use_enable omxil) \
+		$(use_enable opengl glx) \
+		$(use_enable optimisememory optimize-memory) \
+		$(use_enable oss) \
+		$(use_enable png) \
+		$(use_enable portaudio) \
+		$(use_enable postproc) \
+		$(use_enable projectm) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable pvr) \
+		$(use_enable qt4) \
+		$(use_enable rtsp realrtsp) \
+		$(use_enable run-as-root) \
+		$(use_enable samba smb) \
+		$(use_enable schroedinger) \
+		$(use_enable sdl) \
+		$(use_enable sdl-image) \
+		$(use_enable shine) \
+		$(use_enable sid) \
+		$(use_enable shout) \
+		$(use_enable skins skins2) \
+		$(use_enable speex) \
+		$(use_enable sqlite) \
+		$(use_enable sse) \
+		$(use_enable svg) \
+		$(use_enable switcher) \
+		$(use_enable swscale) \
+		$(use_enable taglib) \
+		$(use_enable theora) \
+		$(use_enable truetype freetype) \
+		$(use_enable twolame) \
+		$(use_enable udev) \
+		$(use_enable upnp) \
+		$(use_enable vcdx) \
+		$(use_enable vaapi libva) \
+		$(use_enable vlm) \
+		$(use_enable vorbis) \
+		$(use_enable waveout) \
+		$(use_enable win32codecs loader) \
+		$(use_enable wingdi) \
+		$(use_enable wma-fixed) \
+		$(use_with X x) \
+		$(use_enable x264) \
+		$(use_enable xcb) \
+		$(use_enable xml libxml2) \
+		$(use_enable xosd) \
+		$(use_enable xv xvideo) \
+		$(use_enable zvbi) $(use_enable !zvbi telx) \
+		--disable-optimizations \
+		--enable-fast-install
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS THANKS NEWS README \
+		doc/fortunes.txt doc/intf-vcd.txt
+
+	# Punt useless libtool's .la files
+	find "${D}" -name '*.la' -delete
+}
+
+pkg_postinst() {
+	if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then
+		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
+		"/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
+	else
+		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
+		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+		ewarn "If you do not do it, vlc will take a long time to load."
+	fi
+}
diff --git a/metadata/cache/app-admin/stow-1.3.3 b/metadata/cache/app-admin/stow-1.3.3
deleted file mode 100644
index 79b2ba32777f..000000000000
--- a/metadata/cache/app-admin/stow-1.3.3
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-lang/perl
-dev-lang/perl
-0
-mirror://gnu/stow/stow-1.3.3.tar.gz
-
-http://www.gnu.org/software/stow/
-GPL-2
-manage installation of software in /usr/local
-amd64 ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
-
-
-
-
-
-
-
-install
-
-
-
-
-
diff --git a/metadata/cache/app-admin/stow-1.3.3-r1 b/metadata/cache/app-admin/stow-1.3.3-r1
new file mode 100644
index 000000000000..abccfd366bb3
--- /dev/null
+++ b/metadata/cache/app-admin/stow-1.3.3-r1
@@ -0,0 +1,22 @@
+dev-lang/perl
+dev-lang/perl
+0
+mirror://gnu/stow/stow-1.3.3.tar.gz
+
+http://www.gnu.org/software/stow/
+GPL-2
+Manage installation of software in /var/lib/
+~amd64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+
+
+
+
+
+
+
+install postinst
+
+
+
+
+
diff --git a/metadata/cache/app-admin/stow-2.1.1 b/metadata/cache/app-admin/stow-2.1.1
new file mode 100644
index 000000000000..6a4dd1de1503
--- /dev/null
+++ b/metadata/cache/app-admin/stow-2.1.1
@@ -0,0 +1,22 @@
+dev-lang/perl
+dev-lang/perl
+0
+mirror://gnu/stow/stow-2.1.1.tar.gz
+
+http://www.gnu.org/software/stow/
+GPL-2
+Manage installation of software in /var/lib/
+~amd64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+
+
+
+
+
+2
+
+install postinst
+
+
+
+
+
diff --git a/metadata/cache/app-crypt/mit-krb5-1.9.2-r1 b/metadata/cache/app-crypt/mit-krb5-1.9.2-r1
index 08e460dacc2b..6e164449a95b 100644
--- a/metadata/cache/app-crypt/mit-krb5-1.9.2-r1
+++ b/metadata/cache/app-crypt/mit-krb5-1.9.2-r1
@@ -6,7 +6,7 @@ http://web.mit.edu/kerberos/dist/krb5/1.9/krb5-1.9.2-signed.tar
 http://web.mit.edu/kerberos/www/
 as-is
 MIT Kerberos V
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 eutils flag-o-matic multilib portability toolchain-funcs user versionator
 doc +keyutils openldap +pkinit +threads test xinetd
 
diff --git a/metadata/cache/app-crypt/truecrypt-7.0a-r2 b/metadata/cache/app-crypt/truecrypt-7.0a-r2
deleted file mode 100644
index 065ca5d5d8fb..000000000000
--- a/metadata/cache/app-crypt/truecrypt-7.0a-r2
+++ /dev/null
@@ -1,22 +0,0 @@
-|| ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) sys-fs/fuse x11-libs/wxGTK:2.8[X?] || ( dev-libs/pkcs11-helper dev-libs/opensc )
-|| ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) sys-fs/fuse x11-libs/wxGTK:2.8[X?] app-admin/sudo
-0
-truecrypt-7.0a.tar.gz
-mirror fetch bindist
-http://www.truecrypt.org/
-truecrypt-3.0
-Free open-source disk encryption software
-~amd64 ~ppc ~x86
-eutils flag-o-matic linux-info multilib portability toolchain-funcs user versionator wxwidgets
-X
-
-
-
-2
-
-compile install nofetch postinst prepare setup test
-
-
-
-
-
diff --git a/metadata/cache/app-crypt/truecrypt-7.0a-r5 b/metadata/cache/app-crypt/truecrypt-7.0a-r5
deleted file mode 100644
index fe40353c0d49..000000000000
--- a/metadata/cache/app-crypt/truecrypt-7.0a-r5
+++ /dev/null
@@ -1,22 +0,0 @@
-|| ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) sys-fs/fuse x11-libs/wxGTK:2.8[X?] app-admin/sudo || ( dev-libs/pkcs11-helper dev-libs/opensc ) !ppc? ( dev-lang/nasm )
-|| ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) sys-fs/fuse x11-libs/wxGTK:2.8[X?] app-admin/sudo
-0
-truecrypt-7.0a.tar.gz mirror://gentoo/truecrypt-pkcs11.h.bz2
-mirror fetch bindist
-http://www.truecrypt.org/
-truecrypt-3.0
-Free open-source disk encryption software
--* ~amd64 ~ppc ~x86
-eutils flag-o-matic linux-info multilib pax-utils portability toolchain-funcs user versionator wxwidgets
-X
-
-
-
-2
-
-compile install nofetch postinst prepare setup test
-
-
-
-
-
diff --git a/metadata/cache/app-crypt/truecrypt-7.0a-r6 b/metadata/cache/app-crypt/truecrypt-7.1
similarity index 89%
rename from metadata/cache/app-crypt/truecrypt-7.0a-r6
rename to metadata/cache/app-crypt/truecrypt-7.1
index 0e24fdc96e16..f31e25516009 100644
--- a/metadata/cache/app-crypt/truecrypt-7.0a-r6
+++ b/metadata/cache/app-crypt/truecrypt-7.1
@@ -1,7 +1,7 @@
 || ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) sys-fs/fuse x11-libs/wxGTK:2.8[X?] app-admin/sudo !ppc? ( dev-lang/nasm )
 || ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) sys-fs/fuse x11-libs/wxGTK:2.8[X?] app-admin/sudo
 0
-truecrypt-7.0a.tar.gz mirror://gentoo/truecrypt-pkcs11.h.bz2
+truecrypt-7.1.tar.gz mirror://gentoo/truecrypt-pkcs11.h.bz2
 mirror fetch bindist
 http://www.truecrypt.org/
 truecrypt-3.0
diff --git a/metadata/cache/app-emulation/virtualbox-4.1.4 b/metadata/cache/app-emulation/virtualbox-4.1.4
index b371f654027e..8ed26dc5bf6a 100644
--- a/metadata/cache/app-emulation/virtualbox-4.1.4
+++ b/metadata/cache/app-emulation/virtualbox-4.1.4
@@ -6,7 +6,7 @@ http://download.virtualbox.org/virtualbox/4.1.4/VirtualBox-4.1.4.tar.bz2
 http://www.virtualbox.org/
 GPL-2
 Family of powerful x86 virtualization products for enterprise as well as home use
-amd64 ~x86
+amd64 x86
 base eutils fdo-mime flag-o-matic java-pkg-opt-2 java-utils-2 linux-info multilib pax-utils portability python qt4-r2 toolchain-funcs user versionator
 +additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc elibc_FreeBSD java
 java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java )
diff --git a/metadata/cache/app-emulation/virtualbox-additions-4.1.4 b/metadata/cache/app-emulation/virtualbox-additions-4.1.4
index bb577823f2da..a205a33de651 100644
--- a/metadata/cache/app-emulation/virtualbox-additions-4.1.4
+++ b/metadata/cache/app-emulation/virtualbox-additions-4.1.4
@@ -6,7 +6,7 @@ mirror
 http://www.virtualbox.org/
 PUEL
 CD image containing guest additions for VirtualBox
-amd64 ~x86
+amd64 x86
 eutils multilib portability toolchain-funcs user
 
 
diff --git a/metadata/cache/app-emulation/virtualbox-bin-4.1.4 b/metadata/cache/app-emulation/virtualbox-bin-4.1.4
index f05e3659ba16..94ec7e5e7f91 100644
--- a/metadata/cache/app-emulation/virtualbox-bin-4.1.4
+++ b/metadata/cache/app-emulation/virtualbox-bin-4.1.4
@@ -6,7 +6,7 @@ mirror
 http://www.virtualbox.org/
 GPL-2 PUEL
 Family of powerful x86 virtualization products for enterprise as well as home use
-amd64 ~x86
+amd64 x86
 eutils fdo-mime multilib pax-utils portability toolchain-funcs user
 +additions +chm headless python sdk vboxwebsrv rdesktop-vrdp
 
diff --git a/metadata/cache/app-emulation/virtualbox-extpack-oracle-4.1.4 b/metadata/cache/app-emulation/virtualbox-extpack-oracle-4.1.4
index 277cc7e778ef..3031c51ca1a4 100644
--- a/metadata/cache/app-emulation/virtualbox-extpack-oracle-4.1.4
+++ b/metadata/cache/app-emulation/virtualbox-extpack-oracle-4.1.4
@@ -6,7 +6,7 @@ mirror strip
 http://www.virtualbox.org/
 PUEL
 PUEL extensions for VirtualBox
-amd64 ~x86
+amd64 x86
 eutils multilib portability toolchain-funcs user
 
 
diff --git a/metadata/cache/app-emulation/virtualbox-guest-additions-4.1.4-r1 b/metadata/cache/app-emulation/virtualbox-guest-additions-4.1.4-r1
index c04ad7887009..4b523f2ec0e0 100644
--- a/metadata/cache/app-emulation/virtualbox-guest-additions-4.1.4-r1
+++ b/metadata/cache/app-emulation/virtualbox-guest-additions-4.1.4-r1
@@ -6,7 +6,7 @@ http://download.virtualbox.org/virtualbox/4.1.4/VirtualBox-4.1.4.tar.bz2
 http://www.virtualbox.org/
 GPL-2
 VirtualBox kernel modules and user-space tools for Linux guests
-amd64 ~x86
+amd64 x86
 eutils linux-info linux-mod multilib portability toolchain-funcs user versionator
 X kernel_linux
 
diff --git a/metadata/cache/app-emulation/virtualbox-modules-4.1.4 b/metadata/cache/app-emulation/virtualbox-modules-4.1.4
index faaefb945cef..752df6106562 100644
--- a/metadata/cache/app-emulation/virtualbox-modules-4.1.4
+++ b/metadata/cache/app-emulation/virtualbox-modules-4.1.4
@@ -6,7 +6,7 @@ http://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-4.1.4.tar.
 http://www.virtualbox.org/
 GPL-2
 Kernel Modules for Virtualbox
-amd64 ~x86
+amd64 x86
 eutils linux-info linux-mod multilib portability toolchain-funcs user versionator
 pax_kernel kernel_linux
 
diff --git a/metadata/cache/app-emulation/vmware-player-4.0.1.528992-r1 b/metadata/cache/app-emulation/vmware-player-4.0.1.528992-r2
similarity index 100%
rename from metadata/cache/app-emulation/vmware-player-4.0.1.528992-r1
rename to metadata/cache/app-emulation/vmware-player-4.0.1.528992-r2
diff --git a/metadata/cache/app-emulation/vmware-workstation-8.0.1.528992-r1 b/metadata/cache/app-emulation/vmware-workstation-8.0.1.528992-r2
similarity index 100%
rename from metadata/cache/app-emulation/vmware-workstation-8.0.1.528992-r1
rename to metadata/cache/app-emulation/vmware-workstation-8.0.1.528992-r2
diff --git a/metadata/cache/app-forensics/cmospwd-4.6 b/metadata/cache/app-forensics/cmospwd-4.6
deleted file mode 100644
index 60268f3052fc..000000000000
--- a/metadata/cache/app-forensics/cmospwd-4.6
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-0
-http://www.cgsecurity.org/cmospwd-4.6.tar.gz
-
-http://www.cgsecurity.org/index.html?cmospwd.html
-GPL-2
-CmosPwd decrypts password stored in cmos used to access BIOS SETUP
-~amd64 x86
-multilib toolchain-funcs
-
-
-
-
-
-
-compile install
-
-
-
-
-
diff --git a/metadata/cache/app-i18n/libtomoe-gtk-0.6.0-r2 b/metadata/cache/app-i18n/libtomoe-gtk-0.6.0-r2
index 7afdd3fe0ac1..eb731ca1bfba 100644
--- a/metadata/cache/app-i18n/libtomoe-gtk-0.6.0-r2
+++ b/metadata/cache/app-i18n/libtomoe-gtk-0.6.0-r2
@@ -1,5 +1,5 @@
->=app-i18n/tomoe-0.6.0[python?] python? ( dev-python/pygtk:2 dev-python/pygobject:2 ) gucharmap? ( >=gnome-extra/gucharmap-1.4.0 ) dev-util/pkgconfig sys-devel/gettext doc? ( >=dev-util/gtk-doc-1.4 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
->=app-i18n/tomoe-0.6.0[python?] python? ( dev-python/pygtk:2 dev-python/pygobject:2 ) gucharmap? ( >=gnome-extra/gucharmap-1.4.0 ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+>=app-i18n/tomoe-0.6.0[python?] python? ( dev-python/pygtk:2 dev-python/pygobject:2 ) gucharmap? ( gnome-extra/gucharmap:0 ) dev-util/gtk-doc-am dev-util/pkgconfig sys-devel/gettext doc? ( >=dev-util/gtk-doc-1.4 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+>=app-i18n/tomoe-0.6.0[python?] python? ( dev-python/pygtk:2 dev-python/pygobject:2 ) gucharmap? ( gnome-extra/gucharmap:0 ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
 0
 mirror://sourceforge/tomoe/tomoe-gtk-0.6.0.tar.gz
 
diff --git a/metadata/cache/app-i18n/tomoe-0.6.0-r1 b/metadata/cache/app-i18n/tomoe-0.6.0-r1
index ce7a4624ef43..28441c586183 100644
--- a/metadata/cache/app-i18n/tomoe-0.6.0-r1
+++ b/metadata/cache/app-i18n/tomoe-0.6.0-r1
@@ -1,4 +1,4 @@
-dev-util/pkgconfig doc? ( dev-util/gtk-doc ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+dev-util/gtk-doc-am dev-util/intltool dev-util/pkgconfig doc? ( dev-util/gtk-doc ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
 >=dev-libs/glib-2.4 ruby? ( dev-ruby/ruby-glib2 ) hyperestraier? ( app-text/hyperestraier ) subversion? ( >=dev-libs/apr-1 dev-vcs/subversion ) mysql? ( dev-db/mysql ) python? ( dev-python/pygobject:2 dev-python/pygtk:2 ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
 0
 mirror://sourceforge/tomoe/tomoe-0.6.0.tar.gz
diff --git a/metadata/cache/app-misc/strigi-0.7.6-r1 b/metadata/cache/app-misc/strigi-0.7.6-r1
index c7beb4946ffe..c9f4c4da1606 100644
--- a/metadata/cache/app-misc/strigi-0.7.6-r1
+++ b/metadata/cache/app-misc/strigi-0.7.6-r1
@@ -6,7 +6,7 @@ http://dev.gentoo.org/~dilfridge/distfiles/strigi-0.7.6.tar.xz
 https://projects.kde.org/projects/kdesupport/strigi/strigi
 GPL-2
 Fast crawling desktop search engine with Qt4 GUI
-~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user
 clucene +dbus debug exif fam ffmpeg hyperestraier inotify log +qt4 test
 
diff --git a/metadata/cache/app-office/akonadi-server-1.6.2 b/metadata/cache/app-office/akonadi-server-1.6.2
index 0215b3cb0251..ea11d624bf1d 100644
--- a/metadata/cache/app-office/akonadi-server-1.6.2
+++ b/metadata/cache/app-office/akonadi-server-1.6.2
@@ -6,7 +6,7 @@ mirror://kde/stable/akonadi/src/akonadi-1.6.2.tar.bz2
 http://pim.kde.org/akonadi
 LGPL-2.1
 The server part of Akonadi
-~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user
 mysql postgres +sqlite test
 || ( sqlite mysql postgres )
diff --git a/metadata/cache/app-portage/eclean-kernel-0.2.1 b/metadata/cache/app-portage/eclean-kernel-0.2.1
index 5cf194992650..96462d39c794 100644
--- a/metadata/cache/app-portage/eclean-kernel-0.2.1
+++ b/metadata/cache/app-portage/eclean-kernel-0.2.1
@@ -6,7 +6,7 @@ mirror://github/mgorny/eclean-kernel/eclean-kernel-0.2.1.tar.bz2
 https://github.com/mgorny/eclean-kernel/
 BSD
 Remove outdated built kernels
-~amd64 ~x86
+~amd64 ~x86 ~x86-fbsd
 base distutils eutils multilib portability python toolchain-funcs user
 
 
diff --git a/metadata/cache/app-shells/zsh-4.3.14 b/metadata/cache/app-shells/zsh-4.3.14
new file mode 100644
index 000000000000..619e620f20b6
--- /dev/null
+++ b/metadata/cache/app-shells/zsh-4.3.14
@@ -0,0 +1,22 @@
+sys-apps/groff >=sys-libs/ncurses-5.1 static? ( >=sys-libs/ncurses-5.7-r4[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm )
+>=sys-libs/ncurses-5.1 static? ( >=sys-libs/ncurses-5.7-r4[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm )
+0
+mirror://sourceforge/zsh/zsh-4.3.14.tar.bz2 ftp://ftp.zsh.org/pub/zsh-4.3.14.tar.bz2 doc? ( ftp://ftp.zsh.org/pub/zsh-4.3.14-doc.tar.bz2 )
+
+http://www.zsh.org/
+ZSH gdbm? ( GPL-2 )
+UNIX Shell similar to the Korn shell
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+eutils flag-o-matic multilib portability prefix toolchain-funcs user
+caps debug doc examples gdbm maildir pcre static unicode
+
+examples? ( app-doc/zsh-lovers )
+
+4
+
+configure install postinst prepare test
+
+
+
+
+
diff --git a/metadata/cache/app-text/xournal-0.4.5-r2 b/metadata/cache/app-text/xournal-0.4.5_p20111022-r2
similarity index 60%
rename from metadata/cache/app-text/xournal-0.4.5-r2
rename to metadata/cache/app-text/xournal-0.4.5_p20111022-r2
index a760f483149a..4a9a64fc6836 100644
--- a/metadata/cache/app-text/xournal-0.4.5-r2
+++ b/metadata/cache/app-text/xournal-0.4.5_p20111022-r2
@@ -1,14 +1,14 @@
-app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango dev-util/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango dev-util/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
 app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
 0
-mirror://sourceforge/xournal/xournal-0.4.5.tar.gz http://dev.gentoo.org/~dilfridge/distfiles/xournal-0.4.5-sjg-image-rev7.patch.gz
+http://dev.gentoo.org/~dilfridge/distfiles/xournal-0.4.5_p20111022.tar.xz http://dev.gentoo.org/~dilfridge/distfiles/xournal-0.4.5_p20111022-r2-patchset.tar.xz
 
 http://xournal.sourceforge.net/
 GPL-2
 Xournal is an application for notetaking, sketching, and keeping a journal using a stylus.
-amd64 x86
-eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator
-+pdf doc debug
+~amd64 ~x86
+autotools eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator
++pdf
 
 
 
diff --git a/metadata/cache/dev-embedded/gnusim8085-1.3.5 b/metadata/cache/dev-embedded/gnusim8085-1.3.5
deleted file mode 100644
index 891c52b4824b..000000000000
--- a/metadata/cache/dev-embedded/gnusim8085-1.3.5
+++ /dev/null
@@ -1,22 +0,0 @@
->=x11-libs/gtk+-2.12:2 >=gnome-base/libgnomeui-2.0 x11-libs/gtksourceview:2.0 nls? ( sys-devel/gettext )
->=x11-libs/gtk+-2.12:2 >=gnome-base/libgnomeui-2.0 x11-libs/gtksourceview:2.0
-0
-mirror://sourceforge/gnusim8085/gnusim8085-1.3.5.tar.gz
-
-http://sourceforge.net/projects/gnusim8085
-GPL-2
-A GTK2 8085 Simulator
-~amd64 x86
-eutils multilib portability toolchain-funcs user
-nls doc
-
-
-
-2
-
-configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/dev-embedded/gnusim8085-1.3.6 b/metadata/cache/dev-embedded/gnusim8085-1.3.6
deleted file mode 100644
index 9c60c7878f13..000000000000
--- a/metadata/cache/dev-embedded/gnusim8085-1.3.6
+++ /dev/null
@@ -1,22 +0,0 @@
->=x11-libs/gtk+-2.12:2 x11-libs/gtksourceview:2.0 nls? ( sys-devel/gettext ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
->=x11-libs/gtk+-2.12:2 x11-libs/gtksourceview:2.0
-0
-http://launchpad.net/gnusim8085/trunk/1.3.6/+download/gnusim8085-1.3.6.tar.gz
-
-http://gnusim8085.org
-GPL-2
-A GTK2 8085 Simulator
-~amd64 ~x86
-autotools eutils libtool multilib portability toolchain-funcs user
-nls examples
-
-
-
-4
-
-configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/dev-java/sun-javamail-1.4.3 b/metadata/cache/dev-java/sun-javamail-1.4.3
index 52c6b05fb1de..a79c08e0456c 100644
--- a/metadata/cache/dev-java/sun-javamail-1.4.3
+++ b/metadata/cache/dev-java/sun-javamail-1.4.3
@@ -6,7 +6,7 @@ http://kenai.com/projects/javamail/downloads/download//javamail-1.4.3-src.zip
 http://java.sun.com/products/javamail/index.html
 CDDL GPL-2 BSD
 A Java-based framework to build multiplatform mail and messaging applications.
-amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib portability toolchain-funcs user versionator
 elibc_FreeBSD doc source elibc_FreeBSD
 
diff --git a/metadata/cache/dev-lang/erlang-13.2.4 b/metadata/cache/dev-lang/erlang-13.2.4
index 3e8941a391a1..23cf8b471ba3 100644
--- a/metadata/cache/dev-lang/erlang-13.2.4
+++ b/metadata/cache/dev-lang/erlang-13.2.4
@@ -4,7 +4,7 @@
 http://www.erlang.org/download/otp_src_R13B04.tar.gz http://erlang.org/download/otp_doc_man_R13B04.tar.gz doc? ( http://erlang.org/download/otp_doc_html_R13B04.tar.gz )
 
 http://www.erlang.org/
-EPL
+ErlPL-1.1
 Erlang programming language, runtime environment, and large collection of libraries
 alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris
 autotools elisp-common eutils libtool multilib portability toolchain-funcs user versionator wxwidgets
diff --git a/metadata/cache/dev-lang/erlang-14.2.2-r1 b/metadata/cache/dev-lang/erlang-14.2.2-r1
index 8d5587a84503..6100833783c8 100644
--- a/metadata/cache/dev-lang/erlang-14.2.2-r1
+++ b/metadata/cache/dev-lang/erlang-14.2.2-r1
@@ -4,7 +4,7 @@
 http://www.erlang.org/download/otp_src_R14B02.tar.gz http://erlang.org/download/otp_doc_man_R14B02.tar.gz doc? ( http://erlang.org/download/otp_doc_html_R14B02.tar.gz )
 
 http://www.erlang.org/
-EPL
+ErlPL-1.1
 Erlang programming language, runtime environment, and large collection of libraries
 ~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris
 elisp-common eutils java-pkg-opt-2 java-utils-2 multilib portability toolchain-funcs user versionator wxwidgets
diff --git a/metadata/cache/dev-lang/erlang-14.2.3 b/metadata/cache/dev-lang/erlang-14.2.3
index 2c35dcaca32a..7a819d8d74e9 100644
--- a/metadata/cache/dev-lang/erlang-14.2.3
+++ b/metadata/cache/dev-lang/erlang-14.2.3
@@ -4,7 +4,7 @@
 http://www.erlang.org/download/otp_src_R14B03.tar.gz http://erlang.org/download/otp_doc_man_R14B03.tar.gz doc? ( http://erlang.org/download/otp_doc_html_R14B03.tar.gz )
 
 http://www.erlang.org/
-EPL
+ErlPL-1.1
 Erlang programming language, runtime environment, and large collection of libraries
 ~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris
 elisp-common eutils java-pkg-opt-2 java-utils-2 multilib portability toolchain-funcs user versionator wxwidgets
diff --git a/metadata/cache/dev-lang/erlang-14.2.4 b/metadata/cache/dev-lang/erlang-14.2.4
index f8b025a15615..473951e1134c 100644
--- a/metadata/cache/dev-lang/erlang-14.2.4
+++ b/metadata/cache/dev-lang/erlang-14.2.4
@@ -4,7 +4,7 @@
 http://www.erlang.org/download/otp_src_R14B04.tar.gz http://erlang.org/download/otp_doc_man_R14B04.tar.gz doc? ( http://erlang.org/download/otp_doc_html_R14B04.tar.gz )
 
 http://www.erlang.org/
-EPL
+ErlPL-1.1
 Erlang programming language, runtime environment, and large collection of libraries
 ~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris
 elisp-common eutils java-pkg-opt-2 java-utils-2 multilib portability toolchain-funcs user versionator wxwidgets
diff --git a/metadata/cache/dev-libs/grantlee-0.1.8 b/metadata/cache/dev-libs/grantlee-0.1.8
index ba07105aa0bb..205eea683a46 100644
--- a/metadata/cache/dev-libs/grantlee-0.1.8
+++ b/metadata/cache/dev-libs/grantlee-0.1.8
@@ -6,7 +6,7 @@ test
 http://www.gitorious.org/grantlee/pages/Home
 LGPL-2.1
 C++ string template engine based on the Django template system
-~amd64 ~arm ~ppc ~ppc64 ~x86
+amd64 ~arm ~ppc ~ppc64 x86
 base cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user
 debug doc test
 
diff --git a/metadata/cache/dev-libs/qjson-0.7.1-r1 b/metadata/cache/dev-libs/qjson-0.7.1-r1
index 22775b568d63..ac073c812519 100644
--- a/metadata/cache/dev-libs/qjson-0.7.1-r1
+++ b/metadata/cache/dev-libs/qjson-0.7.1-r1
@@ -6,7 +6,7 @@ mirror://sourceforge/qjson/qjson-0.7.1.tar.bz2
 http://qjson.sourceforge.net
 LGPL-2.1
 A library for mapping JSON data to QVariant objects
-~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+amd64 ~arm ~hppa ~ppc ~ppc64 x86
 base cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user
 debug doc test
 
diff --git a/metadata/cache/dev-libs/serd-0.4.2 b/metadata/cache/dev-libs/serd-0.4.2
deleted file mode 100644
index 4004c07987c0..000000000000
--- a/metadata/cache/dev-libs/serd-0.4.2
+++ /dev/null
@@ -1,22 +0,0 @@
-doc? ( app-doc/doxygen )
-
-0
-http://download.drobilla.net/serd-0.4.2.tar.bz2
-
-http://drobilla.net/software/serd/
-ISC
-Library for RDF syntax which supports reading and writing Turtle and NTriples
-~amd64
-base eutils multilib portability toolchain-funcs user
-doc test
-
-
-
-3
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-libs/shared-desktop-ontologies-0.7.0 b/metadata/cache/dev-libs/shared-desktop-ontologies-0.7.0
index 0cfe74425ee4..ad05da889fdb 100644
--- a/metadata/cache/dev-libs/shared-desktop-ontologies-0.7.0
+++ b/metadata/cache/dev-libs/shared-desktop-ontologies-0.7.0
@@ -6,7 +6,7 @@ mirror://sourceforge/oscaf/shared-desktop-ontologies/shared-desktop-ontologies-0
 http://sourceforge.net/projects/oscaf
 || ( BSD CCPL-Attribution-ShareAlike-3.0 )
 Shared OSCAF desktop ontologies
-~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-libs/sord-0.4.2 b/metadata/cache/dev-libs/sord-0.4.2
deleted file mode 100644
index 9eb9ddece6b4..000000000000
--- a/metadata/cache/dev-libs/sord-0.4.2
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/glib:2 dev-libs/serd doc? ( app-doc/doxygen ) dev-util/pkgconfig
-dev-libs/glib:2 dev-libs/serd
-0
-http://download.drobilla.net/sord-0.4.2.tar.bz2
-
-http://drobilla.net/software/sord/
-ISC
-Library for storing RDF data in memory
-~amd64
-base eutils multilib portability toolchain-funcs user
-doc test
-
-
-
-3
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ml/pcre-ocaml-6.2.3 b/metadata/cache/dev-ml/pcre-ocaml-6.2.3
new file mode 100644
index 000000000000..f9d5047cc184
--- /dev/null
+++ b/metadata/cache/dev-ml/pcre-ocaml-6.2.3
@@ -0,0 +1,22 @@
+>=dev-lang/ocaml-3.10.2[ocamlopt?] >=dev-libs/libpcre-4.5 >=dev-ml/findlib-1.0.4-r1
+>=dev-lang/ocaml-3.10.2[ocamlopt?] >=dev-libs/libpcre-4.5
+0
+http://www.ocaml.info/ocaml_sources/pcre-ocaml-6.2.3.tar.gz
+
+http://www.ocaml.info/home/ocaml_sources.html
+LGPL-2.1
+Perl Compatibility Regular Expressions for O'Caml
+~amd64 ~ppc ~x86 ~x86-fbsd
+eutils findlib multilib portability toolchain-funcs user
+examples +ocamlopt
+
+
+
+2
+
+compile install prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-python/eyeD3-0.6.18 b/metadata/cache/dev-python/eyeD3-0.6.18
new file mode 100644
index 000000000000..e2e8f8dd2b6d
--- /dev/null
+++ b/metadata/cache/dev-python/eyeD3-0.6.18
@@ -0,0 +1,22 @@
+>=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+>=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+0
+http://eyed3.nicfit.net/releases/eyeD3-0.6.18.tar.gz
+
+http://eyed3.nicfit.net/
+GPL-2
+Module for manipulating ID3 (v1 + v2) tags in Python
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
+distutils multilib python toolchain-funcs
+
+
+
+
+3
+
+compile configure install postinst postrm prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-python/llfuse-0.37 b/metadata/cache/dev-python/llfuse-0.37
new file mode 100644
index 000000000000..77fea8178667
--- /dev/null
+++ b/metadata/cache/dev-python/llfuse-0.37
@@ -0,0 +1,22 @@
+>=sys-fs/fuse-2.8.0 dev-python/setuptools dev-util/pkgconfig >=app-admin/eselect-python-20091230 dev-lang/python
+>=sys-fs/fuse-2.8.0 >=app-admin/eselect-python-20091230 dev-lang/python
+0
+mirror://pypi/l/llfuse/llfuse-0.37.tar.bz2
+
+http://python-llfuse.googlecode.com/ http://pypi.python.org/pypi/llfuse
+LGPL-2
+Python bindings for the low-level FUSE API
+~amd64 ~x86
+distutils multilib python toolchain-funcs
+doc
+
+
+
+4
+
+compile install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/slop-2.4.0 b/metadata/cache/dev-ruby/slop-2.4.0
new file mode 100644
index 000000000000..69f417032ca5
--- /dev/null
+++ b/metadata/cache/dev-ruby/slop-2.4.0
@@ -0,0 +1,22 @@
+ruby_targets_ruby18? ( test? ( dev-ruby/minitest[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/minitest[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/minitest[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+0
+https://github.com/injekt/slop/tarball/v2.4.0 -> slop-2.4.0.tgz
+
+https://github.com/injekt/slop
+MIT
+A simple option parser with an easy to remember syntax and friendly API.
+~amd64
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby test test
+|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/yard-0.7.4 b/metadata/cache/dev-ruby/yard-0.7.4
new file mode 100644
index 000000000000..cc92032a6552
--- /dev/null
+++ b/metadata/cache/dev-ruby/yard-0.7.4
@@ -0,0 +1,22 @@
+ruby_targets_ruby18? ( doc? ( || ( dev-ruby/bluecloth[ruby_targets_ruby18] dev-ruby/maruku[ruby_targets_ruby18] dev-ruby/rdiscount[ruby_targets_ruby18] dev-ruby/kramdown[ruby_targets_ruby18] ) ) ) ruby_targets_ree18? ( doc? ( || ( dev-ruby/bluecloth[ruby_targets_ree18] dev-ruby/maruku[ruby_targets_ree18] dev-ruby/rdiscount[ruby_targets_ree18] dev-ruby/kramdown[ruby_targets_ree18] ) ) ) ruby_targets_jruby? ( doc? ( || ( dev-ruby/bluecloth[ruby_targets_jruby] dev-ruby/maruku[ruby_targets_jruby] dev-ruby/rdiscount[ruby_targets_jruby] dev-ruby/kramdown[ruby_targets_jruby] ) ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rspec:2[ruby_targets_ree18] ) ) 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_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) 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_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+0
+mirror://rubygems/yard-0.7.4.gem
+
+http://yardoc.org/
+as-is
+Documentation generation tool for the Ruby programming language
+~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby doc doc test test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-scheme/chicken-4.7.3 b/metadata/cache/dev-scheme/chicken-4.7.3
new file mode 100644
index 000000000000..b95fc1dcc7d1
--- /dev/null
+++ b/metadata/cache/dev-scheme/chicken-4.7.3
@@ -0,0 +1,22 @@
+sys-apps/texinfo emacs? ( virtual/emacs )
+emacs? ( virtual/emacs app-emacs/scheme-complete )
+0
+http://code.call-cc.org/dev-snapshots/2011/08/17/chicken-4.7.3.tar.gz
+test
+http://www.call-cc.org/
+BSD
+Chicken is a Scheme interpreter and native Scheme to C compiler
+~alpha ~amd64 ~ppc ~ppc64 ~x86
+eutils multilib portability toolchain-funcs user
+emacs parallel-build
+
+
+
+3
+
+compile install prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-util/bdelta-0.2.3 b/metadata/cache/dev-util/bdelta-0.2.3
new file mode 100644
index 000000000000..dcdc7db0b6ce
--- /dev/null
+++ b/metadata/cache/dev-util/bdelta-0.2.3
@@ -0,0 +1,22 @@
+
+
+0
+http://deltup.org/request.php?10 -> bdelta-0.2.3.tar.gz
+
+http://deltup.sourceforge.net
+GPL-2
+Binary Delta - Efficient difference algorithm and format
+~alpha ~amd64 ~ppc ~sparc ~x86
+eutils multilib portability toolchain-funcs user
+
+
+
+
+4
+
+compile install prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-util/kbuild-0.1.9998_pre20110817 b/metadata/cache/dev-util/kbuild-0.1.9998_pre20110817
index 563ead21ef1b..f8bdafdad1b2 100644
--- a/metadata/cache/dev-util/kbuild-0.1.9998_pre20110817
+++ b/metadata/cache/dev-util/kbuild-0.1.9998_pre20110817
@@ -6,7 +6,7 @@ http://dev.gentoo.org/~polynomial-c/kBuild-0.1.9998-pre20110817-src.tar.gz
 http://svn.netlabs.org/kbuild/wiki
 GPL-3
 A makefile framework for writing simple makefiles for complex tasks
-amd64 ~x86
+amd64 x86
 autotools eutils libtool multilib portability toolchain-funcs user
 
 
diff --git a/metadata/cache/java-virtuals/jaf-1.1-r1 b/metadata/cache/java-virtuals/jaf-1.1-r1
index 6dcf8432113d..0a00fd241125 100644
--- a/metadata/cache/java-virtuals/jaf-1.1-r1
+++ b/metadata/cache/java-virtuals/jaf-1.1-r1
@@ -6,7 +6,7 @@
 http://www.gentoo.org
 GPL-2
 Virtual for JavaBeans Activation Framework (JAF)
-amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 eutils java-utils-2 java-virtuals-2 multilib portability toolchain-funcs user versionator
 elibc_FreeBSD
 
diff --git a/metadata/cache/kde-base/activitymanager-4.7.2 b/metadata/cache/kde-base/activitymanager-4.7.2
deleted file mode 100644
index 6dde74666fe5..000000000000
--- a/metadata/cache/kde-base/activitymanager-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/kdelibs-4.7.2:4[aqua=,semantic-desktop=] >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/activitymanager-4.7.3
index 6e88cc63c946..b1a55bb4c36f 100644
--- a/metadata/cache/kde-base/activitymanager-4.7.3
+++ b/metadata/cache/kde-base/activitymanager-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/akonadiconsole-4.7.2 b/metadata/cache/kde-base/akonadiconsole-4.7.2
deleted file mode 100644
index 8e108da3925c..000000000000
--- a/metadata/cache/kde-base/akonadiconsole-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.2:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.7.2: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.2:4[aqua=]
->=kde-base/kdepimlibs-4.7.2:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdepim-4.7.2.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Akonadi developer console
-~amd64 ~x86 ~amd64-linux ~x86-linux
-base 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.3 b/metadata/cache/kde-base/akonadiconsole-4.7.3
index 46e63ec01d4c..773fad4cfe6e 100644
--- a/metadata/cache/kde-base/akonadiconsole-4.7.3
+++ b/metadata/cache/kde-base/akonadiconsole-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/akregator-4.7.2 b/metadata/cache/kde-base/akregator-4.7.2
deleted file mode 100644
index 50e6d5cc575f..000000000000
--- a/metadata/cache/kde-base/akregator-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.2:4[aqua=] >=kde-base/kdepim-common-libs-4.7.2: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.2:4[aqua=]
->=kde-base/kdepimlibs-4.7.2:4[aqua=] >=kde-base/kdepim-common-libs-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] kontact? ( >=kde-base/kontact-4.7.2:4[aqua=] )
-4
-mirror://kde/stable/4.7.2/src/kdepim-4.7.2.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE news feed aggregator.
-~amd64 ~x86 ~amd64-linux ~x86-linux
-base 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.3 b/metadata/cache/kde-base/akregator-4.7.3
index c06ab9f8c3fb..b6791177908a 100644
--- a/metadata/cache/kde-base/akregator-4.7.3
+++ b/metadata/cache/kde-base/akregator-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/amor-4.7.2 b/metadata/cache/kde-base/amor-4.7.2
deleted file mode 100644
index 8c4c9a9aafcc..000000000000
--- a/metadata/cache/kde-base/amor-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdetoys-4.7.2.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.3 b/metadata/cache/kde-base/amor-4.7.3
index 43fa3a619d04..27923c0657e4 100644
--- a/metadata/cache/kde-base/amor-4.7.3
+++ b/metadata/cache/kde-base/amor-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/ark-4.7.2-r1 b/metadata/cache/kde-base/ark-4.7.2-r1
deleted file mode 100644
index f7e54d184dfd..000000000000
--- a/metadata/cache/kde-base/ark-4.7.2-r1
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkonq-4.7.2: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.2:4[aqua=]
->=kde-base/libkonq-4.7.2: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.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeutils-4.7.2.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.3 b/metadata/cache/kde-base/ark-4.7.3
index 0d8492fad210..9ff4c715ff44 100644
--- a/metadata/cache/kde-base/ark-4.7.3
+++ b/metadata/cache/kde-base/ark-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 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
 
diff --git a/metadata/cache/kde-base/attica-4.7.2 b/metadata/cache/kde-base/attica-4.7.2
deleted file mode 100644
index 614a3dab6c18..000000000000
--- a/metadata/cache/kde-base/attica-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=dev-libs/libattica-0.1.4 >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/attica-4.7.3
index 83dc25fc36a6..3e31b302f6c8 100644
--- a/metadata/cache/kde-base/attica-4.7.3
+++ b/metadata/cache/kde-base/attica-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/blinken-4.7.2 b/metadata/cache/kde-base/blinken-4.7.2
deleted file mode 100644
index b8b8507da0c8..000000000000
--- a/metadata/cache/kde-base/blinken-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkdeedu-4.7.2: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.2:4[aqua=]
->=kde-base/libkdeedu-4.7.2:4[aqua=] >=kde-base/knotify-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/blinken-4.7.2.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.3 b/metadata/cache/kde-base/blinken-4.7.3
index a19e1ee51648..a717266ca51e 100644
--- a/metadata/cache/kde-base/blinken-4.7.3
+++ b/metadata/cache/kde-base/blinken-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/blogilo-4.7.2 b/metadata/cache/kde-base/blogilo-4.7.2
deleted file mode 100644
index 0ce13d9ca4d5..000000000000
--- a/metadata/cache/kde-base/blogilo-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.2: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.2:4[aqua=]
->=kde-base/kdepimlibs-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdepim-4.7.2.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Blogging Client
-~amd64 ~x86 ~amd64-linux ~x86-linux
-base 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.3 b/metadata/cache/kde-base/blogilo-4.7.3
index 931998865da8..68d0ed2c63b1 100644
--- a/metadata/cache/kde-base/blogilo-4.7.3
+++ b/metadata/cache/kde-base/blogilo-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/bomber-4.7.2 b/metadata/cache/kde-base/bomber-4.7.2
deleted file mode 100644
index bff0ab8443c6..000000000000
--- a/metadata/cache/kde-base/bomber-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/bomber-4.7.3
index f30e393ce957..09b9effa57e5 100644
--- a/metadata/cache/kde-base/bomber-4.7.3
+++ b/metadata/cache/kde-base/bomber-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/bovo-4.7.2 b/metadata/cache/kde-base/bovo-4.7.2
deleted file mode 100644
index ac53735444b9..000000000000
--- a/metadata/cache/kde-base/bovo-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/bovo-4.7.3
index 14fa93e7d7cc..cd62c69218a1 100644
--- a/metadata/cache/kde-base/bovo-4.7.3
+++ b/metadata/cache/kde-base/bovo-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/cantor-4.7.2 b/metadata/cache/kde-base/cantor-4.7.2
deleted file mode 100644
index 31f56411f0b9..000000000000
--- a/metadata/cache/kde-base/cantor-4.7.2
+++ /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.2:4[aqua=]
-ps? ( app-text/libspectre ) R? ( dev-lang/R ) >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/cantor-4.7.2.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.3 b/metadata/cache/kde-base/cantor-4.7.3
index 6ec6aeca455f..ba56d8b98e7b 100644
--- a/metadata/cache/kde-base/cantor-4.7.3
+++ b/metadata/cache/kde-base/cantor-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 KDE4 interface for doing mathematics and scientific computing
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+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
 
diff --git a/metadata/cache/kde-base/cervisia-4.7.2 b/metadata/cache/kde-base/cervisia-4.7.2
deleted file mode 100644
index 533bc3d1aa22..000000000000
--- a/metadata/cache/kde-base/cervisia-4.7.2
+++ /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.2:4[aqua=]
-dev-vcs/cvs >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdesdk-4.7.2.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.3 b/metadata/cache/kde-base/cervisia-4.7.3
index f24d0f3a73b6..b3ed342a1f84 100644
--- a/metadata/cache/kde-base/cervisia-4.7.3
+++ b/metadata/cache/kde-base/cervisia-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/dolphin-4.7.2 b/metadata/cache/kde-base/dolphin-4.7.2
deleted file mode 100644
index 032aa47fd814..000000000000
--- a/metadata/cache/kde-base/dolphin-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdelibs-4.7.2:4[aqua=,semantic-desktop=] >=kde-base/libkonq-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/kdelibs-4.7.2:4[aqua=,semantic-desktop=] >=kde-base/libkonq-4.7.2:4[aqua=] semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.2 ) >=kde-base/kfind-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-baseapps-4.7.2.tar.bz2
-
-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.2:4[aqua=] || ( >=kde-base/ffmpegthumbs-4.7.2:4[aqua=] >=kde-base/mplayerthumbs-4.7.2:4[aqua=] ) )
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/dolphin-4.7.3 b/metadata/cache/kde-base/dolphin-4.7.3
index 1056ec15e838..433e9d593405 100644
--- a/metadata/cache/kde-base/dolphin-4.7.3
+++ b/metadata/cache/kde-base/dolphin-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 A KDE filemanager focusing on usability
-~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+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
 
diff --git a/metadata/cache/kde-base/dolphin-plugins-4.7.2 b/metadata/cache/kde-base/dolphin-plugins-4.7.2
deleted file mode 100644
index 620aec3ea660..000000000000
--- a/metadata/cache/kde-base/dolphin-plugins-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkonq-4.7.2: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.2:4[aqua=]
->=kde-base/libkonq-4.7.2:4[aqua=] >=kde-base/kompare-4.7.2:4[aqua=] git? ( dev-vcs/git ) subversion? ( dev-vcs/subversion ) >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdesdk-4.7.2.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.3 b/metadata/cache/kde-base/dolphin-plugins-4.7.3
index 20bcdb082508..43515233589d 100644
--- a/metadata/cache/kde-base/dolphin-plugins-4.7.3
+++ b/metadata/cache/kde-base/dolphin-plugins-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/dragonplayer-4.7.2 b/metadata/cache/kde-base/dragonplayer-4.7.2
deleted file mode 100644
index f49c2273ea47..000000000000
--- a/metadata/cache/kde-base/dragonplayer-4.7.2
+++ /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.2:4[aqua=]
->=media-libs/phonon-4.4.3 xine? ( media-libs/xine-lib[xcb] ) >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdemultimedia-4.7.2.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.3 b/metadata/cache/kde-base/dragonplayer-4.7.3
index 2f4e651627a4..53fe59ed56ef 100644
--- a/metadata/cache/kde-base/dragonplayer-4.7.3
+++ b/metadata/cache/kde-base/dragonplayer-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/drkonqi-4.7.2 b/metadata/cache/kde-base/drkonqi-4.7.2
deleted file mode 100644
index e77f024f3e1c..000000000000
--- a/metadata/cache/kde-base/drkonqi-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/drkonqi-4.7.3
index 0d8bff83e20f..808f997bb85d 100644
--- a/metadata/cache/kde-base/drkonqi-4.7.3
+++ b/metadata/cache/kde-base/drkonqi-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/ffmpegthumbs-4.7.2 b/metadata/cache/kde-base/ffmpegthumbs-4.7.2
deleted file mode 100644
index 2c17d7678fa6..000000000000
--- a/metadata/cache/kde-base/ffmpegthumbs-4.7.2
+++ /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.2:4[aqua=]
-virtual/ffmpeg >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdemultimedia-4.7.2.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.3 b/metadata/cache/kde-base/ffmpegthumbs-4.7.3
index 200f9a0427a8..7c28a7c8259c 100644
--- a/metadata/cache/kde-base/ffmpegthumbs-4.7.3
+++ b/metadata/cache/kde-base/ffmpegthumbs-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/filelight-4.7.2 b/metadata/cache/kde-base/filelight-4.7.2
deleted file mode 100644
index b0f5811137ba..000000000000
--- a/metadata/cache/kde-base/filelight-4.7.2
+++ /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.2:4[aqua=]
-x11-apps/xdpyinfo >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeutils-4.7.2.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.3 b/metadata/cache/kde-base/filelight-4.7.3
index 459bb87e7253..d0102b967538 100644
--- a/metadata/cache/kde-base/filelight-4.7.3
+++ b/metadata/cache/kde-base/filelight-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/freespacenotifier-4.7.2 b/metadata/cache/kde-base/freespacenotifier-4.7.2
deleted file mode 100644
index 17528f4b155c..000000000000
--- a/metadata/cache/kde-base/freespacenotifier-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3 b/metadata/cache/kde-base/freespacenotifier-4.7.3
index 102ec53cc3f4..587a4d9fdb89 100644
--- a/metadata/cache/kde-base/freespacenotifier-4.7.3
+++ b/metadata/cache/kde-base/freespacenotifier-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/granatier-4.7.2 b/metadata/cache/kde-base/granatier-4.7.2
deleted file mode 100644
index ebcdf88be5ff..000000000000
--- a/metadata/cache/kde-base/granatier-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-media-libs/libsndfile media-libs/openal >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/granatier-4.7.3
index 8dca2c310e98..1972d58b852e 100644
--- a/metadata/cache/kde-base/granatier-4.7.3
+++ b/metadata/cache/kde-base/granatier-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/gwenview-4.7.2 b/metadata/cache/kde-base/gwenview-4.7.2
deleted file mode 100644
index 32c3e11de3e0..000000000000
--- a/metadata/cache/kde-base/gwenview-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdelibs-4.7.2:4[aqua=,semantic-desktop=] >=kde-base/libkonq-4.7.2:4[aqua=] >=media-gfx/exiv2-0.19 virtual/jpeg kipi? ( >=kde-base/libkipi-4.7.2: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.2:4[aqua=]
->=kde-base/kdelibs-4.7.2:4[aqua=,semantic-desktop=] >=kde-base/libkonq-4.7.2:4[aqua=] >=media-gfx/exiv2-0.19 virtual/jpeg kipi? ( >=kde-base/libkipi-4.7.2:4[aqua=] ) >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/gwenview-4.7.2.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.3 b/metadata/cache/kde-base/gwenview-4.7.3
index 61845dd7092a..fe8f2ce79bff 100644
--- a/metadata/cache/kde-base/gwenview-4.7.3
+++ b/metadata/cache/kde-base/gwenview-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 KDE image viewer
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+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
 
diff --git a/metadata/cache/kde-base/jovie-4.7.2 b/metadata/cache/kde-base/jovie-4.7.2
deleted file mode 100644
index 6eb58c1d063d..000000000000
--- a/metadata/cache/kde-base/jovie-4.7.2
+++ /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.2:4[aqua=]
-app-accessibility/speech-dispatcher >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeaccessibility-4.7.2.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.3 b/metadata/cache/kde-base/jovie-4.7.3
index 6bd1d22627e7..f0c45b37abc1 100644
--- a/metadata/cache/kde-base/jovie-4.7.3
+++ b/metadata/cache/kde-base/jovie-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/juk-4.7.2 b/metadata/cache/kde-base/juk-4.7.2
deleted file mode 100644
index 9cea4399e065..000000000000
--- a/metadata/cache/kde-base/juk-4.7.2
+++ /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.2:4[aqua=]
->=media-libs/taglib-1.6 musicbrainz? ( media-libs/tunepimp ) >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdemultimedia-4.7.2.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.3 b/metadata/cache/kde-base/juk-4.7.3
index 5cebcbec890d..634365d8c86f 100644
--- a/metadata/cache/kde-base/juk-4.7.3
+++ b/metadata/cache/kde-base/juk-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kabcclient-4.7.2 b/metadata/cache/kde-base/kabcclient-4.7.2
deleted file mode 100644
index a252cd8dcbf4..000000000000
--- a/metadata/cache/kde-base/kabcclient-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.2: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.2:4[aqua=]
->=kde-base/kdepimlibs-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdepim-4.7.2.tar.bz2
-
-http://www.kde.org/
-GPL-2
-A command line client for accessing the KDE addressbook
-~amd64 ~x86 ~amd64-linux ~x86-linux
-base 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.3 b/metadata/cache/kde-base/kabcclient-4.7.3
index 84deb47ef1ba..6c549ca38cc7 100644
--- a/metadata/cache/kde-base/kabcclient-4.7.3
+++ b/metadata/cache/kde-base/kabcclient-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kaccessible-4.7.2 b/metadata/cache/kde-base/kaccessible-4.7.2
deleted file mode 100644
index 84ed428dfe10..000000000000
--- a/metadata/cache/kde-base/kaccessible-4.7.2
+++ /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.2:4[aqua=]
-app-accessibility/speech-dispatcher >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeaccessibility-4.7.2.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.3 b/metadata/cache/kde-base/kaccessible-4.7.3
index 25552fbfec8d..060aafd2fb43 100644
--- a/metadata/cache/kde-base/kaccessible-4.7.3
+++ b/metadata/cache/kde-base/kaccessible-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kactivities-4.7.2 b/metadata/cache/kde-base/kactivities-4.7.2
deleted file mode 100644
index 090b9b772dc0..000000000000
--- a/metadata/cache/kde-base/kactivities-4.7.2
+++ /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.2:4[aqua=]
-!<=kde-base/kdelibs-4.7.1-r1:4 >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdelibs-4.7.2.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.3 b/metadata/cache/kde-base/kactivities-4.7.3
index 94eb2ad567f3..af77ee8284fc 100644
--- a/metadata/cache/kde-base/kactivities-4.7.3
+++ b/metadata/cache/kde-base/kactivities-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 KDE Activity Manager
-~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+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
 
diff --git a/metadata/cache/kde-base/kaddressbook-4.7.2 b/metadata/cache/kde-base/kaddressbook-4.7.2
deleted file mode 100644
index 050c76c78101..000000000000
--- a/metadata/cache/kde-base/kaddressbook-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/grantlee-0.1.4 >=kde-base/kdelibs-4.7.2:4[aqua=,semantic-desktop] >=kde-base/kdepimlibs-4.7.2:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.7.2: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.2:4[aqua=]
->=dev-libs/grantlee-0.1.4 >=kde-base/kdelibs-4.7.2:4[aqua=,semantic-desktop] >=kde-base/kdepimlibs-4.7.2:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] kontact? ( >=kde-base/kontact-4.7.2:4[aqua=] )
-4
-mirror://kde/stable/4.7.2/src/kdepim-4.7.2.tar.bz2
-
-http://www.kde.org/
-GPL-2
-The KDE Address Book
-~amd64 ~x86 ~amd64-linux ~x86-linux
-base 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.3 b/metadata/cache/kde-base/kaddressbook-4.7.3
index 702d46e532e1..221cc24ab703 100644
--- a/metadata/cache/kde-base/kaddressbook-4.7.3
+++ b/metadata/cache/kde-base/kaddressbook-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 The KDE Address Book
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kajongg-4.7.2-r1 b/metadata/cache/kde-base/kajongg-4.7.2-r1
deleted file mode 100644
index d9388f0fbda9..000000000000
--- a/metadata/cache/kde-base/kajongg-4.7.2-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-db/sqlite:3 >=kde-base/libkdegames-4.7.2:4[aqua=] >=kde-base/pykde4-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=] >=app-admin/eselect-python-20091230
-dev-db/sqlite:3 >=kde-base/libkdegames-4.7.2:4[aqua=] >=kde-base/pykde4-4.7.2:4[aqua=] >=kde-base/libkmahjongg-4.7.2:4[aqua=] >=dev-python/twisted-8.2.0 >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=] >=app-admin/eselect-python-20091230
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/kajongg-4.7.3
index 97071dcc7297..e9f44a97cecb 100644
--- a/metadata/cache/kde-base/kajongg-4.7.3
+++ b/metadata/cache/kde-base/kajongg-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 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
 
diff --git a/metadata/cache/kde-base/kalarm-4.7.2 b/metadata/cache/kde-base/kalarm-4.7.2
deleted file mode 100644
index 471aecaff080..000000000000
--- a/metadata/cache/kde-base/kalarm-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.2:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.7.2: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.2:4[aqua=]
->=kde-base/kdepimlibs-4.7.2:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.7.2:4[aqua=] media-libs/phonon >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdepim-4.7.2.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Personal alarm message, command and email scheduler for KDE
-~amd64 ~x86 ~amd64-linux ~x86-linux
-base 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.3 b/metadata/cache/kde-base/kalarm-4.7.3
index 1b28c496cb62..34aff44b5459 100644
--- a/metadata/cache/kde-base/kalarm-4.7.3
+++ b/metadata/cache/kde-base/kalarm-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kalgebra-4.7.2 b/metadata/cache/kde-base/kalgebra-4.7.2
deleted file mode 100644
index 8e2ff3f70a3e..000000000000
--- a/metadata/cache/kde-base/kalgebra-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkdeedu-4.7.2: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.2:4[aqua=]
->=kde-base/libkdeedu-4.7.2:4[aqua=] readline? ( sys-libs/readline ) >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kalgebra-4.7.2.tar.bz2
-
-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.3 b/metadata/cache/kde-base/kalgebra-4.7.3
index 276f6596370b..fe5afc74a6fb 100644
--- a/metadata/cache/kde-base/kalgebra-4.7.3
+++ b/metadata/cache/kde-base/kalgebra-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 MathML-based graph calculator for KDE.
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+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
 
diff --git a/metadata/cache/kde-base/kalzium-4.7.2 b/metadata/cache/kde-base/kalzium-4.7.2
deleted file mode 100644
index caf0718e8b6b..000000000000
--- a/metadata/cache/kde-base/kalzium-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkdeedu-4.7.2: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.2:4[aqua=]
->=kde-base/libkdeedu-4.7.2:4[aqua=] editor? ( >=sci-chemistry/openbabel-2.2 ) >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kalzium-4.7.2.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.3 b/metadata/cache/kde-base/kalzium-4.7.3
index 5936bfeeda65..58e6ad10224c 100644
--- a/metadata/cache/kde-base/kalzium-4.7.3
+++ b/metadata/cache/kde-base/kalzium-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kamera-4.7.2 b/metadata/cache/kde-base/kamera-4.7.2
deleted file mode 100644
index 618e828c383e..000000000000
--- a/metadata/cache/kde-base/kamera-4.7.2
+++ /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.2:4[aqua=]
-media-libs/libgphoto2 >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kamera-4.7.2.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.3 b/metadata/cache/kde-base/kamera-4.7.3
index 3f4e5ed57fdd..0c27eda3288f 100644
--- a/metadata/cache/kde-base/kamera-4.7.3
+++ b/metadata/cache/kde-base/kamera-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kanagram-4.7.2 b/metadata/cache/kde-base/kanagram-4.7.2
deleted file mode 100644
index 4849a89f0f19..000000000000
--- a/metadata/cache/kde-base/kanagram-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkdeedu-4.7.2: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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kanagram-4.7.2.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.3 b/metadata/cache/kde-base/kanagram-4.7.3
index 6efa3fd330ad..00217dd30858 100644
--- a/metadata/cache/kde-base/kanagram-4.7.3
+++ b/metadata/cache/kde-base/kanagram-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kapman-4.7.2 b/metadata/cache/kde-base/kapman-4.7.2
deleted file mode 100644
index 368f8f854780..000000000000
--- a/metadata/cache/kde-base/kapman-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/kapman-4.7.3
index a2c827e61d3e..053eac0cef6e 100644
--- a/metadata/cache/kde-base/kapman-4.7.3
+++ b/metadata/cache/kde-base/kapman-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kapptemplate-4.7.2 b/metadata/cache/kde-base/kapptemplate-4.7.2
deleted file mode 100644
index 7d620238f505..000000000000
--- a/metadata/cache/kde-base/kapptemplate-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdesdk-4.7.2.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.3 b/metadata/cache/kde-base/kapptemplate-4.7.3
index e29ef21089e7..14a6bb99a988 100644
--- a/metadata/cache/kde-base/kapptemplate-4.7.3
+++ b/metadata/cache/kde-base/kapptemplate-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kate-4.7.2 b/metadata/cache/kde-base/kate-4.7.2
deleted file mode 100644
index 3616e497f5d9..000000000000
--- a/metadata/cache/kde-base/kate-4.7.2
+++ /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.2:4[aqua=]
-dev-libs/libxml2 dev-libs/libxslt >=kde-base/katepart-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kate-4.7.2.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.3 b/metadata/cache/kde-base/kate-4.7.3
index d69b94facb42..87307d974b0e 100644
--- a/metadata/cache/kde-base/kate-4.7.3
+++ b/metadata/cache/kde-base/kate-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/katepart-4.7.2 b/metadata/cache/kde-base/katepart-4.7.2
deleted file mode 100644
index 0f507f8fe6aa..000000000000
--- a/metadata/cache/kde-base/katepart-4.7.2
+++ /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.2:4[aqua=]
-!<=kde-base/kdelibs-4.6.50:4 >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kate-4.7.2.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Editor KPart
-~amd64 ~arm ~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.3 b/metadata/cache/kde-base/katepart-4.7.3
index 650e482e66e4..667da5d5de77 100644
--- a/metadata/cache/kde-base/katepart-4.7.3
+++ b/metadata/cache/kde-base/katepart-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 KDE Editor KPart
-~amd64 ~arm ~ppc ~ppc64 ~x86
+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
 
diff --git a/metadata/cache/kde-base/katomic-4.7.2 b/metadata/cache/kde-base/katomic-4.7.2
deleted file mode 100644
index f3d4216cdd11..000000000000
--- a/metadata/cache/kde-base/katomic-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/katomic-4.7.3
index 8064dd85bcb4..3d7d1b651fcc 100644
--- a/metadata/cache/kde-base/katomic-4.7.3
+++ b/metadata/cache/kde-base/katomic-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kbattleship-4.7.2 b/metadata/cache/kde-base/kbattleship-4.7.2
deleted file mode 100644
index 642943c2970c..000000000000
--- a/metadata/cache/kde-base/kbattleship-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/kbattleship-4.7.3
index 7ec84f601297..ccd8d14d8de6 100644
--- a/metadata/cache/kde-base/kbattleship-4.7.3
+++ b/metadata/cache/kde-base/kbattleship-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kblackbox-4.7.2 b/metadata/cache/kde-base/kblackbox-4.7.2
deleted file mode 100644
index 0b1e72bb4302..000000000000
--- a/metadata/cache/kde-base/kblackbox-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/kblackbox-4.7.3
index 31ce956b02a1..ca1388c77deb 100644
--- a/metadata/cache/kde-base/kblackbox-4.7.3
+++ b/metadata/cache/kde-base/kblackbox-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kblocks-4.7.2 b/metadata/cache/kde-base/kblocks-4.7.2
deleted file mode 100644
index 588dd39b9433..000000000000
--- a/metadata/cache/kde-base/kblocks-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/kblocks-4.7.3
index bacfdcfcfffe..d1d5f8d4f848 100644
--- a/metadata/cache/kde-base/kblocks-4.7.3
+++ b/metadata/cache/kde-base/kblocks-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kbounce-4.7.2 b/metadata/cache/kde-base/kbounce-4.7.2
deleted file mode 100644
index 4901885616fd..000000000000
--- a/metadata/cache/kde-base/kbounce-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/kbounce-4.7.3
index 4588c7a21b81..f0a20b5138e9 100644
--- a/metadata/cache/kde-base/kbounce-4.7.3
+++ b/metadata/cache/kde-base/kbounce-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kbreakout-4.7.2 b/metadata/cache/kde-base/kbreakout-4.7.2
deleted file mode 100644
index 1cb9175604cf..000000000000
--- a/metadata/cache/kde-base/kbreakout-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/kbreakout-4.7.3
index 5657014ff6ac..cbe0c18844a5 100644
--- a/metadata/cache/kde-base/kbreakout-4.7.3
+++ b/metadata/cache/kde-base/kbreakout-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kbruch-4.7.2 b/metadata/cache/kde-base/kbruch-4.7.2
deleted file mode 100644
index 2077dcecaf88..000000000000
--- a/metadata/cache/kde-base/kbruch-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kbruch-4.7.2.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.3 b/metadata/cache/kde-base/kbruch-4.7.3
index d331cd580425..fca85a9f3291 100644
--- a/metadata/cache/kde-base/kbruch-4.7.3
+++ b/metadata/cache/kde-base/kbruch-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kcachegrind-4.7.2 b/metadata/cache/kde-base/kcachegrind-4.7.2
deleted file mode 100644
index e5c4df549693..000000000000
--- a/metadata/cache/kde-base/kcachegrind-4.7.2
+++ /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.2:4[aqua=]
-media-gfx/graphviz >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdesdk-4.7.2.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.3 b/metadata/cache/kde-base/kcachegrind-4.7.3
index 6059a6529773..dc125c620a97 100644
--- a/metadata/cache/kde-base/kcachegrind-4.7.3
+++ b/metadata/cache/kde-base/kcachegrind-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kcalc-4.7.2 b/metadata/cache/kde-base/kcalc-4.7.2
deleted file mode 100644
index bcd0f22e83e3..000000000000
--- a/metadata/cache/kde-base/kcalc-4.7.2
+++ /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.2:4[aqua=]
-dev-libs/gmp >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeutils-4.7.2.tar.bz2
-
-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.3 b/metadata/cache/kde-base/kcalc-4.7.3
index 95e3526a05e3..6a778af898c8 100644
--- a/metadata/cache/kde-base/kcalc-4.7.3
+++ b/metadata/cache/kde-base/kcalc-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 KDE calculator
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kcharselect-4.7.2 b/metadata/cache/kde-base/kcharselect-4.7.2
deleted file mode 100644
index 833e0041961d..000000000000
--- a/metadata/cache/kde-base/kcharselect-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeutils-4.7.2.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.3 b/metadata/cache/kde-base/kcharselect-4.7.3
index 660e87d48d92..ce5680c66f83 100644
--- a/metadata/cache/kde-base/kcharselect-4.7.3
+++ b/metadata/cache/kde-base/kcharselect-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kcheckpass-4.7.2 b/metadata/cache/kde-base/kcheckpass-4.7.2
deleted file mode 100644
index 74b1cc6eda54..000000000000
--- a/metadata/cache/kde-base/kcheckpass-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-pam? ( >=kde-base/kdebase-pam-7 virtual/pam ) >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3 b/metadata/cache/kde-base/kcheckpass-4.7.3
index 3b1a803d69ae..4c145cbfe5ce 100644
--- a/metadata/cache/kde-base/kcheckpass-4.7.3
+++ b/metadata/cache/kde-base/kcheckpass-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kcminit-4.7.2 b/metadata/cache/kde-base/kcminit-4.7.2
deleted file mode 100644
index 1becb2ee9e0d..000000000000
--- a/metadata/cache/kde-base/kcminit-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/ksplash-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/ksplash-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3 b/metadata/cache/kde-base/kcminit-4.7.3
index bddcd7a700db..0536826b9bd4 100644
--- a/metadata/cache/kde-base/kcminit-4.7.3
+++ b/metadata/cache/kde-base/kcminit-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kcmshell-4.7.2 b/metadata/cache/kde-base/kcmshell-4.7.2
deleted file mode 100644
index 13dc83a2df95..000000000000
--- a/metadata/cache/kde-base/kcmshell-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/kcmshell-4.7.3
index d4c42c6e0b10..4d940e110952 100644
--- a/metadata/cache/kde-base/kcmshell-4.7.3
+++ b/metadata/cache/kde-base/kcmshell-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kcolorchooser-4.7.2 b/metadata/cache/kde-base/kcolorchooser-4.7.2
deleted file mode 100644
index 4289fc402db2..000000000000
--- a/metadata/cache/kde-base/kcolorchooser-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kcolorchooser-4.7.2.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.3 b/metadata/cache/kde-base/kcolorchooser-4.7.3
index b3f1bdc7a9e9..00ee0440b38e 100644
--- a/metadata/cache/kde-base/kcolorchooser-4.7.3
+++ b/metadata/cache/kde-base/kcolorchooser-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kcontrol-4.7.2 b/metadata/cache/kde-base/kcontrol-4.7.2
deleted file mode 100644
index ba6cf4746a2c..000000000000
--- a/metadata/cache/kde-base/kcontrol-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/kdnssd-4.7.2:4[aqua=] >=kde-base/khotkeys-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/kcontrol-4.7.3
index 7e19d1d40b93..bad2f39bb97f 100644
--- a/metadata/cache/kde-base/kcontrol-4.7.3
+++ b/metadata/cache/kde-base/kcontrol-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kcron-4.7.2 b/metadata/cache/kde-base/kcron-4.7.2
deleted file mode 100644
index ae2eb8d0d9e7..000000000000
--- a/metadata/cache/kde-base/kcron-4.7.2
+++ /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.2:4[aqua=]
-!prefix? ( virtual/cron ) >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeadmin-4.7.2.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.3 b/metadata/cache/kde-base/kcron-4.7.3
index 45339d7b21ff..a07a36aee619 100644
--- a/metadata/cache/kde-base/kcron-4.7.3
+++ b/metadata/cache/kde-base/kcron-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kde-env-4.7.2 b/metadata/cache/kde-base/kde-env-4.7.2
deleted file mode 100644
index ae6f15c3a263..000000000000
--- a/metadata/cache/kde-base/kde-env-4.7.2
+++ /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.3 b/metadata/cache/kde-base/kde-env-4.7.3
index ae6f15c3a263..7dd7519ffd65 100644
--- a/metadata/cache/kde-base/kde-env-4.7.3
+++ b/metadata/cache/kde-base/kde-env-4.7.3
@@ -6,7 +6,7 @@
 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
+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
 
diff --git a/metadata/cache/kde-base/kde-l10n-4.7.2-r1 b/metadata/cache/kde-base/kde-l10n-4.7.2-r1
deleted file mode 100644
index 7b2a34705f1b..000000000000
--- a/metadata/cache/kde-base/kde-l10n-4.7.2-r1
+++ /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.2:4[aqua=]
-!<kde-misc/konq-plugins-4.6 >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-linguas_ar? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-ar-4.7.2.tar.bz2 ) linguas_bg? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-bg-4.7.2.tar.bz2 ) linguas_bs? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-bs-4.7.2.tar.bz2 ) linguas_ca? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-ca-4.7.2.tar.bz2 ) linguas_ca@valencia? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-ca@valencia-4.7.2.tar.bz2 ) linguas_cs? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-cs-4.7.2.tar.bz2 ) linguas_da? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-da-4.7.2.tar.bz2 ) linguas_de? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-de-4.7.2.tar.bz2 ) linguas_el? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-el-4.7.2.tar.bz2 ) linguas_en_GB? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-en_GB-4.7.2.tar.bz2 ) linguas_es? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-es-4.7.2.tar.bz2 ) linguas_et? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-et-4.7.2.tar.bz2 ) linguas_eu? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-eu-4.7.2.tar.bz2 ) linguas_fi? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-fi-4.7.2.tar.bz2 ) linguas_fr? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-fr-4.7.2.tar.bz2 ) linguas_ga? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-ga-4.7.2.tar.bz2 ) linguas_gl? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-gl-4.7.2.tar.bz2 ) linguas_he? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-he-4.7.2.tar.bz2 ) linguas_hr? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-hr-4.7.2.tar.bz2 ) linguas_hu? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-hu-4.7.2.tar.bz2 ) linguas_ia? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-ia-4.7.2.tar.bz2 ) linguas_id? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-id-4.7.2.tar.bz2 ) linguas_is? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-is-4.7.2.tar.bz2 ) linguas_it? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-it-4.7.2.tar.bz2 ) linguas_ja? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-ja-4.7.2.tar.bz2 ) linguas_kk? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-kk-4.7.2.tar.bz2 ) linguas_km? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-km-4.7.2.tar.bz2 ) linguas_kn? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-kn-4.7.2.tar.bz2 ) linguas_ko? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-ko-4.7.2.tar.bz2 ) linguas_lt? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-lt-4.7.2.tar.bz2 ) linguas_lv? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-lv-4.7.2.tar.bz2 ) linguas_nb? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-nb-4.7.2.tar.bz2 ) linguas_nds? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-nds-4.7.2.tar.bz2 ) linguas_nl? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-nl-4.7.2.tar.bz2 ) linguas_nn? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-nn-4.7.2.tar.bz2 ) linguas_pa? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-pa-4.7.2.tar.bz2 ) linguas_pl? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-pl-4.7.2.tar.bz2 ) linguas_pt? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-pt-4.7.2.tar.bz2 ) linguas_pt_BR? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-pt_BR-4.7.2.tar.bz2 ) linguas_ro? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-ro-4.7.2.tar.bz2 ) linguas_ru? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-ru-4.7.2.tar.bz2 ) linguas_sk? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-sk-4.7.2.tar.bz2 ) linguas_sl? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-sl-4.7.2.tar.bz2 ) linguas_sr? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-sr-4.7.2.tar.bz2 ) linguas_sv? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-sv-4.7.2.tar.bz2 ) linguas_th? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-th-4.7.2.tar.bz2 ) linguas_tr? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-tr-4.7.2.tar.bz2 ) linguas_ug? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-ug-4.7.2.tar.bz2 ) linguas_uk? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-uk-4.7.2.tar.bz2 ) linguas_wa? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-wa-4.7.2.tar.bz2 ) linguas_zh_CN? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-zh_CN-4.7.2.tar.bz2 ) linguas_zh_TW? ( mirror://kde/stable/4.7.2/src/kde-l10n/kde-l10n-zh_TW-4.7.2.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.3 b/metadata/cache/kde-base/kde-l10n-4.7.3
index c8351cd488fc..b1d0ca90f4ab 100644
--- a/metadata/cache/kde-base/kde-l10n-4.7.3
+++ b/metadata/cache/kde-base/kde-l10n-4.7.3
@@ -6,7 +6,7 @@ linguas_ar? ( mirror://kde/stable/4.7.3/src/kde-l10n/kde-l10n-ar-4.7.3.tar.bz2 )
 http://www.kde.org/
 GPL-2
 KDE internationalization package
-~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+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
 
diff --git a/metadata/cache/kde-base/kde-meta-4.7.2 b/metadata/cache/kde-base/kde-meta-4.7.2
deleted file mode 100644
index 53eb40f81d70..000000000000
--- a/metadata/cache/kde-base/kde-meta-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/kate-4.7.2:4[aqua=] >=kde-base/kdeadmin-meta-4.7.2:4[aqua=] >=kde-base/kdeartwork-meta-4.7.2:4[aqua=] >=kde-base/kdebase-meta-4.7.2:4[aqua=] >=kde-base/kdeedu-meta-4.7.2:4[aqua=] >=kde-base/kdegames-meta-4.7.2:4[aqua=] >=kde-base/kdegraphics-meta-4.7.2:4[aqua=] >=kde-base/kdemultimedia-meta-4.7.2:4[aqua=] >=kde-base/kdenetwork-meta-4.7.2:4[aqua=] >=kde-base/kdeplasma-addons-4.7.2:4[aqua=] >=kde-base/kdetoys-meta-4.7.2:4[aqua=] >=kde-base/kdeutils-meta-4.7.2:4[aqua=] accessibility? ( >=kde-base/kdeaccessibility-meta-4.7.2:4[aqua=] ) nls? ( >=kde-base/kde-l10n-4.7.2:4[aqua=] ) sdk? ( >=kde-base/kdebindings-meta-4.7.2:4[aqua=] >=kde-base/kdesdk-meta-4.7.2:4[aqua=] >=kde-base/kdewebdev-meta-4.7.2: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-meta-4.7.3 b/metadata/cache/kde-base/kde-meta-4.7.3
index 68951127fb16..16d927678170 100644
--- a/metadata/cache/kde-base/kde-meta-4.7.3
+++ b/metadata/cache/kde-base/kde-meta-4.7.3
@@ -6,7 +6,7 @@
 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
+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
 
diff --git a/metadata/cache/kde-base/kde-wallpapers-4.7.2-r1 b/metadata/cache/kde-base/kde-wallpapers-4.7.2-r1
deleted file mode 100644
index adc8381a81c0..000000000000
--- a/metadata/cache/kde-base/kde-wallpapers-4.7.2-r1
+++ /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.2:4[aqua=]
-!kde-base/kdebase-wallpapers:4 >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kde-wallpapers-4.7.2.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE wallpapers
-~amd64 ~arm ~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.3 b/metadata/cache/kde-base/kde-wallpapers-4.7.3
index 3049c5246ecb..fb97cff505a5 100644
--- a/metadata/cache/kde-base/kde-wallpapers-4.7.3
+++ b/metadata/cache/kde-base/kde-wallpapers-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kdeaccessibility-meta-4.7.2 b/metadata/cache/kde-base/kdeaccessibility-meta-4.7.2
deleted file mode 100644
index b01f690b80ab..000000000000
--- a/metadata/cache/kde-base/kdeaccessibility-meta-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/jovie-4.7.2:4[aqua=] >=kde-base/kaccessible-4.7.2:4[aqua=] >=kde-base/kmag-4.7.2:4[aqua=] >=kde-base/kmousetool-4.7.2:4[aqua=] >=kde-base/kmouth-4.7.2: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/kdeaccessibility-meta-4.7.3 b/metadata/cache/kde-base/kdeaccessibility-meta-4.7.3
index c03a5c26427d..25f61522205e 100644
--- a/metadata/cache/kde-base/kdeaccessibility-meta-4.7.3
+++ b/metadata/cache/kde-base/kdeaccessibility-meta-4.7.3
@@ -6,7 +6,7 @@
 http://www.kde.org/
 GPL-2
 kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
 aqua
 
diff --git a/metadata/cache/kde-base/kdeaccounts-plugin-4.7.2 b/metadata/cache/kde-base/kdeaccounts-plugin-4.7.2
deleted file mode 100644
index a44820936685..000000000000
--- a/metadata/cache/kde-base/kdeaccounts-plugin-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.2: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.2:4[aqua=]
->=kde-base/kdepimlibs-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdesdk-4.7.2.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.3 b/metadata/cache/kde-base/kdeaccounts-plugin-4.7.3
index 0dd41d7508c8..d94b64187ff3 100644
--- a/metadata/cache/kde-base/kdeaccounts-plugin-4.7.3
+++ b/metadata/cache/kde-base/kdeaccounts-plugin-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kdeadmin-meta-4.7.2 b/metadata/cache/kde-base/kdeadmin-meta-4.7.2
deleted file mode 100644
index 571cf846f32d..000000000000
--- a/metadata/cache/kde-base/kdeadmin-meta-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/kcron-4.7.2:4[aqua=] >=kde-base/ksystemlog-4.7.2:4[aqua=] >=kde-base/kuser-4.7.2:4[aqua=] cups? ( >=kde-base/system-config-printer-kde-4.7.2: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/kdeadmin-meta-4.7.3 b/metadata/cache/kde-base/kdeadmin-meta-4.7.3
index 2d77dfdd37c0..39d76648b7b0 100644
--- a/metadata/cache/kde-base/kdeadmin-meta-4.7.3
+++ b/metadata/cache/kde-base/kdeadmin-meta-4.7.3
@@ -6,7 +6,7 @@
 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
 cups aqua
 
diff --git a/metadata/cache/kde-base/kdeartwork-colorschemes-4.7.2 b/metadata/cache/kde-base/kdeartwork-colorschemes-4.7.2
deleted file mode 100644
index 3058ea22cef8..000000000000
--- a/metadata/cache/kde-base/kdeartwork-colorschemes-4.7.2
+++ /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.2:4[aqua=]
-!kde-base/kdeaccessibility-colorschemes:4 >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeartwork-4.7.2.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.3 b/metadata/cache/kde-base/kdeartwork-colorschemes-4.7.3
index fbe95ddc7bc6..86e393cce326 100644
--- a/metadata/cache/kde-base/kdeartwork-colorschemes-4.7.3
+++ b/metadata/cache/kde-base/kdeartwork-colorschemes-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 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
 
diff --git a/metadata/cache/kde-base/kdeartwork-desktopthemes-4.7.2 b/metadata/cache/kde-base/kdeartwork-desktopthemes-4.7.2
deleted file mode 100644
index c3190f1546fb..000000000000
--- a/metadata/cache/kde-base/kdeartwork-desktopthemes-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeartwork-4.7.2.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.3 b/metadata/cache/kde-base/kdeartwork-desktopthemes-4.7.3
index 76fb67e52e9a..b980cd54edf3 100644
--- a/metadata/cache/kde-base/kdeartwork-desktopthemes-4.7.3
+++ b/metadata/cache/kde-base/kdeartwork-desktopthemes-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 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
 
diff --git a/metadata/cache/kde-base/kdeartwork-emoticons-4.7.2 b/metadata/cache/kde-base/kdeartwork-emoticons-4.7.2
deleted file mode 100644
index f8e8241e65f4..000000000000
--- a/metadata/cache/kde-base/kdeartwork-emoticons-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeartwork-4.7.2.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.3 b/metadata/cache/kde-base/kdeartwork-emoticons-4.7.3
index 2f12d6efc465..bd1f299ec903 100644
--- a/metadata/cache/kde-base/kdeartwork-emoticons-4.7.3
+++ b/metadata/cache/kde-base/kdeartwork-emoticons-4.7.3
@@ -6,7 +6,7 @@ binchecks strip
 http://www.kde.org/
 GPL-2
 EmotIcons (icons for things like smilies :-) for kde
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 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
 
diff --git a/metadata/cache/kde-base/kdeartwork-iconthemes-4.7.2 b/metadata/cache/kde-base/kdeartwork-iconthemes-4.7.2
deleted file mode 100644
index 897a8684333c..000000000000
--- a/metadata/cache/kde-base/kdeartwork-iconthemes-4.7.2
+++ /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.2:4[aqua=]
-!x11-themes/nuvola !kde-base/kdeaccessibility-iconthemes:4 >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeartwork-4.7.2.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.3 b/metadata/cache/kde-base/kdeartwork-iconthemes-4.7.3
index 61ec28116e8a..8617563987cb 100644
--- a/metadata/cache/kde-base/kdeartwork-iconthemes-4.7.3
+++ b/metadata/cache/kde-base/kdeartwork-iconthemes-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 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
 
diff --git a/metadata/cache/kde-base/kdeartwork-kscreensaver-4.7.2 b/metadata/cache/kde-base/kdeartwork-kscreensaver-4.7.2
deleted file mode 100644
index 26aa18ca1b14..000000000000
--- a/metadata/cache/kde-base/kdeartwork-kscreensaver-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kscreensaver-4.7.2:4[aqua=,opengl?] >=kde-base/libkworkspace-4.7.2:4[aqua=] media-libs/libart_lgpl opengl? ( virtual/opengl ) xscreensaver? ( x11-misc/xscreensaver ) eigen? ( dev-cpp/eigen:2 ) kexiv2? ( >=kde-base/libkexiv2-4.7.2: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.2:4[aqua=]
->=kde-base/kscreensaver-4.7.2:4[aqua=,opengl?] >=kde-base/libkworkspace-4.7.2:4[aqua=] media-libs/libart_lgpl opengl? ( virtual/opengl ) xscreensaver? ( x11-misc/xscreensaver ) >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeartwork-4.7.2.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.3 b/metadata/cache/kde-base/kdeartwork-kscreensaver-4.7.3
index 7b44ad908868..235641b470c4 100644
--- a/metadata/cache/kde-base/kdeartwork-kscreensaver-4.7.3
+++ b/metadata/cache/kde-base/kdeartwork-kscreensaver-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kdeartwork-meta-4.7.2 b/metadata/cache/kde-base/kdeartwork-meta-4.7.2
deleted file mode 100644
index 773e4f7a73d7..000000000000
--- a/metadata/cache/kde-base/kdeartwork-meta-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/kdeartwork-colorschemes-4.7.2:4[aqua=] >=kde-base/kdeartwork-desktopthemes-4.7.2:4[aqua=] >=kde-base/kdeartwork-emoticons-4.7.2:4[aqua=] >=kde-base/kdeartwork-iconthemes-4.7.2:4[aqua=] >=kde-base/kdeartwork-kscreensaver-4.7.2:4[aqua=] >=kde-base/kdeartwork-sounds-4.7.2:4[aqua=] >=kde-base/kdeartwork-styles-4.7.2:4[aqua=] >=kde-base/kdeartwork-wallpapers-4.7.2:4[aqua=] >=kde-base/kdeartwork-weatherwallpapers-4.7.2: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-meta-4.7.3 b/metadata/cache/kde-base/kdeartwork-meta-4.7.3
index 7569d2f4a1d1..45cd3932aac9 100644
--- a/metadata/cache/kde-base/kdeartwork-meta-4.7.3
+++ b/metadata/cache/kde-base/kdeartwork-meta-4.7.3
@@ -6,7 +6,7 @@
 http://www.kde.org/
 GPL-2
 kdeartwork - merge this to pull in all kdeartwork-derived packages
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
 aqua
 
diff --git a/metadata/cache/kde-base/kdeartwork-sounds-4.7.2 b/metadata/cache/kde-base/kdeartwork-sounds-4.7.2
deleted file mode 100644
index ab4ef56d184a..000000000000
--- a/metadata/cache/kde-base/kdeartwork-sounds-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeartwork-4.7.2.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.3 b/metadata/cache/kde-base/kdeartwork-sounds-4.7.3
index 9a5099604864..e68941c96285 100644
--- a/metadata/cache/kde-base/kdeartwork-sounds-4.7.3
+++ b/metadata/cache/kde-base/kdeartwork-sounds-4.7.3
@@ -6,7 +6,7 @@ binchecks strip
 http://www.kde.org/
 GPL-2
 Extra sound themes for kde
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 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
 
diff --git a/metadata/cache/kde-base/kdeartwork-styles-4.7.2 b/metadata/cache/kde-base/kdeartwork-styles-4.7.2
deleted file mode 100644
index 1c7d110facc7..000000000000
--- a/metadata/cache/kde-base/kdeartwork-styles-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kwin-4.7.2: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.2:4[aqua=]
->=kde-base/kwin-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeartwork-4.7.2.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.3 b/metadata/cache/kde-base/kdeartwork-styles-4.7.3
index 6b29912794c1..6b4535d3e993 100644
--- a/metadata/cache/kde-base/kdeartwork-styles-4.7.3
+++ b/metadata/cache/kde-base/kdeartwork-styles-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kdeartwork-wallpapers-4.7.2 b/metadata/cache/kde-base/kdeartwork-wallpapers-4.7.2
deleted file mode 100644
index 619d7060d2c3..000000000000
--- a/metadata/cache/kde-base/kdeartwork-wallpapers-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeartwork-4.7.2.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.3 b/metadata/cache/kde-base/kdeartwork-wallpapers-4.7.3
index 95d75d7f94e7..7d93cf1a90d5 100644
--- a/metadata/cache/kde-base/kdeartwork-wallpapers-4.7.3
+++ b/metadata/cache/kde-base/kdeartwork-wallpapers-4.7.3
@@ -6,7 +6,7 @@ binchecks strip
 http://www.kde.org/
 GPL-2
 Wallpapers from kde
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 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
 
diff --git a/metadata/cache/kde-base/kdeartwork-weatherwallpapers-4.7.2 b/metadata/cache/kde-base/kdeartwork-weatherwallpapers-4.7.2
deleted file mode 100644
index 120f299557e9..000000000000
--- a/metadata/cache/kde-base/kdeartwork-weatherwallpapers-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/kdeartwork-wallpapers-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeartwork-4.7.2.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.3 b/metadata/cache/kde-base/kdeartwork-weatherwallpapers-4.7.3
index 8f979a385f52..549ae79e57f0 100644
--- a/metadata/cache/kde-base/kdeartwork-weatherwallpapers-4.7.3
+++ b/metadata/cache/kde-base/kdeartwork-weatherwallpapers-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 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
 
diff --git a/metadata/cache/kde-base/kdebase-cursors-4.7.2 b/metadata/cache/kde-base/kdebase-cursors-4.7.2
deleted file mode 100644
index 99b8819b4e62..000000000000
--- a/metadata/cache/kde-base/kdebase-cursors-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3 b/metadata/cache/kde-base/kdebase-cursors-4.7.3
index 6361a39232b8..1545103d5eb2 100644
--- a/metadata/cache/kde-base/kdebase-cursors-4.7.3
+++ b/metadata/cache/kde-base/kdebase-cursors-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kdebase-data-4.7.2 b/metadata/cache/kde-base/kdebase-data-4.7.2
deleted file mode 100644
index 1064d83fbda1..000000000000
--- a/metadata/cache/kde-base/kdebase-data-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-wallpapers? ( >=kde-base/kde-wallpapers-4.7.2:4[aqua=] ) >=kde-base/oxygen-icons-4.7.2:4[aqua=] x11-themes/hicolor-icon-theme >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/kdebase-data-4.7.3
index af55d76d8983..8593a084f2dc 100644
--- a/metadata/cache/kde-base/kdebase-data-4.7.3
+++ b/metadata/cache/kde-base/kdebase-data-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kdebase-desktoptheme-4.7.2 b/metadata/cache/kde-base/kdebase-desktoptheme-4.7.2
deleted file mode 100644
index c47b382e7440..000000000000
--- a/metadata/cache/kde-base/kdebase-desktoptheme-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/kdebase-desktoptheme-4.7.3
index 6e0aa178e5d3..0825a14c88b4 100644
--- a/metadata/cache/kde-base/kdebase-desktoptheme-4.7.3
+++ b/metadata/cache/kde-base/kdebase-desktoptheme-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kdebase-kioslaves-4.7.2 b/metadata/cache/kde-base/kdebase-kioslaves-4.7.2
deleted file mode 100644
index 3d157995ac39..000000000000
--- a/metadata/cache/kde-base/kdebase-kioslaves-4.7.2
+++ /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.2: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.2:4[aqua=,bzip2?,lzma?] >=kde-base/kdialog-4.7.2:4[aqua=] virtual/ssh !aqua? ( !kernel_SunOS? ( virtual/eject ) ) >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/kdebase-kioslaves-4.7.3
index e9faf93089fc..91a0824d20d9 100644
--- a/metadata/cache/kde-base/kdebase-kioslaves-4.7.3
+++ b/metadata/cache/kde-base/kdebase-kioslaves-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kdebase-menu-4.7.2 b/metadata/cache/kde-base/kdebase-menu-4.7.2
deleted file mode 100644
index 0ebcbb9067c2..000000000000
--- a/metadata/cache/kde-base/kdebase-menu-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/kdebase-menu-4.7.3
index 2a2de264bbeb..4b9d2654690d 100644
--- a/metadata/cache/kde-base/kdebase-menu-4.7.3
+++ b/metadata/cache/kde-base/kdebase-menu-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kdebase-menu-icons-4.7.2 b/metadata/cache/kde-base/kdebase-menu-icons-4.7.2
deleted file mode 100644
index 0ec2fed69f0f..000000000000
--- a/metadata/cache/kde-base/kdebase-menu-icons-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/kdebase-menu-icons-4.7.3
index 144a4f14f4f0..8d16ba362f53 100644
--- a/metadata/cache/kde-base/kdebase-menu-icons-4.7.3
+++ b/metadata/cache/kde-base/kdebase-menu-icons-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kdebase-meta-4.7.2 b/metadata/cache/kde-base/kdebase-meta-4.7.2
deleted file mode 100644
index 6098bb945f22..000000000000
--- a/metadata/cache/kde-base/kdebase-meta-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/dolphin-4.7.2:4[aqua=] >=kde-base/freespacenotifier-4.7.2:4[aqua=] >=kde-base/kcheckpass-4.7.2:4[aqua=] >=kde-base/kcminit-4.7.2:4[aqua=] wallpapers? ( >=kde-base/kde-wallpapers-4.7.2:4[aqua=] ) >=kde-base/kdebase-cursors-4.7.2:4[aqua=] >=kde-base/kdebase-runtime-meta-4.7.2:4[aqua=] >=kde-base/kdebase-startkde-4.7.2:4[aqua=] >=kde-base/kdepasswd-4.7.2:4[aqua=] >=kde-base/kdialog-4.7.2:4[aqua=] >=kde-base/keditbookmarks-4.7.2:4[aqua=] >=kde-base/kephal-4.7.2:4[aqua=] >=kde-base/kfind-4.7.2:4[aqua=] >=kde-base/kfmclient-4.7.2:4[aqua=] >=kde-base/khotkeys-4.7.2:4[aqua=] >=kde-base/kinfocenter-4.7.2:4[aqua=] >=kde-base/klipper-4.7.2:4[aqua=] >=kde-base/kmenuedit-4.7.2:4[aqua=] >=kde-base/konq-plugins-4.7.2:4[aqua=] >=kde-base/konqueror-4.7.2:4[aqua=] >=kde-base/konsole-4.7.2:4[aqua=] >=kde-base/kscreensaver-4.7.2:4[aqua=] >=kde-base/ksmserver-4.7.2:4[aqua=] >=kde-base/ksplash-4.7.2:4[aqua=] >=kde-base/kstartupconfig-4.7.2:4[aqua=] >=kde-base/kstyles-4.7.2:4[aqua=] >=kde-base/ksysguard-4.7.2:4[aqua=] >=kde-base/ksystraycmd-4.7.2:4[aqua=] >=kde-base/kwin-4.7.2:4[aqua=] >=kde-base/kwrite-4.7.2:4[aqua=] >=kde-base/kwrited-4.7.2:4[aqua=] >=kde-base/libkonq-4.7.2:4[aqua=] >=kde-base/libkworkspace-4.7.2:4[aqua=] >=kde-base/liboxygenstyle-4.7.2:4[aqua=] >=kde-base/libplasmaclock-4.7.2:4[aqua=] >=kde-base/libplasmagenericshell-4.7.2:4[aqua=] >=kde-base/libtaskmanager-4.7.2:4[aqua=] >=kde-base/nsplugins-4.7.2:4[aqua=] >=kde-base/phonon-kde-4.7.2:4[aqua=] >=kde-base/plasma-apps-4.7.2:4[aqua=] >=kde-base/plasma-workspace-4.7.2:4[aqua=] >=kde-base/powerdevil-4.7.2:4[aqua=] >=kde-base/qguiplatformplugin_kde-4.7.2:4[aqua=] >=kde-base/solid-4.7.2:4[aqua=] >=kde-base/systemsettings-4.7.2:4[aqua=] !prefix? ( >=kde-base/kdm-4.7.2: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-meta-4.7.3 b/metadata/cache/kde-base/kdebase-meta-4.7.3
index c65e7c7576fc..90664812414f 100644
--- a/metadata/cache/kde-base/kdebase-meta-4.7.3
+++ b/metadata/cache/kde-base/kdebase-meta-4.7.3
@@ -6,7 +6,7 @@
 http://www.kde.org/
 GPL-2
 Merge this to pull in all kdebase-derived packages
-~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
 +wallpapers aqua
 
diff --git a/metadata/cache/kde-base/kdebase-runtime-meta-4.7.2 b/metadata/cache/kde-base/kdebase-runtime-meta-4.7.2
deleted file mode 100644
index edd43ddc5a17..000000000000
--- a/metadata/cache/kde-base/kdebase-runtime-meta-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/activitymanager-4.7.2:4[aqua=] >=kde-base/attica-4.7.2:4[aqua=] >=kde-base/drkonqi-4.7.2:4[aqua=] >=kde-base/kcmshell-4.7.2:4[aqua=] >=kde-base/kcontrol-4.7.2:4[aqua=] >=kde-base/kdebase-data-4.7.2:4[aqua=] >=kde-base/kdebase-desktoptheme-4.7.2:4[aqua=] >=kde-base/kdebase-kioslaves-4.7.2:4[aqua=] >=kde-base/kdebase-menu-4.7.2:4[aqua=] >=kde-base/kdebase-menu-icons-4.7.2:4[aqua=] >=kde-base/kdebugdialog-4.7.2:4[aqua=] >=kde-base/kdesu-4.7.2:4[aqua=] >=kde-base/kdontchangethehostname-4.7.2:4[aqua=] >=kde-base/keditfiletype-4.7.2:4[aqua=] >=kde-base/kfile-4.7.2:4[aqua=] >=kde-base/kglobalaccel-4.7.2:4[aqua=] >=kde-base/kiconfinder-4.7.2:4[aqua=] >=kde-base/kioclient-4.7.2:4[aqua=] >=kde-base/kmimetypefinder-4.7.2:4[aqua=] >=kde-base/knetattach-4.7.2:4[aqua=] >=kde-base/knewstuff-4.7.2:4[aqua=] >=kde-base/kpasswdserver-4.7.2:4[aqua=] >=kde-base/kquitapp-4.7.2:4[aqua=] >=kde-base/kstart-4.7.2:4[aqua=] >=kde-base/ktimezoned-4.7.2:4[aqua=] >=kde-base/ktraderclient-4.7.2:4[aqua=] >=kde-base/kuiserver-4.7.2:4[aqua=] >=kde-base/kurifilter-plugins-4.7.2:4[aqua=] >=kde-base/kwallet-4.7.2:4[aqua=] >=kde-base/kwalletd-4.7.2:4[aqua=] >=kde-base/plasma-runtime-4.7.2:4[aqua=] >=kde-base/renamedlg-plugins-4.7.2:4[aqua=] >=kde-base/solid-runtime-4.7.2:4[aqua=] handbook? ( >=kde-base/khelpcenter-4.7.2:4[aqua=] ) semantic-desktop? ( >=kde-base/nepomuk-4.7.2: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-runtime-meta-4.7.3 b/metadata/cache/kde-base/kdebase-runtime-meta-4.7.3
index b5c2dc192676..b96400784886 100644
--- a/metadata/cache/kde-base/kdebase-runtime-meta-4.7.3
+++ b/metadata/cache/kde-base/kdebase-runtime-meta-4.7.3
@@ -6,7 +6,7 @@
 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
+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
 
diff --git a/metadata/cache/kde-base/kdebase-startkde-4.7.2 b/metadata/cache/kde-base/kdebase-startkde-4.7.2
deleted file mode 100644
index 2ca7632e76f5..000000000000
--- a/metadata/cache/kde-base/kdebase-startkde-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/kcminit-4.7.2:4[aqua=] >=kde-base/kdebase-runtime-meta-4.7.2:4[aqua=] wallpapers? ( >=kde-base/kde-wallpapers-4.7.2:4[aqua=] ) >=kde-base/kfmclient-4.7.2:4[aqua=] >=kde-base/knotify-4.7.2:4[aqua=] >=kde-base/kreadconfig-4.7.2:4[aqua=] >=kde-base/krunner-4.7.2:4[aqua=] >=kde-base/ksmserver-4.7.2:4[aqua=] >=kde-base/ksplash-4.7.2:4[aqua=] >=kde-base/kstartupconfig-4.7.2:4[aqua=] >=kde-base/kwin-4.7.2:4[aqua=] >=kde-base/phonon-kde-4.7.2:4[aqua=] >=kde-base/plasma-apps-4.7.2:4[aqua=] >=kde-base/plasma-workspace-4.7.2:4[aqua=] >=kde-base/systemsettings-4.7.2: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.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3 b/metadata/cache/kde-base/kdebase-startkde-4.7.3
index 77a7699c26a5..86c4e9c64e82 100644
--- a/metadata/cache/kde-base/kdebase-startkde-4.7.3
+++ b/metadata/cache/kde-base/kdebase-startkde-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kdebindings-meta-4.7.2 b/metadata/cache/kde-base/kdebindings-meta-4.7.2
deleted file mode 100644
index 96f71e37e96e..000000000000
--- a/metadata/cache/kde-base/kdebindings-meta-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/smokegen-4.7.2:4[aqua=] >=kde-base/smokekde-4.7.2:4[aqua=] >=kde-base/smokeqt-4.7.2:4[aqua=] csharp? ( >=kde-base/kimono-4.7.2:4[aqua=] >=kde-base/qyoto-4.7.2:4[aqua=] ) java? ( >=kde-base/krossjava-4.7.2:4[aqua=] ) perl? ( >=kde-base/perlkde-4.7.2:4[aqua=] >=kde-base/perlqt-4.7.2:4[aqua=] ) python? ( >=kde-base/krosspython-4.7.2:4[aqua=] >=kde-base/pykde4-4.7.2:4[aqua=] ) ruby? ( >=kde-base/korundum-4.7.2:4[aqua=] >=kde-base/krossruby-4.7.2:4[aqua=] >=kde-base/qtruby-4.7.2: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-meta-4.7.3 b/metadata/cache/kde-base/kdebindings-meta-4.7.3
index fed973566fab..9f9e1fef81be 100644
--- a/metadata/cache/kde-base/kdebindings-meta-4.7.3
+++ b/metadata/cache/kde-base/kdebindings-meta-4.7.3
@@ -6,7 +6,7 @@
 http://www.kde.org/
 GPL-2
 KDE bindings - merge this to pull in all kdebindings-derived packages
-~amd64 ~ppc ~x86
+amd64 ~ppc x86
 eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
 csharp java perl python ruby aqua
 
diff --git a/metadata/cache/kde-base/kdebugdialog-4.7.2 b/metadata/cache/kde-base/kdebugdialog-4.7.2
deleted file mode 100644
index 0ebafec3fe68..000000000000
--- a/metadata/cache/kde-base/kdebugdialog-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/kdebugdialog-4.7.3
index 585e5ce9cbdb..d0ba2ac09f17 100644
--- a/metadata/cache/kde-base/kdebugdialog-4.7.3
+++ b/metadata/cache/kde-base/kdebugdialog-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kdeedu-meta-4.7.2 b/metadata/cache/kde-base/kdeedu-meta-4.7.2
deleted file mode 100644
index 1eefaa0cb402..000000000000
--- a/metadata/cache/kde-base/kdeedu-meta-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/blinken-4.7.2:4[aqua=] >=kde-base/cantor-4.7.2:4[aqua=] >=kde-base/kalgebra-4.7.2:4[aqua=] >=kde-base/kalzium-4.7.2:4[aqua=] >=kde-base/kanagram-4.7.2:4[aqua=] >=kde-base/kbruch-4.7.2:4[aqua=] >=kde-base/kgeography-4.7.2:4[aqua=] >=kde-base/khangman-4.7.2:4[aqua=] >=kde-base/kig-4.7.2:4[aqua=] >=kde-base/kiten-4.7.2:4[aqua=] >=kde-base/klettres-4.7.2:4[aqua=] >=kde-base/kmplot-4.7.2:4[aqua=] >=kde-base/kstars-4.7.2:4[aqua=] >=kde-base/ktouch-4.7.2:4[aqua=] >=kde-base/kturtle-4.7.2:4[aqua=] >=kde-base/kwordquiz-4.7.2:4[aqua=] >=kde-base/libkdeedu-4.7.2:4[aqua=] >=kde-base/marble-4.7.2:4[aqua=] >=kde-base/parley-4.7.2:4[aqua=] >=kde-base/rocs-4.7.2:4[aqua=] >=kde-base/step-4.7.2: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/kdeedu-meta-4.7.3 b/metadata/cache/kde-base/kdeedu-meta-4.7.3
index 8aa8ebce2dc0..381ab44fdb5a 100644
--- a/metadata/cache/kde-base/kdeedu-meta-4.7.3
+++ b/metadata/cache/kde-base/kdeedu-meta-4.7.3
@@ -6,7 +6,7 @@
 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
 aqua
 
diff --git a/metadata/cache/kde-base/kdegames-meta-4.7.2 b/metadata/cache/kde-base/kdegames-meta-4.7.2
deleted file mode 100644
index 43f1e1d7094b..000000000000
--- a/metadata/cache/kde-base/kdegames-meta-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/bomber-4.7.2:4[aqua=] >=kde-base/bovo-4.7.2:4[aqua=] >=kde-base/granatier-4.7.2:4[aqua=] >=kde-base/kapman-4.7.2:4[aqua=] >=kde-base/katomic-4.7.2:4[aqua=] >=kde-base/kbattleship-4.7.2:4[aqua=] >=kde-base/kblackbox-4.7.2:4[aqua=] >=kde-base/kblocks-4.7.2:4[aqua=] >=kde-base/kbounce-4.7.2:4[aqua=] >=kde-base/kbreakout-4.7.2:4[aqua=] >=kde-base/kdiamond-4.7.2:4[aqua=] >=kde-base/kfourinline-4.7.2:4[aqua=] >=kde-base/kgoldrunner-4.7.2:4[aqua=] >=kde-base/killbots-4.7.2:4[aqua=] >=kde-base/kigo-4.7.2:4[aqua=] >=kde-base/kiriki-4.7.2:4[aqua=] >=kde-base/kjumpingcube-4.7.2:4[aqua=] >=kde-base/klickety-4.7.2:4[aqua=] >=kde-base/klines-4.7.2:4[aqua=] >=kde-base/kmahjongg-4.7.2:4[aqua=] >=kde-base/kmines-4.7.2:4[aqua=] >=kde-base/knetwalk-4.7.2:4[aqua=] >=kde-base/kolf-4.7.2:4[aqua=] >=kde-base/kollision-4.7.2:4[aqua=] >=kde-base/konquest-4.7.2:4[aqua=] >=kde-base/kpat-4.7.2:4[aqua=] >=kde-base/kreversi-4.7.2:4[aqua=] >=kde-base/kshisen-4.7.2:4[aqua=] >=kde-base/ksirk-4.7.2:4[aqua=] >=kde-base/kspaceduel-4.7.2:4[aqua=] >=kde-base/ksquares-4.7.2:4[aqua=] >=kde-base/ktron-4.7.2:4[aqua=] >=kde-base/ktuberling-4.7.2:4[aqua=] >=kde-base/kubrick-4.7.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=] >=kde-base/libkmahjongg-4.7.2:4[aqua=] >=kde-base/lskat-4.7.2:4[aqua=] >=kde-base/palapeli-4.7.2:4[aqua=] opengl? ( >=kde-base/ksudoku-4.7.2:4[aqua=] ) python? ( >=kde-base/kajongg-4.7.2: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/kdegames-meta-4.7.3 b/metadata/cache/kde-base/kdegames-meta-4.7.3
index a6c7e7163a66..67209b760025 100644
--- a/metadata/cache/kde-base/kdegames-meta-4.7.3
+++ b/metadata/cache/kde-base/kdegames-meta-4.7.3
@@ -6,7 +6,7 @@
 http://www.kde.org/
 GPL-2
 kdegames - merge this to pull in all kdegames-derived packages
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
 opengl python aqua
 
diff --git a/metadata/cache/kde-base/kdegraphics-meta-4.7.2 b/metadata/cache/kde-base/kdegraphics-meta-4.7.2
deleted file mode 100644
index 33389d27f4a8..000000000000
--- a/metadata/cache/kde-base/kdegraphics-meta-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/gwenview-4.7.2:4[aqua=] >=kde-base/kamera-4.7.2:4[aqua=] >=kde-base/kcolorchooser-4.7.2:4[aqua=] >=kde-base/kdegraphics-strigi-analyzer-4.7.2:4[aqua=] >=kde-base/kgamma-4.7.2:4[aqua=] >=kde-base/kolourpaint-4.7.2:4[aqua=] >=kde-base/kruler-4.7.2:4[aqua=] >=kde-base/ksnapshot-4.7.2:4[aqua=] >=kde-base/libkdcraw-4.7.2:4[aqua=] >=kde-base/libkexiv2-4.7.2:4[aqua=] >=kde-base/libkipi-4.7.2:4[aqua=] >=kde-base/okular-4.7.2:4[aqua=] >=kde-base/svgpart-4.7.2:4[aqua=] >=kde-base/thumbnailers-4.7.2:4[aqua=] scanner? ( >=kde-base/ksaneplugin-4.7.2:4[aqua=] >=kde-base/libksane-4.7.2: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-meta-4.7.3 b/metadata/cache/kde-base/kdegraphics-meta-4.7.3
index ecc86a90427e..6198fb64a489 100644
--- a/metadata/cache/kde-base/kdegraphics-meta-4.7.3
+++ b/metadata/cache/kde-base/kdegraphics-meta-4.7.3
@@ -6,7 +6,7 @@
 http://www.kde.org/
 GPL-2
 kdegraphics - merge this to pull in all kdegraphics-derived packages
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
 scanner aqua
 
diff --git a/metadata/cache/kde-base/kdegraphics-strigi-analyzer-4.7.2 b/metadata/cache/kde-base/kdegraphics-strigi-analyzer-4.7.2
deleted file mode 100644
index 1fd5024ecf40..000000000000
--- a/metadata/cache/kde-base/kdegraphics-strigi-analyzer-4.7.2
+++ /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.2:4[aqua=]
-app-misc/strigi >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegraphics-strigi-analyzer-4.7.2.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.3 b/metadata/cache/kde-base/kdegraphics-strigi-analyzer-4.7.3
index a44c6a4cbc60..bcfed5032ae5 100644
--- a/metadata/cache/kde-base/kdegraphics-strigi-analyzer-4.7.3
+++ b/metadata/cache/kde-base/kdegraphics-strigi-analyzer-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kdelibs-4.7.2-r1 b/metadata/cache/kde-base/kdelibs-4.7.2-r1
deleted file mode 100644
index 4ec0c40e7887..000000000000
--- a/metadata/cache/kde-base/kdelibs-4.7.2-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 ) 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.2: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/oxygen-icons-4.7.2: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.2/src/kdelibs-4.7.2.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.2:4[aqua=] || ( ( >=kde-base/kfmclient-4.7.2:4[aqua=] ) x11-misc/xdg-utils ) handbook? ( >=kde-base/khelpcenter-4.7.2: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.2: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-r1 b/metadata/cache/kde-base/kdelibs-4.7.3-r1
index 385628105dcd..e989b63bc904 100644
--- a/metadata/cache/kde-base/kdelibs-4.7.3-r1
+++ b/metadata/cache/kde-base/kdelibs-4.7.3-r1
@@ -6,7 +6,7 @@ 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
+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 )
diff --git a/metadata/cache/kde-base/kdemultimedia-kioslaves-4.7.2 b/metadata/cache/kde-base/kdemultimedia-kioslaves-4.7.2
deleted file mode 100644
index 325cac825840..000000000000
--- a/metadata/cache/kde-base/kdemultimedia-kioslaves-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkcddb-4.7.2:4[aqua=] >=kde-base/libkcompactdisc-4.7.2: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.2:4[aqua=]
->=kde-base/libkcddb-4.7.2:4[aqua=] >=kde-base/libkcompactdisc-4.7.2:4[aqua=] media-sound/cdparanoia encode? ( flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libvorbis ) ) >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdemultimedia-4.7.2.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.3 b/metadata/cache/kde-base/kdemultimedia-kioslaves-4.7.3
index 973100900075..4928ebab7cec 100644
--- a/metadata/cache/kde-base/kdemultimedia-kioslaves-4.7.3
+++ b/metadata/cache/kde-base/kdemultimedia-kioslaves-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 KDE kioslaves from the kdemultimedia package
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kdemultimedia-meta-4.7.2 b/metadata/cache/kde-base/kdemultimedia-meta-4.7.2
deleted file mode 100644
index 64288bbe2dbb..000000000000
--- a/metadata/cache/kde-base/kdemultimedia-meta-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/dragonplayer-4.7.2:4[aqua=] >=kde-base/juk-4.7.2:4[aqua=] >=kde-base/kdemultimedia-kioslaves-4.7.2:4[aqua=] >=kde-base/kmix-4.7.2:4[aqua=] >=kde-base/kscd-4.7.2:4[aqua=] >=kde-base/libkcddb-4.7.2:4[aqua=] >=kde-base/libkcompactdisc-4.7.2:4[aqua=] mplayer? ( >=kde-base/mplayerthumbs-4.7.2:4[aqua=] ) ffmpeg? ( >=kde-base/ffmpegthumbs-4.7.2: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/kdemultimedia-meta-4.7.3 b/metadata/cache/kde-base/kdemultimedia-meta-4.7.3
index 5abf30000b37..c86f3ead7352 100644
--- a/metadata/cache/kde-base/kdemultimedia-meta-4.7.3
+++ b/metadata/cache/kde-base/kdemultimedia-meta-4.7.3
@@ -6,7 +6,7 @@
 http://www.kde.org/
 GPL-2
 kdemultimedia - merge this to pull in all kdemultimedia-derived packages
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
 ffmpeg +mplayer aqua
 
diff --git a/metadata/cache/kde-base/kdenetwork-filesharing-4.7.2 b/metadata/cache/kde-base/kdenetwork-filesharing-4.7.2
deleted file mode 100644
index a3cdea39dd90..000000000000
--- a/metadata/cache/kde-base/kdenetwork-filesharing-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdenetwork-4.7.2.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.3 b/metadata/cache/kde-base/kdenetwork-filesharing-4.7.3
index 35cdb4e488d3..e7a9b4c71e27 100644
--- a/metadata/cache/kde-base/kdenetwork-filesharing-4.7.3
+++ b/metadata/cache/kde-base/kdenetwork-filesharing-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kdenetwork-meta-4.7.2 b/metadata/cache/kde-base/kdenetwork-meta-4.7.2
deleted file mode 100644
index d97ec464d28c..000000000000
--- a/metadata/cache/kde-base/kdenetwork-meta-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/kdenetwork-filesharing-4.7.2:4[aqua=] >=kde-base/kdnssd-4.7.2:4[aqua=] >=kde-base/kget-4.7.2:4[aqua=] >=kde-base/kopete-4.7.2:4[aqua=] >=kde-base/krdc-4.7.2:4[aqua=] >=kde-base/krfb-4.7.2:4[aqua=] ppp? ( >=kde-base/kppp-4.7.2: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/kdenetwork-meta-4.7.3 b/metadata/cache/kde-base/kdenetwork-meta-4.7.3
index 9ff29aac98ce..7f3f3ad27662 100644
--- a/metadata/cache/kde-base/kdenetwork-meta-4.7.3
+++ b/metadata/cache/kde-base/kdenetwork-meta-4.7.3
@@ -6,7 +6,7 @@
 http://www.kde.org/
 GPL-2
 kdenetwork - merge this to pull in all kdenetwork-derived packages
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
 ppp aqua
 
diff --git a/metadata/cache/kde-base/kdepasswd-4.7.2 b/metadata/cache/kde-base/kdepasswd-4.7.2
deleted file mode 100644
index 26d9f1a5771c..000000000000
--- a/metadata/cache/kde-base/kdepasswd-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkonq-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/libkonq-4.7.2:4[aqua=] >=kde-base/kdesu-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-baseapps-4.7.2.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.3 b/metadata/cache/kde-base/kdepasswd-4.7.3
index bbb5b627dbb6..1307d6d5f9bb 100644
--- a/metadata/cache/kde-base/kdepasswd-4.7.3
+++ b/metadata/cache/kde-base/kdepasswd-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kdepim-common-libs-4.7.2 b/metadata/cache/kde-base/kdepim-common-libs-4.7.2
deleted file mode 100644
index 027f76089624..000000000000
--- a/metadata/cache/kde-base/kdepim-common-libs-4.7.2
+++ /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.2: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.2: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.2:4[aqua=,semantic-desktop] app-crypt/gnupg >=kde-base/kdepim-runtime-4.7.2: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.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdepim-4.7.2.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Common libraries for KDE PIM apps
-~amd64 ~x86 ~amd64-linux ~x86-linux
-base 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.3 b/metadata/cache/kde-base/kdepim-common-libs-4.7.3
index febdf0615e8b..ba108d5b0514 100644
--- a/metadata/cache/kde-base/kdepim-common-libs-4.7.3
+++ b/metadata/cache/kde-base/kdepim-common-libs-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 Common libraries for KDE PIM apps
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kdepim-icons-4.7.2 b/metadata/cache/kde-base/kdepim-icons-4.7.2
deleted file mode 100644
index febdb2c536ae..000000000000
--- a/metadata/cache/kde-base/kdepim-icons-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.2: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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdepim-4.7.2.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE PIM icons
-~amd64 ~x86 ~amd64-linux ~x86-linux
-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.3 b/metadata/cache/kde-base/kdepim-icons-4.7.3
index 2e54235b6092..c5e9589a556a 100644
--- a/metadata/cache/kde-base/kdepim-icons-4.7.3
+++ b/metadata/cache/kde-base/kdepim-icons-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 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
 
diff --git a/metadata/cache/kde-base/kdepim-kresources-4.7.2 b/metadata/cache/kde-base/kdepim-kresources-4.7.2
deleted file mode 100644
index 450900410dd4..000000000000
--- a/metadata/cache/kde-base/kdepim-kresources-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.2:4[aqua=] >=kde-base/kdepim-common-libs-4.7.2: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.2:4[aqua=]
->=kde-base/kdepimlibs-4.7.2:4[aqua=] >=kde-base/kdepim-common-libs-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdepim-4.7.2.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE PIM groupware plugin collection
-~amd64 ~x86 ~amd64-linux ~x86-linux
-base 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.3 b/metadata/cache/kde-base/kdepim-kresources-4.7.3
index c71249ea1612..845ce6117cf1 100644
--- a/metadata/cache/kde-base/kdepim-kresources-4.7.3
+++ b/metadata/cache/kde-base/kdepim-kresources-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kdepim-l10n-4.7.2 b/metadata/cache/kde-base/kdepim-l10n-4.7.2
deleted file mode 100644
index 125432ab1334..000000000000
--- a/metadata/cache/kde-base/kdepim-l10n-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-linguas_ar? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-ar-4.7.2.tar.bz2 ) linguas_bg? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-bg-4.7.2.tar.bz2 ) linguas_bs? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-bs-4.7.2.tar.bz2 ) linguas_ca? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-ca-4.7.2.tar.bz2 ) linguas_ca@valencia? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-ca@valencia-4.7.2.tar.bz2 ) linguas_cs? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-cs-4.7.2.tar.bz2 ) linguas_da? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-da-4.7.2.tar.bz2 ) linguas_de? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-de-4.7.2.tar.bz2 ) linguas_el? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-el-4.7.2.tar.bz2 ) linguas_en_GB? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-en_GB-4.7.2.tar.bz2 ) linguas_es? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-es-4.7.2.tar.bz2 ) linguas_et? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-et-4.7.2.tar.bz2 ) linguas_eu? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-eu-4.7.2.tar.bz2 ) linguas_fi? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-fi-4.7.2.tar.bz2 ) linguas_fr? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-fr-4.7.2.tar.bz2 ) linguas_ga? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-ga-4.7.2.tar.bz2 ) linguas_gl? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-gl-4.7.2.tar.bz2 ) linguas_he? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-he-4.7.2.tar.bz2 ) linguas_hr? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-hr-4.7.2.tar.bz2 ) linguas_hu? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-hu-4.7.2.tar.bz2 ) linguas_ia? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-ia-4.7.2.tar.bz2 ) linguas_id? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-id-4.7.2.tar.bz2 ) linguas_is? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-is-4.7.2.tar.bz2 ) linguas_it? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-it-4.7.2.tar.bz2 ) linguas_ja? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-ja-4.7.2.tar.bz2 ) linguas_kk? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-kk-4.7.2.tar.bz2 ) linguas_km? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-km-4.7.2.tar.bz2 ) linguas_kn? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-kn-4.7.2.tar.bz2 ) linguas_ko? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-ko-4.7.2.tar.bz2 ) linguas_lt? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-lt-4.7.2.tar.bz2 ) linguas_lv? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-lv-4.7.2.tar.bz2 ) linguas_nb? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-nb-4.7.2.tar.bz2 ) linguas_nds? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-nds-4.7.2.tar.bz2 ) linguas_nl? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-nl-4.7.2.tar.bz2 ) linguas_nn? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-nn-4.7.2.tar.bz2 ) linguas_pa? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-pa-4.7.2.tar.bz2 ) linguas_pl? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-pl-4.7.2.tar.bz2 ) linguas_pt? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-pt-4.7.2.tar.bz2 ) linguas_pt_BR? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-pt_BR-4.7.2.tar.bz2 ) linguas_ro? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-ro-4.7.2.tar.bz2 ) linguas_ru? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-ru-4.7.2.tar.bz2 ) linguas_sk? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-sk-4.7.2.tar.bz2 ) linguas_sl? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-sl-4.7.2.tar.bz2 ) linguas_sr? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-sr-4.7.2.tar.bz2 ) linguas_sv? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-sv-4.7.2.tar.bz2 ) linguas_th? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-th-4.7.2.tar.bz2 ) linguas_tr? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-tr-4.7.2.tar.bz2 ) linguas_ug? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-ug-4.7.2.tar.bz2 ) linguas_uk? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-uk-4.7.2.tar.bz2 ) linguas_wa? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-wa-4.7.2.tar.bz2 ) linguas_zh_CN? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-zh_CN-4.7.2.tar.bz2 ) linguas_zh_TW? ( mirror://kde/stable/4.7.2/src/kdepim-l10n/kde-l10n-zh_TW-4.7.2.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.3 b/metadata/cache/kde-base/kdepim-l10n-4.7.3
index 52879c956a35..aa3d015db06d 100644
--- a/metadata/cache/kde-base/kdepim-l10n-4.7.3
+++ b/metadata/cache/kde-base/kdepim-l10n-4.7.3
@@ -6,7 +6,7 @@ linguas_ar? ( mirror://kde/stable/4.7.3/src/kdepim-l10n/kde-l10n-ar-4.7.3.tar.bz
 http://www.kde.org/
 GPL-2
 KDE PIM internationalization package
-~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+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
 
diff --git a/metadata/cache/kde-base/kdepim-meta-4.7.2 b/metadata/cache/kde-base/kdepim-meta-4.7.2
deleted file mode 100644
index b5497c99e211..000000000000
--- a/metadata/cache/kde-base/kdepim-meta-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/akonadiconsole-4.7.2:4[aqua=] >=kde-base/akregator-4.7.2:4[aqua=] >=kde-base/blogilo-4.7.2:4[aqua=] >=kde-base/kabcclient-4.7.2:4[aqua=] >=kde-base/kaddressbook-4.7.2:4[aqua=] >=kde-base/kalarm-4.7.2:4[aqua=] >=kde-base/kdepim-icons-4.7.2:4[aqua=] >=kde-base/kdepim-kresources-4.7.2:4[aqua=] >=kde-base/kdepim-runtime-4.7.2:4[aqua=] >=kde-base/kdepim-strigi-analyzer-4.7.2:4[aqua=] >=kde-base/kdepim-wizards-4.7.2:4[aqua=] >=kde-base/kjots-4.7.2:4[aqua=] >=kde-base/kleopatra-4.7.2:4[aqua=] >=kde-base/kmail-4.7.2:4[aqua=] >=kde-base/knode-4.7.2:4[aqua=] >=kde-base/knotes-4.7.2:4[aqua=] >=kde-base/konsolekalendar-4.7.2:4[aqua=] >=kde-base/kontact-4.7.2:4[aqua=] >=kde-base/korganizer-4.7.2:4[aqua=] >=kde-base/ktimetracker-4.7.2:4[aqua=]
-4
-
-
-http://www.kde.org/
-GPL-2
-kdepim - merge this to pull in all kdepim-derived packages
-~amd64 ~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-meta-4.7.3 b/metadata/cache/kde-base/kdepim-meta-4.7.3
index d01f4e886bad..712af8d0a336 100644
--- a/metadata/cache/kde-base/kdepim-meta-4.7.3
+++ b/metadata/cache/kde-base/kdepim-meta-4.7.3
@@ -6,7 +6,7 @@
 http://www.kde.org/
 GPL-2
 kdepim - merge this to pull in all kdepim-derived packages
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
 aqua
 
diff --git a/metadata/cache/kde-base/kdepim-runtime-4.7.2-r1 b/metadata/cache/kde-base/kdepim-runtime-4.7.2-r1
deleted file mode 100644
index e085f3caae44..000000000000
--- a/metadata/cache/kde-base/kdepim-runtime-4.7.2-r1
+++ /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.2: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.2: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.2:4[aqua=,semantic-desktop] x11-misc/shared-mime-info >=kde-base/kdepim-icons-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdepim-runtime-4.7.2.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-KDE PIM runtime plugin collection
-~amd64 ~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.3 b/metadata/cache/kde-base/kdepim-runtime-4.7.3
index bee9ab5d909a..fbfc95b91230 100644
--- a/metadata/cache/kde-base/kdepim-runtime-4.7.3
+++ b/metadata/cache/kde-base/kdepim-runtime-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 KDE PIM runtime plugin collection
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+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
 
diff --git a/metadata/cache/kde-base/kdepim-strigi-analyzer-4.7.2 b/metadata/cache/kde-base/kdepim-strigi-analyzer-4.7.2
deleted file mode 100644
index 51569f0cbe75..000000000000
--- a/metadata/cache/kde-base/kdepim-strigi-analyzer-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-app-misc/strigi >=kde-base/kdepimlibs-4.7.2:4[aqua=] >=kde-base/kdepim-common-libs-4.7.2: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.2:4[aqua=]
-app-misc/strigi >=kde-base/kdepimlibs-4.7.2:4[aqua=] >=kde-base/kdepim-common-libs-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdepim-4.7.2.tar.bz2
-
-http://www.kde.org/
-GPL-2
-kdepim: strigi plugins
-~amd64 ~x86 ~amd64-linux ~x86-linux
-base 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.3 b/metadata/cache/kde-base/kdepim-strigi-analyzer-4.7.3
index 6c94a1420ad7..d4d0d5907541 100644
--- a/metadata/cache/kde-base/kdepim-strigi-analyzer-4.7.3
+++ b/metadata/cache/kde-base/kdepim-strigi-analyzer-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kdepim-wizards-4.7.2 b/metadata/cache/kde-base/kdepim-wizards-4.7.2
deleted file mode 100644
index e3813fce555c..000000000000
--- a/metadata/cache/kde-base/kdepim-wizards-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.2:4[aqua=] >=kde-base/kdepim-kresources-4.7.2:4[aqua=] >=kde-base/kdepim-common-libs-4.7.2: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.2:4[aqua=]
->=kde-base/kdepimlibs-4.7.2:4[aqua=] >=kde-base/kdepim-kresources-4.7.2:4[aqua=] >=kde-base/kdepim-common-libs-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdepim-4.7.2.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE PIM wizards
-~amd64 ~x86 ~amd64-linux ~x86-linux
-base 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.3 b/metadata/cache/kde-base/kdepim-wizards-4.7.3
index db9d4e559fd5..a3120248cca8 100644
--- a/metadata/cache/kde-base/kdepim-wizards-4.7.3
+++ b/metadata/cache/kde-base/kdepim-wizards-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kdepimlibs-4.7.2 b/metadata/cache/kde-base/kdepimlibs-4.7.2
deleted file mode 100644
index 407317b5362b..000000000000
--- a/metadata/cache/kde-base/kdepimlibs-4.7.2
+++ /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.2: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.2: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.2: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.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdepimlibs-4.7.2.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.3 b/metadata/cache/kde-base/kdepimlibs-4.7.3
index a1efec88dc56..b4f7adf8220a 100644
--- a/metadata/cache/kde-base/kdepimlibs-4.7.3
+++ b/metadata/cache/kde-base/kdepimlibs-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 LGPL-2.1
 Common library for KDE PIM apps.
-~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+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
 
diff --git a/metadata/cache/kde-base/kdeplasma-addons-4.7.2 b/metadata/cache/kde-base/kdeplasma-addons-4.7.2
deleted file mode 100644
index cc722ce9e872..000000000000
--- a/metadata/cache/kde-base/kdeplasma-addons-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-app-crypt/qca:2 app-crypt/qca-ossl:2 >=kde-base/kdelibs-4.7.2:4[aqua=,semantic-desktop=] >=kde-base/krunner-4.7.2:4[aqua=] >=kde-base/plasma-workspace-4.7.2:4[aqua=,semantic-desktop=] x11-misc/shared-mime-info attica? ( dev-libs/libattica ) desktopglobe? ( >=kde-base/marble-4.7.2:4[aqua=] ) exif? ( >=kde-base/libkexiv2-4.7.2:4[aqua=] ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-base/kdepimlibs-4.7.2:4[aqua=,semantic-desktop] >=kde-base/plasma-workspace-4.7.2: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.2:4[aqua=]
-app-crypt/qca:2 app-crypt/qca-ossl:2 >=kde-base/kdelibs-4.7.2:4[aqua=,semantic-desktop=] >=kde-base/krunner-4.7.2:4[aqua=] >=kde-base/plasma-workspace-4.7.2:4[aqua=,semantic-desktop=] x11-misc/shared-mime-info attica? ( dev-libs/libattica ) desktopglobe? ( >=kde-base/marble-4.7.2:4[aqua=] ) exif? ( >=kde-base/libkexiv2-4.7.2:4[aqua=] ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-base/kdepimlibs-4.7.2:4[aqua=,semantic-desktop] >=kde-base/plasma-workspace-4.7.2:4[aqua=,rss] ) >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeplasma-addons-4.7.2.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
index 5e4b165fd9cb..747dbd4174fe 100644
--- a/metadata/cache/kde-base/kdeplasma-addons-4.7.3-r1
+++ b/metadata/cache/kde-base/kdeplasma-addons-4.7.3-r1
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kdesdk-kioslaves-4.7.2 b/metadata/cache/kde-base/kdesdk-kioslaves-4.7.2
deleted file mode 100644
index 51ff8ad8d743..000000000000
--- a/metadata/cache/kde-base/kdesdk-kioslaves-4.7.2
+++ /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.2:4[aqua=]
-subversion? ( dev-libs/apr dev-vcs/subversion ) subversion? ( !>=dev-vcs/kdesvn-1.5.2:4 ) >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdesdk-4.7.2.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.3 b/metadata/cache/kde-base/kdesdk-kioslaves-4.7.3
index e8b9e81ed586..bd32c44e43e3 100644
--- a/metadata/cache/kde-base/kdesdk-kioslaves-4.7.3
+++ b/metadata/cache/kde-base/kdesdk-kioslaves-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kdesdk-meta-4.7.2 b/metadata/cache/kde-base/kdesdk-meta-4.7.2
deleted file mode 100644
index b11dc6f6b7cd..000000000000
--- a/metadata/cache/kde-base/kdesdk-meta-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-
-cvs? ( >=kde-base/cervisia-4.7.2:4[aqua=] ) >=kde-base/dolphin-plugins-4.7.2:4[aqua=] >=kde-base/kapptemplate-4.7.2:4[aqua=] >=kde-base/kate-4.7.2:4[aqua=] >=kde-base/kcachegrind-4.7.2:4[aqua=] >=kde-base/kdeaccounts-plugin-4.7.2:4[aqua=] >=kde-base/kdesdk-kioslaves-4.7.2:4[aqua=] >=kde-base/kdesdk-misc-4.7.2:4[aqua=] >=kde-base/kdesdk-scripts-4.7.2:4[aqua=] >=kde-base/kdesdk-strigi-analyzer-4.7.2:4[aqua=] >=kde-base/kompare-4.7.2:4[aqua=] >=kde-base/kstartperf-4.7.2:4[aqua=] >=kde-base/kuiviewer-4.7.2:4[aqua=] >=kde-base/lokalize-4.7.2:4[aqua=] >=kde-base/okteta-4.7.2:4[aqua=] >=kde-base/umbrello-4.7.2: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-meta-4.7.3 b/metadata/cache/kde-base/kdesdk-meta-4.7.3
index d2ceb07c8a69..c2f17ed0332e 100644
--- a/metadata/cache/kde-base/kdesdk-meta-4.7.3
+++ b/metadata/cache/kde-base/kdesdk-meta-4.7.3
@@ -6,7 +6,7 @@ cvs? ( >=kde-base/cervisia-4.7.3:4[aqua=] ) >=kde-base/dolphin-plugins-4.7.3:4[a
 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
 cvs aqua
 
diff --git a/metadata/cache/kde-base/kdesdk-misc-4.7.2 b/metadata/cache/kde-base/kdesdk-misc-4.7.2
deleted file mode 100644
index eb682d5d1b2f..000000000000
--- a/metadata/cache/kde-base/kdesdk-misc-4.7.2
+++ /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.2:4[aqua=]
-extras? ( >=dev-java/antlr-2.7.7:0[cxx,script] ) >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdesdk-4.7.2.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.3 b/metadata/cache/kde-base/kdesdk-misc-4.7.3
index c287a101208d..31d2b5af7883 100644
--- a/metadata/cache/kde-base/kdesdk-misc-4.7.3
+++ b/metadata/cache/kde-base/kdesdk-misc-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kdesdk-scripts-4.7.2 b/metadata/cache/kde-base/kdesdk-scripts-4.7.2
deleted file mode 100644
index 045eb3461c29..000000000000
--- a/metadata/cache/kde-base/kdesdk-scripts-4.7.2
+++ /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.2:4[aqua=]
-app-arch/advancecomp media-gfx/optipng >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdesdk-4.7.2.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.3 b/metadata/cache/kde-base/kdesdk-scripts-4.7.3
index f40850f7166c..4e22fccd6f96 100644
--- a/metadata/cache/kde-base/kdesdk-scripts-4.7.3
+++ b/metadata/cache/kde-base/kdesdk-scripts-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kdesdk-strigi-analyzer-4.7.2 b/metadata/cache/kde-base/kdesdk-strigi-analyzer-4.7.2
deleted file mode 100644
index 24caceaeafcf..000000000000
--- a/metadata/cache/kde-base/kdesdk-strigi-analyzer-4.7.2
+++ /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.2:4[aqua=]
-app-misc/strigi >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdesdk-4.7.2.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.3 b/metadata/cache/kde-base/kdesdk-strigi-analyzer-4.7.3
index 1179f2dac1bc..7b273bb67afa 100644
--- a/metadata/cache/kde-base/kdesdk-strigi-analyzer-4.7.3
+++ b/metadata/cache/kde-base/kdesdk-strigi-analyzer-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kdesu-4.7.2 b/metadata/cache/kde-base/kdesu-4.7.2
deleted file mode 100644
index 72fe5548a15f..000000000000
--- a/metadata/cache/kde-base/kdesu-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/kdesu-4.7.3
index c699add1d710..e995ce31bb54 100644
--- a/metadata/cache/kde-base/kdesu-4.7.3
+++ b/metadata/cache/kde-base/kdesu-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kdetoys-meta-4.7.2 b/metadata/cache/kde-base/kdetoys-meta-4.7.2
deleted file mode 100644
index 7240bac2e18f..000000000000
--- a/metadata/cache/kde-base/kdetoys-meta-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/amor-4.7.2:4[aqua=] >=kde-base/kteatime-4.7.2:4[aqua=] >=kde-base/ktux-4.7.2: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/kdetoys-meta-4.7.3 b/metadata/cache/kde-base/kdetoys-meta-4.7.3
index 61f93cda0cc3..01d296fb36bf 100644
--- a/metadata/cache/kde-base/kdetoys-meta-4.7.3
+++ b/metadata/cache/kde-base/kdetoys-meta-4.7.3
@@ -6,7 +6,7 @@
 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
 aqua
 
diff --git a/metadata/cache/kde-base/kdeutils-meta-4.7.2 b/metadata/cache/kde-base/kdeutils-meta-4.7.2
deleted file mode 100644
index 349fa6f471ac..000000000000
--- a/metadata/cache/kde-base/kdeutils-meta-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/ark-4.7.2:4[aqua=] >=kde-base/filelight-4.7.2:4[aqua=] >=kde-base/kcalc-4.7.2:4[aqua=] >=kde-base/kcharselect-4.7.2:4[aqua=] >=kde-base/kdf-4.7.2:4[aqua=] >=kde-base/kgpg-4.7.2:4[aqua=] >=kde-base/kremotecontrol-4.7.2:4[aqua=] >=kde-base/ktimer-4.7.2:4[aqua=] >=kde-base/kwallet-4.7.2:4[aqua=] >=kde-base/superkaramba-4.7.2:4[aqua=] >=kde-base/sweeper-4.7.2:4[aqua=] cups? ( >=kde-base/printer-applet-4.7.2:4[aqua=] ) floppy? ( >=kde-base/kfloppy-4.7.2: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/kdeutils-meta-4.7.3 b/metadata/cache/kde-base/kdeutils-meta-4.7.3
index b912137ccb41..bb9d4df97114 100644
--- a/metadata/cache/kde-base/kdeutils-meta-4.7.3
+++ b/metadata/cache/kde-base/kdeutils-meta-4.7.3
@@ -6,7 +6,7 @@
 http://www.kde.org/
 GPL-2
 kdeutils - merge this to pull in all kdeutils-derived packages
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
 cups floppy aqua
 
diff --git a/metadata/cache/kde-base/kdewebdev-meta-4.7.2 b/metadata/cache/kde-base/kdewebdev-meta-4.7.2
deleted file mode 100644
index bf66917c2699..000000000000
--- a/metadata/cache/kde-base/kdewebdev-meta-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=kde-base/kfilereplace-4.7.2:4[aqua=] >=kde-base/kimagemapeditor-4.7.2:4[aqua=] >=kde-base/klinkstatus-4.7.2:4[aqua=] >=kde-base/kommander-4.7.2: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/kdewebdev-meta-4.7.3 b/metadata/cache/kde-base/kdewebdev-meta-4.7.3
index 7d1e5826cbc3..a9a4486aefe7 100644
--- a/metadata/cache/kde-base/kdewebdev-meta-4.7.3
+++ b/metadata/cache/kde-base/kdewebdev-meta-4.7.3
@@ -6,7 +6,7 @@
 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 eutils kde4-functions kde4-meta-pkg multilib portability toolchain-funcs user versionator
 aqua
 
diff --git a/metadata/cache/kde-base/kdf-4.7.2 b/metadata/cache/kde-base/kdf-4.7.2
deleted file mode 100644
index afd04a6b3236..000000000000
--- a/metadata/cache/kde-base/kdf-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeutils-4.7.2.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.3 b/metadata/cache/kde-base/kdf-4.7.3
index 9ded05ea2536..2e31ef09d1f6 100644
--- a/metadata/cache/kde-base/kdf-4.7.3
+++ b/metadata/cache/kde-base/kdf-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kdialog-4.7.2 b/metadata/cache/kde-base/kdialog-4.7.2
deleted file mode 100644
index 87f759fd8d00..000000000000
--- a/metadata/cache/kde-base/kdialog-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-baseapps-4.7.2.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.3 b/metadata/cache/kde-base/kdialog-4.7.3
index d9eec991b0b7..cae2d45afc92 100644
--- a/metadata/cache/kde-base/kdialog-4.7.3
+++ b/metadata/cache/kde-base/kdialog-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kdiamond-4.7.2 b/metadata/cache/kde-base/kdiamond-4.7.2
deleted file mode 100644
index a6143d8d148d..000000000000
--- a/metadata/cache/kde-base/kdiamond-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/kdiamond-4.7.3
index 9e4644f37606..e71309161518 100644
--- a/metadata/cache/kde-base/kdiamond-4.7.3
+++ b/metadata/cache/kde-base/kdiamond-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kdm-4.7.2-r1 b/metadata/cache/kde-base/kdm-4.7.2-r1
deleted file mode 100644
index d0ed6b0180b2..000000000000
--- a/metadata/cache/kde-base/kdm-4.7.2-r1
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkworkspace-4.7.2: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.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/libkworkspace-4.7.2: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.2:4[aqua=] virtual/pam ) >=kde-base/kdepasswd-4.7.2:4[aqua=] >=x11-apps/xinit-1.0.5-r2 x11-apps/xmessage >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3-r1 b/metadata/cache/kde-base/kdm-4.7.3-r1
index 27aac54f65e4..d1f475300dbd 100644
--- a/metadata/cache/kde-base/kdm-4.7.3-r1
+++ b/metadata/cache/kde-base/kdm-4.7.3-r1
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kdnssd-4.7.2 b/metadata/cache/kde-base/kdnssd-4.7.2
deleted file mode 100644
index 376526d559da..000000000000
--- a/metadata/cache/kde-base/kdnssd-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-zeroconf? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-zeroconf? ( >=kde-base/kdelibs-4.7.2:4[aqua=,zeroconf] ) >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdenetwork-4.7.2.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.3 b/metadata/cache/kde-base/kdnssd-4.7.3
index 17ebb124096f..4170bf4fa9e2 100644
--- a/metadata/cache/kde-base/kdnssd-4.7.3
+++ b/metadata/cache/kde-base/kdnssd-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kdontchangethehostname-4.7.2 b/metadata/cache/kde-base/kdontchangethehostname-4.7.2
deleted file mode 100644
index af6b8df3f3bc..000000000000
--- a/metadata/cache/kde-base/kdontchangethehostname-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-x11-apps/xauth >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/kdontchangethehostname-4.7.3
index db882cc3cc5e..644f3e75100d 100644
--- a/metadata/cache/kde-base/kdontchangethehostname-4.7.3
+++ b/metadata/cache/kde-base/kdontchangethehostname-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/keditbookmarks-4.7.2 b/metadata/cache/kde-base/keditbookmarks-4.7.2
deleted file mode 100644
index 4d093e969c70..000000000000
--- a/metadata/cache/kde-base/keditbookmarks-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkonq-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/libkonq-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-baseapps-4.7.2.tar.bz2
-
-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.3 b/metadata/cache/kde-base/keditbookmarks-4.7.3
index 9ae2c562ab3d..9a0cfb237e86 100644
--- a/metadata/cache/kde-base/keditbookmarks-4.7.3
+++ b/metadata/cache/kde-base/keditbookmarks-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 KDE's bookmarks editor
-~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+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
 
diff --git a/metadata/cache/kde-base/keditfiletype-4.7.2 b/metadata/cache/kde-base/keditfiletype-4.7.2
deleted file mode 100644
index 1635d8fdb6b7..000000000000
--- a/metadata/cache/kde-base/keditfiletype-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/keditfiletype-4.7.3
index d9a887e8f742..113c5b34489d 100644
--- a/metadata/cache/kde-base/keditfiletype-4.7.3
+++ b/metadata/cache/kde-base/keditfiletype-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 KDE mime/file type assocciation editor
-~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+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
 
diff --git a/metadata/cache/kde-base/kephal-4.7.2 b/metadata/cache/kde-base/kephal-4.7.2
deleted file mode 100644
index 6a235ce286a8..000000000000
--- a/metadata/cache/kde-base/kephal-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-x11-libs/libxkbfile x11-libs/libXrandr >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3 b/metadata/cache/kde-base/kephal-4.7.3
index 742575e697aa..657b8287e302 100644
--- a/metadata/cache/kde-base/kephal-4.7.3
+++ b/metadata/cache/kde-base/kephal-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kfile-4.7.2 b/metadata/cache/kde-base/kfile-4.7.2
deleted file mode 100644
index 90df9877ce0b..000000000000
--- a/metadata/cache/kde-base/kfile-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/kfile-4.7.3
index 6526bbe51646..4dec3719d076 100644
--- a/metadata/cache/kde-base/kfile-4.7.3
+++ b/metadata/cache/kde-base/kfile-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kfilereplace-4.7.2 b/metadata/cache/kde-base/kfilereplace-4.7.2
deleted file mode 100644
index 5c89176f982b..000000000000
--- a/metadata/cache/kde-base/kfilereplace-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdewebdev-4.7.2.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.3 b/metadata/cache/kde-base/kfilereplace-4.7.3
index d25ba3271dbc..b03736bf70a7 100644
--- a/metadata/cache/kde-base/kfilereplace-4.7.3
+++ b/metadata/cache/kde-base/kfilereplace-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kfind-4.7.2 b/metadata/cache/kde-base/kfind-4.7.2
deleted file mode 100644
index 9e8e60e25ec4..000000000000
--- a/metadata/cache/kde-base/kfind-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkonq-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/libkonq-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-baseapps-4.7.2.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.3 b/metadata/cache/kde-base/kfind-4.7.3
index 402f6188037a..7e45aced424d 100644
--- a/metadata/cache/kde-base/kfind-4.7.3
+++ b/metadata/cache/kde-base/kfind-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kfloppy-4.7.2 b/metadata/cache/kde-base/kfloppy-4.7.2
deleted file mode 100644
index 2d8bb35e0224..000000000000
--- a/metadata/cache/kde-base/kfloppy-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeutils-4.7.2.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.3 b/metadata/cache/kde-base/kfloppy-4.7.3
index 0c4a9306dcfa..dfc6fe400ad6 100644
--- a/metadata/cache/kde-base/kfloppy-4.7.3
+++ b/metadata/cache/kde-base/kfloppy-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kfmclient-4.7.2 b/metadata/cache/kde-base/kfmclient-4.7.2
deleted file mode 100644
index 6505e5a419d7..000000000000
--- a/metadata/cache/kde-base/kfmclient-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-baseapps-4.7.2.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.3 b/metadata/cache/kde-base/kfmclient-4.7.3
index 8bd9c93727d9..8fad6368d4fc 100644
--- a/metadata/cache/kde-base/kfmclient-4.7.3
+++ b/metadata/cache/kde-base/kfmclient-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kfourinline-4.7.2 b/metadata/cache/kde-base/kfourinline-4.7.2
deleted file mode 100644
index 2d7178efd734..000000000000
--- a/metadata/cache/kde-base/kfourinline-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/kfourinline-4.7.3
index 8fb7f254bdab..1a10b129424a 100644
--- a/metadata/cache/kde-base/kfourinline-4.7.3
+++ b/metadata/cache/kde-base/kfourinline-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kgamma-4.7.2 b/metadata/cache/kde-base/kgamma-4.7.2
deleted file mode 100644
index 93a562849c7a..000000000000
--- a/metadata/cache/kde-base/kgamma-4.7.2
+++ /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.2:4[aqua=]
-x11-libs/libXxf86vm >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kgamma-4.7.2.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.3 b/metadata/cache/kde-base/kgamma-4.7.3
index 743375ac80ec..a204be44fcf9 100644
--- a/metadata/cache/kde-base/kgamma-4.7.3
+++ b/metadata/cache/kde-base/kgamma-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kgeography-4.7.2 b/metadata/cache/kde-base/kgeography-4.7.2
deleted file mode 100644
index 0eb7949a0c60..000000000000
--- a/metadata/cache/kde-base/kgeography-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kgeography-4.7.2.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.3 b/metadata/cache/kde-base/kgeography-4.7.3
index aa36c6c6f0e2..615e6268def5 100644
--- a/metadata/cache/kde-base/kgeography-4.7.3
+++ b/metadata/cache/kde-base/kgeography-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kget-4.7.2 b/metadata/cache/kde-base/kget-4.7.2
deleted file mode 100644
index c1a9e1921918..000000000000
--- a/metadata/cache/kde-base/kget-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-app-crypt/qca:2 >=kde-base/kdelibs-4.7.2:4[aqua=,semantic-desktop=] >=kde-base/kdepimlibs-4.7.2:4[aqua=] >=kde-base/libkonq-4.7.2:4[aqua=] >=kde-base/libkworkspace-4.7.2:4[aqua=] >=kde-base/solid-4.7.2: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.2:4[aqua=]
-app-crypt/qca:2 >=kde-base/kdelibs-4.7.2:4[aqua=,semantic-desktop=] >=kde-base/kdepimlibs-4.7.2:4[aqua=] >=kde-base/libkonq-4.7.2:4[aqua=] >=kde-base/libkworkspace-4.7.2:4[aqua=] >=kde-base/solid-4.7.2: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.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdenetwork-4.7.2.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.3 b/metadata/cache/kde-base/kget-4.7.3
index 8f863f749381..e3c9d2210457 100644
--- a/metadata/cache/kde-base/kget-4.7.3
+++ b/metadata/cache/kde-base/kget-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kglobalaccel-4.7.2 b/metadata/cache/kde-base/kglobalaccel-4.7.2
deleted file mode 100644
index 802aa91d0cab..000000000000
--- a/metadata/cache/kde-base/kglobalaccel-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/kglobalaccel-4.7.3
index 0d8211411721..66653d7723ce 100644
--- a/metadata/cache/kde-base/kglobalaccel-4.7.3
+++ b/metadata/cache/kde-base/kglobalaccel-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kgoldrunner-4.7.2 b/metadata/cache/kde-base/kgoldrunner-4.7.2
deleted file mode 100644
index bd34d6f9089d..000000000000
--- a/metadata/cache/kde-base/kgoldrunner-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-media-libs/libsndfile media-libs/openal >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/kgoldrunner-4.7.3
index 23129193299d..4e16a75f865c 100644
--- a/metadata/cache/kde-base/kgoldrunner-4.7.3
+++ b/metadata/cache/kde-base/kgoldrunner-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kgpg-4.7.2 b/metadata/cache/kde-base/kgpg-4.7.2
deleted file mode 100644
index ae88a4011534..000000000000
--- a/metadata/cache/kde-base/kgpg-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.2: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.2:4[aqua=]
->=kde-base/kdepimlibs-4.7.2:4[aqua=] app-crypt/gnupg >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeutils-4.7.2.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.3 b/metadata/cache/kde-base/kgpg-4.7.3
index 6150241cfb29..fb43f3b85309 100644
--- a/metadata/cache/kde-base/kgpg-4.7.3
+++ b/metadata/cache/kde-base/kgpg-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/khangman-4.7.2 b/metadata/cache/kde-base/khangman-4.7.2
deleted file mode 100644
index 3192f4ba6c42..000000000000
--- a/metadata/cache/kde-base/khangman-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkdeedu-4.7.2: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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/khangman-4.7.2.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.3 b/metadata/cache/kde-base/khangman-4.7.3
index a246a57dcc90..372c095b3154 100644
--- a/metadata/cache/kde-base/khangman-4.7.3
+++ b/metadata/cache/kde-base/khangman-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/khelpcenter-4.7.2 b/metadata/cache/kde-base/khelpcenter-4.7.2
deleted file mode 100644
index d725f2922331..000000000000
--- a/metadata/cache/kde-base/khelpcenter-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/kdesu-4.7.2:4[aqua=] >=www-misc/htdig-3.2.0_beta6-r1 >=kde-base/oxygen-icons-4.7.2:4[aqua=] >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/khelpcenter-4.7.3
index aac3320bdc82..76dfa23cf8ef 100644
--- a/metadata/cache/kde-base/khelpcenter-4.7.3
+++ b/metadata/cache/kde-base/khelpcenter-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/khotkeys-4.7.2 b/metadata/cache/kde-base/khotkeys-4.7.2
deleted file mode 100644
index b48ac9b0e1ac..000000000000
--- a/metadata/cache/kde-base/khotkeys-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkworkspace-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/libkworkspace-4.7.2:4[aqua=] x11-libs/libXtst >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3 b/metadata/cache/kde-base/khotkeys-4.7.3
index aa7c2185bdf6..e24d710b59bb 100644
--- a/metadata/cache/kde-base/khotkeys-4.7.3
+++ b/metadata/cache/kde-base/khotkeys-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kiconfinder-4.7.2 b/metadata/cache/kde-base/kiconfinder-4.7.2
deleted file mode 100644
index bd8c53c2f5ab..000000000000
--- a/metadata/cache/kde-base/kiconfinder-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/kiconfinder-4.7.3
index 3a82e5eec01e..21630e3fe7eb 100644
--- a/metadata/cache/kde-base/kiconfinder-4.7.3
+++ b/metadata/cache/kde-base/kiconfinder-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kig-4.7.2 b/metadata/cache/kde-base/kig-4.7.2
deleted file mode 100644
index 9200cb8a4f4b..000000000000
--- a/metadata/cache/kde-base/kig-4.7.2
+++ /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.2:4[aqua=]
-kig-scripting? ( >=dev-libs/boost-1.32 ) >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kig-4.7.2.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.3 b/metadata/cache/kde-base/kig-4.7.3
index 70512253f141..b6378ca065c3 100644
--- a/metadata/cache/kde-base/kig-4.7.3
+++ b/metadata/cache/kde-base/kig-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kigo-4.7.2 b/metadata/cache/kde-base/kigo-4.7.2
deleted file mode 100644
index 1672efdae489..000000000000
--- a/metadata/cache/kde-base/kigo-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-games-board/gnugo >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/kigo-4.7.3
index c04236dcbb04..5a0a37618a10 100644
--- a/metadata/cache/kde-base/kigo-4.7.3
+++ b/metadata/cache/kde-base/kigo-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/killbots-4.7.2 b/metadata/cache/kde-base/killbots-4.7.2
deleted file mode 100644
index 86652a0d3bcf..000000000000
--- a/metadata/cache/kde-base/killbots-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/killbots-4.7.3
index fe1fdacd1661..1ff2410d9a17 100644
--- a/metadata/cache/kde-base/killbots-4.7.3
+++ b/metadata/cache/kde-base/killbots-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 Kill the bots or they kill you!
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kimagemapeditor-4.7.2 b/metadata/cache/kde-base/kimagemapeditor-4.7.2
deleted file mode 100644
index ef0bd01b7d88..000000000000
--- a/metadata/cache/kde-base/kimagemapeditor-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdewebdev-4.7.2.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.3 b/metadata/cache/kde-base/kimagemapeditor-4.7.3
index c81cd3d020b9..f0fa2460f3d3 100644
--- a/metadata/cache/kde-base/kimagemapeditor-4.7.3
+++ b/metadata/cache/kde-base/kimagemapeditor-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kimono-4.7.2 b/metadata/cache/kde-base/kimono-4.7.2
deleted file mode 100644
index 88361b517312..000000000000
--- a/metadata/cache/kde-base/kimono-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-lang/mono >=kde-base/qyoto-4.7.2:4[aqua=,webkit] >=kde-base/smokeqt-4.7.2:4[aqua=] >=kde-base/smokekde-4.7.2:4[aqua=,akonadi?,semantic-desktop=] plasma? ( >=kde-base/smokeqt-4.7.2: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.2:4[aqua=]
-dev-lang/mono >=kde-base/qyoto-4.7.2:4[aqua=,webkit] >=kde-base/smokeqt-4.7.2:4[aqua=] >=kde-base/smokekde-4.7.2:4[aqua=,akonadi?,semantic-desktop=] plasma? ( >=kde-base/smokeqt-4.7.2:4[aqua=,webkit] ) semantic-desktop? ( >=dev-libs/soprano-2.6.51[clucene] ) !kde-base/kdebindings-csharp:4 >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kimono-4.7.2.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.3 b/metadata/cache/kde-base/kimono-4.7.3
index 7c82c722ccf1..ec3baac8c5da 100644
--- a/metadata/cache/kde-base/kimono-4.7.3
+++ b/metadata/cache/kde-base/kimono-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kinfocenter-4.7.2 b/metadata/cache/kde-base/kinfocenter-4.7.2
deleted file mode 100644
index 2d11311e5f46..000000000000
--- a/metadata/cache/kde-base/kinfocenter-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/solid-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/solid-4.7.2:4[aqua=] sys-apps/pciutils ieee1394? ( sys-libs/libraw1394 ) opengl? ( virtual/glu virtual/opengl ) sys-apps/usbutils >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3 b/metadata/cache/kde-base/kinfocenter-4.7.3
index f9b6e4b202bd..4c760dee2cf4 100644
--- a/metadata/cache/kde-base/kinfocenter-4.7.3
+++ b/metadata/cache/kde-base/kinfocenter-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kioclient-4.7.2 b/metadata/cache/kde-base/kioclient-4.7.2
deleted file mode 100644
index d2d1d80eb3d3..000000000000
--- a/metadata/cache/kde-base/kioclient-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/kioclient-4.7.3
index f072bcc2da25..b89cb0907e18 100644
--- a/metadata/cache/kde-base/kioclient-4.7.3
+++ b/metadata/cache/kde-base/kioclient-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kiriki-4.7.2 b/metadata/cache/kde-base/kiriki-4.7.2
deleted file mode 100644
index bc7ec7d491f2..000000000000
--- a/metadata/cache/kde-base/kiriki-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/kiriki-4.7.3
index acd9dd273095..2d5c7d9ef2dc 100644
--- a/metadata/cache/kde-base/kiriki-4.7.3
+++ b/metadata/cache/kde-base/kiriki-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kiten-4.7.2 b/metadata/cache/kde-base/kiten-4.7.2
deleted file mode 100644
index 368e561540e7..000000000000
--- a/metadata/cache/kde-base/kiten-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kiten-4.7.2.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.3 b/metadata/cache/kde-base/kiten-4.7.3
index d20c9cdbb06e..8cf4aba1a579 100644
--- a/metadata/cache/kde-base/kiten-4.7.3
+++ b/metadata/cache/kde-base/kiten-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kjots-4.7.2 b/metadata/cache/kde-base/kjots-4.7.2
deleted file mode 100644
index 02a2b7b44a69..000000000000
--- a/metadata/cache/kde-base/kjots-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/grantlee-0.1 >=kde-base/kdepimlibs-4.7.2:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.7.2: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.2:4[aqua=]
->=dev-libs/grantlee-0.1 >=kde-base/kdepimlibs-4.7.2:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] kontact? ( >=kde-base/kontact-4.7.2:4[aqua=] )
-4
-mirror://kde/stable/4.7.2/src/kdepim-4.7.2.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE note taking utility
-~amd64 ~x86 ~amd64-linux ~x86-linux
-base 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.3 b/metadata/cache/kde-base/kjots-4.7.3
index 9aa317ec062a..88c5c27df9f5 100644
--- a/metadata/cache/kde-base/kjots-4.7.3
+++ b/metadata/cache/kde-base/kjots-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kjumpingcube-4.7.2 b/metadata/cache/kde-base/kjumpingcube-4.7.2
deleted file mode 100644
index ff2c9a951208..000000000000
--- a/metadata/cache/kde-base/kjumpingcube-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/kjumpingcube-4.7.3
index 8aebc8deb1d0..15f50cbac4f2 100644
--- a/metadata/cache/kde-base/kjumpingcube-4.7.3
+++ b/metadata/cache/kde-base/kjumpingcube-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kleopatra-4.7.2 b/metadata/cache/kde-base/kleopatra-4.7.2
deleted file mode 100644
index 3e2a3fb911fe..000000000000
--- a/metadata/cache/kde-base/kleopatra-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-app-crypt/gpgme dev-libs/boost dev-libs/libassuan dev-libs/libgpg-error >=kde-base/kdepimlibs-4.7.2:4[aqua=] >=kde-base/kdepim-common-libs-4.7.2: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.2:4[aqua=]
-app-crypt/gpgme dev-libs/boost dev-libs/libassuan dev-libs/libgpg-error >=kde-base/kdepimlibs-4.7.2:4[aqua=] >=kde-base/kdepim-common-libs-4.7.2:4[aqua=] app-crypt/gnupg >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdepim-4.7.2.tar.bz2
-
-http://www.kde.org/
-GPL-2
-Kleopatra - KDE X.509 key manager
-~amd64 ~x86 ~amd64-linux ~x86-linux
-base 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.3 b/metadata/cache/kde-base/kleopatra-4.7.3
index a8766d74f80d..26aaa594920f 100644
--- a/metadata/cache/kde-base/kleopatra-4.7.3
+++ b/metadata/cache/kde-base/kleopatra-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/klettres-4.7.2 b/metadata/cache/kde-base/klettres-4.7.2
deleted file mode 100644
index 3fcca4452158..000000000000
--- a/metadata/cache/kde-base/klettres-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/knotify-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/klettres-4.7.2.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.3 b/metadata/cache/kde-base/klettres-4.7.3
index a3627b3a55d7..c7c289ac12e7 100644
--- a/metadata/cache/kde-base/klettres-4.7.3
+++ b/metadata/cache/kde-base/klettres-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/klickety-4.7.2 b/metadata/cache/kde-base/klickety-4.7.2
deleted file mode 100644
index 4ae756a09b11..000000000000
--- a/metadata/cache/kde-base/klickety-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/klickety-4.7.3
index 99c2c928dee6..b991b755e00b 100644
--- a/metadata/cache/kde-base/klickety-4.7.3
+++ b/metadata/cache/kde-base/klickety-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/klines-4.7.2 b/metadata/cache/kde-base/klines-4.7.2
deleted file mode 100644
index 7defc8d73348..000000000000
--- a/metadata/cache/kde-base/klines-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/klines-4.7.3
index 77f56f260c81..dd37f37eb550 100644
--- a/metadata/cache/kde-base/klines-4.7.3
+++ b/metadata/cache/kde-base/klines-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/klinkstatus-4.7.2 b/metadata/cache/kde-base/klinkstatus-4.7.2
deleted file mode 100644
index f8acfa59f164..000000000000
--- a/metadata/cache/kde-base/klinkstatus-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.2: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.2:4[aqua=]
->=kde-base/kdepimlibs-4.7.2:4[aqua=,semantic-desktop] tidy? ( app-text/htmltidy ) >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdewebdev-4.7.2.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.3 b/metadata/cache/kde-base/klinkstatus-4.7.3
index cf6ae310ec8f..a6f312e7fdf9 100644
--- a/metadata/cache/kde-base/klinkstatus-4.7.3
+++ b/metadata/cache/kde-base/klinkstatus-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/klipper-4.7.2 b/metadata/cache/kde-base/klipper-4.7.2
deleted file mode 100644
index 3a282ee91611..000000000000
--- a/metadata/cache/kde-base/klipper-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkworkspace-4.7.2:4[aqua=] >=kde-base/libtaskmanager-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/libkworkspace-4.7.2:4[aqua=] >=kde-base/libtaskmanager-4.7.2:4[aqua=] !aqua? ( x11-libs/libXfixes ) >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3 b/metadata/cache/kde-base/klipper-4.7.3
index d601852eccf2..e9b72103a0de 100644
--- a/metadata/cache/kde-base/klipper-4.7.3
+++ b/metadata/cache/kde-base/klipper-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kmag-4.7.2 b/metadata/cache/kde-base/kmag-4.7.2
deleted file mode 100644
index 7149027bccf2..000000000000
--- a/metadata/cache/kde-base/kmag-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/kaccessible-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeaccessibility-4.7.2.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.3 b/metadata/cache/kde-base/kmag-4.7.3
index e071c1968deb..15efad180233 100644
--- a/metadata/cache/kde-base/kmag-4.7.3
+++ b/metadata/cache/kde-base/kmag-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kmahjongg-4.7.2 b/metadata/cache/kde-base/kmahjongg-4.7.2
deleted file mode 100644
index 743cef0bbb25..000000000000
--- a/metadata/cache/kde-base/kmahjongg-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkmahjongg-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/libkmahjongg-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/kmahjongg-4.7.3
index 9e7bc2353ab4..eae10c8815dd 100644
--- a/metadata/cache/kde-base/kmahjongg-4.7.3
+++ b/metadata/cache/kde-base/kmahjongg-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kmail-4.7.2 b/metadata/cache/kde-base/kmail-4.7.2
deleted file mode 100644
index 6da959c18cdc..000000000000
--- a/metadata/cache/kde-base/kmail-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.2:4[aqua=,semantic-desktop] >=kde-base/korganizer-4.7.2:4[aqua=] >=kde-base/kdepim-common-libs-4.7.2: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.2:4[aqua=]
->=kde-base/kdepimlibs-4.7.2:4[aqua=,semantic-desktop] >=kde-base/korganizer-4.7.2:4[aqua=] >=kde-base/kdepim-common-libs-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] kontact? ( >=kde-base/kontact-4.7.2:4[aqua=] )
-4
-mirror://kde/stable/4.7.2/src/kdepim-4.7.2.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KMail is the email component of Kontact, the integrated personal information manager of KDE.
-~amd64 ~x86 ~amd64-linux ~x86-linux
-base 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.3 b/metadata/cache/kde-base/kmail-4.7.3
index 8ecab65f1664..5b96b6c65fec 100644
--- a/metadata/cache/kde-base/kmail-4.7.3
+++ b/metadata/cache/kde-base/kmail-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kmenuedit-4.7.2 b/metadata/cache/kde-base/kmenuedit-4.7.2
deleted file mode 100644
index cb1f634b683e..000000000000
--- a/metadata/cache/kde-base/kmenuedit-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/khotkeys-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/khotkeys-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3 b/metadata/cache/kde-base/kmenuedit-4.7.3
index 5e804d1a926a..6ea3edda7ec4 100644
--- a/metadata/cache/kde-base/kmenuedit-4.7.3
+++ b/metadata/cache/kde-base/kmenuedit-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kmimetypefinder-4.7.2 b/metadata/cache/kde-base/kmimetypefinder-4.7.2
deleted file mode 100644
index 15f5c92c479a..000000000000
--- a/metadata/cache/kde-base/kmimetypefinder-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/kmimetypefinder-4.7.3
index 4ded16686ce1..c930dd52336d 100644
--- a/metadata/cache/kde-base/kmimetypefinder-4.7.3
+++ b/metadata/cache/kde-base/kmimetypefinder-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kmines-4.7.2 b/metadata/cache/kde-base/kmines-4.7.2
deleted file mode 100644
index f4e4e5240de1..000000000000
--- a/metadata/cache/kde-base/kmines-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/kmines-4.7.3
index 33fe4b633a04..73d5db485d98 100644
--- a/metadata/cache/kde-base/kmines-4.7.3
+++ b/metadata/cache/kde-base/kmines-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kmix-4.7.2 b/metadata/cache/kde-base/kmix-4.7.2
deleted file mode 100644
index b4d4f5bc0697..000000000000
--- a/metadata/cache/kde-base/kmix-4.7.2
+++ /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.2:4[aqua=]
-alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( >=media-sound/pulseaudio-0.9.12 ) >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdemultimedia-4.7.2.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.3 b/metadata/cache/kde-base/kmix-4.7.3
index a2a940ae1226..36cff2fb929b 100644
--- a/metadata/cache/kde-base/kmix-4.7.3
+++ b/metadata/cache/kde-base/kmix-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 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
 
diff --git a/metadata/cache/kde-base/kmousetool-4.7.2 b/metadata/cache/kde-base/kmousetool-4.7.2
deleted file mode 100644
index cdc2e225a922..000000000000
--- a/metadata/cache/kde-base/kmousetool-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/knotify-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeaccessibility-4.7.2.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.3 b/metadata/cache/kde-base/kmousetool-4.7.3
index 0320b91336f6..debf0db6a9a4 100644
--- a/metadata/cache/kde-base/kmousetool-4.7.3
+++ b/metadata/cache/kde-base/kmousetool-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kmouth-4.7.2 b/metadata/cache/kde-base/kmouth-4.7.2
deleted file mode 100644
index 6e2ab0a49382..000000000000
--- a/metadata/cache/kde-base/kmouth-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeaccessibility-4.7.2.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.3 b/metadata/cache/kde-base/kmouth-4.7.3
index ffc8fced3774..ecdf574f5356 100644
--- a/metadata/cache/kde-base/kmouth-4.7.3
+++ b/metadata/cache/kde-base/kmouth-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kmplot-4.7.2 b/metadata/cache/kde-base/kmplot-4.7.2
deleted file mode 100644
index 2179b21bcb49..000000000000
--- a/metadata/cache/kde-base/kmplot-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/knotify-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kmplot-4.7.2.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.3 b/metadata/cache/kde-base/kmplot-4.7.3
index 46e600bfc9aa..11073c1d8aa6 100644
--- a/metadata/cache/kde-base/kmplot-4.7.3
+++ b/metadata/cache/kde-base/kmplot-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/knetattach-4.7.2 b/metadata/cache/kde-base/knetattach-4.7.2
deleted file mode 100644
index 7f3c148a2e7b..000000000000
--- a/metadata/cache/kde-base/knetattach-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/knetattach-4.7.3
index 4b29ba4fc34d..4de5dd582b6c 100644
--- a/metadata/cache/kde-base/knetattach-4.7.3
+++ b/metadata/cache/kde-base/knetattach-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/knetwalk-4.7.2 b/metadata/cache/kde-base/knetwalk-4.7.2
deleted file mode 100644
index 45bb654a9ec7..000000000000
--- a/metadata/cache/kde-base/knetwalk-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/knetwalk-4.7.3
index f759397dd023..3b04adb10940 100644
--- a/metadata/cache/kde-base/knetwalk-4.7.3
+++ b/metadata/cache/kde-base/knetwalk-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/knewstuff-4.7.2 b/metadata/cache/kde-base/knewstuff-4.7.2
deleted file mode 100644
index 09c1ef1440f5..000000000000
--- a/metadata/cache/kde-base/knewstuff-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/knewstuff-4.7.3
index 94d5387dd604..ebd137405167 100644
--- a/metadata/cache/kde-base/knewstuff-4.7.3
+++ b/metadata/cache/kde-base/knewstuff-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/knode-4.7.2 b/metadata/cache/kde-base/knode-4.7.2
deleted file mode 100644
index ff973041a866..000000000000
--- a/metadata/cache/kde-base/knode-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.2:4[aqua=] >=kde-base/kdepim-common-libs-4.7.2: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.2:4[aqua=]
->=kde-base/kdepimlibs-4.7.2:4[aqua=] >=kde-base/kdepim-common-libs-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] kontact? ( >=kde-base/kontact-4.7.2:4[aqua=] )
-4
-mirror://kde/stable/4.7.2/src/kdepim-4.7.2.tar.bz2
-test
-http://www.kde.org/
-GPL-2
-A newsreader for KDE
-~amd64 ~x86 ~amd64-linux ~x86-linux
-base 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.3 b/metadata/cache/kde-base/knode-4.7.3
index e5af55e0fa6b..90009149b0d4 100644
--- a/metadata/cache/kde-base/knode-4.7.3
+++ b/metadata/cache/kde-base/knode-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 A newsreader for KDE
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/knotes-4.7.2 b/metadata/cache/kde-base/knotes-4.7.2
deleted file mode 100644
index 9af4167db3d7..000000000000
--- a/metadata/cache/kde-base/knotes-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.2:4[aqua=] >=kde-base/kdepim-common-libs-4.7.2: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.2:4[aqua=]
->=kde-base/kdepimlibs-4.7.2:4[aqua=] >=kde-base/kdepim-common-libs-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] kontact? ( >=kde-base/kontact-4.7.2:4[aqua=] )
-4
-mirror://kde/stable/4.7.2/src/kdepim-4.7.2.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE Notes application
-~amd64 ~x86 ~amd64-linux ~x86-linux
-base 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.3 b/metadata/cache/kde-base/knotes-4.7.3
index 7fa8c48c7786..f455b4bc1d20 100644
--- a/metadata/cache/kde-base/knotes-4.7.3
+++ b/metadata/cache/kde-base/knotes-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/knotify-4.7.2 b/metadata/cache/kde-base/knotify-4.7.2
deleted file mode 100644
index 62404eb2ed64..000000000000
--- a/metadata/cache/kde-base/knotify-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/knotify-4.7.3
index c2fa4720e831..950cea9375d0 100644
--- a/metadata/cache/kde-base/knotify-4.7.3
+++ b/metadata/cache/kde-base/knotify-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kolf-4.7.2 b/metadata/cache/kde-base/kolf-4.7.2
deleted file mode 100644
index 4a6521bee7bd..000000000000
--- a/metadata/cache/kde-base/kolf-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/kolf-4.7.3
index bffc4414087f..34c056a53b95 100644
--- a/metadata/cache/kde-base/kolf-4.7.3
+++ b/metadata/cache/kde-base/kolf-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kollision-4.7.2 b/metadata/cache/kde-base/kollision-4.7.2
deleted file mode 100644
index 1ed4686050dd..000000000000
--- a/metadata/cache/kde-base/kollision-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/kollision-4.7.3
index bcf307e3093f..eb9e7133e9df 100644
--- a/metadata/cache/kde-base/kollision-4.7.3
+++ b/metadata/cache/kde-base/kollision-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kolourpaint-4.7.2 b/metadata/cache/kde-base/kolourpaint-4.7.2
deleted file mode 100644
index 3bdb5d47d883..000000000000
--- a/metadata/cache/kde-base/kolourpaint-4.7.2
+++ /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.2:4[aqua=]
-media-libs/qimageblitz scanner? ( kde-base/ksaneplugin ) >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kolourpaint-4.7.2.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.3 b/metadata/cache/kde-base/kolourpaint-4.7.3
index cf3f5b362009..8482024ce352 100644
--- a/metadata/cache/kde-base/kolourpaint-4.7.3
+++ b/metadata/cache/kde-base/kolourpaint-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kommander-4.7.2 b/metadata/cache/kde-base/kommander-4.7.2
deleted file mode 100644
index 341b1143b7b3..000000000000
--- a/metadata/cache/kde-base/kommander-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdewebdev-4.7.2.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.3 b/metadata/cache/kde-base/kommander-4.7.3
index ed464739a9f8..bf3d67955b47 100644
--- a/metadata/cache/kde-base/kommander-4.7.3
+++ b/metadata/cache/kde-base/kommander-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kompare-4.7.2 b/metadata/cache/kde-base/kompare-4.7.2
deleted file mode 100644
index 1853d8a159b3..000000000000
--- a/metadata/cache/kde-base/kompare-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdesdk-4.7.2.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.3 b/metadata/cache/kde-base/kompare-4.7.3
index 869a5c00a0fa..680d4a456e2a 100644
--- a/metadata/cache/kde-base/kompare-4.7.3
+++ b/metadata/cache/kde-base/kompare-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/konq-plugins-4.7.2 b/metadata/cache/kde-base/konq-plugins-4.7.2
deleted file mode 100644
index d54cddd6acc7..000000000000
--- a/metadata/cache/kde-base/konq-plugins-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkonq-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/libkonq-4.7.2:4[aqua=] tidy? ( app-text/htmltidy ) !kde-misc/konq-plugins >=kde-base/kcmshell-4.7.2:4[aqua=] >=kde-base/konqueror-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-baseapps-4.7.2.tar.bz2
-
-http://kde.org/
-GPL-2
-Various plugins for konqueror
-~amd64 ~arm ~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.3 b/metadata/cache/kde-base/konq-plugins-4.7.3
index 7ab444daa88a..5a2ffafdc12c 100644
--- a/metadata/cache/kde-base/konq-plugins-4.7.3
+++ b/metadata/cache/kde-base/konq-plugins-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/konqueror-4.7.2 b/metadata/cache/kde-base/konqueror-4.7.2
deleted file mode 100644
index afbe3ee9e06d..000000000000
--- a/metadata/cache/kde-base/konqueror-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkonq-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/libkonq-4.7.2:4[aqua=] >=kde-base/kfind-4.7.2:4[aqua=] >=kde-base/kfmclient-4.7.2:4[aqua=] bookmarks? ( >=kde-base/keditbookmarks-4.7.2:4[aqua=] ) svg? ( >=kde-base/svgpart-4.7.2:4[aqua=] ) >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-baseapps-4.7.2.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.3 b/metadata/cache/kde-base/konqueror-4.7.3
index 8eb89f28cc81..7d2e5bcdce1c 100644
--- a/metadata/cache/kde-base/konqueror-4.7.3
+++ b/metadata/cache/kde-base/konqueror-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 KDE: Web browser, file manager, ...
-~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+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
 
diff --git a/metadata/cache/kde-base/konquest-4.7.2 b/metadata/cache/kde-base/konquest-4.7.2
deleted file mode 100644
index 272ecc8128ed..000000000000
--- a/metadata/cache/kde-base/konquest-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/konquest-4.7.3
index d20f20220b5c..61938865ad8d 100644
--- a/metadata/cache/kde-base/konquest-4.7.3
+++ b/metadata/cache/kde-base/konquest-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/konsole-4.7.2 b/metadata/cache/kde-base/konsole-4.7.2
deleted file mode 100644
index cbdb9a541079..000000000000
--- a/metadata/cache/kde-base/konsole-4.7.2
+++ /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.2: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.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/konsole-4.7.2.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.3 b/metadata/cache/kde-base/konsole-4.7.3
index 36952d973a87..04e61acfbb57 100644
--- a/metadata/cache/kde-base/konsole-4.7.3
+++ b/metadata/cache/kde-base/konsole-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/konsolekalendar-4.7.2 b/metadata/cache/kde-base/konsolekalendar-4.7.2
deleted file mode 100644
index df500c68d954..000000000000
--- a/metadata/cache/kde-base/konsolekalendar-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.2:4[aqua=] >=kde-base/kdepim-common-libs-4.7.2: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.2:4[aqua=]
->=kde-base/kdepimlibs-4.7.2:4[aqua=] >=kde-base/kdepim-common-libs-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdepim-4.7.2.tar.bz2
-
-http://www.kde.org/
-GPL-2
-A command line interface to KDE calendars
-~amd64 ~x86 ~amd64-linux ~x86-linux
-base 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.3 b/metadata/cache/kde-base/konsolekalendar-4.7.3
index a5e16265ec94..472e8b6166f7 100644
--- a/metadata/cache/kde-base/konsolekalendar-4.7.3
+++ b/metadata/cache/kde-base/konsolekalendar-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kontact-4.7.2 b/metadata/cache/kde-base/kontact-4.7.2
deleted file mode 100644
index b465044a1d80..000000000000
--- a/metadata/cache/kde-base/kontact-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.2:4[aqua=] >=kde-base/kdepim-common-libs-4.7.2: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.2:4[aqua=]
->=kde-base/kdepimlibs-4.7.2:4[aqua=] >=kde-base/kdepim-common-libs-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdepim-4.7.2.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KDE personal information manager
-~amd64 ~x86 ~amd64-linux ~x86-linux
-base 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.3 b/metadata/cache/kde-base/kontact-4.7.3
index f94e79d95859..6fa2b7c2d4dd 100644
--- a/metadata/cache/kde-base/kontact-4.7.3
+++ b/metadata/cache/kde-base/kontact-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kopete-4.7.2 b/metadata/cache/kde-base/kopete-4.7.2
deleted file mode 100644
index efaf8e323616..000000000000
--- a/metadata/cache/kde-base/kopete-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/libpcre >=kde-base/kdepimlibs-4.7.2: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.2:4[aqua=]
-dev-libs/libpcre >=kde-base/kdepimlibs-4.7.2: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.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdenetwork-4.7.2.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.3 b/metadata/cache/kde-base/kopete-4.7.3
index 13861c02ca08..48fb268cb907 100644
--- a/metadata/cache/kde-base/kopete-4.7.3
+++ b/metadata/cache/kde-base/kopete-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 KDE multi-protocol IM client
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/korganizer-4.7.2 b/metadata/cache/kde-base/korganizer-4.7.2
deleted file mode 100644
index 3daccc833bd7..000000000000
--- a/metadata/cache/kde-base/korganizer-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.2:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.7.2: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.2:4[aqua=]
->=kde-base/kdepimlibs-4.7.2:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.7.2:4[aqua=] sys-libs/zlib >=kde-base/ktimezoned-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] kontact? ( >=kde-base/kontact-4.7.2:4[aqua=] )
-4
-mirror://kde/stable/4.7.2/src/kdepim-4.7.2.tar.bz2
-
-http://www.kde.org/
-GPL-2
-A Personal Organizer for KDE
-~amd64 ~x86 ~amd64-linux ~x86-linux
-base 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.3 b/metadata/cache/kde-base/korganizer-4.7.3
index 5705e50f02af..80d3a45f7e95 100644
--- a/metadata/cache/kde-base/korganizer-4.7.3
+++ b/metadata/cache/kde-base/korganizer-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 A Personal Organizer for KDE
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/korundum-4.7.2 b/metadata/cache/kde-base/korundum-4.7.2
deleted file mode 100644
index 24d7a55668fb..000000000000
--- a/metadata/cache/kde-base/korundum-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/qtruby-4.7.2:4[aqua=] >=kde-base/smokekde-4.7.2:4[aqua=,akonadi?,kate?,okular?,semantic-desktop=] >=kde-base/smokeqt-4.7.2: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.2:4[aqua=] ruby_targets_ruby18? ( dev-lang/ruby:1.8 )
->=kde-base/qtruby-4.7.2:4[aqua=] >=kde-base/smokekde-4.7.2:4[aqua=,akonadi?,kate?,okular?,semantic-desktop=] >=kde-base/smokeqt-4.7.2:4[aqua=] !kde-base/kdebindings-ruby:4 >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] ruby_targets_ruby18? ( dev-lang/ruby:1.8 )
-4
-mirror://kde/stable/4.7.2/src/korundum-4.7.2.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 semantic-desktop 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.3 b/metadata/cache/kde-base/korundum-4.7.3
index 7e8d63c9d398..5f67c0f728c9 100644
--- a/metadata/cache/kde-base/korundum-4.7.3
+++ b/metadata/cache/kde-base/korundum-4.7.3
@@ -6,7 +6,7 @@ mirror://kde/stable/4.7.3/src/korundum-4.7.3.tar.bz2
 http://www.kde.org/
 GPL-2
 KDE Ruby bindings
-~amd64 ~x86
+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 semantic-desktop aqua kdeenablefinal elibc_FreeBSD ruby_targets_ruby18
 || ( ruby_targets_ruby18 )
diff --git a/metadata/cache/kde-base/kpasswdserver-4.7.2 b/metadata/cache/kde-base/kpasswdserver-4.7.2
deleted file mode 100644
index 89fb2c42ce5b..000000000000
--- a/metadata/cache/kde-base/kpasswdserver-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.tar.bz2
-
-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.3 b/metadata/cache/kde-base/kpasswdserver-4.7.3
index cc053d98b405..4c10d87f1ce6 100644
--- a/metadata/cache/kde-base/kpasswdserver-4.7.3
+++ b/metadata/cache/kde-base/kpasswdserver-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 KDED Password Module
-~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+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
 
diff --git a/metadata/cache/kde-base/kpat-4.7.2 b/metadata/cache/kde-base/kpat-4.7.2
deleted file mode 100644
index ab05e8bb0636..000000000000
--- a/metadata/cache/kde-base/kpat-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/kpat-4.7.3
index a974f771cf37..6a0b7d6bedd4 100644
--- a/metadata/cache/kde-base/kpat-4.7.3
+++ b/metadata/cache/kde-base/kpat-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kppp-4.7.2 b/metadata/cache/kde-base/kppp-4.7.2
deleted file mode 100644
index 232e4221c2ed..000000000000
--- a/metadata/cache/kde-base/kppp-4.7.2
+++ /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.2:4[aqua=]
-net-dialup/ppp >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdenetwork-4.7.2.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.3 b/metadata/cache/kde-base/kppp-4.7.3
index 0aba9d69b487..c21dde2c1b46 100644
--- a/metadata/cache/kde-base/kppp-4.7.3
+++ b/metadata/cache/kde-base/kppp-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kquitapp-4.7.2 b/metadata/cache/kde-base/kquitapp-4.7.2
deleted file mode 100644
index bd3155c183ac..000000000000
--- a/metadata/cache/kde-base/kquitapp-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/kquitapp-4.7.3
index ddb9148eda93..896b7722c25f 100644
--- a/metadata/cache/kde-base/kquitapp-4.7.3
+++ b/metadata/cache/kde-base/kquitapp-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/krdc-4.7.2 b/metadata/cache/kde-base/krdc-4.7.2
deleted file mode 100644
index 00a1592a2729..000000000000
--- a/metadata/cache/kde-base/krdc-4.7.2
+++ /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.2: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.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdenetwork-4.7.2.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.3 b/metadata/cache/kde-base/krdc-4.7.3
index e9c20d0ae37e..a573518b2f81 100644
--- a/metadata/cache/kde-base/krdc-4.7.3
+++ b/metadata/cache/kde-base/krdc-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kreadconfig-4.7.2 b/metadata/cache/kde-base/kreadconfig-4.7.2
deleted file mode 100644
index 74eefa1d7a08..000000000000
--- a/metadata/cache/kde-base/kreadconfig-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/kreadconfig-4.7.3
index 7268fd7de9dc..511137fa03b3 100644
--- a/metadata/cache/kde-base/kreadconfig-4.7.3
+++ b/metadata/cache/kde-base/kreadconfig-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kremotecontrol-4.7.2 b/metadata/cache/kde-base/kremotecontrol-4.7.2
deleted file mode 100644
index 80e4ecfd54ac..000000000000
--- a/metadata/cache/kde-base/kremotecontrol-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkworkspace-4.7.2:4[aqua=] >=kde-base/solid-4.7.2: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.2:4[aqua=]
->=kde-base/libkworkspace-4.7.2:4[aqua=] >=kde-base/solid-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeutils-4.7.2.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.3 b/metadata/cache/kde-base/kremotecontrol-4.7.3
index e50c3a9c40b1..ee9ae5294c99 100644
--- a/metadata/cache/kde-base/kremotecontrol-4.7.3
+++ b/metadata/cache/kde-base/kremotecontrol-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kreversi-4.7.2 b/metadata/cache/kde-base/kreversi-4.7.2
deleted file mode 100644
index a9cd14858f09..000000000000
--- a/metadata/cache/kde-base/kreversi-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/kreversi-4.7.3
index 484f2b2e3038..9391b7355d89 100644
--- a/metadata/cache/kde-base/kreversi-4.7.3
+++ b/metadata/cache/kde-base/kreversi-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/krfb-4.7.2 b/metadata/cache/kde-base/krfb-4.7.2
deleted file mode 100644
index 3381999047e9..000000000000
--- a/metadata/cache/kde-base/krfb-4.7.2
+++ /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.2:4[aqua=]
-sys-libs/zlib virtual/jpeg !aqua? ( x11-libs/libXdamage ) >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdenetwork-4.7.2.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.3 b/metadata/cache/kde-base/krfb-4.7.3
index 705f6e13318d..75f62a9c5c5e 100644
--- a/metadata/cache/kde-base/krfb-4.7.3
+++ b/metadata/cache/kde-base/krfb-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/krossjava-4.7.2 b/metadata/cache/kde-base/krossjava-4.7.2
deleted file mode 100644
index c8c61e5de804..000000000000
--- a/metadata/cache/kde-base/krossjava-4.7.2
+++ /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.2:4[aqua=]
->=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kross-interpreters-4.7.2.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.3 b/metadata/cache/kde-base/krossjava-4.7.3
index aeb84b562d32..a77052b77629 100644
--- a/metadata/cache/kde-base/krossjava-4.7.3
+++ b/metadata/cache/kde-base/krossjava-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 Java plugin for the kdelibs/kross scripting framework.
-~amd64 ~ppc ~x86
+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
 
diff --git a/metadata/cache/kde-base/krosspython-4.7.2-r1 b/metadata/cache/kde-base/krosspython-4.7.2-r1
deleted file mode 100644
index d6c943debee6..000000000000
--- a/metadata/cache/kde-base/krosspython-4.7.2-r1
+++ /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.2:4[aqua=]
->=app-admin/eselect-python-20091230 =dev-lang/python-2* >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kross-interpreters-4.7.2.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.3 b/metadata/cache/kde-base/krosspython-4.7.3
index 4a799452cf51..d174aec9c96a 100644
--- a/metadata/cache/kde-base/krosspython-4.7.3
+++ b/metadata/cache/kde-base/krosspython-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 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
 
diff --git a/metadata/cache/kde-base/krossruby-4.7.2 b/metadata/cache/kde-base/krossruby-4.7.2
deleted file mode 100644
index 74fe2d51d447..000000000000
--- a/metadata/cache/kde-base/krossruby-4.7.2
+++ /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.2:4[aqua=] ruby_targets_ruby18? ( dev-lang/ruby:1.8 )
-!kde-base/kdebindings-ruby:4 >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] ruby_targets_ruby18? ( dev-lang/ruby:1.8 )
-4
-mirror://kde/stable/4.7.2/src/kross-interpreters-4.7.2.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.3 b/metadata/cache/kde-base/krossruby-4.7.3
index 2f888a7b964b..18ea5f58b963 100644
--- a/metadata/cache/kde-base/krossruby-4.7.3
+++ b/metadata/cache/kde-base/krossruby-4.7.3
@@ -6,7 +6,7 @@ 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
+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 )
diff --git a/metadata/cache/kde-base/kruler-4.7.2 b/metadata/cache/kde-base/kruler-4.7.2
deleted file mode 100644
index 7202060fd0e2..000000000000
--- a/metadata/cache/kde-base/kruler-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kruler-4.7.2.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.3 b/metadata/cache/kde-base/kruler-4.7.3
index 16b595f52934..844fe1b0712e 100644
--- a/metadata/cache/kde-base/kruler-4.7.3
+++ b/metadata/cache/kde-base/kruler-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/krunner-4.7.2 b/metadata/cache/kde-base/krunner-4.7.2
deleted file mode 100644
index 50cdbbb7205a..000000000000
--- a/metadata/cache/kde-base/krunner-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kcheckpass-4.7.2:4[aqua=] >=kde-base/kephal-4.7.2:4[aqua=] >=kde-base/ksmserver-4.7.2:4[aqua=] >=kde-base/ksysguard-4.7.2:4[aqua=] >=kde-base/libkworkspace-4.7.2:4[aqua=] >=kde-base/libplasmagenericshell-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/kcheckpass-4.7.2:4[aqua=] >=kde-base/kephal-4.7.2:4[aqua=] >=kde-base/ksmserver-4.7.2:4[aqua=] >=kde-base/ksysguard-4.7.2:4[aqua=] >=kde-base/libkworkspace-4.7.2:4[aqua=] >=kde-base/libplasmagenericshell-4.7.2:4[aqua=] !aqua? ( x11-libs/libXcursor x11-libs/libXScrnSaver ) >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3 b/metadata/cache/kde-base/krunner-4.7.3
index 13f4ab2b46a4..c4cc74ae8f9b 100644
--- a/metadata/cache/kde-base/krunner-4.7.3
+++ b/metadata/cache/kde-base/krunner-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/ksaneplugin-4.7.2 b/metadata/cache/kde-base/ksaneplugin-4.7.2
deleted file mode 100644
index f2c1b786d138..000000000000
--- a/metadata/cache/kde-base/ksaneplugin-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libksane-4.7.2: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.2:4[aqua=]
->=kde-base/libksane-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/ksaneplugin-4.7.2.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.3 b/metadata/cache/kde-base/ksaneplugin-4.7.3
index 729268b932d6..278608a69e88 100644
--- a/metadata/cache/kde-base/ksaneplugin-4.7.3
+++ b/metadata/cache/kde-base/ksaneplugin-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kscd-4.7.2 b/metadata/cache/kde-base/kscd-4.7.2
deleted file mode 100644
index d455d40781e9..000000000000
--- a/metadata/cache/kde-base/kscd-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkcddb-4.7.2:4[aqua=] >=kde-base/libkcompactdisc-4.7.2: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.2:4[aqua=]
->=kde-base/libkcddb-4.7.2:4[aqua=] >=kde-base/libkcompactdisc-4.7.2:4[aqua=] media-libs/musicbrainz:3 >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdemultimedia-4.7.2.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.3 b/metadata/cache/kde-base/kscd-4.7.3
index 1f8cd8b56853..4a190d0b63f0 100644
--- a/metadata/cache/kde-base/kscd-4.7.3
+++ b/metadata/cache/kde-base/kscd-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 KDE CD player
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kscreensaver-4.7.2 b/metadata/cache/kde-base/kscreensaver-4.7.2
deleted file mode 100644
index 417053a51784..000000000000
--- a/metadata/cache/kde-base/kscreensaver-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/glib:2 >=kde-base/kcheckpass-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-dev-libs/glib:2 >=kde-base/kcheckpass-4.7.2: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.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3 b/metadata/cache/kde-base/kscreensaver-4.7.3
index 4ee168b2f29d..60d68753bfda 100644
--- a/metadata/cache/kde-base/kscreensaver-4.7.3
+++ b/metadata/cache/kde-base/kscreensaver-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kshisen-4.7.2 b/metadata/cache/kde-base/kshisen-4.7.2
deleted file mode 100644
index 7fbe2cf149d5..000000000000
--- a/metadata/cache/kde-base/kshisen-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkmahjongg-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/libkmahjongg-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/kshisen-4.7.3
index 196a4a196419..da65afca06ab 100644
--- a/metadata/cache/kde-base/kshisen-4.7.3
+++ b/metadata/cache/kde-base/kshisen-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/ksirk-4.7.2 b/metadata/cache/kde-base/ksirk-4.7.2
deleted file mode 100644
index 270287eca92d..000000000000
--- a/metadata/cache/kde-base/ksirk-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-app-crypt/qca:2 >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/ksirk-4.7.3
index 3c8b421d6f47..019316b96a95 100644
--- a/metadata/cache/kde-base/ksirk-4.7.3
+++ b/metadata/cache/kde-base/ksirk-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/ksmserver-4.7.2 b/metadata/cache/kde-base/ksmserver-4.7.2
deleted file mode 100644
index 5fc731714c2c..000000000000
--- a/metadata/cache/kde-base/ksmserver-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kcminit-4.7.2:4[aqua=] >=kde-base/libkworkspace-4.7.2:4[aqua=] >=kde-base/solid-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/kcminit-4.7.2:4[aqua=] >=kde-base/libkworkspace-4.7.2:4[aqua=] >=kde-base/solid-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3 b/metadata/cache/kde-base/ksmserver-4.7.3
index bae6c87152d1..3607bfad93f5 100644
--- a/metadata/cache/kde-base/ksmserver-4.7.3
+++ b/metadata/cache/kde-base/ksmserver-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/ksnapshot-4.7.2 b/metadata/cache/kde-base/ksnapshot-4.7.2
deleted file mode 100644
index f405326566cd..000000000000
--- a/metadata/cache/kde-base/ksnapshot-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-kipi? ( >=kde-base/libkipi-4.7.2: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.2:4[aqua=]
-kipi? ( >=kde-base/libkipi-4.7.2:4[aqua=] ) >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/ksnapshot-4.7.2.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.3 b/metadata/cache/kde-base/ksnapshot-4.7.3
index 9dffbf7d7bcf..872cea1daa7d 100644
--- a/metadata/cache/kde-base/ksnapshot-4.7.3
+++ b/metadata/cache/kde-base/ksnapshot-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kspaceduel-4.7.2 b/metadata/cache/kde-base/kspaceduel-4.7.2
deleted file mode 100644
index abe865199b87..000000000000
--- a/metadata/cache/kde-base/kspaceduel-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/kspaceduel-4.7.3
index b7b966aa4ab3..3852cb38c04c 100644
--- a/metadata/cache/kde-base/kspaceduel-4.7.3
+++ b/metadata/cache/kde-base/kspaceduel-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/ksplash-4.7.2 b/metadata/cache/kde-base/ksplash-4.7.2
deleted file mode 100644
index 0bb89dbe579c..000000000000
--- a/metadata/cache/kde-base/ksplash-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-media-libs/libpng xinerama? ( x11-libs/libXinerama ) >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3 b/metadata/cache/kde-base/ksplash-4.7.3
index f4875d996b1c..dab07db63422 100644
--- a/metadata/cache/kde-base/ksplash-4.7.3
+++ b/metadata/cache/kde-base/ksplash-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/ksquares-4.7.2 b/metadata/cache/kde-base/ksquares-4.7.2
deleted file mode 100644
index 54c5d1d6a408..000000000000
--- a/metadata/cache/kde-base/ksquares-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/ksquares-4.7.3
index 1bae7716a5bc..76f1a69b2e1c 100644
--- a/metadata/cache/kde-base/ksquares-4.7.3
+++ b/metadata/cache/kde-base/ksquares-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kstars-4.7.2 b/metadata/cache/kde-base/kstars-4.7.2
deleted file mode 100644
index 569dbdbd2131..000000000000
--- a/metadata/cache/kde-base/kstars-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-cpp/eigen:2 >=kde-base/libkdeedu-4.7.2: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.2:4[aqua=]
-dev-cpp/eigen:2 >=kde-base/libkdeedu-4.7.2:4[aqua=] fits? ( >=sci-libs/cfitsio-0.390 ) indi? ( >=sci-libs/indilib-0.6.2[fits?] ) >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kstars-4.7.2.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.3 b/metadata/cache/kde-base/kstars-4.7.3
index 0d3f7ba4464a..8e0a6ec6ae45 100644
--- a/metadata/cache/kde-base/kstars-4.7.3
+++ b/metadata/cache/kde-base/kstars-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kstart-4.7.2 b/metadata/cache/kde-base/kstart-4.7.2
deleted file mode 100644
index 948a9ce4144b..000000000000
--- a/metadata/cache/kde-base/kstart-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/kstart-4.7.3
index 296603c3dffc..8d70f95b1b93 100644
--- a/metadata/cache/kde-base/kstart-4.7.3
+++ b/metadata/cache/kde-base/kstart-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kstartperf-4.7.2 b/metadata/cache/kde-base/kstartperf-4.7.2
deleted file mode 100644
index cb3a727c12bd..000000000000
--- a/metadata/cache/kde-base/kstartperf-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdesdk-4.7.2.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.3 b/metadata/cache/kde-base/kstartperf-4.7.3
index 9d3b72773d5c..bbc17037d2be 100644
--- a/metadata/cache/kde-base/kstartperf-4.7.3
+++ b/metadata/cache/kde-base/kstartperf-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kstartupconfig-4.7.2 b/metadata/cache/kde-base/kstartupconfig-4.7.2
deleted file mode 100644
index fd4b017e46c8..000000000000
--- a/metadata/cache/kde-base/kstartupconfig-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3 b/metadata/cache/kde-base/kstartupconfig-4.7.3
index 815513d44d8f..63d6c80e982c 100644
--- a/metadata/cache/kde-base/kstartupconfig-4.7.3
+++ b/metadata/cache/kde-base/kstartupconfig-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kstyles-4.7.2 b/metadata/cache/kde-base/kstyles-4.7.2
deleted file mode 100644
index 364420ac38e3..000000000000
--- a/metadata/cache/kde-base/kstyles-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/liboxygenstyle-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/liboxygenstyle-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3 b/metadata/cache/kde-base/kstyles-4.7.3
index c7053adce9aa..931c35a2ba77 100644
--- a/metadata/cache/kde-base/kstyles-4.7.3
+++ b/metadata/cache/kde-base/kstyles-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/ksudoku-4.7.2 b/metadata/cache/kde-base/ksudoku-4.7.2
deleted file mode 100644
index 4dee04a3be19..000000000000
--- a/metadata/cache/kde-base/ksudoku-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/ksudoku-4.7.3
index d679bab9672a..fcfb89d99b1e 100644
--- a/metadata/cache/kde-base/ksudoku-4.7.3
+++ b/metadata/cache/kde-base/ksudoku-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/ksysguard-4.7.2 b/metadata/cache/kde-base/ksysguard-4.7.2
deleted file mode 100644
index bac36859c0e2..000000000000
--- a/metadata/cache/kde-base/ksysguard-4.7.2
+++ /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.2: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.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.tar.bz2
-
-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.3 b/metadata/cache/kde-base/ksysguard-4.7.3
index 702574712cf1..4ba4875862b5 100644
--- a/metadata/cache/kde-base/ksysguard-4.7.3
+++ b/metadata/cache/kde-base/ksysguard-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/ksystemlog-4.7.2 b/metadata/cache/kde-base/ksystemlog-4.7.2
deleted file mode 100644
index a19edaecef88..000000000000
--- a/metadata/cache/kde-base/ksystemlog-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeadmin-4.7.2.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.3 b/metadata/cache/kde-base/ksystemlog-4.7.3
index 8d98824dee4e..d4660d41b07d 100644
--- a/metadata/cache/kde-base/ksystemlog-4.7.3
+++ b/metadata/cache/kde-base/ksystemlog-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 KDE system log viewer
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/ksystraycmd-4.7.2 b/metadata/cache/kde-base/ksystraycmd-4.7.2
deleted file mode 100644
index 032b6c78240f..000000000000
--- a/metadata/cache/kde-base/ksystraycmd-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3 b/metadata/cache/kde-base/ksystraycmd-4.7.3
index 12d21798e625..524877155322 100644
--- a/metadata/cache/kde-base/ksystraycmd-4.7.3
+++ b/metadata/cache/kde-base/ksystraycmd-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kteatime-4.7.2 b/metadata/cache/kde-base/kteatime-4.7.2
deleted file mode 100644
index 13746da195b0..000000000000
--- a/metadata/cache/kde-base/kteatime-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdetoys-4.7.2.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.3 b/metadata/cache/kde-base/kteatime-4.7.3
index 0b9d58a8337c..b8fb6e85c477 100644
--- a/metadata/cache/kde-base/kteatime-4.7.3
+++ b/metadata/cache/kde-base/kteatime-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/ktimer-4.7.2 b/metadata/cache/kde-base/ktimer-4.7.2
deleted file mode 100644
index c24cdb010cea..000000000000
--- a/metadata/cache/kde-base/ktimer-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeutils-4.7.2.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.3 b/metadata/cache/kde-base/ktimer-4.7.3
index b77e51946ffb..0578d0ffbf44 100644
--- a/metadata/cache/kde-base/ktimer-4.7.3
+++ b/metadata/cache/kde-base/ktimer-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/ktimetracker-4.7.2 b/metadata/cache/kde-base/ktimetracker-4.7.2
deleted file mode 100644
index 89614d670cae..000000000000
--- a/metadata/cache/kde-base/ktimetracker-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepim-kresources-4.7.2:4[aqua=] >=kde-base/kdepimlibs-4.7.2:4[aqua=] >=kde-base/kdepim-common-libs-4.7.2: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.2:4[aqua=]
->=kde-base/kdepim-kresources-4.7.2:4[aqua=] >=kde-base/kdepimlibs-4.7.2:4[aqua=] >=kde-base/kdepim-common-libs-4.7.2:4[aqua=] x11-libs/libXScrnSaver >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] kontact? ( >=kde-base/kontact-4.7.2:4[aqua=] )
-4
-mirror://kde/stable/4.7.2/src/kdepim-4.7.2.tar.bz2
-
-http://www.kde.org/
-GPL-2
-KTimeTracker tracks time spent on various tasks.
-~amd64 ~x86 ~amd64-linux ~x86-linux
-base 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.3 b/metadata/cache/kde-base/ktimetracker-4.7.3
index 04ebcde6f087..e6678fe5ce45 100644
--- a/metadata/cache/kde-base/ktimetracker-4.7.3
+++ b/metadata/cache/kde-base/ktimetracker-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/ktimezoned-4.7.2 b/metadata/cache/kde-base/ktimezoned-4.7.2
deleted file mode 100644
index b0c20f5f2bfe..000000000000
--- a/metadata/cache/kde-base/ktimezoned-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/ktimezoned-4.7.3
index 06583169c52d..49ea8c9ce69b 100644
--- a/metadata/cache/kde-base/ktimezoned-4.7.3
+++ b/metadata/cache/kde-base/ktimezoned-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/ktouch-4.7.2 b/metadata/cache/kde-base/ktouch-4.7.2
deleted file mode 100644
index 3f4cea698c59..000000000000
--- a/metadata/cache/kde-base/ktouch-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/knotify-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/ktouch-4.7.2.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.3 b/metadata/cache/kde-base/ktouch-4.7.3
index 37f47fecb12b..8fce51d22756 100644
--- a/metadata/cache/kde-base/ktouch-4.7.3
+++ b/metadata/cache/kde-base/ktouch-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/ktraderclient-4.7.2 b/metadata/cache/kde-base/ktraderclient-4.7.2
deleted file mode 100644
index 1343b664e5f9..000000000000
--- a/metadata/cache/kde-base/ktraderclient-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/ktraderclient-4.7.3
index 64a3fb859d52..b5d579b4fa93 100644
--- a/metadata/cache/kde-base/ktraderclient-4.7.3
+++ b/metadata/cache/kde-base/ktraderclient-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/ktron-4.7.2 b/metadata/cache/kde-base/ktron-4.7.2
deleted file mode 100644
index 9ba7e69ae628..000000000000
--- a/metadata/cache/kde-base/ktron-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/ktron-4.7.3
index 239e94a0d79d..49f8ec1ecb90 100644
--- a/metadata/cache/kde-base/ktron-4.7.3
+++ b/metadata/cache/kde-base/ktron-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/ktuberling-4.7.2 b/metadata/cache/kde-base/ktuberling-4.7.2
deleted file mode 100644
index 053add970231..000000000000
--- a/metadata/cache/kde-base/ktuberling-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/ktuberling-4.7.3
index b73546c58323..cd393c79987a 100644
--- a/metadata/cache/kde-base/ktuberling-4.7.3
+++ b/metadata/cache/kde-base/ktuberling-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kturtle-4.7.2 b/metadata/cache/kde-base/kturtle-4.7.2
deleted file mode 100644
index 2ed210b1ac04..000000000000
--- a/metadata/cache/kde-base/kturtle-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/knotify-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kturtle-4.7.2.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.3 b/metadata/cache/kde-base/kturtle-4.7.3
index 91d75faadad8..82f65c92e82e 100644
--- a/metadata/cache/kde-base/kturtle-4.7.3
+++ b/metadata/cache/kde-base/kturtle-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/ktux-4.7.2 b/metadata/cache/kde-base/ktux-4.7.2
deleted file mode 100644
index 270ed89508b9..000000000000
--- a/metadata/cache/kde-base/ktux-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kscreensaver-4.7.2:4[aqua=] >=kde-base/libkworkspace-4.7.2: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.2:4[aqua=]
->=kde-base/kscreensaver-4.7.2:4[aqua=] >=kde-base/libkworkspace-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdetoys-4.7.2.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.3 b/metadata/cache/kde-base/ktux-4.7.3
index 194d1039bed9..f4e0d87ad947 100644
--- a/metadata/cache/kde-base/ktux-4.7.3
+++ b/metadata/cache/kde-base/ktux-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kubrick-4.7.2 b/metadata/cache/kde-base/kubrick-4.7.2
deleted file mode 100644
index 9dd4b9e0ca01..000000000000
--- a/metadata/cache/kde-base/kubrick-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/kubrick-4.7.3
index 442ee1a5599d..218f4df5d0b5 100644
--- a/metadata/cache/kde-base/kubrick-4.7.3
+++ b/metadata/cache/kde-base/kubrick-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kuiserver-4.7.2 b/metadata/cache/kde-base/kuiserver-4.7.2
deleted file mode 100644
index 17000591cbf1..000000000000
--- a/metadata/cache/kde-base/kuiserver-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/kuiserver-4.7.3
index 2485f9865f0d..9f35f0aeaebd 100644
--- a/metadata/cache/kde-base/kuiserver-4.7.3
+++ b/metadata/cache/kde-base/kuiserver-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kuiviewer-4.7.2 b/metadata/cache/kde-base/kuiviewer-4.7.2
deleted file mode 100644
index 9ac2d651af08..000000000000
--- a/metadata/cache/kde-base/kuiviewer-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdesdk-4.7.2.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.3 b/metadata/cache/kde-base/kuiviewer-4.7.3
index 2377fecaecdc..9bdcab81f046 100644
--- a/metadata/cache/kde-base/kuiviewer-4.7.3
+++ b/metadata/cache/kde-base/kuiviewer-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kurifilter-plugins-4.7.2 b/metadata/cache/kde-base/kurifilter-plugins-4.7.2
deleted file mode 100644
index bd8b4d9678ce..000000000000
--- a/metadata/cache/kde-base/kurifilter-plugins-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/kurifilter-plugins-4.7.3
index 953d5914f49a..e03a490e33a5 100644
--- a/metadata/cache/kde-base/kurifilter-plugins-4.7.3
+++ b/metadata/cache/kde-base/kurifilter-plugins-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 KDE: Plugins to manage filtering URIs.
-~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+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
 
diff --git a/metadata/cache/kde-base/kuser-4.7.2 b/metadata/cache/kde-base/kuser-4.7.2
deleted file mode 100644
index f63467ce994b..000000000000
--- a/metadata/cache/kde-base/kuser-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdepimlibs-4.7.2: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.2:4[aqua=]
->=kde-base/kdepimlibs-4.7.2:4[aqua=] >=kde-base/knotify-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeadmin-4.7.2.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.3 b/metadata/cache/kde-base/kuser-4.7.3
index 11d0a3083a25..becd335db1a6 100644
--- a/metadata/cache/kde-base/kuser-4.7.3
+++ b/metadata/cache/kde-base/kuser-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/kwallet-4.7.2 b/metadata/cache/kde-base/kwallet-4.7.2
deleted file mode 100644
index 90e78f1331b6..000000000000
--- a/metadata/cache/kde-base/kwallet-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeutils-4.7.2.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.3 b/metadata/cache/kde-base/kwallet-4.7.3
index 9335135957eb..45335308acc9 100644
--- a/metadata/cache/kde-base/kwallet-4.7.3
+++ b/metadata/cache/kde-base/kwallet-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kwalletd-4.7.2 b/metadata/cache/kde-base/kwalletd-4.7.2
deleted file mode 100644
index 4530790d9585..000000000000
--- a/metadata/cache/kde-base/kwalletd-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/kwalletd-4.7.3
index 4fd55acf5e3b..d0fe9984a6f0 100644
--- a/metadata/cache/kde-base/kwalletd-4.7.3
+++ b/metadata/cache/kde-base/kwalletd-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kwin-4.7.2 b/metadata/cache/kde-base/kwin-4.7.2
deleted file mode 100644
index 2cd73241a8e7..000000000000
--- a/metadata/cache/kde-base/kwin-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kephal-4.7.2:4[aqua=] >=kde-base/libkworkspace-4.7.2:4[aqua=] >=kde-base/liboxygenstyle-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/kephal-4.7.2:4[aqua=] >=kde-base/libkworkspace-4.7.2:4[aqua=] >=kde-base/liboxygenstyle-4.7.2: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.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3 b/metadata/cache/kde-base/kwin-4.7.3
index 7e72ae42536e..b0e539970174 100644
--- a/metadata/cache/kde-base/kwin-4.7.3
+++ b/metadata/cache/kde-base/kwin-4.7.3
@@ -6,7 +6,7 @@ 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
+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 )
diff --git a/metadata/cache/kde-base/kwordquiz-4.7.2 b/metadata/cache/kde-base/kwordquiz-4.7.2
deleted file mode 100644
index c06e717d5bbc..000000000000
--- a/metadata/cache/kde-base/kwordquiz-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkdeedu-4.7.2: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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kwordquiz-4.7.2.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.3 b/metadata/cache/kde-base/kwordquiz-4.7.3
index 717ee0969b96..f1494fbcff3b 100644
--- a/metadata/cache/kde-base/kwordquiz-4.7.3
+++ b/metadata/cache/kde-base/kwordquiz-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kwrite-4.7.2 b/metadata/cache/kde-base/kwrite-4.7.2
deleted file mode 100644
index 002b4f2c3cf1..000000000000
--- a/metadata/cache/kde-base/kwrite-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/katepart-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kate-4.7.2.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.3 b/metadata/cache/kde-base/kwrite-4.7.3
index 053edec8e3cc..36286b22b031 100644
--- a/metadata/cache/kde-base/kwrite-4.7.3
+++ b/metadata/cache/kde-base/kwrite-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/kwrited-4.7.2 b/metadata/cache/kde-base/kwrited-4.7.2
deleted file mode 100644
index 77320573c6a7..000000000000
--- a/metadata/cache/kde-base/kwrited-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=sys-libs/libutempter-1.1.5 >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3 b/metadata/cache/kde-base/kwrited-4.7.3
index bded40ddfc53..2bfd027c9fd7 100644
--- a/metadata/cache/kde-base/kwrited-4.7.3
+++ b/metadata/cache/kde-base/kwrited-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/libkcddb-4.7.2 b/metadata/cache/kde-base/libkcddb-4.7.2
deleted file mode 100644
index 92ab871e1703..000000000000
--- a/metadata/cache/kde-base/libkcddb-4.7.2
+++ /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.2:4[aqua=]
-musicbrainz? ( media-libs/musicbrainz:3 ) >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdemultimedia-4.7.2.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.3 b/metadata/cache/kde-base/libkcddb-4.7.3
index fed8aa8b6d1d..a27068bd6bab 100644
--- a/metadata/cache/kde-base/libkcddb-4.7.3
+++ b/metadata/cache/kde-base/libkcddb-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 KDE library for CDDB
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/libkcompactdisc-4.7.2 b/metadata/cache/kde-base/libkcompactdisc-4.7.2
deleted file mode 100644
index 9c214144fc50..000000000000
--- a/metadata/cache/kde-base/libkcompactdisc-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdemultimedia-4.7.2.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.3 b/metadata/cache/kde-base/libkcompactdisc-4.7.3
index 0fafbe2f18a2..3003b7f0610f 100644
--- a/metadata/cache/kde-base/libkcompactdisc-4.7.3
+++ b/metadata/cache/kde-base/libkcompactdisc-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 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
 
diff --git a/metadata/cache/kde-base/libkdcraw-4.7.2 b/metadata/cache/kde-base/libkdcraw-4.7.2
deleted file mode 100644
index 613aad238ad1..000000000000
--- a/metadata/cache/kde-base/libkdcraw-4.7.2
+++ /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.2:4[aqua=]
-media-libs/lcms:0 virtual/jpeg >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/libkdcraw-4.7.2.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.3 b/metadata/cache/kde-base/libkdcraw-4.7.3
index 0d7b1ce0ae15..b944bc07c8cb 100644
--- a/metadata/cache/kde-base/libkdcraw-4.7.3
+++ b/metadata/cache/kde-base/libkdcraw-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/libkdeedu-4.7.2 b/metadata/cache/kde-base/libkdeedu-4.7.2
deleted file mode 100644
index be375d20c907..000000000000
--- a/metadata/cache/kde-base/libkdeedu-4.7.2
+++ /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.2:4[aqua=]
-!kde-base/kvtml-data:4 >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/libkdeedu-4.7.2.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.3 b/metadata/cache/kde-base/libkdeedu-4.7.3
index 576887f3db69..cfbc442084f3 100644
--- a/metadata/cache/kde-base/libkdeedu-4.7.3
+++ b/metadata/cache/kde-base/libkdeedu-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 Common library for KDE educational apps
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+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
 
diff --git a/metadata/cache/kde-base/libkdegames-4.7.2 b/metadata/cache/kde-base/libkdegames-4.7.2
deleted file mode 100644
index 9b1737899faa..000000000000
--- a/metadata/cache/kde-base/libkdegames-4.7.2
+++ /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.2:4[aqua=]
->=dev-games/ggz-client-libs-0.0.14 >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/libkdegames-4.7.3
index c8d62ff0ba72..2855a5a65742 100644
--- a/metadata/cache/kde-base/libkdegames-4.7.3
+++ b/metadata/cache/kde-base/libkdegames-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/libkexiv2-4.7.2 b/metadata/cache/kde-base/libkexiv2-4.7.2
deleted file mode 100644
index b4b8e5236f9c..000000000000
--- a/metadata/cache/kde-base/libkexiv2-4.7.2
+++ /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.2:4[aqua=]
->=media-gfx/exiv2-0.20 media-libs/lcms:0 virtual/jpeg >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/libkexiv2-4.7.2.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.3 b/metadata/cache/kde-base/libkexiv2-4.7.3
index c89288acf0d8..3a46d70b416c 100644
--- a/metadata/cache/kde-base/libkexiv2-4.7.3
+++ b/metadata/cache/kde-base/libkexiv2-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/libkipi-4.7.2 b/metadata/cache/kde-base/libkipi-4.7.2
deleted file mode 100644
index 70f276283a2b..000000000000
--- a/metadata/cache/kde-base/libkipi-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/libkipi-4.7.2.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.3 b/metadata/cache/kde-base/libkipi-4.7.3
index 3c41dcdbefa6..76596b847857 100644
--- a/metadata/cache/kde-base/libkipi-4.7.3
+++ b/metadata/cache/kde-base/libkipi-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/libkmahjongg-4.7.2 b/metadata/cache/kde-base/libkmahjongg-4.7.2
deleted file mode 100644
index c4f92976d28f..000000000000
--- a/metadata/cache/kde-base/libkmahjongg-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/libkmahjongg-4.7.3
index 3845ed418a75..f4c7f09b599b 100644
--- a/metadata/cache/kde-base/libkmahjongg-4.7.3
+++ b/metadata/cache/kde-base/libkmahjongg-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/libkonq-4.7.2 b/metadata/cache/kde-base/libkonq-4.7.2
deleted file mode 100644
index 292abffb8965..000000000000
--- a/metadata/cache/kde-base/libkonq-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-baseapps-4.7.2.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.3 b/metadata/cache/kde-base/libkonq-4.7.3
index 583e41f8fb40..ecb1759879ba 100644
--- a/metadata/cache/kde-base/libkonq-4.7.3
+++ b/metadata/cache/kde-base/libkonq-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 The embeddable part of konqueror
-~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+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
 
diff --git a/metadata/cache/kde-base/libksane-4.7.2 b/metadata/cache/kde-base/libksane-4.7.2
deleted file mode 100644
index c5f601197d41..000000000000
--- a/metadata/cache/kde-base/libksane-4.7.2
+++ /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.2:4[aqua=]
-media-gfx/sane-backends >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/libksane-4.7.2.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.3 b/metadata/cache/kde-base/libksane-4.7.3
index 88905a4be701..ad5bba81206b 100644
--- a/metadata/cache/kde-base/libksane-4.7.3
+++ b/metadata/cache/kde-base/libksane-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/libkworkspace-4.7.2 b/metadata/cache/kde-base/libkworkspace-4.7.2
deleted file mode 100644
index ec4fe4a216e2..000000000000
--- a/metadata/cache/kde-base/libkworkspace-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-x11-libs/libxkbfile x11-libs/libXcomposite >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3 b/metadata/cache/kde-base/libkworkspace-4.7.3
index 2f3995c4fa86..a1edbfe6aa43 100644
--- a/metadata/cache/kde-base/libkworkspace-4.7.3
+++ b/metadata/cache/kde-base/libkworkspace-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/liboxygenstyle-4.7.2 b/metadata/cache/kde-base/liboxygenstyle-4.7.2
deleted file mode 100644
index 7e2920b4e22c..000000000000
--- a/metadata/cache/kde-base/liboxygenstyle-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3 b/metadata/cache/kde-base/liboxygenstyle-4.7.3
index 29c840da794c..4ea949c68062 100644
--- a/metadata/cache/kde-base/liboxygenstyle-4.7.3
+++ b/metadata/cache/kde-base/liboxygenstyle-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/libplasmaclock-4.7.2 b/metadata/cache/kde-base/libplasmaclock-4.7.2
deleted file mode 100644
index 369519f2061c..000000000000
--- a/metadata/cache/kde-base/libplasmaclock-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kephal-4.7.2:4[aqua=] holidays? ( >=kde-base/kdepimlibs-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/kephal-4.7.2:4[aqua=] holidays? ( >=kde-base/kdepimlibs-4.7.2:4[aqua=] ) >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3 b/metadata/cache/kde-base/libplasmaclock-4.7.3
index 5a71d695d6c6..ecc86a48ae14 100644
--- a/metadata/cache/kde-base/libplasmaclock-4.7.3
+++ b/metadata/cache/kde-base/libplasmaclock-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/libplasmagenericshell-4.7.2 b/metadata/cache/kde-base/libplasmagenericshell-4.7.2
deleted file mode 100644
index 3167cf427917..000000000000
--- a/metadata/cache/kde-base/libplasmagenericshell-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kephal-4.7.2:4[aqua=] >=kde-base/libkworkspace-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/kephal-4.7.2:4[aqua=] >=kde-base/libkworkspace-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3 b/metadata/cache/kde-base/libplasmagenericshell-4.7.3
index 221879093441..1aa587930f11 100644
--- a/metadata/cache/kde-base/libplasmagenericshell-4.7.3
+++ b/metadata/cache/kde-base/libplasmagenericshell-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/libtaskmanager-4.7.2 b/metadata/cache/kde-base/libtaskmanager-4.7.2
deleted file mode 100644
index 9b867496d2a0..000000000000
--- a/metadata/cache/kde-base/libtaskmanager-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kephal-4.7.2:4[aqua=] >=kde-base/libkworkspace-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/kephal-4.7.2:4[aqua=] >=kde-base/libkworkspace-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3 b/metadata/cache/kde-base/libtaskmanager-4.7.3
index fad438fab144..cbd607954e7e 100644
--- a/metadata/cache/kde-base/libtaskmanager-4.7.3
+++ b/metadata/cache/kde-base/libtaskmanager-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/lokalize-4.7.2-r1 b/metadata/cache/kde-base/lokalize-4.7.2-r1
deleted file mode 100644
index dfc9b7c3c3cc..000000000000
--- a/metadata/cache/kde-base/lokalize-4.7.2-r1
+++ /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.2: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.2:4[aqua=] >=kde-base/krosspython-4.7.2:4[aqua=] >=kde-base/pykde4-4.7.2:4[aqua=] >=app-admin/eselect-python-20091230 =dev-lang/python-2* >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdesdk-4.7.2.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.3 b/metadata/cache/kde-base/lokalize-4.7.3
index aa49307b4155..369648e356cc 100644
--- a/metadata/cache/kde-base/lokalize-4.7.3
+++ b/metadata/cache/kde-base/lokalize-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 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
 
diff --git a/metadata/cache/kde-base/lskat-4.7.2 b/metadata/cache/kde-base/lskat-4.7.2
deleted file mode 100644
index be370961ff7f..000000000000
--- a/metadata/cache/kde-base/lskat-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/lskat-4.7.3
index e3746d12fbe9..27663ec1aa0f 100644
--- a/metadata/cache/kde-base/lskat-4.7.3
+++ b/metadata/cache/kde-base/lskat-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/marble-4.7.2-r1 b/metadata/cache/kde-base/marble-4.7.2-r1
deleted file mode 100644
index e5087c10170d..000000000000
--- a/metadata/cache/kde-base/marble-4.7.2-r1
+++ /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.2: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.2: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.2:4[aqua=] ) ) kde? ( >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
-4
-mirror://kde/stable/4.7.2/src/marble-4.7.2.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
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/marble-4.7.3 b/metadata/cache/kde-base/marble-4.7.3
index 252366f5b0ac..b3f079f22ae9 100644
--- a/metadata/cache/kde-base/marble-4.7.3
+++ b/metadata/cache/kde-base/marble-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 Generic geographical map widget
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+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 )
diff --git a/metadata/cache/kde-base/mplayerthumbs-4.7.2 b/metadata/cache/kde-base/mplayerthumbs-4.7.2
deleted file mode 100644
index 71f6ff5205b1..000000000000
--- a/metadata/cache/kde-base/mplayerthumbs-4.7.2
+++ /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.2:4[aqua=]
-|| ( >=kde-base/dolphin-4.7.2:4[aqua=] >=kde-base/konqueror-4.7.2:4[aqua=] ) >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdemultimedia-4.7.2.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.3 b/metadata/cache/kde-base/mplayerthumbs-4.7.3
index 58df945463cc..b3a166cedacd 100644
--- a/metadata/cache/kde-base/mplayerthumbs-4.7.3
+++ b/metadata/cache/kde-base/mplayerthumbs-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/nepomuk-4.7.2 b/metadata/cache/kde-base/nepomuk-4.7.2
deleted file mode 100644
index 21f4c35ebafa..000000000000
--- a/metadata/cache/kde-base/nepomuk-4.7.2
+++ /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.2: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.2: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.2:4[aqua=,semantic-desktop] !kde-misc/nepomukcontroller >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.tar.bz2
-
-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.3 b/metadata/cache/kde-base/nepomuk-4.7.3
index 16098faadf22..1c32b18bea2f 100644
--- a/metadata/cache/kde-base/nepomuk-4.7.3
+++ b/metadata/cache/kde-base/nepomuk-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 Nepomuk KDE4 client
-~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+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
 
diff --git a/metadata/cache/kde-base/nsplugins-4.7.2 b/metadata/cache/kde-base/nsplugins-4.7.2
deleted file mode 100644
index d2562f0ff476..000000000000
--- a/metadata/cache/kde-base/nsplugins-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-x11-libs/libXt >=kde-base/konqueror-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-baseapps-4.7.2.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.3 b/metadata/cache/kde-base/nsplugins-4.7.3
index 2274a49d49eb..96b5b9698aba 100644
--- a/metadata/cache/kde-base/nsplugins-4.7.3
+++ b/metadata/cache/kde-base/nsplugins-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/okteta-4.7.2 b/metadata/cache/kde-base/okteta-4.7.2
deleted file mode 100644
index 9d04bebcac37..000000000000
--- a/metadata/cache/kde-base/okteta-4.7.2
+++ /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.2:4[aqua=]
-app-crypt/qca:2 >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdesdk-4.7.2.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.3 b/metadata/cache/kde-base/okteta-4.7.3
index 0d1ee55c79c2..bebfd80537a6 100644
--- a/metadata/cache/kde-base/okteta-4.7.3
+++ b/metadata/cache/kde-base/okteta-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 KDE hexeditor
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/okular-4.7.2 b/metadata/cache/kde-base/okular-4.7.2
deleted file mode 100644
index 1ed21d69d3e9..000000000000
--- a/metadata/cache/kde-base/okular-4.7.2
+++ /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.2: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.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/okular-4.7.2.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.3 b/metadata/cache/kde-base/okular-4.7.3
index d34056936faa..68159c7b5b83 100644
--- a/metadata/cache/kde-base/okular-4.7.3
+++ b/metadata/cache/kde-base/okular-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/oxygen-icons-4.7.2 b/metadata/cache/kde-base/oxygen-icons-4.7.2
deleted file mode 100644
index 7aa754440bad..000000000000
--- a/metadata/cache/kde-base/oxygen-icons-4.7.2
+++ /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.3 b/metadata/cache/kde-base/oxygen-icons-4.7.3
index 7aa754440bad..06a59fc19b6e 100644
--- a/metadata/cache/kde-base/oxygen-icons-4.7.3
+++ b/metadata/cache/kde-base/oxygen-icons-4.7.3
@@ -6,7 +6,7 @@
 http://www.oxygen-icons.org/
 LGPL-3
 Oxygen SVG icon theme.
-~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+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
 
diff --git a/metadata/cache/kde-base/palapeli-4.7.2 b/metadata/cache/kde-base/palapeli-4.7.2
deleted file mode 100644
index 5a917d97fe61..000000000000
--- a/metadata/cache/kde-base/palapeli-4.7.2
+++ /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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=kde-base/libkdegames-4.7.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegames-4.7.2.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.3 b/metadata/cache/kde-base/palapeli-4.7.3
index 7b44bb579f91..89b8b54f807b 100644
--- a/metadata/cache/kde-base/palapeli-4.7.3
+++ b/metadata/cache/kde-base/palapeli-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/parley-4.7.2 b/metadata/cache/kde-base/parley-4.7.2
deleted file mode 100644
index e2711958a95e..000000000000
--- a/metadata/cache/kde-base/parley-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkdeedu-4.7.2: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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/parley-4.7.2.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.3 b/metadata/cache/kde-base/parley-4.7.3
index 1868d4866659..a055d5367542 100644
--- a/metadata/cache/kde-base/parley-4.7.3
+++ b/metadata/cache/kde-base/parley-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/perlkde-4.7.2-r1 b/metadata/cache/kde-base/perlkde-4.7.2-r1
deleted file mode 100644
index d7761895fe6b..000000000000
--- a/metadata/cache/kde-base/perlkde-4.7.2-r1
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-lang/perl-5.10.1 >=kde-base/perlqt-4.7.2:4[aqua=] >=kde-base/smokekde-4.7.2: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.2:4[aqua=]
->=dev-lang/perl-5.10.1 >=kde-base/perlqt-4.7.2:4[aqua=] >=kde-base/smokekde-4.7.2: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.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/perlkde-4.7.2.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.3 b/metadata/cache/kde-base/perlkde-4.7.3
index 2ca873a4d3a9..0717fe633c21 100644
--- a/metadata/cache/kde-base/perlkde-4.7.3
+++ b/metadata/cache/kde-base/perlkde-4.7.3
@@ -6,7 +6,7 @@ mirror://kde/stable/4.7.3/src/perlkde-4.7.3.tar.bz2
 http://www.kde.org/
 GPL-2
 KDE Perl bindings
-~amd64 ~x86
+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
 
diff --git a/metadata/cache/kde-base/perlqt-4.7.2-r1 b/metadata/cache/kde-base/perlqt-4.7.2-r1
deleted file mode 100644
index 5f4d8850072e..000000000000
--- a/metadata/cache/kde-base/perlqt-4.7.2-r1
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-lang/perl-5.10.1 dev-perl/List-MoreUtils >=kde-base/smokeqt-4.7.2: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.2: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.2/src/perlqt-4.7.2.tar.bz2
-
-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.3 b/metadata/cache/kde-base/perlqt-4.7.3
index b4ce305b56ce..90b059a6440f 100644
--- a/metadata/cache/kde-base/perlqt-4.7.3
+++ b/metadata/cache/kde-base/perlqt-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 Qt Perl bindings
-~amd64 ~x86
+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
 
diff --git a/metadata/cache/kde-base/phonon-kde-4.7.2 b/metadata/cache/kde-base/phonon-kde-4.7.2
deleted file mode 100644
index 90caa2d5e4aa..000000000000
--- a/metadata/cache/kde-base/phonon-kde-4.7.2
+++ /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.2: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.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/phonon-kde-4.7.3
index c5905113e6ba..d65f19d6d557 100644
--- a/metadata/cache/kde-base/phonon-kde-4.7.3
+++ b/metadata/cache/kde-base/phonon-kde-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/plasma-apps-4.7.2 b/metadata/cache/kde-base/plasma-apps-4.7.2
deleted file mode 100644
index 72fcfdab4eee..000000000000
--- a/metadata/cache/kde-base/plasma-apps-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkonq-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/libkonq-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-baseapps-4.7.2.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.3 b/metadata/cache/kde-base/plasma-apps-4.7.3
index dfbc839403d0..68d0601c1332 100644
--- a/metadata/cache/kde-base/plasma-apps-4.7.3
+++ b/metadata/cache/kde-base/plasma-apps-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/plasma-runtime-4.7.2 b/metadata/cache/kde-base/plasma-runtime-4.7.2
deleted file mode 100644
index 8c26dde8cebb..000000000000
--- a/metadata/cache/kde-base/plasma-runtime-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/plasma-runtime-4.7.3
index fa46a6671a93..c4c1c92effcb 100644
--- a/metadata/cache/kde-base/plasma-runtime-4.7.3
+++ b/metadata/cache/kde-base/plasma-runtime-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/plasma-workspace-4.7.2-r1 b/metadata/cache/kde-base/plasma-workspace-4.7.2-r1
deleted file mode 100644
index 0dfbf5425ce7..000000000000
--- a/metadata/cache/kde-base/plasma-workspace-4.7.2-r1
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kactivities-4.7.2:4[aqua=] >=kde-base/kdelibs-4.7.2:4[aqua=,semantic-desktop=] >=kde-base/kephal-4.7.2:4[aqua=] >=kde-base/ksysguard-4.7.2:4[aqua=] >=kde-base/libkworkspace-4.7.2:4[aqua=] >=kde-base/libplasmagenericshell-4.7.2:4[aqua=] >=kde-base/libtaskmanager-4.7.2:4[aqua=] >=kde-base/solid-4.7.2: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.2:4[aqua=] ) qalculate? ( sci-libs/libqalculate ) rss? ( >=kde-base/kdepimlibs-4.7.2:4[aqua=,semantic-desktop=] >=kde-base/libplasmaclock-4.7.2:4[aqua=,holidays] ) !rss? ( >=kde-base/libplasmaclock-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/kactivities-4.7.2:4[aqua=] >=kde-base/kdelibs-4.7.2:4[aqua=,semantic-desktop=] >=kde-base/kephal-4.7.2:4[aqua=] >=kde-base/ksysguard-4.7.2:4[aqua=] >=kde-base/libkworkspace-4.7.2:4[aqua=] >=kde-base/libplasmagenericshell-4.7.2:4[aqua=] >=kde-base/libtaskmanager-4.7.2:4[aqua=] >=kde-base/solid-4.7.2: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.2:4[aqua=] ) qalculate? ( sci-libs/libqalculate ) rss? ( >=kde-base/kdepimlibs-4.7.2:4[aqua=,semantic-desktop=] >=kde-base/libplasmaclock-4.7.2:4[aqua=,holidays] ) !rss? ( >=kde-base/libplasmaclock-4.7.2:4[aqua=,-holidays] ) xinerama? ( x11-libs/libXinerama ) >=kde-base/activitymanager-4.7.2:4[aqua=] >=kde-base/plasma-runtime-4.7.2:4[aqua=] >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3-r7 b/metadata/cache/kde-base/plasma-workspace-4.7.3-r7
index 7e66543c1db9..b98df35a07b3 100644
--- a/metadata/cache/kde-base/plasma-workspace-4.7.3-r7
+++ b/metadata/cache/kde-base/plasma-workspace-4.7.3-r7
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/powerdevil-4.7.2 b/metadata/cache/kde-base/powerdevil-4.7.2
deleted file mode 100644
index d333c3931088..000000000000
--- a/metadata/cache/kde-base/powerdevil-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkworkspace-4.7.2:4[aqua=] >=kde-base/solid-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/libkworkspace-4.7.2:4[aqua=] >=kde-base/solid-4.7.2:4[aqua=] pm-utils? ( sys-power/pm-utils ) >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3 b/metadata/cache/kde-base/powerdevil-4.7.3
index 7a3c030523cb..9d0ec50f883d 100644
--- a/metadata/cache/kde-base/powerdevil-4.7.3
+++ b/metadata/cache/kde-base/powerdevil-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/printer-applet-4.7.2 b/metadata/cache/kde-base/printer-applet-4.7.2
deleted file mode 100644
index 0ca053befc92..000000000000
--- a/metadata/cache/kde-base/printer-applet-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-admin/system-config-printer-common-1.2.2 >=kde-base/pykde4-4.7.2: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.2:4[aqua=]
->=app-admin/system-config-printer-common-1.2.2 >=kde-base/pykde4-4.7.2:4[aqua=] >=app-admin/eselect-python-20091230 =dev-lang/python-2* >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeutils-4.7.2.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
-
-
-
-3
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-base/printer-applet-4.7.3 b/metadata/cache/kde-base/printer-applet-4.7.3
index 4c05d3d54f0d..e2d2eafd897b 100644
--- a/metadata/cache/kde-base/printer-applet-4.7.3
+++ b/metadata/cache/kde-base/printer-applet-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/pykde4-4.7.2-r1 b/metadata/cache/kde-base/pykde4-4.7.2-r1
deleted file mode 100644
index 56a365ceee2e..000000000000
--- a/metadata/cache/kde-base/pykde4-4.7.2-r1
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-python/sip-4.12.3-r2 >=kde-base/kdelibs-4.7.2:4[aqua=,opengl,semantic-desktop=] semantic-desktop? ( >=kde-base/kdepimlibs-4.7.2: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.2:4[aqua=]
->=dev-python/sip-4.12.3-r2 >=kde-base/kdelibs-4.7.2:4[aqua=,opengl,semantic-desktop=] semantic-desktop? ( >=kde-base/kdepimlibs-4.7.2: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.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/pykde4-4.7.2.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.3 b/metadata/cache/kde-base/pykde4-4.7.3
index bf9ab67efbe0..081a03e152dd 100644
--- a/metadata/cache/kde-base/pykde4-4.7.3
+++ b/metadata/cache/kde-base/pykde4-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/qguiplatformplugin_kde-4.7.2 b/metadata/cache/kde-base/qguiplatformplugin_kde-4.7.2
deleted file mode 100644
index 13fb9af0add4..000000000000
--- a/metadata/cache/kde-base/qguiplatformplugin_kde-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3 b/metadata/cache/kde-base/qguiplatformplugin_kde-4.7.3
index 0598dcad2c0c..949050c7f114 100644
--- a/metadata/cache/kde-base/qguiplatformplugin_kde-4.7.3
+++ b/metadata/cache/kde-base/qguiplatformplugin_kde-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/qtruby-4.7.2 b/metadata/cache/kde-base/qtruby-4.7.2
deleted file mode 100644
index e98f7a961035..000000000000
--- a/metadata/cache/kde-base/qtruby-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/smokeqt-4.7.2: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.2: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.2/src/qtruby-4.7.2.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.3 b/metadata/cache/kde-base/qtruby-4.7.3
index 3c6765b0c636..9598739d1b9a 100644
--- a/metadata/cache/kde-base/qtruby-4.7.3
+++ b/metadata/cache/kde-base/qtruby-4.7.3
@@ -6,7 +6,7 @@ mirror://kde/stable/4.7.3/src/qtruby-4.7.3.tar.bz2
 http://www.kde.org/
 GPL-2
 Qt Ruby bindings
-~amd64 ~x86
+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 )
diff --git a/metadata/cache/kde-base/qyoto-4.7.2 b/metadata/cache/kde-base/qyoto-4.7.2
deleted file mode 100644
index e9f156c037f9..000000000000
--- a/metadata/cache/kde-base/qyoto-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-lang/mono >=kde-base/smokeqt-4.7.2: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.2:4[aqua=,opengl,phonon?,qscintilla?,webkit?] !kde-base/kdebindings-csharp:4
-4
-mirror://kde/stable/4.7.2/src/qyoto-4.7.2.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.3 b/metadata/cache/kde-base/qyoto-4.7.3
index 4579bcd9b922..f7136615eeac 100644
--- a/metadata/cache/kde-base/qyoto-4.7.3
+++ b/metadata/cache/kde-base/qyoto-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/renamedlg-plugins-4.7.2 b/metadata/cache/kde-base/renamedlg-plugins-4.7.2
deleted file mode 100644
index 31a8097121b4..000000000000
--- a/metadata/cache/kde-base/renamedlg-plugins-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/renamedlg-plugins-4.7.3
index 9d6f80b0f61d..ae2388fce309 100644
--- a/metadata/cache/kde-base/renamedlg-plugins-4.7.3
+++ b/metadata/cache/kde-base/renamedlg-plugins-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/rocs-4.7.2 b/metadata/cache/kde-base/rocs-4.7.2
deleted file mode 100644
index 7c2424ba1fce..000000000000
--- a/metadata/cache/kde-base/rocs-4.7.2
+++ /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.2:4[aqua=]
-dev-libs/boost >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/rocs-4.7.2.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.3 b/metadata/cache/kde-base/rocs-4.7.3
index cee8d444137d..ab12bfaba2eb 100644
--- a/metadata/cache/kde-base/rocs-4.7.3
+++ b/metadata/cache/kde-base/rocs-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 KDE4 interface to work with Graph Theory
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+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
 
diff --git a/metadata/cache/kde-base/smokegen-4.7.2 b/metadata/cache/kde-base/smokegen-4.7.2
deleted file mode 100644
index e5cf66dec2df..000000000000
--- a/metadata/cache/kde-base/smokegen-4.7.2
+++ /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.2/src/smokegen-4.7.2.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.3 b/metadata/cache/kde-base/smokegen-4.7.3
index 01775c56a982..1fef97485230 100644
--- a/metadata/cache/kde-base/smokegen-4.7.3
+++ b/metadata/cache/kde-base/smokegen-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/smokekde-4.7.2 b/metadata/cache/kde-base/smokekde-4.7.2
deleted file mode 100644
index 6f51546a3ff0..000000000000
--- a/metadata/cache/kde-base/smokekde-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/kdelibs-4.7.2:4[aqua=,semantic-desktop=] >=kde-base/smokeqt-4.7.2:4[aqua=] akonadi? ( >=kde-base/kdepimlibs-4.7.2:4[aqua=] ) attica? ( dev-libs/libattica ) kate? ( >=kde-base/kate-4.7.2:4[aqua=] ) okular? ( >=kde-base/okular-4.7.2: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.2:4[aqua=]
->=kde-base/kdelibs-4.7.2:4[aqua=,semantic-desktop=] >=kde-base/smokeqt-4.7.2:4[aqua=] akonadi? ( >=kde-base/kdepimlibs-4.7.2:4[aqua=] ) attica? ( dev-libs/libattica ) kate? ( >=kde-base/kate-4.7.2:4[aqua=] ) okular? ( >=kde-base/okular-4.7.2:4[aqua=] ) !kde-base/smoke:4 >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/smokekde-4.7.2.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.3 b/metadata/cache/kde-base/smokekde-4.7.3
index 6c2c24fd8e4a..3f4c6def8696 100644
--- a/metadata/cache/kde-base/smokekde-4.7.3
+++ b/metadata/cache/kde-base/smokekde-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/smokeqt-4.7.2 b/metadata/cache/kde-base/smokeqt-4.7.2
deleted file mode 100644
index e2ba163b3c82..000000000000
--- a/metadata/cache/kde-base/smokeqt-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/smokegen-4.7.2: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.2: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.2/src/smokeqt-4.7.2.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.3 b/metadata/cache/kde-base/smokeqt-4.7.3
index 272b0e37101f..d2cb6f530571 100644
--- a/metadata/cache/kde-base/smokeqt-4.7.3
+++ b/metadata/cache/kde-base/smokeqt-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/solid-4.7.2 b/metadata/cache/kde-base/solid-4.7.2
deleted file mode 100644
index 970e158a3fcb..000000000000
--- a/metadata/cache/kde-base/solid-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-networkmanager? ( net-misc/networkmanager ) wicd? ( net-misc/wicd ) >=kde-base/solid-runtime-4.7.2:4[aqua=] >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.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.3 b/metadata/cache/kde-base/solid-4.7.3
index 228fe98a7f29..219e23759132 100644
--- a/metadata/cache/kde-base/solid-4.7.3
+++ b/metadata/cache/kde-base/solid-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/solid-runtime-4.7.2 b/metadata/cache/kde-base/solid-runtime-4.7.2
deleted file mode 100644
index e5e3566de95c..000000000000
--- a/metadata/cache/kde-base/solid-runtime-4.7.2
+++ /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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-runtime-4.7.2.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.3 b/metadata/cache/kde-base/solid-runtime-4.7.3
index c5a3c23d9990..b5edb9ae1bf5 100644
--- a/metadata/cache/kde-base/solid-runtime-4.7.3
+++ b/metadata/cache/kde-base/solid-runtime-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/step-4.7.2 b/metadata/cache/kde-base/step-4.7.2
deleted file mode 100644
index 53fd6f7ed9d9..000000000000
--- a/metadata/cache/kde-base/step-4.7.2
+++ /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.2: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.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/step-4.7.2.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.3 b/metadata/cache/kde-base/step-4.7.3
index 39102ddecf9d..76d980a6857c 100644
--- a/metadata/cache/kde-base/step-4.7.3
+++ b/metadata/cache/kde-base/step-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/superkaramba-4.7.2-r1 b/metadata/cache/kde-base/superkaramba-4.7.2-r1
deleted file mode 100644
index fad9803bf818..000000000000
--- a/metadata/cache/kde-base/superkaramba-4.7.2-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/qimageblitz python? ( >=kde-base/pykde4-4.7.2: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.2:4[aqua=]
-media-libs/qimageblitz python? ( >=kde-base/pykde4-4.7.2:4[aqua=] ) python? ( >=kde-base/krosspython-4.7.2:4[aqua=] ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeutils-4.7.2.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.3 b/metadata/cache/kde-base/superkaramba-4.7.3
index 21b0b82c1a4b..fdbcbba150aa 100644
--- a/metadata/cache/kde-base/superkaramba-4.7.3
+++ b/metadata/cache/kde-base/superkaramba-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 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
 
diff --git a/metadata/cache/kde-base/svgpart-4.7.2 b/metadata/cache/kde-base/svgpart-4.7.2
deleted file mode 100644
index c91ff0cb3d3d..000000000000
--- a/metadata/cache/kde-base/svgpart-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/svgpart-4.7.2.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.3 b/metadata/cache/kde-base/svgpart-4.7.3
index cd01f9a8591c..a5bd52850e16 100644
--- a/metadata/cache/kde-base/svgpart-4.7.3
+++ b/metadata/cache/kde-base/svgpart-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/sweeper-4.7.2 b/metadata/cache/kde-base/sweeper-4.7.2
deleted file mode 100644
index f0108df25c59..000000000000
--- a/metadata/cache/kde-base/sweeper-4.7.2
+++ /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.2:4[aqua=]
->=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeutils-4.7.2.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.3 b/metadata/cache/kde-base/sweeper-4.7.3
index 8f04848e85ef..df5c477f9dd5 100644
--- a/metadata/cache/kde-base/sweeper-4.7.3
+++ b/metadata/cache/kde-base/sweeper-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/kde-base/system-config-printer-kde-4.7.2-r1 b/metadata/cache/kde-base/system-config-printer-kde-4.7.2-r1
deleted file mode 100644
index c60e7bfce707..000000000000
--- a/metadata/cache/kde-base/system-config-printer-kde-4.7.2-r1
+++ /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.2: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.2:4[aqua=]
->=app-admin/system-config-printer-common-1.2.2 >=dev-python/pycups-1.9.49 >=kde-base/pykde4-4.7.2:4[aqua=] net-print/cups[dbus] >=app-admin/eselect-python-20091230 =dev-lang/python-2* >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdeadmin-4.7.2.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.3 b/metadata/cache/kde-base/system-config-printer-kde-4.7.3
index 3972d6e85ecf..6e3143e266ce 100644
--- a/metadata/cache/kde-base/system-config-printer-kde-4.7.3
+++ b/metadata/cache/kde-base/system-config-printer-kde-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/systemsettings-4.7.2 b/metadata/cache/kde-base/systemsettings-4.7.2
deleted file mode 100644
index 27367cea7321..000000000000
--- a/metadata/cache/kde-base/systemsettings-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/glib:2 >=kde-base/libkworkspace-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-dev-libs/glib:2 >=kde-base/libkworkspace-4.7.2: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.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=] >=media-libs/qimageblitz-0.0.4
-4
-mirror://kde/stable/4.7.2/src/kde-workspace-4.7.2.tar.bz2
-
-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 b/metadata/cache/kde-base/systemsettings-4.7.3
index 3721d6f59d1f..7d901393e376 100644
--- a/metadata/cache/kde-base/systemsettings-4.7.3
+++ b/metadata/cache/kde-base/systemsettings-4.7.3
@@ -6,7 +6,7 @@ test
 http://www.kde.org/
 GPL-2
 System settings utility
-~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+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
 
diff --git a/metadata/cache/kde-base/thumbnailers-4.7.2 b/metadata/cache/kde-base/thumbnailers-4.7.2
deleted file mode 100644
index eb9d32f8a9e0..000000000000
--- a/metadata/cache/kde-base/thumbnailers-4.7.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkdcraw-4.7.2:4[aqua=] >=kde-base/libkexiv2-4.7.2: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.2:4[aqua=]
->=kde-base/libkdcraw-4.7.2:4[aqua=] >=kde-base/libkexiv2-4.7.2:4[aqua=] media-libs/lcms:0 >=kde-base/oxygen-icons-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdegraphics-thumbnailers-4.7.2.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.3 b/metadata/cache/kde-base/thumbnailers-4.7.3
index c40867b3a6dd..3d36b05978ac 100644
--- a/metadata/cache/kde-base/thumbnailers-4.7.3
+++ b/metadata/cache/kde-base/thumbnailers-4.7.3
@@ -6,7 +6,7 @@ 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
+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
 
diff --git a/metadata/cache/kde-base/umbrello-4.7.2 b/metadata/cache/kde-base/umbrello-4.7.2
deleted file mode 100644
index e950e4223808..000000000000
--- a/metadata/cache/kde-base/umbrello-4.7.2
+++ /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.2:4[aqua=]
-dev-libs/libxml2 dev-libs/libxslt >=kde-base/oxygen-icons-4.7.2:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.2: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.2:4[aqua=]
-4
-mirror://kde/stable/4.7.2/src/kdesdk-4.7.2.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.3 b/metadata/cache/kde-base/umbrello-4.7.3
index e610e11a045a..d3eecd8b5d90 100644
--- a/metadata/cache/kde-base/umbrello-4.7.3
+++ b/metadata/cache/kde-base/umbrello-4.7.3
@@ -6,7 +6,7 @@ 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
+amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 base 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
 
diff --git a/metadata/cache/mail-filter/policyd-1.82-r1 b/metadata/cache/mail-filter/policyd-1.82-r1
index 6390b69bea2e..49c465f72cfe 100644
--- a/metadata/cache/mail-filter/policyd-1.82-r1
+++ b/metadata/cache/mail-filter/policyd-1.82-r1
@@ -6,7 +6,7 @@ http://policyd.sourceforge.net/policyd-1.82.tar.gz
 http://policyd.sf.net/
 GPL-2
 Policy daemon for postfix and other MTAs
-~amd64 x86
+~amd64 ~hppa x86
 eutils multilib portability toolchain-funcs user
 
 
diff --git a/metadata/cache/media-gfx/converseen-0.4.7 b/metadata/cache/media-gfx/converseen-0.4.7
new file mode 100644
index 000000000000..bfcc5433fc31
--- /dev/null
+++ b/metadata/cache/media-gfx/converseen-0.4.7
@@ -0,0 +1,22 @@
+x11-libs/qt-gui:4 || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+x11-libs/qt-gui:4 || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+0
+mirror://sourceforge/converseen/converseen-0.4.7.tar.bz2
+
+http://converseen.sourceforge.net
+GPL-3
+Batch image converter and resizer based on ImageMagick
+~amd64 ~x86
+base cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user
+debug
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/media-gfx/digikam-2.3.0 b/metadata/cache/media-gfx/digikam-2.3.0
index 7091e3031c42..90b8c472d517 100644
--- a/metadata/cache/media-gfx/digikam-2.3.0
+++ b/metadata/cache/media-gfx/digikam-2.3.0
@@ -6,7 +6,7 @@ test
 http://www.digikam.org/
 GPL-2 handbook? ( FDL-1.2 )
 Digital photo management application for KDE
-~amd64 ~x86
+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
 
diff --git a/metadata/cache/media-libs/freeverb3-2.6.0 b/metadata/cache/media-libs/freeverb3-2.6.0
new file mode 100644
index 000000000000..f68c03a1adac
--- /dev/null
+++ b/metadata/cache/media-libs/freeverb3-2.6.0
@@ -0,0 +1,22 @@
+>=sci-libs/fftw-3.0.1 audacious? ( <media-sound/audacious-3 media-libs/libsndfile ) jack? ( media-sound/jack-audio-connection-kit media-libs/libsndfile )
+>=sci-libs/fftw-3.0.1 audacious? ( <media-sound/audacious-3 media-libs/libsndfile ) jack? ( media-sound/jack-audio-connection-kit media-libs/libsndfile )
+0
+mirror://sourceforge/freeverb3/freeverb3-2.6.0.tar.gz
+
+http://freeverb3.sourceforge.net/
+GPL-2
+High Quality Reverb and Impulse Response Convolution library including XMMS/Audacious Effect plugins
+~amd64 ~x86
+eutils multilib portability toolchain-funcs user versionator
+audacious avx jack plugdouble sse sse2 sse3 sse4 3dnow forcefpu
+
+
+
+2
+
+configure install
+
+
+
+
+
diff --git a/metadata/cache/media-libs/herqq-1.0.0-r1 b/metadata/cache/media-libs/herqq-1.0.0-r1
index ceda2aced61d..6ec4e38fb0e1 100644
--- a/metadata/cache/media-libs/herqq-1.0.0-r1
+++ b/metadata/cache/media-libs/herqq-1.0.0-r1
@@ -6,7 +6,7 @@ mirror://sourceforge/hupnp/herqq-1.0.0.zip
 http://www.herqq.org
 GPL-3
 A software library for building UPnP devices
-~amd64 ~ppc ~ppc64 ~x86
+amd64 ~ppc ~ppc64 ~x86
 base eutils multilib portability qt4-r2 toolchain-funcs user
 doc
 
diff --git a/metadata/cache/media-libs/libaacplus-2.0.2 b/metadata/cache/media-libs/libaacplus-2.0.2
index be1adec7602b..533dd65f8fff 100644
--- a/metadata/cache/media-libs/libaacplus-2.0.2
+++ b/metadata/cache/media-libs/libaacplus-2.0.2
@@ -6,7 +6,7 @@ mirror
 http://tipok.org.ua/node/17
 LGPL-2.1
 HE-AAC+ v2 library, based on the reference implementation
-~amd64 ~hppa
+~amd64 ~hppa ~x86-fbsd
 autotools eutils libtool multilib portability toolchain-funcs user
 bindist fftw static-libs
 !bindist
diff --git a/metadata/cache/media-libs/libkface-2.3.0 b/metadata/cache/media-libs/libkface-2.3.0
index de02b9e0ce03..f20b34b1a59d 100644
--- a/metadata/cache/media-libs/libkface-2.3.0
+++ b/metadata/cache/media-libs/libkface-2.3.0
@@ -6,7 +6,7 @@ mirror://sourceforge/digikam/digikam-2.3.0.tar.bz2
 http://www.digikam.org/
 GPL-2
 Qt/C++ wrapper around LibFace to perform face recognition and detection
-~amd64 ~x86
+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
 
diff --git a/metadata/cache/media-libs/libkgeomap-2.3.0 b/metadata/cache/media-libs/libkgeomap-2.3.0
index 070e40238076..cfc1874eff4b 100644
--- a/metadata/cache/media-libs/libkgeomap-2.3.0
+++ b/metadata/cache/media-libs/libkgeomap-2.3.0
@@ -6,7 +6,7 @@ mirror://sourceforge/digikam/digikam-2.3.0.tar.bz2
 http://www.digikam.org/
 GPL-2
 Wrapper library for world map components as marble, openstreetmap and googlemap
-~amd64 ~x86
+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
 
diff --git a/metadata/cache/media-libs/libmediawiki-2.3.0 b/metadata/cache/media-libs/libmediawiki-2.3.0
index 1e74a37ca168..3d05ee939666 100644
--- a/metadata/cache/media-libs/libmediawiki-2.3.0
+++ b/metadata/cache/media-libs/libmediawiki-2.3.0
@@ -6,7 +6,7 @@ mirror://sourceforge/digikam/digikam-2.3.0.tar.bz2
 http://www.digikam.org/
 GPL-2
 KDE C++ interface for MediaWiki based web service as wikipedia.org
-~amd64 ~x86
+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
 
diff --git a/metadata/cache/media-libs/libpgf-6.11.32 b/metadata/cache/media-libs/libpgf-6.11.32
index 2b98730aa792..22177d9c0d1a 100644
--- a/metadata/cache/media-libs/libpgf-6.11.32
+++ b/metadata/cache/media-libs/libpgf-6.11.32
@@ -6,7 +6,7 @@ http://dev.gentoo.org/~dilfridge/distfiles/libpgf-6.11.32.tar.bz2
 http://www.libpgf.org/
 LGPL-2.1
 Library to load, handle and manipulate images in the PGF format
-~amd64 ~ppc ~x86
+amd64 ~ppc x86
 autotools eutils libtool multilib portability toolchain-funcs user
 doc static-libs
 
diff --git a/metadata/cache/media-libs/lilv-0.5.0 b/metadata/cache/media-libs/lilv-0.5.0
new file mode 100644
index 000000000000..82e6cf545778
--- /dev/null
+++ b/metadata/cache/media-libs/lilv-0.5.0
@@ -0,0 +1,22 @@
+>=media-libs/lv2core-6 >=dev-libs/serd-0.5 >=dev-libs/sord-0.5 doc? ( app-doc/doxygen ) dev-util/pkgconfig
+>=media-libs/lv2core-6 >=dev-libs/serd-0.5 >=dev-libs/sord-0.5
+0
+http://download.drobilla.net/lilv-0.5.0.tar.bz2
+
+http://drobilla.net/software/lilv/
+ISC
+Library to make the use of LV2 plugins as simple as possible for applications
+~amd64
+base eutils multilib portability toolchain-funcs user waf-utils
+doc test
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/media-libs/lv2core-6.0 b/metadata/cache/media-libs/lv2core-6.0
new file mode 100644
index 000000000000..c967729b0cfe
--- /dev/null
+++ b/metadata/cache/media-libs/lv2core-6.0
@@ -0,0 +1,22 @@
+
+!<media-libs/slv2-0.4.2
+0
+http://lv2plug.in/spec/lv2core-6.0.tar.bz2
+
+http://lv2plug.in/
+LGPL-2.1 MIT
+LV2 is a simple but extensible successor of LADSPA
+~amd64 ~ppc ~x86
+base eutils multilib portability toolchain-funcs user waf-utils
+
+
+
+
+4
+
+compile configure install prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/media-plugins/audacious-plugins-3.1 b/metadata/cache/media-plugins/audacious-plugins-3.1
index 67b81782791c..60efdf6d2f08 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.2.0-r1 b/metadata/cache/media-plugins/kipi-plugins-2.2.0-r1
deleted file mode 100644
index 38144b6c1ce9..000000000000
--- a/metadata/cache/media-plugins/kipi-plugins-2.2.0-r1
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/libkipi-4.7:4[aqua=] >=kde-base/libkdcraw-4.7:4[aqua=] >=kde-base/libkexiv2-4.7:4[aqua=] dev-libs/expat dev-libs/libxml2 dev-libs/libxslt dev-libs/qjson gpssync? ( >=media-libs/libkgeomap-2.2.0 ) mediawiki? ( >=media-libs/libmediawiki-2.2.0 ) media-libs/libpng media-libs/tiff virtual/jpeg calendar? ( >=kde-base/kdepimlibs-4.7:4[aqua=] ) crypt? ( app-crypt/qca:2 ) ipod? ( media-libs/libgpod x11-libs/gtk+:2 ) redeyes? ( >=media-libs/opencv-2.2.0-r10 ) scanner? ( >=kde-base/libksane-4.7:4[aqua=] media-gfx/sane-backends ) vkontakte? ( net-libs/libkvkontakte ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 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:4[aqua=]
->=kde-base/libkipi-4.7:4[aqua=] >=kde-base/libkdcraw-4.7:4[aqua=] >=kde-base/libkexiv2-4.7:4[aqua=] dev-libs/expat dev-libs/libxml2 dev-libs/libxslt dev-libs/qjson gpssync? ( >=media-libs/libkgeomap-2.2.0 ) mediawiki? ( >=media-libs/libmediawiki-2.2.0 ) media-libs/libpng media-libs/tiff virtual/jpeg calendar? ( >=kde-base/kdepimlibs-4.7:4[aqua=] ) crypt? ( app-crypt/qca:2 ) ipod? ( media-libs/libgpod x11-libs/gtk+:2 ) redeyes? ( >=media-libs/opencv-2.2.0-r10 ) scanner? ( >=kde-base/libksane-4.7:4[aqua=] media-gfx/sane-backends ) vkontakte? ( net-libs/libkvkontakte ) cdr? ( app-cdr/k3b ) expoblending? ( media-gfx/hugin ) imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) mjpeg? ( media-video/mjpegtools ) panorama? ( media-gfx/enblend >=media-gfx/hugin-2011.0.0 ) >=kde-base/oxygen-icons-4.7:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ar(+)] ) linguas_az? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_az(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_be(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_bg(+)] ) linguas_bn? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_bn(+)] ) linguas_br? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_br(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_cs(+)] ) linguas_csb? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_csb(+)] ) linguas_cy? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_cy(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_eu(+)] ) linguas_fa? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fa(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fi(+)] ) linguas_fo? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fo(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fr(+)] ) linguas_fy? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fy(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_gl(+)] ) linguas_ha? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ha(+)] ) linguas_he? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_he(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_hi(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_hr(+)] ) linguas_hsb? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_hsb(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_hu(+)] ) linguas_id? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_id(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ja(+)] ) linguas_ka? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ka(+)] ) linguas_kk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_kk(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_km(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ko(+)] ) linguas_ku? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ku(+)] ) linguas_lb? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_lb(+)] ) linguas_lo? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_lo(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_lv(+)] ) linguas_mi? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_mi(+)] ) linguas_mk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_mk(+)] ) linguas_mn? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_mn(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ms(+)] ) linguas_mt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_mt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nds(+)] ) linguas_ne? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ne(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nn(+)] ) linguas_nso? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nso(+)] ) linguas_oc? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_oc(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ru(+)] ) linguas_rw? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_rw(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_se(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sl(+)] ) linguas_sq? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sq(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sr(+)] ) linguas_ss? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ss(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sv(+)] ) linguas_ta? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ta(+)] ) linguas_te? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_te(+)] ) linguas_tg? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_tg(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_tr(+)] ) linguas_tt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_tt(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_uk(+)] ) linguas_uz? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_uz(+)] ) linguas_ven? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ven(+)] ) linguas_vi? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_vi(+)] ) linguas_wa? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_wa(+)] ) linguas_xh? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_xh(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_HK? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_HK(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_TW(+)] ) linguas_zu? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zu(+)] ) handbook? ( >=kde-base/kdelibs-4.7: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:4[aqua=]
-4
-mirror://sourceforge/digikam/digikam-2.2.0.tar.bz2
-
-http://www.digikam.org/
-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
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/media-plugins/kipi-plugins-2.3.0 b/metadata/cache/media-plugins/kipi-plugins-2.3.0
index 3232b32385f3..2541ee679e9a 100644
--- a/metadata/cache/media-plugins/kipi-plugins-2.3.0
+++ b/metadata/cache/media-plugins/kipi-plugins-2.3.0
@@ -6,7 +6,7 @@ mirror://sourceforge/digikam/digikam-2.3.0.tar.bz2
 http://www.digikam.org/
 GPL-2 handbook? ( FDL-1.2 )
 Plugins for the KDE Image Plugin Interface
-~amd64 ~x86
+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
 
diff --git a/metadata/cache/media-plugins/kipi-plugins-2.4.1 b/metadata/cache/media-plugins/kipi-plugins-2.4.1
new file mode 100644
index 000000000000..ba34c3c4eaac
--- /dev/null
+++ b/metadata/cache/media-plugins/kipi-plugins-2.4.1
@@ -0,0 +1,22 @@
+>=kde-base/libkipi-4.7:4[aqua=] >=kde-base/libkdcraw-4.7:4[aqua=] >=kde-base/libkexiv2-4.7:4[aqua=] dev-libs/expat dev-libs/libxml2 dev-libs/libxslt dev-libs/qjson gpssync? ( >=media-libs/libkgeomap-2.4.1 ) media-libs/libpng media-libs/tiff virtual/jpeg calendar? ( >=kde-base/kdepimlibs-4.7:4[aqua=] ) crypt? ( app-crypt/qca:2 ) ipod? ( media-libs/libgpod x11-libs/gtk+:2 ) redeyes? ( >=media-libs/opencv-2.2.0-r10 ) scanner? ( >=kde-base/libksane-4.7:4[aqua=] media-gfx/sane-backends ) vkontakte? ( >=net-libs/libkvkontakte-2.4.1 ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 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:4[aqua=]
+>=kde-base/libkipi-4.7:4[aqua=] >=kde-base/libkdcraw-4.7:4[aqua=] >=kde-base/libkexiv2-4.7:4[aqua=] dev-libs/expat dev-libs/libxml2 dev-libs/libxslt dev-libs/qjson gpssync? ( >=media-libs/libkgeomap-2.4.1 ) media-libs/libpng media-libs/tiff virtual/jpeg calendar? ( >=kde-base/kdepimlibs-4.7:4[aqua=] ) crypt? ( app-crypt/qca:2 ) ipod? ( media-libs/libgpod x11-libs/gtk+:2 ) redeyes? ( >=media-libs/opencv-2.2.0-r10 ) scanner? ( >=kde-base/libksane-4.7:4[aqua=] media-gfx/sane-backends ) vkontakte? ( >=net-libs/libkvkontakte-2.4.1 ) cdr? ( app-cdr/k3b ) expoblending? ( media-gfx/hugin ) imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) mjpeg? ( media-video/mjpegtools ) panorama? ( media-gfx/enblend >=media-gfx/hugin-2011.0.0 ) >=kde-base/oxygen-icons-4.7:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ar(+)] ) linguas_az? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_az(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_be(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_bg(+)] ) linguas_bn? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_bn(+)] ) linguas_br? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_br(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_cs(+)] ) linguas_csb? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_csb(+)] ) linguas_cy? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_cy(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_eu(+)] ) linguas_fa? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fa(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fi(+)] ) linguas_fo? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fo(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fr(+)] ) linguas_fy? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fy(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_gl(+)] ) linguas_ha? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ha(+)] ) linguas_he? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_he(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_hi(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_hr(+)] ) linguas_hsb? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_hsb(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_hu(+)] ) linguas_id? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_id(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ja(+)] ) linguas_ka? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ka(+)] ) linguas_kk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_kk(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_km(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ko(+)] ) linguas_ku? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ku(+)] ) linguas_lb? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_lb(+)] ) linguas_lo? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_lo(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_lv(+)] ) linguas_mi? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_mi(+)] ) linguas_mk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_mk(+)] ) linguas_mn? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_mn(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ms(+)] ) linguas_mt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_mt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nds(+)] ) linguas_ne? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ne(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nn(+)] ) linguas_nso? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nso(+)] ) linguas_oc? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_oc(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ru(+)] ) linguas_rw? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_rw(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_se(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sl(+)] ) linguas_sq? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sq(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sr(+)] ) linguas_ss? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ss(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sv(+)] ) linguas_ta? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ta(+)] ) linguas_te? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_te(+)] ) linguas_tg? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_tg(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_tr(+)] ) linguas_tt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_tt(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_uk(+)] ) linguas_uz? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_uz(+)] ) linguas_ven? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ven(+)] ) linguas_vi? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_vi(+)] ) linguas_wa? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_wa(+)] ) linguas_xh? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_xh(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_HK? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_HK(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_TW(+)] ) linguas_zu? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zu(+)] ) handbook? ( >=kde-base/kdelibs-4.7: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:4[aqua=]
+4
+mirror://sourceforge/digikam/digikam-2.4.1.tar.bz2
+
+http://www.digikam.org/
+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
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/media-sound/audacious-3.1 b/metadata/cache/media-sound/audacious-3.1
index e2cf82aab081..dd3fc70880fe 100644
--- a/metadata/cache/media-sound/audacious-3.1
+++ b/metadata/cache/media-sound/audacious-3.1
@@ -6,7 +6,7 @@ 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
 
 altivec chardet nls session sse2
 
diff --git a/metadata/cache/media-sound/flacon-0.6.0 b/metadata/cache/media-sound/flacon-0.6.0
new file mode 100644
index 000000000000..069417cd64d3
--- /dev/null
+++ b/metadata/cache/media-sound/flacon-0.6.0
@@ -0,0 +1,22 @@
+dev-python/PyQt4[X] media-sound/shntool[mac?] flac? ( media-libs/flac ) mac? ( media-sound/mac ) mp3? ( media-sound/lame ) mp4? ( media-libs/faac ) ogg? ( media-sound/vorbis-tools ) tta? ( media-sound/ttaenc ) wavpack? ( media-sound/wavpack ) replaygain? ( mp3? ( media-sound/mp3gain ) ogg? ( media-sound/vorbisgain ) ) >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+dev-python/PyQt4[X] media-sound/shntool[mac?] flac? ( media-libs/flac ) mac? ( media-sound/mac ) mp3? ( media-sound/lame ) mp4? ( media-libs/faac ) ogg? ( media-sound/vorbis-tools ) tta? ( media-sound/ttaenc ) wavpack? ( media-sound/wavpack ) replaygain? ( mp3? ( media-sound/mp3gain ) ogg? ( media-sound/vorbisgain ) ) >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+0
+https://flacon.googlecode.com/files/flacon-0.6.0.tgz
+
+https://code.google.com/p/flacon/
+GPL-3
+Extracts audio tracks from audio CD image to separate tracks
+~amd64 ~x86
+multilib python toolchain-funcs
+flac mac mp3 mp4 ogg replaygain tta wavpack
+
+
+
+4
+
+compile postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/media-sound/tomahawk-0.3.2 b/metadata/cache/media-sound/tomahawk-0.3.2
deleted file mode 100644
index 421e8e4c5cac..000000000000
--- a/metadata/cache/media-sound/tomahawk-0.3.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-cpp/clucene-2.3.3.4 >=dev-libs/boost-1.41 >=dev-libs/qjson-0.7.1 >=media-libs/libechonest-1.1.10 >=media-libs/phonon-4.5.0 media-libs/taglib >=x11-libs/qt-core-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[sqlite] >=x11-libs/qt-webkit-4.7.0:4 >=x11-libs/qt-xmlpatterns-4.7.0:4 fftw? ( sci-libs/fftw:3.0 ) jabber? ( net-libs/jreen ) libsamplerate? ( media-libs/libsamplerate ) resolver? ( dev-libs/libattica >=dev-libs/quazip-0.4.3 ) twitter? ( net-libs/qtweetlib ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
->=dev-cpp/clucene-2.3.3.4 >=dev-libs/boost-1.41 >=dev-libs/qjson-0.7.1 >=media-libs/libechonest-1.1.10 >=media-libs/phonon-4.5.0 media-libs/taglib >=x11-libs/qt-core-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[sqlite] >=x11-libs/qt-webkit-4.7.0:4 >=x11-libs/qt-xmlpatterns-4.7.0:4 fftw? ( sci-libs/fftw:3.0 ) jabber? ( net-libs/jreen ) libsamplerate? ( media-libs/libsamplerate ) resolver? ( dev-libs/libattica >=dev-libs/quazip-0.4.3 ) twitter? ( net-libs/qtweetlib )
-0
-http://download.tomahawk-player.org/tomahawk-0.3.2.tar.bz2
-
-http://tomahawk-player.org/
-GPL-3 BSD
-Qt playdar social music player
-~amd64 ~x86
-base cmake-utils eutils flag-o-matic multilib portability qt4-r2 toolchain-funcs user
-debug fftw jabber libsamplerate +resolver twitter
-
-
-
-4
-
-compile configure install postinst prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/media-sound/tomahawk-0.3.0 b/metadata/cache/media-sound/tomahawk-0.3.3
similarity index 95%
rename from metadata/cache/media-sound/tomahawk-0.3.0
rename to metadata/cache/media-sound/tomahawk-0.3.3
index c79ec7370539..b5a248539e0f 100644
--- a/metadata/cache/media-sound/tomahawk-0.3.0
+++ b/metadata/cache/media-sound/tomahawk-0.3.3
@@ -1,7 +1,7 @@
 >=dev-cpp/clucene-2.3.3.4 >=dev-libs/boost-1.41 >=dev-libs/qjson-0.7.1 >=media-libs/libechonest-1.1.10 >=media-libs/phonon-4.5.0 media-libs/taglib >=x11-libs/qt-core-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[sqlite] >=x11-libs/qt-webkit-4.7.0:4 >=x11-libs/qt-xmlpatterns-4.7.0:4 fftw? ( sci-libs/fftw:3.0 ) jabber? ( net-libs/jreen ) libsamplerate? ( media-libs/libsamplerate ) resolver? ( dev-libs/libattica >=dev-libs/quazip-0.4.3 ) twitter? ( net-libs/qtweetlib ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 >=dev-cpp/clucene-2.3.3.4 >=dev-libs/boost-1.41 >=dev-libs/qjson-0.7.1 >=media-libs/libechonest-1.1.10 >=media-libs/phonon-4.5.0 media-libs/taglib >=x11-libs/qt-core-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[sqlite] >=x11-libs/qt-webkit-4.7.0:4 >=x11-libs/qt-xmlpatterns-4.7.0:4 fftw? ( sci-libs/fftw:3.0 ) jabber? ( net-libs/jreen ) libsamplerate? ( media-libs/libsamplerate ) resolver? ( dev-libs/libattica >=dev-libs/quazip-0.4.3 ) twitter? ( net-libs/qtweetlib )
 0
-http://download.tomahawk-player.org/tomahawk-0.3.0.tar.bz2
+http://download.tomahawk-player.org/tomahawk-0.3.3.tar.bz2
 
 http://tomahawk-player.org/
 GPL-3 BSD
diff --git a/metadata/cache/media-video/parole-0.2.0.2-r1 b/metadata/cache/media-video/parole-0.2.0.2-r1
deleted file mode 100644
index d537c916c457..000000000000
--- a/metadata/cache/media-video/parole-0.2.0.2-r1
+++ /dev/null
@@ -1,22 +0,0 @@
->=x11-libs/gtk+-2.16:2 >=dev-libs/glib-2.16:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=dev-libs/dbus-glib-0.88 >=media-libs/gstreamer-0.10.11:0.10 >=media-libs/gst-plugins-base-0.10.11:0.10 media-plugins/gst-plugins-meta:0.10 libnotify? ( >=x11-libs/libnotify-0.4.5 ) taglib? ( >=media-libs/taglib-1.4 ) dev-util/intltool dev-util/pkgconfig x11-proto/xproto >=sys-apps/sed-4
->=x11-libs/gtk+-2.16:2 >=dev-libs/glib-2.16:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=dev-libs/dbus-glib-0.88 >=media-libs/gstreamer-0.10.11:0.10 >=media-libs/gst-plugins-base-0.10.11:0.10 media-plugins/gst-plugins-meta:0.10 libnotify? ( >=x11-libs/libnotify-0.4.5 ) taglib? ( >=media-libs/taglib-1.4 )
-0
-mirror://xfce/src/apps/parole/0.2/parole-0.2.0.2.tar.bz2
-
-http://goodies.xfce.org/projects/applications/parole/
-GPL-2
-a simple media player based on the GStreamer framework for the Xfce4 desktop
-amd64 x86
-autotools base eutils fdo-mime gnome2-utils libtool multilib nsplugins portability toolchain-funcs user xfconf
-debug libnotify nsplugin taglib
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/media-video/vlc-1.2.9999 b/metadata/cache/media-video/vlc-1.2.9999
new file mode 100644
index 000000000000..695c7a865b01
--- /dev/null
+++ b/metadata/cache/media-video/vlc-1.2.9999
@@ -0,0 +1,22 @@
+>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvb? ( >=media-libs/libdvbpsi-0.1.6 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2010.10.15 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) libv4l2? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) fbosd? ( sys-kernel/linux-headers ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool dev-vcs/git
+>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvb? ( >=media-libs/libdvbpsi-0.1.6 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2010.10.15 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) libv4l2? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 )
+0
+mirror://gentoo/vlc-patches-101.tar.bz2
+
+http://www.videolan.org/vlc/
+GPL-2
+VLC media player - Video player and streamer
+
+autotools eutils flag-o-matic git-2 libtool multilib portability toolchain-funcs user
+a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec +avformat bidi bluray cdda cddb dbus dc1394 debug dirac direct2d directfb directx dshow dts dvb dvd dxva2 elibc_glibc egl +encode fbosd fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify libproxy libsamplerate libtiger libv4l2 linsys libtar lirc live lua +macosx +macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext +macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg mtp musepack ncurses neon ogg omxil opengl optimisememory oss png portaudio +postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba schroedinger sdl sdl-image shine shout sid skins speex sqlite sse svg +swscale switcher taglib theora truetype twolame udev upnp vaapi vcdx vlm vorbis waveout win32codecs wingdi wma-fixed +X x264 +xcb xml xosd xv zvbi
+aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dxva2? ( avcodec ) egl? ( X ) ffmpeg? ( avcodec avformat postproc swscale ) fontconfig? ( truetype ) gnutls? ( gcrypt ) libtar? ( skins ) libtiger? ( kate ) media-library? ( sqlite ) qt4? ( X ) sdl? ( X ) skins? ( truetype qt4 X ) switcher? ( avcodec ) vaapi? ( avcodec X ) vlm? ( encode ) xv? ( xcb )
+
+
+4
+
+configure install postinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/net-libs/libkvkontakte-2.3.0 b/metadata/cache/net-libs/libkvkontakte-2.3.0
index 1973333323aa..2b001cb0188d 100644
--- a/metadata/cache/net-libs/libkvkontakte-2.3.0
+++ b/metadata/cache/net-libs/libkvkontakte-2.3.0
@@ -6,7 +6,7 @@ mirror://sourceforge/digikam/digikam-2.3.0.tar.bz2
 http://www.digikam.org/
 GPL-2
 Library for accessing the features of social networking site vkontakte.ru
-~amd64 ~x86
+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
 
diff --git a/metadata/cache/net-libs/libkvkontakte-2.2.0 b/metadata/cache/net-libs/libkvkontakte-2.4.1
similarity index 96%
rename from metadata/cache/net-libs/libkvkontakte-2.2.0
rename to metadata/cache/net-libs/libkvkontakte-2.4.1
index e722739010a3..a3989340e388 100644
--- a/metadata/cache/net-libs/libkvkontakte-2.2.0
+++ b/metadata/cache/net-libs/libkvkontakte-2.4.1
@@ -1,7 +1,7 @@
 >=dev-libs/qjson-0.7.0 >=sys-apps/sed-4 >=dev-util/cmake-2.8 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:4[aqua=]
 >=dev-libs/qjson-0.7.0 >=kde-base/oxygen-icons-4.7: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:4[aqua=]
 4
-mirror://sourceforge/digikam/digikam-2.2.0.tar.bz2
+mirror://sourceforge/digikam/digikam-2.4.1.tar.bz2
 
 http://www.digikam.org/
 GPL-2
diff --git a/metadata/cache/net-mail/mpack-1.6-r1 b/metadata/cache/net-mail/mpack-1.6-r1
new file mode 100644
index 000000000000..6708546bb563
--- /dev/null
+++ b/metadata/cache/net-mail/mpack-1.6-r1
@@ -0,0 +1,22 @@
+
+
+0
+ftp://ftp.andrew.cmu.edu/pub/mpack/mpack-1.6.tar.gz
+
+ftp://ftp.andrew.cmu.edu/pub/mpack/
+as-is
+Command-line MIME encoding and decoding utilities
+~amd64 ~sparc ~x86 ~ppc-macos ~sparc-solaris ~x86-solaris
+eutils multilib portability toolchain-funcs user
+
+
+
+
+3
+
+install prepare
+
+
+
+
+
diff --git a/metadata/cache/net-misc/mediatomb-0.12.1-r1 b/metadata/cache/net-misc/mediatomb-0.12.1-r1
new file mode 100644
index 000000000000..f6bd13b6a598
--- /dev/null
+++ b/metadata/cache/net-misc/mediatomb-0.12.1-r1
@@ -0,0 +1,22 @@
+mysql? ( virtual/mysql ) !mysql? ( >=dev-db/sqlite-3 ) javascript? ( dev-lang/spidermonkey ) dev-libs/expat taglib? ( media-libs/taglib ) !taglib? ( media-libs/id3lib ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) libextractor? ( media-libs/libextractor ) mp4? ( media-libs/libmp4v2 ) ffmpeg? ( virtual/ffmpeg ) thumbnail? ( media-video/ffmpegthumbnailer[jpeg] ) net-misc/curl sys-apps/file sys-libs/zlib virtual/libiconv || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+mysql? ( virtual/mysql ) !mysql? ( >=dev-db/sqlite-3 ) javascript? ( dev-lang/spidermonkey ) dev-libs/expat taglib? ( media-libs/taglib ) !taglib? ( media-libs/id3lib ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) libextractor? ( media-libs/libextractor ) mp4? ( media-libs/libmp4v2 ) ffmpeg? ( virtual/ffmpeg ) thumbnail? ( media-video/ffmpegthumbnailer[jpeg] ) net-misc/curl sys-apps/file sys-libs/zlib virtual/libiconv
+0
+mirror://sourceforge/mediatomb/mediatomb-0.12.1.tar.gz
+
+http://www.mediatomb.cc/
+GPL-2
+MediaTomb is an open source UPnP MediaServer
+~amd64 ~arm ~ppc ~x86
+autotools eutils libtool linux-info multilib portability toolchain-funcs user versionator
+debug +exif +ffmpeg inotify +javascript lastfm libextractor +mp4 mysql +taglib thumbnail
+
+
+
+2
+
+configure install postinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/sci-libs/clapack-3.2.1-r6 b/metadata/cache/sci-libs/clapack-3.2.1-r6
index 089724a9c63c..0470bd3f447b 100644
--- a/metadata/cache/sci-libs/clapack-3.2.1-r6
+++ b/metadata/cache/sci-libs/clapack-3.2.1-r6
@@ -6,7 +6,7 @@ http://www.netlib.org/clapack/clapack-3.2.1-CMAKE.tgz
 http://www.netlib.org/clapack/
 BSD
 f2c'ed version of LAPACK
-~amd64 ~ppc ~x86 ~amd64-linux
+amd64 ~ppc x86 ~amd64-linux
 base cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user
 test
 
diff --git a/metadata/cache/sys-apps/ethtool-3.1 b/metadata/cache/sys-apps/ethtool-3.1
new file mode 100644
index 000000000000..b0f6b554d867
--- /dev/null
+++ b/metadata/cache/sys-apps/ethtool-3.1
@@ -0,0 +1,22 @@
+
+
+0
+mirror://kernel/software/network/ethtool/ethtool-3.1.tar.bz2
+
+http://www.kernel.org/pub/software/network/ethtool/
+GPL-2
+Utility for examining and tuning ethernet-based network interfaces
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+
+
+
+
+
+4
+
+-
+
+
+
+
+
diff --git a/metadata/cache/sys-apps/hwloc-1.2.1 b/metadata/cache/sys-apps/hwloc-1.2.1
index a0dc58efc248..2cc398886c55 100644
--- a/metadata/cache/sys-apps/hwloc-1.2.1
+++ b/metadata/cache/sys-apps/hwloc-1.2.1
@@ -14,7 +14,7 @@ cairo +numa svg static-libs xml X
 
 4
 
-configure install
+configure install setup
 
 
 
diff --git a/metadata/cache/sys-apps/hwloc-1.3 b/metadata/cache/sys-apps/hwloc-1.3
index 1a12ebb81bf0..d9031a168ed5 100644
--- a/metadata/cache/sys-apps/hwloc-1.3
+++ b/metadata/cache/sys-apps/hwloc-1.3
@@ -14,7 +14,7 @@ cairo debug +numa +pci svg static-libs xml X
 
 4
 
-configure install
+configure install setup
 
 
 
diff --git a/metadata/cache/sys-auth/polkit-0.103 b/metadata/cache/sys-auth/polkit-0.103
new file mode 100644
index 000000000000..3dd45231995f
--- /dev/null
+++ b/metadata/cache/sys-auth/polkit-0.103
@@ -0,0 +1,22 @@
+>=dev-libs/glib-2.28 dev-libs/expat introspection? ( >=dev-libs/gobject-introspection-0.6.2 ) pam? ( virtual/pam ) dev-libs/libxslt app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-util/pkgconfig dev-util/intltool doc? ( >=dev-util/gtk-doc-1.13 )
+>=dev-libs/glib-2.28 dev-libs/expat introspection? ( >=dev-libs/gobject-introspection-0.6.2 ) pam? ( virtual/pam )
+0
+http://hal.freedesktop.org/releases/polkit-0.103.tar.gz
+
+http://hal.freedesktop.org/docs/polkit/
+GPL-2
+Policy framework for controlling privileges for system-wide services
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+eutils flag-o-matic multilib pam portability toolchain-funcs user
+debug doc examples gtk +introspection kde nls pam
+
+>=sys-auth/consolekit-0.4.5[policykit] pam? ( sys-auth/pambase[consolekit] ) gtk? ( || ( >=gnome-extra/polkit-gnome-0.103 lxde-base/lxpolkit ) ) kde? ( sys-auth/polkit-kde-agent )
+
+4
+
+configure install postinst
+
+
+
+
+
diff --git a/metadata/cache/sys-boot/unetbootin-549 b/metadata/cache/sys-boot/unetbootin-549
deleted file mode 100644
index 51ab17b7c667..000000000000
--- a/metadata/cache/sys-boot/unetbootin-549
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-libs/qt-gui
-x11-libs/qt-gui sys-fs/mtools sys-boot/syslinux app-arch/p7zip
-0
-mirror://sourceforge/unetbootin/unetbootin-source-549.tar.gz
-
-http://unetbootin.sourceforge.net/
-GPL-2
-Universal Netboot Installer creates Live USB systems for various OS distributions.
-amd64 x86
-base eutils multilib portability qt4-r2 toolchain-funcs user
-
-
-
-
-3
-
-compile configure install prepare unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-boot/unetbootin-555 b/metadata/cache/sys-boot/unetbootin-555
deleted file mode 100644
index 353edbcd3e8a..000000000000
--- a/metadata/cache/sys-boot/unetbootin-555
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-libs/qt-gui
-x11-libs/qt-gui sys-fs/mtools sys-boot/syslinux app-arch/p7zip
-0
-mirror://sourceforge/unetbootin/unetbootin-source-555.tar.gz
-
-http://unetbootin.sourceforge.net/
-GPL-2
-Universal Netboot Installer creates Live USB systems for various OS distributions.
-~amd64 ~x86
-base eutils multilib portability qt4-r2 toolchain-funcs user
-
-
-
-
-3
-
-compile configure install prepare unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-devel/gcc-4.6.2 b/metadata/cache/sys-devel/gcc-4.6.2
index 053b7903aaad..d5450b180e8b 100644
--- a/metadata/cache/sys-devel/gcc-4.6.2
+++ b/metadata/cache/sys-devel/gcc-4.6.2
@@ -1,7 +1,7 @@
 elibc_glibc? ( >=sys-libs/glibc-2.8 ) amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) >=sys-devel/binutils-2.18 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 )
 4.6
-mirror://gnu/gcc/gcc-4.6.2/gcc-4.6.2.tar.bz2 mirror://gentoo/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.2-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.2-patches-1.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.2-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.2-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.2-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.6.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.2-piepatches-v0.4.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+mirror://gnu/gcc/gcc-4.6.2/gcc-4.6.2.tar.bz2 mirror://gentoo/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.2-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.2-patches-1.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.2-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.2-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.2-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.6.2-piepatches-v0.5.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.2-piepatches-v0.5.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.2-piepatches-v0.5.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.2-piepatches-v0.5.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.2-piepatches-v0.5.0.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
 strip
 http://gcc.gnu.org/
 GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
diff --git a/metadata/cache/sys-freebsd/boot0-9.0_rc2 b/metadata/cache/sys-freebsd/boot0-9.0_rc2
new file mode 100644
index 000000000000..3c14fe9baca8
--- /dev/null
+++ b/metadata/cache/sys-freebsd/boot0-9.0_rc2
@@ -0,0 +1,22 @@
+=sys-freebsd/freebsd-mk-defs-9.0* =sys-freebsd/freebsd-lib-9.0* virtual/pmake virtual/pmake
+
+0
+mirror://gentoo/freebsd-sys-9.0_rc2.tar.bz2
+
+http://www.freebsd.org/
+BSD
+FreeBSD's bootloader
+~sparc-fbsd ~x86-fbsd
+bsdmk eutils flag-o-matic freebsd multilib portability toolchain-funcs user versionator
+bzip2 ieee1394 tftp zfs profile
+
+
+
+2
+
+compile install prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-freebsd/freebsd-bin-9.0_rc2 b/metadata/cache/sys-freebsd/freebsd-bin-9.0_rc2
new file mode 100644
index 000000000000..376aa8adf5a6
--- /dev/null
+++ b/metadata/cache/sys-freebsd/freebsd-bin-9.0_rc2
@@ -0,0 +1,22 @@
+=sys-freebsd/freebsd-lib-9.0* sys-libs/ncurses sys-apps/ed !app-misc/realpath !<sys-freebsd/freebsd-ubin-8 =sys-freebsd/freebsd-mk-defs-9.0* >=sys-devel/flex-2.5.31-r2 virtual/pmake virtual/pmake
+=sys-freebsd/freebsd-lib-9.0* sys-libs/ncurses sys-apps/ed !app-misc/realpath !<sys-freebsd/freebsd-ubin-8
+0
+mirror://gentoo/freebsd-bin-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-ubin-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-sbin-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-lib-9.0_rc2.tar.bz2
+
+http://www.freebsd.org/
+BSD
+FreeBSD /bin tools
+~sparc-fbsd ~x86-fbsd
+bsdmk eutils flag-o-matic freebsd multilib portability toolchain-funcs user versionator
+profile
+
+
+
+
+
+compile install setup unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-freebsd/freebsd-cddl-9.0_rc2 b/metadata/cache/sys-freebsd/freebsd-cddl-9.0_rc2
new file mode 100644
index 000000000000..0ff05a3a849a
--- /dev/null
+++ b/metadata/cache/sys-freebsd/freebsd-cddl-9.0_rc2
@@ -0,0 +1,22 @@
+=sys-freebsd/freebsd-lib-9.0* =sys-freebsd/freebsd-libexec-9.0* build? ( sys-apps/baselayout ) dev-libs/libelf =sys-freebsd/freebsd-mk-defs-9.0* !build? ( =sys-freebsd/freebsd-sources-9.0* ) virtual/pmake virtual/pmake
+=sys-freebsd/freebsd-lib-9.0* =sys-freebsd/freebsd-libexec-9.0* build? ( sys-apps/baselayout ) dev-libs/libelf
+0
+mirror://gentoo/freebsd-cddl-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-contrib-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-ubin-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-lib-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-sbin-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-sys-9.0_rc2.tar.bz2 build? ( mirror://gentoo/freebsd-sys-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-include-9.0_rc2.tar.bz2 )
+
+http://www.freebsd.org/
+CDDL
+FreeBSD CDDL (opensolaris/zfs) extra software
+~x86-fbsd
+bsdmk eutils flag-o-matic freebsd multilib portability toolchain-funcs user versionator
+build profile
+
+
+
+
+
+compile install unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-freebsd/freebsd-contrib-9.0_rc2 b/metadata/cache/sys-freebsd/freebsd-contrib-9.0_rc2
new file mode 100644
index 000000000000..0f574032a47b
--- /dev/null
+++ b/metadata/cache/sys-freebsd/freebsd-contrib-9.0_rc2
@@ -0,0 +1,22 @@
+=sys-freebsd/freebsd-sources-9.0* =sys-freebsd/freebsd-mk-defs-9.0* virtual/pmake virtual/pmake
+
+0
+mirror://gentoo/freebsd-gnu-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-contrib-9.0_rc2.tar.bz2
+
+http://www.freebsd.org/
+BSD GPL-2 as-is
+Contributed sources for FreeBSD.
+~sparc-fbsd ~x86-fbsd
+bsdmk eutils flag-o-matic freebsd multilib portability toolchain-funcs user versionator
+profile
+
+
+
+
+
+compile install unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-freebsd/freebsd-lib-9.0_rc2 b/metadata/cache/sys-freebsd/freebsd-lib-9.0_rc2
new file mode 100644
index 000000000000..66f1b5ae5dd1
--- /dev/null
+++ b/metadata/cache/sys-freebsd/freebsd-lib-9.0_rc2
@@ -0,0 +1,22 @@
+ssl? ( dev-libs/openssl ) hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) usb? ( !dev-libs/libusb ) zfs? ( =sys-freebsd/freebsd-cddl-9.0* ) >=dev-libs/expat-2.0.1 !dev-libs/libedit !sys-freebsd/freebsd-headers >=sys-devel/flex-2.5.31-r2 =sys-freebsd/freebsd-sources-9.0* !bootstrap? ( app-arch/bzip2 ) =sys-freebsd/freebsd-mk-defs-9.0* virtual/pmake virtual/pmake
+ssl? ( dev-libs/openssl ) hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) usb? ( !dev-libs/libusb ) zfs? ( =sys-freebsd/freebsd-cddl-9.0* ) >=dev-libs/expat-2.0.1 !dev-libs/libedit !sys-freebsd/freebsd-headers
+0
+mirror://gentoo/freebsd-lib-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-contrib-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-crypto-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-libexec-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-etc-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-include-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-usbin-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-gnu-9.0_rc2.tar.bz2 build? ( mirror://gentoo/freebsd-sys-9.0_rc2.tar.bz2 )
+
+http://www.freebsd.org/
+BSD
+FreeBSD's base system libraries
+~sparc-fbsd ~x86-fbsd
+bsdmk eutils flag-o-matic freebsd multilib portability toolchain-funcs user versionator
+atm bluetooth ssl hesiod ipv6 kerberos usb netware build bootstrap crosscompile_opts_headers-only zfs userland_GNU userland_BSD profile
+
+
+
+2
+
+compile install prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-freebsd/freebsd-libexec-9.0_rc2 b/metadata/cache/sys-freebsd/freebsd-libexec-9.0_rc2
new file mode 100644
index 000000000000..0867d2ee816e
--- /dev/null
+++ b/metadata/cache/sys-freebsd/freebsd-libexec-9.0_rc2
@@ -0,0 +1,22 @@
+=sys-freebsd/freebsd-lib-9.0* pam? ( virtual/pam ) =sys-freebsd/freebsd-mk-defs-9.0* =sys-freebsd/freebsd-sources-9.0* virtual/pmake virtual/pmake
+=sys-freebsd/freebsd-lib-9.0* pam? ( virtual/pam ) xinetd? ( sys-apps/xinetd )
+0
+mirror://gentoo/freebsd-libexec-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-ubin-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-bin-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-contrib-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-lib-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-etc-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-usbin-9.0_rc2.tar.bz2
+
+http://www.freebsd.org/
+BSD
+FreeBSD libexec things
+~sparc-fbsd ~x86-fbsd
+bsdmk eutils flag-o-matic freebsd multilib pam portability toolchain-funcs user versionator
+pam ssl kerberos ipv6 nis xinetd profile
+
+
+
+2
+
+compile install prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-freebsd/freebsd-mk-defs-9.0_rc2 b/metadata/cache/sys-freebsd/freebsd-mk-defs-9.0_rc2
new file mode 100644
index 000000000000..4c8c22387870
--- /dev/null
+++ b/metadata/cache/sys-freebsd/freebsd-mk-defs-9.0_rc2
@@ -0,0 +1,22 @@
+virtual/pmake virtual/pmake
+
+0
+mirror://gentoo/freebsd-share-9.0_rc2.tar.bz2
+strip
+http://www.freebsd.org/
+BSD
+Makefiles definitions used for building and installing libraries and system files
+~amd64 ~x86 ~sparc-fbsd ~x86-fbsd
+bsdmk eutils flag-o-matic freebsd multilib portability toolchain-funcs user versionator
+userland_GNU profile
+
+
+
+3
+
+compile install prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-freebsd/freebsd-pam-modules-9.0_rc2 b/metadata/cache/sys-freebsd/freebsd-pam-modules-9.0_rc2
new file mode 100644
index 000000000000..1b992c15abd3
--- /dev/null
+++ b/metadata/cache/sys-freebsd/freebsd-pam-modules-9.0_rc2
@@ -0,0 +1,22 @@
+>=sys-auth/openpam-20050201-r1 kerberos? ( dev-libs/openssl virtual/krb5 ) =sys-freebsd/freebsd-mk-defs-9.0* =sys-freebsd/freebsd-sources-9.0* virtual/pmake virtual/pmake
+>=sys-auth/openpam-20050201-r1 kerberos? ( dev-libs/openssl virtual/krb5 )
+0
+mirror://gentoo/freebsd-lib-9.0_rc2.tar.bz2
+
+http://www.freebsd.org/
+BSD
+FreeBSD's PAM authentication modules
+~x86-fbsd ~sparc-fbsd
+bsdmk eutils flag-o-matic freebsd multilib pam portability toolchain-funcs user versionator
+kerberos nis profile
+
+
+
+
+
+compile install setup unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-freebsd/freebsd-pf-9.0_rc2 b/metadata/cache/sys-freebsd/freebsd-pf-9.0_rc2
new file mode 100644
index 000000000000..9a6de5dcf99b
--- /dev/null
+++ b/metadata/cache/sys-freebsd/freebsd-pf-9.0_rc2
@@ -0,0 +1,22 @@
+net-libs/libpcap dev-libs/libevent sys-freebsd/freebsd-mk-defs =sys-freebsd/freebsd-sources-9.0* virtual/pmake virtual/pmake
+net-libs/libpcap
+0
+mirror://gentoo/freebsd-usbin-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-sbin-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-contrib-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-etc-9.0_rc2.tar.bz2
+
+http://www.freebsd.org/
+BSD
+FreeBSD's base system libraries
+~x86-fbsd
+bsdmk eutils flag-o-matic freebsd multilib portability toolchain-funcs user versionator
+profile
+
+
+
+
+
+compile install setup unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-freebsd/freebsd-rescue-9.0_rc2 b/metadata/cache/sys-freebsd/freebsd-rescue-9.0_rc2
new file mode 100644
index 000000000000..d695aa46fa52
--- /dev/null
+++ b/metadata/cache/sys-freebsd/freebsd-rescue-9.0_rc2
@@ -0,0 +1,22 @@
+sys-devel/flex >=app-arch/libarchive-2.7.1[static-libs] app-arch/xz-utils[static-libs] sys-libs/ncurses[static-libs] dev-libs/expat[static-libs] app-arch/bzip2[static-libs] dev-libs/libxml2:2[static-libs] dev-libs/openssl[static-libs] sys-libs/zlib[static-libs] dev-util/pkgconfig =sys-freebsd/freebsd-lib-9.0*[atm?,netware?] =sys-freebsd/freebsd-sources-9.0* =sys-freebsd/freebsd-mk-defs-9.0* virtual/pmake virtual/pmake
+
+0
+mirror://gentoo/freebsd-ubin-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-contrib-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-lib-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-bin-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-sbin-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-usbin-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-gnu-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-sys-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-libexec-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-rescue-9.0_rc2.tar.bz2 zfs? ( mirror://gentoo/freebsd-cddl-9.0_rc2.tar.bz2 )
+
+http://www.freebsd.org/
+BSD zfs? ( CDDL )
+FreeBSD's rescue binaries
+~x86-fbsd
+bsdmk eutils flag-o-matic freebsd multilib portability toolchain-funcs user versionator
+atm netware nis zfs profile
+
+
+
+2
+
+compile install prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-freebsd/freebsd-sbin-9.0_rc2 b/metadata/cache/sys-freebsd/freebsd-sbin-9.0_rc2
new file mode 100644
index 000000000000..9a3fcaecd54a
--- /dev/null
+++ b/metadata/cache/sys-freebsd/freebsd-sbin-9.0_rc2
@@ -0,0 +1,22 @@
+=sys-freebsd/freebsd-lib-9.0*[ipv6?,atm?,netware?] =sys-freebsd/freebsd-libexec-9.0* >=dev-libs/expat-2.0.1 ssl? ( dev-libs/openssl ) sys-libs/readline sys-process/vixie-cron atm? ( net-analyzer/bsnmp ) !build? ( =sys-freebsd/freebsd-sources-9.0* ) =sys-freebsd/freebsd-mk-defs-9.0* virtual/pmake virtual/pmake
+=sys-freebsd/freebsd-lib-9.0*[ipv6?,atm?,netware?] =sys-freebsd/freebsd-libexec-9.0* >=dev-libs/expat-2.0.1 ssl? ( dev-libs/openssl ) sys-libs/readline sys-process/vixie-cron atm? ( net-analyzer/bsnmp )
+0
+mirror://gentoo/freebsd-sbin-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-contrib-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-lib-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-libexec-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-usbin-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-etc-9.0_rc2.tar.bz2 build? ( mirror://gentoo/freebsd-sys-9.0_rc2.tar.bz2 )
+
+http://www.freebsd.org/
+BSD
+FreeBSD sbin utils
+~sparc-fbsd ~x86-fbsd
+bsdmk eutils flag-o-matic freebsd multilib portability toolchain-funcs user versionator
+atm ipfilter +pf ipv6 build ssl +cxx netware profile
+
+
+
+2
+
+compile install prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-freebsd/freebsd-share-9.0_rc2 b/metadata/cache/sys-freebsd/freebsd-share-9.0_rc2
new file mode 100644
index 000000000000..c49f683e2251
--- /dev/null
+++ b/metadata/cache/sys-freebsd/freebsd-share-9.0_rc2
@@ -0,0 +1,22 @@
+=sys-freebsd/freebsd-mk-defs-9.0* =sys-freebsd/freebsd-sources-9.0* virtual/pmake virtual/pmake
+sys-apps/miscfiles
+0
+mirror://gentoo/freebsd-share-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-contrib-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-gnu-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-ubin-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-usbin-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-sbin-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-bin-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-lib-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-etc-9.0_rc2.tar.bz2
+strip
+http://www.freebsd.org/
+BSD
+FreeBSD shared tools/files
+~sparc-fbsd ~x86-fbsd
+bsdmk eutils flag-o-matic freebsd multilib portability toolchain-funcs user versionator
+doc isdn
+
+
+
+
+
+compile install setup unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-freebsd/freebsd-sources-9.0_rc2 b/metadata/cache/sys-freebsd/freebsd-sources-9.0_rc2
new file mode 100644
index 000000000000..512080c36b00
--- /dev/null
+++ b/metadata/cache/sys-freebsd/freebsd-sources-9.0_rc2
@@ -0,0 +1,22 @@
+virtual/pmake virtual/pmake
+>=sys-freebsd/freebsd-mk-defs-8.0
+9.0_rc2
+mirror://gentoo/freebsd-sys-9.0_rc2.tar.bz2
+strip binchecks
+http://www.freebsd.org/
+BSD
+FreeBSD kernel sources
+~sparc-fbsd ~x86-fbsd
+bsdmk eutils flag-o-matic freebsd multilib portability toolchain-funcs user versionator
+symlink
+
+
+
+
+
+compile install postinst unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-freebsd/freebsd-ubin-9.0_rc2 b/metadata/cache/sys-freebsd/freebsd-ubin-9.0_rc2
new file mode 100644
index 000000000000..b28ed714e619
--- /dev/null
+++ b/metadata/cache/sys-freebsd/freebsd-ubin-9.0_rc2
@@ -0,0 +1,22 @@
+=sys-freebsd/freebsd-lib-9.0*[usb?,bluetooth?] ssl? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) ar? ( app-arch/libarchive ) virtual/pam sys-libs/zlib >=sys-libs/ncurses-5.9 !sys-process/fuser-bsd !dev-util/csup sys-devel/flex !build? ( =sys-freebsd/freebsd-sources-9.0* ) =sys-freebsd/freebsd-mk-defs-9.0* virtual/pmake virtual/pmake
+=sys-freebsd/freebsd-lib-9.0*[usb?,bluetooth?] ssl? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) ar? ( app-arch/libarchive ) virtual/pam sys-libs/zlib >=sys-libs/ncurses-5.9 !sys-process/fuser-bsd !dev-util/csup >=sys-auth/pambase-20080219.1 sys-process/cronbase
+0
+mirror://gentoo/freebsd-ubin-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-contrib-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-lib-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-etc-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-bin-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-include-9.0_rc2.tar.bz2 zfs? ( mirror://gentoo/freebsd-cddl-9.0_rc2.tar.bz2 ) build? ( mirror://gentoo/freebsd-sys-9.0_rc2.tar.bz2 )
+
+http://www.freebsd.org/
+BSD zfs? ( CDDL )
+FreeBSD's base system source for /usr/bin
+~sparc-fbsd ~x86-fbsd
+bsdmk eutils flag-o-matic freebsd multilib pam portability toolchain-funcs user versionator
+ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs profile
+
+
+
+2
+
+compile install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-freebsd/freebsd-usbin-9.0_rc2 b/metadata/cache/sys-freebsd/freebsd-usbin-9.0_rc2
new file mode 100644
index 000000000000..9158cca3b08d
--- /dev/null
+++ b/metadata/cache/sys-freebsd/freebsd-usbin-9.0_rc2
@@ -0,0 +1,22 @@
+=sys-freebsd/freebsd-lib-9.0*[usb?,bluetooth?,netware?] =sys-freebsd/freebsd-libexec-9.0* =sys-freebsd/freebsd-contrib-9.0* acpi? ( sys-power/iasl ) build? ( sys-apps/baselayout ) ssl? ( dev-libs/openssl ) sys-apps/tcp-wrappers dev-util/dialog dev-libs/libelf net-libs/libpcap =sys-freebsd/freebsd-mk-defs-9.0* =sys-freebsd/freebsd-ubin-9.0* !build? ( =sys-freebsd/freebsd-sources-9.0* ) sys-apps/texinfo sys-devel/flex virtual/pmake virtual/pmake
+=sys-freebsd/freebsd-lib-9.0*[usb?,bluetooth?,netware?] =sys-freebsd/freebsd-libexec-9.0* =sys-freebsd/freebsd-contrib-9.0* acpi? ( sys-power/iasl ) build? ( sys-apps/baselayout ) ssl? ( dev-libs/openssl ) sys-apps/tcp-wrappers dev-util/dialog dev-libs/libelf net-libs/libpcap
+0
+mirror://gentoo/freebsd-usbin-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-contrib-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-ubin-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-lib-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-sbin-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-etc-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-gnu-9.0_rc2.tar.bz2 nis? ( mirror://gentoo/freebsd-libexec-9.0_rc2.tar.bz2 ) build? ( mirror://gentoo/freebsd-sys-9.0_rc2.tar.bz2 mirror://gentoo/freebsd-include-9.0_rc2.tar.bz2 )
+
+http://www.freebsd.org/
+BSD
+FreeBSD /usr/sbin tools
+~sparc-fbsd ~x86-fbsd
+bsdmk eutils flag-o-matic freebsd multilib portability toolchain-funcs user versionator
+acpi atm audit bluetooth floppy ipv6 isdn minimal netware nis pam ssl usb build profile
+
+
+
+2
+
+compile install postinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-fs/e2fsprogs-1.42_pre0702 b/metadata/cache/sys-fs/e2fsprogs-1.42
similarity index 52%
rename from metadata/cache/sys-fs/e2fsprogs-1.42_pre0702
rename to metadata/cache/sys-fs/e2fsprogs-1.42
index 5e92e220a50f..bccd943e0833 100644
--- a/metadata/cache/sys-fs/e2fsprogs-1.42_pre0702
+++ b/metadata/cache/sys-fs/e2fsprogs-1.42
@@ -1,14 +1,14 @@
-~sys-libs/e2fsprogs-libs-1.42_pre0702 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) dev-util/pkgconfig sys-apps/texinfo
-~sys-libs/e2fsprogs-libs-1.42_pre0702 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl )
+~sys-libs/e2fsprogs-libs-1.42 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) dev-util/pkgconfig sys-apps/texinfo
+~sys-libs/e2fsprogs-libs-1.42 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl )
 0
-mirror://sourceforge/e2fsprogs/e2fsprogs-1.42-WIP-0702.tar.gz
+mirror://sourceforge/e2fsprogs/e2fsprogs-1.42.tar.gz
 
 http://e2fsprogs.sourceforge.net/
 GPL-2 BSD
 Standard EXT2/EXT3/EXT4 filesystem utilities
 ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint
 eutils flag-o-matic multilib portability toolchain-funcs user
-nls elibc_FreeBSD
+nls static-libs elibc_FreeBSD
 
 
 
diff --git a/metadata/cache/sys-libs/e2fsprogs-libs-1.42_pre0702 b/metadata/cache/sys-libs/e2fsprogs-libs-1.42
similarity index 82%
rename from metadata/cache/sys-libs/e2fsprogs-libs-1.42_pre0702
rename to metadata/cache/sys-libs/e2fsprogs-libs-1.42
index 7e5336437316..63433d194762 100644
--- a/metadata/cache/sys-libs/e2fsprogs-libs-1.42_pre0702
+++ b/metadata/cache/sys-libs/e2fsprogs-libs-1.42
@@ -1,14 +1,14 @@
 nls? ( sys-devel/gettext ) dev-util/pkgconfig
 !sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8
 0
-mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.42-WIP-0702.tar.gz
+mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.42.tar.gz
 
 http://e2fsprogs.sourceforge.net/
 GPL-2
 e2fsprogs libraries (common error and subsystem)
 ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 multilib toolchain-funcs
-nls
+nls static-libs
 
 
 
diff --git a/metadata/cache/sys-libs/gdbm-1.9.1-r2 b/metadata/cache/sys-libs/gdbm-1.9.1-r2
index e83a3df45b19..0d75c6f6552a 100644
--- a/metadata/cache/sys-libs/gdbm-1.9.1-r2
+++ b/metadata/cache/sys-libs/gdbm-1.9.1-r2
@@ -6,13 +6,13 @@ mirror://gnu/gdbm/gdbm-1.9.1.tar.gz exporter? ( mirror://gnu/gdbm/gdbm-1.8.3.tar
 http://www.gnu.org/software/gdbm/
 GPL-3
 Standard GNU database libraries
-~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 ~x86-linux
 eutils flag-o-matic libtool multilib portability toolchain-funcs user
 +berkdb exporter static-libs
 
 
 
-2
+3
 
 compile configure install postinst preinst prepare
 
diff --git a/metadata/cache/sys-process/numactl-2.0.7-r1 b/metadata/cache/sys-process/numactl-2.0.7-r1
index 6d8b3ad65d2f..6f33f0b2c99f 100644
--- a/metadata/cache/sys-process/numactl-2.0.7-r1
+++ b/metadata/cache/sys-process/numactl-2.0.7-r1
@@ -6,7 +6,7 @@ ftp://oss.sgi.com/www/projects/libnuma/download/numactl-2.0.7.tar.gz
 http://oss.sgi.com/projects/libnuma/
 GPL-2
 Utilities and libraries for NUMA systems
-~amd64 ~ppc ~x86 ~amd64-linux
+~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux
 eutils multilib portability toolchain-funcs user
 perl
 
diff --git a/metadata/cache/virtual/perl-Pod-Simple-3.160.0-r2 b/metadata/cache/virtual/perl-Pod-Simple-3.160.0-r2
index f40df1dd5dce..03c52cb49447 100644
--- a/metadata/cache/virtual/perl-Pod-Simple-3.160.0-r2
+++ b/metadata/cache/virtual/perl-Pod-Simple-3.160.0-r2
@@ -6,7 +6,7 @@
 
 
 Virtual for Pod-Simple
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 
 
 
diff --git a/metadata/cache/virtual/perl-Time-HiRes-1.972.200 b/metadata/cache/virtual/perl-Time-HiRes-1.972.200
index 68331e919283..85abad6ef9ca 100644
--- a/metadata/cache/virtual/perl-Time-HiRes-1.972.200
+++ b/metadata/cache/virtual/perl-Time-HiRes-1.972.200
@@ -6,7 +6,7 @@
 
 
 Virtual for Time-HiRes
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+~alpha ~amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 
 
 
diff --git a/metadata/cache/www-apps/moodle-1.9.14 b/metadata/cache/www-apps/moodle-1.9.14
deleted file mode 100644
index 931f1e55417a..000000000000
--- a/metadata/cache/www-apps/moodle-1.9.14
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-admin/webapp-config-1.50.15
-|| ( >=dev-lang/php-4.3.0[mysql?,postgres?,imap?,ldap?,odbc?,ctype,curl,gd,iconv,ssl,tokenizer,xml,xmlrpc,zlib] >=dev-lang/php-4.3.0[mysql?,postgres?,imap?,ldap?,odbc?,ctype,curl,gd-external,iconv,ssl,tokenizer,xml,xmlrpc,zlib] ) virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
-1.9.14
-http://download.moodle.org/stable19/moodle-1.9.14.tgz
-
-http://moodle.org
-GPL-2
-The Moodle Course Management System
-~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-eutils multilib portability toolchain-funcs user versionator webapp
-mysql postgres imap ldap odbc vhosts vhosts
-
-
-
-4
-
-install postinst prepare prerm setup
-
-
-
-
-
diff --git a/metadata/cache/www-apps/moodle-2.0.5 b/metadata/cache/www-apps/moodle-2.0.5
deleted file mode 100644
index e9bcd35834ec..000000000000
--- a/metadata/cache/www-apps/moodle-2.0.5
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-admin/webapp-config-1.50.15
-|| ( =dev-lang/php-5.2*[mysqli?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,pcre,simplexml,spl,xml,zip,gd,soap,ssl,tokenizer,xmlrpc] =dev-lang/php-5.2*[mysqli?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,pcre,simplexml,spl,xml,zip,gd-external,soap,ssl,tokenizer,xmlrpc] =dev-lang/php-5.3*[mysqli?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] =dev-lang/php-5.3*[mysqli?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,simplexml,xml,zip,gd-external,intl,soap,ssl,tokenizer,xmlrpc] ) virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
-2.0.5
-http://download.moodle.org/stable20/moodle-2.0.5.tgz
-
-http://moodle.org
-GPL-2
-The Moodle Course Management System
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-eutils multilib portability toolchain-funcs user versionator webapp
-mysqli postgres imap ldap odbc vhosts vhosts
-
-
-
-4
-
-install postinst prepare prerm setup
-
-
-
-
-
diff --git a/metadata/cache/www-apps/moodle-2.1.2 b/metadata/cache/www-apps/moodle-2.1.2
deleted file mode 100644
index 72006ed0c9d1..000000000000
--- a/metadata/cache/www-apps/moodle-2.1.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-admin/webapp-config-1.50.15
-|| ( =dev-lang/php-5.2*[mysqli?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,pcre,simplexml,spl,xml,zip,gd,soap,ssl,tokenizer,xmlrpc] =dev-lang/php-5.2*[mysqli?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,pcre,simplexml,spl,xml,zip,gd-external,soap,ssl,tokenizer,xmlrpc] =dev-lang/php-5.3*[mysqli?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] =dev-lang/php-5.3*[mysqli?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,simplexml,xml,zip,gd-external,intl,soap,ssl,tokenizer,xmlrpc] ) virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
-2.1.2
-http://download.moodle.org/stable21/moodle-2.1.2.tgz
-
-http://moodle.org
-GPL-2
-The Moodle Course Management System
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-eutils multilib portability toolchain-funcs user versionator webapp
-mysqli postgres imap ldap odbc vhosts vhosts
-
-
-
-4
-
-install postinst prepare prerm setup
-
-
-
-
-
diff --git a/metadata/cache/www-client/opera-next-12.00.1105 b/metadata/cache/www-client/opera-next-12.00.1105
deleted file mode 100644
index 00e4ae2b4631..000000000000
--- a/metadata/cache/www-client/opera-next-12.00.1105
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 app-arch/xz-utils >=sys-apps/sed-4
-media-libs/fontconfig media-libs/freetype sys-apps/util-linux sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango x11-libs/pixman ) kde? ( kde-base/kdelibs x11-libs/qt-core x11-libs/qt-gui ) gstreamer? ( dev-libs/glib:2 dev-libs/libxml2 media-plugins/gst-plugins-meta media-libs/gstreamer )
-0
-amd64? ( http://snapshot.opera.com/unix/alpha_12.00-1105/opera-next-12.00-1105.x86_64.linux.tar.xz ) x86? ( http://snapshot.opera.com/unix/alpha_12.00-1105/opera-next-12.00-1105.i386.linux.tar.xz ) x86-fbsd? ( http://snapshot.opera.com/unix/alpha_12.00-1105/opera-next-12.00-1105.i386.freebsd.tar.xz )
-
-http://www.opera.com/
-OPERA-11 LGPL-2 LGPL-3
-A fast and secure web browser and Internet suite
-~amd64 ~x86 ~x86-fbsd
-eutils fdo-mime gnome2-utils multilib pax-utils portability toolchain-funcs user versionator
-elibc_FreeBSD gtk kde +gstreamer linguas_af linguas_az linguas_be linguas_bg linguas_bn linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_ES linguas_es_LA linguas_et linguas_fi linguas_fr linguas_fr_CA linguas_fy linguas_gd linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ka linguas_ko linguas_lt linguas_me linguas_mk linguas_ms linguas_nb linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tl linguas_tr linguas_uk linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu
-
-
-
-4
-
-install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/www-client/opera-next-12.00.1116 b/metadata/cache/www-client/opera-next-12.00.1116
deleted file mode 100644
index 3f93e2283ade..000000000000
--- a/metadata/cache/www-client/opera-next-12.00.1116
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 app-arch/xz-utils >=sys-apps/sed-4
-media-libs/fontconfig media-libs/freetype sys-apps/util-linux sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) gtk3? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) kde? ( kde-base/kdelibs x11-libs/qt-core x11-libs/qt-gui ) gstreamer? ( dev-libs/glib:2 dev-libs/libxml2 media-libs/gst-plugins-base media-libs/gstreamer media-plugins/gst-plugins-meta )
-0
-amd64? ( http://snapshot.opera.com/unix/quack_12.00-1116/opera-next-12.00-1116.x86_64.linux.tar.xz ) x86? ( http://snapshot.opera.com/unix/quack_12.00-1116/opera-next-12.00-1116.i386.linux.tar.xz ) x86-fbsd? ( http://snapshot.opera.com/unix/quack_12.00-1116/opera-next-12.00-1116.i386.freebsd.tar.xz )
-
-http://www.opera.com/
-OPERA-11 LGPL-2 LGPL-3
-A fast and secure web browser and Internet suite
-~amd64 ~x86 ~x86-fbsd
-eutils fdo-mime gnome2-utils multilib pax-utils portability toolchain-funcs user versionator
-elibc_FreeBSD gtk gtk3 kde +gstreamer linguas_af linguas_az linguas_be linguas_bg linguas_bn linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_ES linguas_es_LA linguas_et linguas_fi linguas_fr linguas_fr_CA linguas_fy linguas_gd linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ka linguas_ko linguas_lt linguas_me linguas_mk linguas_ms linguas_nb linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tl linguas_tr linguas_uk linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu
-
-
-
-4
-
-install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/www-client/opera-next-12.00.1155 b/metadata/cache/www-client/opera-next-12.00.1191
similarity index 84%
rename from metadata/cache/www-client/opera-next-12.00.1155
rename to metadata/cache/www-client/opera-next-12.00.1191
index b78f8d06247f..33ed9c3ac911 100644
--- a/metadata/cache/www-client/opera-next-12.00.1155
+++ b/metadata/cache/www-client/opera-next-12.00.1191
@@ -1,7 +1,7 @@
 >=sys-apps/sed-4 app-arch/xz-utils >=sys-apps/sed-4
 media-libs/fontconfig media-libs/freetype sys-apps/util-linux sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) gtk3? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) kde? ( kde-base/kdelibs x11-libs/qt-core x11-libs/qt-gui ) gstreamer? ( dev-libs/glib:2 dev-libs/libxml2 media-libs/gst-plugins-base media-libs/gstreamer media-plugins/gst-plugins-meta )
 0
-amd64? ( http://snapshot.opera.com/unix/hwa_12.00-1155/opera-next-12.00-1155.x86_64.linux.tar.xz ) x86? ( http://snapshot.opera.com/unix/hwa_12.00-1155/opera-next-12.00-1155.i386.linux.tar.xz ) x86-fbsd? ( http://snapshot.opera.com/unix/hwa_12.00-1155/opera-next-12.00-1155.i386.freebsd.tar.xz )
+amd64? ( http://snapshot.opera.com/unix/kisskiss_12.00-1191/opera-next-12.00-1191.x86_64.linux.tar.xz ) x86? ( http://snapshot.opera.com/unix/kisskiss_12.00-1191/opera-next-12.00-1191.i386.linux.tar.xz ) x86-fbsd? ( http://snapshot.opera.com/unix/kisskiss_12.00-1191/opera-next-12.00-1191.i386.freebsd.tar.xz )
 
 http://www.opera.com/
 OPERA-11 LGPL-2 LGPL-3
diff --git a/metadata/cache/www-client/rekonq-0.8.0 b/metadata/cache/www-client/rekonq-0.8.0
index dc117ad32dc3..c9dc8b7ecff4 100644
--- a/metadata/cache/www-client/rekonq-0.8.0
+++ b/metadata/cache/www-client/rekonq-0.8.0
@@ -6,7 +6,7 @@ test
 http://rekonq.kde.org/
 GPL-3
 A browser based on qt-webkit
-~amd64 ~x86
+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
 
diff --git a/metadata/cache/www-plugins/gecko-mediaplayer-1.0.5_beta1 b/metadata/cache/www-plugins/gecko-mediaplayer-1.0.5_beta1
deleted file mode 100644
index df79bbc78654..000000000000
--- a/metadata/cache/www-plugins/gecko-mediaplayer-1.0.5_beta1
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/dbus-glib-0.92 >=dev-libs/glib-2.26:2 dev-libs/nspr >=media-libs/gmtk-1.0.5_beta1 >=media-video/gnome-mplayer-1.0.5_beta1[dbus] || ( >=www-client/firefox-8 >=net-libs/xulrunner-1.9.2:1.9 ) curl? ( net-misc/curl ) dev-util/pkgconfig sys-devel/gettext
->=dev-libs/dbus-glib-0.92 >=dev-libs/glib-2.26:2 dev-libs/nspr >=media-libs/gmtk-1.0.5_beta1 >=media-video/gnome-mplayer-1.0.5_beta1[dbus] || ( >=www-client/firefox-8 >=net-libs/xulrunner-1.9.2:1.9 ) curl? ( net-misc/curl )
-0
-http://gecko-mediaplayer.googlecode.com/files/gecko-mediaplayer-1.0.5b1.tar.gz
-
-http://code.google.com/p/gecko-mediaplayer/
-GPL-2
-A browser plugin that uses GNOME MPlayer
-~amd64 ~ppc ~ppc64 ~x86
-eutils multilib nsplugins portability toolchain-funcs user
-+curl
-
-
-
-4
-
-configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/www-plugins/gecko-mediaplayer-1.0.5_beta1_p20111203 b/metadata/cache/www-plugins/gecko-mediaplayer-1.0.5_beta1_p20111207
similarity index 70%
rename from metadata/cache/www-plugins/gecko-mediaplayer-1.0.5_beta1_p20111203
rename to metadata/cache/www-plugins/gecko-mediaplayer-1.0.5_beta1_p20111207
index 8024e95c7556..846095ff9cbe 100644
--- a/metadata/cache/www-plugins/gecko-mediaplayer-1.0.5_beta1_p20111203
+++ b/metadata/cache/www-plugins/gecko-mediaplayer-1.0.5_beta1_p20111207
@@ -1,7 +1,7 @@
->=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.28:2 dev-libs/nspr >=media-libs/gmtk-1.0.5_beta >=media-video/gnome-mplayer-1.0.5_beta[dbus] curl? ( net-misc/curl ) dev-util/pkgconfig >=net-misc/npapi-sdk-0.27 sys-devel/gettext || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.28:2 dev-libs/nspr >=media-libs/gmtk-1.0.5_beta >=media-video/gnome-mplayer-1.0.5_beta[dbus] curl? ( net-misc/curl ) app-arch/xz-utils dev-util/pkgconfig >=net-misc/npapi-sdk-0.27 sys-devel/gettext || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
 >=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.28:2 dev-libs/nspr >=media-libs/gmtk-1.0.5_beta >=media-video/gnome-mplayer-1.0.5_beta[dbus] curl? ( net-misc/curl )
 0
-http://dev.gentoo.org/~ssuominen/gecko-mediaplayer-1.0.5_beta1_p20111203.tar.xz http://dev.gentoo.org/~ssuominen/gecko-mediaplayer-gconf-2.m4.xz
+http://dev.gentoo.org/~ssuominen/gecko-mediaplayer-1.0.5_beta1_p20111207.tar.xz http://dev.gentoo.org/~ssuominen/gecko-mediaplayer-gconf-2.m4.xz
 
 http://code.google.com/p/gecko-mediaplayer/
 GPL-2
diff --git a/metadata/cache/x11-drivers/nvidia-drivers-173.14.30 b/metadata/cache/x11-drivers/nvidia-drivers-173.14.30
deleted file mode 100644
index 3f86b0be4bff..000000000000
--- a/metadata/cache/x11-drivers/nvidia-drivers-173.14.30
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-base/xorg-server kernel_linux? ( >=sys-libs/glibc-2.6.1 ) multilib? ( app-emulation/emul-linux-x86-opengl ) >=app-admin/eselect-opengl-1.0.9 kernel_linux? ( virtual/linux-sources ) kernel_linux? ( sys-apps/module-init-tools ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) sys-apps/pciutils
-x11-base/xorg-server kernel_linux? ( >=sys-libs/glibc-2.6.1 ) multilib? ( app-emulation/emul-linux-x86-opengl ) >=app-admin/eselect-opengl-1.0.9 acpi? ( sys-power/acpid ) kernel_linux? ( sys-apps/module-init-tools )
-0
-x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/173.14.30/NVIDIA-Linux-x86-173.14.30-pkg0.run ) amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/173.14.30/NVIDIA-Linux-x86_64-173.14.30-pkg2.run ) x86-fbsd? ( ftp://download.nvidia.com/freebsd/173.14.30/NVIDIA-FreeBSD-x86-173.14.30.tar.gz )
-strip
-http://www.nvidia.com/
-NVIDIA
-NVIDIA X11 driver and GLX libraries
--* amd64 x86 ~x86-fbsd
-eutils flag-o-matic linux-info linux-mod multilib nvidia-driver portability toolchain-funcs user versionator
-acpi custom-cflags gtk multilib kernel_linux kernel_linux
-
-gtk? ( media-video/nvidia-settings )
-
-2
-
-compile install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/x11-drivers/nvidia-drivers-96.43.19 b/metadata/cache/x11-drivers/nvidia-drivers-96.43.19
deleted file mode 100644
index 446a0e7a4a61..000000000000
--- a/metadata/cache/x11-drivers/nvidia-drivers-96.43.19
+++ /dev/null
@@ -1,22 +0,0 @@
-<x11-base/xorg-server-1.10 gtk? ( !media-video/nvidia-settings dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/pango ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) multilib? ( app-emulation/emul-linux-x86-opengl ) >=app-admin/eselect-opengl-1.0.9 kernel_linux? ( virtual/linux-sources ) kernel_linux? ( sys-apps/module-init-tools ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) sys-apps/pciutils
-<x11-base/xorg-server-1.10 gtk? ( !media-video/nvidia-settings dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/pango ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) multilib? ( app-emulation/emul-linux-x86-opengl ) >=app-admin/eselect-opengl-1.0.9 acpi? ( sys-power/acpid ) kernel_linux? ( sys-apps/module-init-tools )
-0
-x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/96.43.19/NVIDIA-Linux-x86-96.43.19-pkg0.run ) amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/96.43.19/NVIDIA-Linux-x86_64-96.43.19-pkg2.run ) x86-fbsd? ( ftp://download.nvidia.com/freebsd/96.43.19/NVIDIA-FreeBSD-x86-96.43.19.tar.gz )
-strip
-http://www.nvidia.com/
-NVIDIA
-NVIDIA X11 driver and GLX libraries
--* amd64 x86 ~x86-fbsd
-eutils flag-o-matic linux-info linux-mod multilib nvidia-driver portability toolchain-funcs user versionator
-acpi custom-cflags gtk multilib kernel_linux kernel_linux
-
-
-
-2
-
-compile install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/x11-drivers/xf86-video-virtualbox-4.1.4 b/metadata/cache/x11-drivers/xf86-video-virtualbox-4.1.4
index 6f39a5d5fb9e..9275eb10505e 100644
--- a/metadata/cache/x11-drivers/xf86-video-virtualbox-4.1.4
+++ b/metadata/cache/x11-drivers/xf86-video-virtualbox-4.1.4
@@ -6,7 +6,7 @@ http://download.virtualbox.org/virtualbox/4.1.4/VirtualBox-4.1.4.tar.bz2
 http://www.virtualbox.org/
 GPL-2
 VirtualBox video driver
-amd64 ~x86
+amd64 x86
 eutils linux-info linux-mod multilib portability python toolchain-funcs user versionator
 dri kernel_linux
 
diff --git a/metadata/cache/x11-libs/libfm-9999 b/metadata/cache/x11-libs/libfm-9999
index bd7c6dcf6cc1..a37e176486bc 100644
--- a/metadata/cache/x11-libs/libfm-9999
+++ b/metadata/cache/x11-libs/libfm-9999
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 udev? ( dev-libs/dbus-glib ) >=lxde-base/menu-cache-0.3.2 dev-util/gtk-doc-am doc? ( dev-util/gtk-doc ) >=dev-util/intltool-0.40 dev-util/pkgconfig sys-devel/gettext || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool dev-vcs/git
+>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 udev? ( dev-libs/dbus-glib ) >=lxde-base/menu-cache-0.3.2 >=dev-lang/vala-0.14.0 dev-util/gtk-doc-am doc? ( dev-util/gtk-doc ) >=dev-util/intltool-0.40 dev-util/pkgconfig sys-devel/gettext || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool dev-vcs/git
 >=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 udev? ( dev-libs/dbus-glib ) >=lxde-base/menu-cache-0.3.2 x11-misc/shared-mime-info udev? ( sys-fs/udisks )
 0
 
diff --git a/metadata/cache/x11-misc/colord-0.1.15 b/metadata/cache/x11-misc/colord-0.1.15
index 0bacdb133062..ebd78d0cbf1b 100644
--- a/metadata/cache/x11-misc/colord-0.1.15
+++ b/metadata/cache/x11-misc/colord-0.1.15
@@ -6,7 +6,7 @@ test
 http://www.freedesktop.org/software/colord/
 GPL-2
 System service to accurately color manage input and output devices
-~amd64 ~arm ~hppa ~x86
+~amd64 ~arm ~hppa ~x86 ~x86-fbsd
 autotools base eutils libtool multilib portability toolchain-funcs user
 doc elibc_FreeBSD examples gusb +introspection scanner +udev vala
 
diff --git a/metadata/cache/x11-terms/terminator-0.95 b/metadata/cache/x11-terms/terminator-0.95
index 5ecb2ce250e9..05c027a78f4a 100644
--- a/metadata/cache/x11-terms/terminator-0.95
+++ b/metadata/cache/x11-terms/terminator-0.95
@@ -1,4 +1,4 @@
-dev-util/intltool >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+dev-util/intltool >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 =dev-lang/python-2*
 >=x11-libs/vte-0.16:0[python] dbus? ( sys-apps/dbus ) gnome? ( dev-python/gconf-python dev-python/libgnome-python dev-python/pygobject:2 dev-python/pygtk:2 ) >=app-admin/eselect-python-20091230 =dev-lang/python-2*
 0
 http://launchpad.net/terminator/trunk/0.95/+download/terminator_0.95.tar.gz
@@ -7,14 +7,14 @@ http://www.tenshu.net/p/terminator.html
 GPL-2
 Multiple GNOME terminals in one window
 amd64 x86
-distutils eutils multilib portability python toolchain-funcs user
-dbus gnome
+distutils eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability python toolchain-funcs user versionator
+dbus gnome debug
 
 
 
 2
 
-compile install postinst postrm prepare
+compile configure install postinst postrm preinst prepare unpack
 
 
 
diff --git a/metadata/cache/x11-terms/terminator-0.96 b/metadata/cache/x11-terms/terminator-0.96-r1
similarity index 57%
rename from metadata/cache/x11-terms/terminator-0.96
rename to metadata/cache/x11-terms/terminator-0.96-r1
index 8a9a5ccfe82a..b9cbc7b4053f 100644
--- a/metadata/cache/x11-terms/terminator-0.96
+++ b/metadata/cache/x11-terms/terminator-0.96-r1
@@ -1,4 +1,4 @@
-dev-util/intltool >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+dev-util/intltool >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 =dev-lang/python-2*
 >=x11-libs/vte-0.16:0[python] dbus? ( sys-apps/dbus ) gnome? ( dev-python/gconf-python dev-python/libgnome-python dev-python/pygobject:2 dev-python/pygtk:2 ) >=app-admin/eselect-python-20091230 =dev-lang/python-2*
 0
 http://launchpad.net/terminator/trunk/0.96/+download/terminator_0.96.tar.gz
@@ -7,14 +7,14 @@ http://www.tenshu.net/p/terminator.html
 GPL-2
 Multiple GNOME terminals in one window
 ~amd64 ~x86
-distutils eutils multilib portability python toolchain-funcs user
-dbus gnome
+distutils eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability python toolchain-funcs user versionator
+dbus gnome debug
 
 
 
 2
 
-compile install postinst postrm prepare
+compile configure install postinst postrm preinst prepare unpack
 
 
 
diff --git a/metadata/cache/xfce-extra/xfce4-dict-0.6.0 b/metadata/cache/xfce-extra/xfce4-dict-0.6.0
index 02ffa67a7662..8cc226b3377f 100644
--- a/metadata/cache/xfce-extra/xfce4-dict-0.6.0
+++ b/metadata/cache/xfce-extra/xfce4-dict-0.6.0
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.6:2 >=xfce-base/libxfcegui4-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/intltool dev-util/pkgconfig >=sys-apps/sed-4
+>=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.6:2 >=xfce-base/libxfcegui4-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/intltool dev-util/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.8.0 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
 >=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.6:2 >=xfce-base/libxfcegui4-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8
 0
 mirror://xfce/src/apps/xfce4-dict/0.6/xfce4-dict-0.6.0.tar.bz2
@@ -8,7 +8,7 @@ GPL-2
 A dict.org querying application and panel plug-in for the Xfce desktop
 alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
 autotools base eutils fdo-mime gnome2-utils libtool multilib portability toolchain-funcs user xfconf
-debug
+
 
 
 
diff --git a/metadata/cache/xfce-extra/xfce4-diskperf-plugin-2.3.0 b/metadata/cache/xfce-extra/xfce4-diskperf-plugin-2.3.0
index 9ace95660368..b6c57c857981 100644
--- a/metadata/cache/xfce-extra/xfce4-diskperf-plugin-2.3.0
+++ b/metadata/cache/xfce-extra/xfce4-diskperf-plugin-2.3.0
@@ -1,4 +1,4 @@
->=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/pkgconfig dev-util/intltool >=sys-apps/sed-4
+>=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/pkgconfig dev-util/intltool >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.8.0 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8
 0
 mirror://xfce/src/panel-plugins/xfce4-diskperf-plugin/2.3/xfce4-diskperf-plugin-2.3.0.tar.bz2
@@ -8,7 +8,7 @@ BSD
 Xfce's disk usage and performance panel plugin
 alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~ia64-linux ~x86-linux
 autotools base eutils fdo-mime gnome2-utils libtool multilib portability toolchain-funcs user xfconf
-debug
+
 
 
 
diff --git a/metadata/cache/xfce-extra/xfce4-screenshooter-1.8.0 b/metadata/cache/xfce-extra/xfce4-screenshooter-1.8.0
index 9d0e4a55192f..abdce02c5b8b 100644
--- a/metadata/cache/xfce-extra/xfce4-screenshooter-1.8.0
+++ b/metadata/cache/xfce-extra/xfce4-screenshooter-1.8.0
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.16:2 >=net-libs/libsoup-2.26.0 >=x11-libs/gdk-pixbuf-2.16:2 >=x11-libs/gtk+-2.16:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes >=xfce-base/exo-0.5 >=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfce4ui-4.8 dev-util/intltool dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.8.0
+>=dev-libs/glib-2.16:2 >=net-libs/libsoup-2.26.0 >=x11-libs/gdk-pixbuf-2.16:2 >=x11-libs/gtk+-2.16:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes >=xfce-base/exo-0.5 >=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfce4ui-4.8 dev-util/intltool dev-util/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.8.0 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
 >=dev-libs/glib-2.16:2 >=net-libs/libsoup-2.26.0 >=x11-libs/gdk-pixbuf-2.16:2 >=x11-libs/gtk+-2.16:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes >=xfce-base/exo-0.5 >=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfce4ui-4.8
 0
 mirror://xfce/src/apps/xfce4-screenshooter/1.8/xfce4-screenshooter-1.8.0.tar.bz2
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 161ca60a1fc3..c8055b404008 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 07 Dec 2011 09:06:43 +0000
+Thu, 08 Dec 2011 01:36:44 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 161ca60a1fc3..c8055b404008 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 07 Dec 2011 09:06:43 +0000
+Thu, 08 Dec 2011 01:36:44 +0000
diff --git a/metadata/herds.xml b/metadata/herds.xml
index 290966bb57c3..50f701b341e3 100644
--- a/metadata/herds.xml
+++ b/metadata/herds.xml
@@ -20,7 +20,7 @@
    always a description without a lang attribute. Also there are no overlapping
    descriptions allowed (multiple description tags with the same language)
 
-   $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/metastructure/herds/herds.xml,v 1.884 2011/12/05 23:15:29 pesa Exp $
+   $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/metastructure/herds/herds.xml,v 1.885 2011/12/08 01:17:24 johu Exp $
 
 -->
 <herds>
@@ -415,6 +415,10 @@
     <email>jmbsvicetto@gentoo.org</email>
     <name>Jorge Manuel B. S. Vicetto</name>
   </maintainer>
+  <maintainer>
+    <email>johu@gentoo.org</email>
+    <name>Johannes Huber</name>
+  </maintainer>
   <maintainer>
     <email>mschiff@gentoo.org</email>
     <name>Marc Schiffbauer</name>
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 92086638c6ff..5d5cfbb24905 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 07 Dec 2011 09:06:45 +0000
+Thu, 08 Dec 2011 01:36:45 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 134abde9cbde..e602016dcd2c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Dec  7 09:06:43 UTC 2011
+Thu Dec  8 01:36:44 UTC 2011
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 4d22c66a4789..3ee4ef7f9748 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 07 Dec 2011 09:30:01 +0000
+Thu, 08 Dec 2011 02:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 8a2dc8d50cd4..cd3b7bf4dad3 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1323248701 Wed Dec  7 09:05:01 2011 UTC
+1323308101 Thu Dec  8 01:35:01 2011 UTC
diff --git a/net-libs/libkvkontakte/Manifest b/net-libs/libkvkontakte/Manifest
index 756acf6afb79..d814a753962b 100644
--- a/net-libs/libkvkontakte/Manifest
+++ b/net-libs/libkvkontakte/Manifest
@@ -1,2 +1,2 @@
-DIST digikam-2.2.0.tar.bz2 54181796 RMD160 5053a1f63e242d841f94ce707e235a5ccacb8698 SHA1 b4ce7c8b17978f3c76b107a1535cd4b21d3bb6fb SHA256 d7597d8817d2ebd363def6042022b25b665e91ea59c431ead3def4634221b616
 DIST digikam-2.3.0.tar.bz2 54522109 RMD160 304bce5841f5d36a72a064784c90c91960c9a7c3 SHA1 15b8b16d7cce6ac50fb958d30166214f2f2b83ee SHA256 29ddf83a160817314e9274a35d678678da58006e41d961dcebc6afb0ab200a33
+DIST digikam-2.4.1.tar.bz2 54531119 RMD160 2a07c061927e7cec7a0128a68e60f9d7c6d1e78b SHA1 2ec3a20225462d277d5f0c3aa17b1ecfbb61f98c SHA256 aca967a4cc5312923cb2340502eb10a571684c14cf63896a68a1796d0483de3b
diff --git a/net-libs/libkvkontakte/libkvkontakte-2.3.0.ebuild b/net-libs/libkvkontakte/libkvkontakte-2.3.0.ebuild
index 1d7e509f74b6..9e5dc4174083 100644
--- a/net-libs/libkvkontakte/libkvkontakte-2.3.0.ebuild
+++ b/net-libs/libkvkontakte/libkvkontakte-2.3.0.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/net-libs/libkvkontakte/libkvkontakte-2.3.0.ebuild,v 1.1 2011/11/09 02:49:24 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libkvkontakte/libkvkontakte-2.3.0.ebuild,v 1.3 2011/12/07 22:04:59 hwoarang Exp $
 
 EAPI=4
 
@@ -20,7 +20,7 @@ HOMEPAGE="http://www.digikam.org/"
 SRC_URI="mirror://sourceforge/${DIGIKAMPN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 SLOT=4
 
diff --git a/net-libs/libkvkontakte/libkvkontakte-2.2.0.ebuild b/net-libs/libkvkontakte/libkvkontakte-2.4.1.ebuild
similarity index 86%
rename from net-libs/libkvkontakte/libkvkontakte-2.2.0.ebuild
rename to net-libs/libkvkontakte/libkvkontakte-2.4.1.ebuild
index a26dd969db42..bc9d8a97f1ac 100644
--- a/net-libs/libkvkontakte/libkvkontakte-2.2.0.ebuild
+++ b/net-libs/libkvkontakte/libkvkontakte-2.4.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/net-libs/libkvkontakte/libkvkontakte-2.2.0.ebuild,v 1.1 2011/10/03 18:04:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libkvkontakte/libkvkontakte-2.4.1.ebuild,v 1.1 2011/12/07 21:42:02 dilfridge Exp $
 
 EAPI=4
 
@@ -29,7 +29,7 @@ RDEPEND=${DEPEND}
 
 S=${WORKDIR}/${MY_P}/extra/${PN}
 
-PATCHES=( "${FILESDIR}/${P}-libdir.patch" )
+PATCHES=( "${FILESDIR}/${PN}-2.2.0-libdir.patch" )
 
 src_configure() {
 	mycmakeargs=(
diff --git a/net-mail/mpack/files/mpack-1.6-compile.patch b/net-mail/mpack/files/mpack-1.6-compile.patch
new file mode 100644
index 000000000000..570319cabe55
--- /dev/null
+++ b/net-mail/mpack/files/mpack-1.6-compile.patch
@@ -0,0 +1,129 @@
+From a01468c1734129595355af0815d4577af4e265cc Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Wed, 7 Dec 2011 23:22:55 +0100
+Subject: [PATCH] Add missing includes, remove conflicting prototypes
+
+---
+ decode.c   |    1 +
+ encode.c   |    1 +
+ magic.c    |    1 +
+ part.c     |    1 +
+ unixos.c   |    5 +----
+ unixpk.c   |    2 ++
+ unixpk.o   |  Bin 12000 -> 12016 bytes
+ unixunpk.c |    1 +
+ xmalloc.c  |    2 +-
+ 9 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/decode.c b/decode.c
+index c96918f..8b8df56 100644
+--- a/decode.c
++++ b/decode.c
+@@ -28,6 +28,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <ctype.h>
++#include <stdlib.h>
+ #include "xmalloc.h"
+ #include "common.h"
+ #include "part.h"
+diff --git a/encode.c b/encode.c
+index 0ba3934..1377cf8 100644
+--- a/encode.c
++++ b/encode.c
+@@ -24,6 +24,7 @@
+  */
+ #include <stdio.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ extern char *magic_look(FILE *infile);
+ extern char *os_genid(void);
+diff --git a/magic.c b/magic.c
+index e08c6f8..a452a43 100644
+--- a/magic.c
++++ b/magic.c
+@@ -23,6 +23,7 @@
+  * SOFTWARE.
+  */
+ #include <stdio.h>
++#include <string.h>
+ 
+ /* Description of the various file formats and their magic numbers */
+ struct magic {
+diff --git a/part.c b/part.c
+index 1d4efe6..15fd724 100644
+--- a/part.c
++++ b/part.c
+@@ -28,6 +28,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ #include "part.h"
+ #include "xmalloc.h"
+diff --git a/unixos.c b/unixos.c
+index 3f5c4c0..fa6d0a7 100644
+--- a/unixos.c
++++ b/unixos.c
+@@ -30,6 +30,7 @@
+ #include <sys/param.h>
+ #include <netdb.h>
+ #include <fcntl.h>
++#include <stdlib.h>
+ #include "xmalloc.h"
+ #include "common.h"
+ #include "part.h"
+@@ -38,10 +39,6 @@
+ #define MAXHOSTNAMELEN 64
+ #endif
+ 
+-extern int errno;
+-extern char *malloc();
+-extern char *getenv();
+-
+ int overwrite_files = 0;
+ int didchat;
+ 
+diff --git a/unixpk.c b/unixpk.c
+index c2aaa56..1f81ea9 100644
+--- a/unixpk.c
++++ b/unixpk.c
+@@ -25,6 +25,8 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <errno.h>
++#include <stdlib.h>
++#include <unistd.h>
+ #include "common.h"
+ #include "version.h"
+ #include "xmalloc.h"
+diff --git a/unixunpk.c b/unixunpk.c
+index a1f065b..0f5fa85 100644
+--- a/unixunpk.c
++++ b/unixunpk.c
+@@ -23,6 +23,7 @@
+  * SOFTWARE.
+  */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "version.h"
+ #include "part.h"
+ 
+diff --git a/xmalloc.c b/xmalloc.c
+index 7c74360..46dbbd1 100644
+--- a/xmalloc.c
++++ b/xmalloc.c
+@@ -24,7 +24,7 @@
+  */
+ #include <stdio.h>
+ #include <string.h>
+-extern char *malloc(), *realloc();
++#include <stdlib.h>
+ 
+ char *xmalloc (int size)
+ {
+-- 
+1.7.8
+
diff --git a/net-mail/mpack/files/mpack-1.6-paths.patch b/net-mail/mpack/files/mpack-1.6-paths.patch
new file mode 100644
index 000000000000..0dc2de8b2123
--- /dev/null
+++ b/net-mail/mpack/files/mpack-1.6-paths.patch
@@ -0,0 +1,95 @@
+From b857da37ec211e4472070c9e870aa5a0b827563b Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Thu, 8 Dec 2011 00:09:03 +0100
+Subject: [PATCH] Use /var/tmp rather than /usr/tmp
+
+---
+ README.unix  |    2 +-
+ mkreadme.pl  |    2 +-
+ unixos.c     |    2 +-
+ unixpk.c     |    2 +-
+ unixpk.man   |    2 +-
+ unixunpk.man |    2 +-
+ 8 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/README.unix b/README.unix
+index d7a762c..c26b7c8 100644
+--- a/README.unix
++++ b/README.unix
+@@ -188,7 +188,7 @@ The environment variables which control munpack's behavior are:
+ 
+      TMPDIR
+           Root of directory to store partial messages awaiting 
+-          reassembly.  Default is "/usr/tmp".   Partial messages
++          reassembly.  Default is "/var/tmp".   Partial messages
+ 	  are stored in subdirectories of $TMPDIR/m-prts-$USER/
+ 
+ 
+diff --git a/mkreadme.pl b/mkreadme.pl
+index a45117b..22e4e81 100755
+--- a/mkreadme.pl
++++ b/mkreadme.pl
+@@ -413,7 +413,7 @@ The environment variables which control munpack's behavior are:
+ =unix
+      TMPDIR
+           Root of directory to store partial messages awaiting 
+-          reassembly.  Default is "/usr/tmp".   Partial messages
++          reassembly.  Default is "/var/tmp".   Partial messages
+ 	  are stored in subdirectories of $TMPDIR/m-prts-$USER/
+ 
+ =pc os2
+diff --git a/unixos.c b/unixos.c
+index 2243d12..fa6d0a7 100644
+--- a/unixos.c
++++ b/unixos.c
+@@ -87,7 +87,7 @@ char *os_idtodir(char *id)
+ 	strcpy(buf, getenv("TMPDIR"));
+     }
+     else {
+-	strcpy(buf, "/usr/tmp");
++	strcpy(buf, "/var/tmp");
+     }
+     strcat(buf, "/m-prts-");
+     p = getenv("USER");
+diff --git a/unixpk.c b/unixpk.c
+index 3605dd1..0bae849 100644
+--- a/unixpk.c
++++ b/unixpk.c
+@@ -166,7 +166,7 @@ int main(int argc, char **argv)
+ 	    strcpy(fnamebuf, getenv("TMPDIR"));
+ 	}
+ 	else {
+-	    strcpy(fnamebuf, "/usr/tmp");
++	    strcpy(fnamebuf, "/var/tmp");
+ 	}
+ 	strcat(fnamebuf, "/mpackXXXXXX");
+ 	mktemp(fnamebuf);
+diff --git a/unixpk.man b/unixpk.man
+index de251ee..c4c9313 100644
+--- a/unixpk.man
++++ b/unixpk.man
+@@ -136,7 +136,7 @@ Mail the generated messages to the specified addresses.
+ .SH ENVIRONMENT
+ .TP
+ .B TMPDIR
+-Directory to store temporary files.  Default is /usr/tmp.
++Directory to store temporary files.  Default is /var/tmp.
+ .TP
+ .B SPLITSIZE
+ Default value of the -m switch.
+diff --git a/unixunpk.man b/unixunpk.man
+index da384b1..8c9ab7e 100644
+--- a/unixunpk.man
++++ b/unixunpk.man
+@@ -107,7 +107,7 @@ see the section "OPTIONS" above.
+ .SH ENVIRONMENT
+ .TP
+ .B TMPDIR
+-Directory to store temporary files.  Default is /usr/tmp.
++Directory to store temporary files.  Default is /var/tmp.
+ .SH FILES
+ .TP
+ .B $TMPDIR/m-prts-$USER/
+-- 
+1.7.8
+
diff --git a/net-mail/mpack/mpack-1.6-r1.ebuild b/net-mail/mpack/mpack-1.6-r1.ebuild
new file mode 100644
index 000000000000..bfdce0a2619a
--- /dev/null
+++ b/net-mail/mpack/mpack-1.6-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mpack/mpack-1.6-r1.ebuild,v 1.1 2011/12/07 23:34:59 sping Exp $
+
+EAPI="3"
+
+inherit eutils
+
+DESCRIPTION="Command-line MIME encoding and decoding utilities"
+HOMEPAGE="ftp://ftp.andrew.cmu.edu/pub/mpack/"
+SRC_URI="ftp://ftp.andrew.cmu.edu/pub/mpack/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~amd64 ~sparc ~x86 ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+src_prepare() {
+	# NOTE: These two patches replace <mpack-1.6-gentoo.patch>
+	epatch "${FILESDIR}"/${P}-compile.patch
+	epatch "${FILESDIR}"/${P}-paths.patch
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	dodoc README.* Changes
+}
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-libav7.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-libav7.patch
new file mode 100644
index 000000000000..e25697c5021b
--- /dev/null
+++ b/net-misc/mediatomb/files/mediatomb-0.12.1-libav7.patch
@@ -0,0 +1,64 @@
+=== modified file 'src/metadata/ffmpeg_handler.cc'
+--- old/src/metadata/ffmpeg_handler.cc	2010-08-25 17:07:03 +0000
++++ new/src/metadata/ffmpeg_handler.cc	2011-05-19 04:33:32 +0000
+@@ -89,6 +89,33 @@
+ 
+ 	Ref<StringConverter> sc = StringConverter::m2i();
+     
++	/* Tabs are 4 characters here */
++	typedef struct {const char *avname; metadata_fields_t field;} mapping_t;
++	static const mapping_t mapping[] =
++	{
++		{"title",   M_TITLE},
++		{"artist",  M_ARTIST},
++		{"album",   M_ALBUM},
++		{"date",    M_DATE},
++		{"genre",   M_GENRE},
++		{"comment", M_DESCRIPTION},
++		{"track",   M_TRACKNUMBER},
++		{NULL,      M_MAX},
++	};
++
++	if (!pFormatCtx->metadata)
++		return;
++	for (const mapping_t *m = mapping; m->avname != NULL; m++)
++	{
++		AVMetadataTag *tag = NULL;
++		tag = av_metadata_get(pFormatCtx->metadata, m->avname, NULL, 0);
++		if (tag && tag->value && tag->value[0])
++		{
++			log_debug("Added metadata %s: %s\n", m->avname, tag->value);
++			item->setMetadata(MT_KEYS[m->field].upnp, sc->convert(tag->value));
++		}
++	}
++	/* Old algorithm (doesn't work with libav >= 0.7)
+ 	if (strlen(pFormatCtx->title) > 0) 
+     {
+ 	    log_debug("Added metadata title: %s\n", pFormatCtx->title);
+@@ -131,6 +158,7 @@
+         item->setMetadata(MT_KEYS[M_TRACKNUMBER].upnp, 
+                           sc->convert(String::from(pFormatCtx->track)));
+ 	}
++	*/
+ }
+ 
+ // ffmpeg library calls
+@@ -178,7 +206,7 @@
+ 	for(i=0; i<pFormatCtx->nb_streams; i++) 
+     {
+ 		AVStream *st = pFormatCtx->streams[i];
+-		if((st != NULL) && (videoset == false) && (st->codec->codec_type == CODEC_TYPE_VIDEO))
++		if((st != NULL) && (videoset == false) && (st->codec->codec_type == AVMEDIA_TYPE_VIDEO))
+         {
+             if (st->codec->codec_tag > 0)
+             {
+@@ -209,7 +237,7 @@
+                 *y = st->codec->height;
+ 			}
+ 		} 
+-		if(st->codec->codec_type == CODEC_TYPE_AUDIO) 
++		if(st->codec->codec_type == AVMEDIA_TYPE_AUDIO) 
+         {
+ 			// Increase number of audiochannels
+ 			audioch++;
+
diff --git a/net-misc/mediatomb/mediatomb-0.12.1-r1.ebuild b/net-misc/mediatomb/mediatomb-0.12.1-r1.ebuild
new file mode 100644
index 000000000000..23bba27cea90
--- /dev/null
+++ b/net-misc/mediatomb/mediatomb-0.12.1-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.12.1-r1.ebuild,v 1.1 2011/12/07 16:59:52 je_fro Exp $
+
+EAPI=2
+inherit autotools eutils linux-info
+
+DESCRIPTION="MediaTomb is an open source UPnP MediaServer"
+HOMEPAGE="http://www.mediatomb.cc/"
+SRC_URI="mirror://sourceforge/mediatomb/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="debug +exif +ffmpeg inotify +javascript lastfm libextractor +mp4 mysql +taglib thumbnail"
+
+DEPEND="
+	mysql? ( virtual/mysql )
+	!mysql? ( >=dev-db/sqlite-3 )
+	javascript? ( dev-lang/spidermonkey )
+	dev-libs/expat
+	taglib? ( media-libs/taglib )
+	!taglib? ( media-libs/id3lib )
+	lastfm? ( >=media-libs/lastfmlib-0.4 )
+	exif? ( media-libs/libexif )
+	libextractor? ( media-libs/libextractor )
+	mp4? ( media-libs/libmp4v2 )
+	ffmpeg? ( virtual/ffmpeg )
+	thumbnail? ( media-video/ffmpegthumbnailer[jpeg] )
+	net-misc/curl
+	sys-apps/file
+	sys-libs/zlib
+	virtual/libiconv"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if use inotify; then
+		if ! linux_config_exists \
+			|| ! linux_chkconfig_present INOTIFY_USER; then
+			ewarn "Please enable Inotify support in your kernel:"
+			ewarn
+			ewarn "  File systems --->"
+			ewarn "    [*] Inotify support for userspace"
+			ewarn
+		fi
+	fi
+	enewgroup mediatomb
+	enewuser mediatomb -1 -1 /dev/null mediatomb
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gcc46.patch"
+	epatch "${FILESDIR}/${P}-libav7.patch"
+	if use javascript && has_version ">=dev-lang/spidermonkey-1.8.5" ; then
+		epatch "${FILESDIR}"/${P}-mozjs185.patch
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	if use thumbnail; then
+		elog "libextrator does not work with thumbnail, disabling libextrator"
+		myconf="${myconf} --enable-ffmpegthumbnailer --enable-ffmpeg --disable-libextractor"
+	elif ! use thumbnail && use ffmpeg && use libextractor; then
+		elog "libextrator does not work with ffmpeg, disabling libextrator"
+		myconf="${myconf} --disable-ffmpegthumbnailer --enable-ffmpeg --disable-libextractor"
+	else
+		myconf="${myconf} $(use_enable thumbnail ffmpegthumbnailer) $(use_enable ffmpeg) $(use_enable libextractor)"
+	fi
+
+	econf \
+		$(use_enable debug tombdebug) \
+		$(use_enable exif libexif) \
+		$(use_enable inotify) \
+		$(use_enable javascript libjs) \
+		$(use_enable lastfm lastfmlib) \
+		$(use_enable mp4 libmp4v2) \
+		$(use_enable mysql) $(use_enable !mysql sqlite3) \
+		$(use_enable taglib) $(use_enable !taglib id3lib) \
+		--enable-curl \
+		--enable-external-transcoding \
+		--enable-libmagic \
+		--enable-protocolinfo-extension \
+		--enable-youtube \
+		--enable-zlib \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed!"
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	sed -e "s:#MYSQL#:$(use mysql && has_version dev-db/mysql[-minimal] && echo "mysql"):" \
+		"${FILESDIR}/${PN}-0.12.0.initd" > "${T}/mediatomb.initd" || die
+	newinitd "${T}/mediatomb.initd" mediatomb || die
+	newconfd "${FILESDIR}/${PN}-0.12.0.confd" mediatomb || die
+
+	insinto /etc/mediatomb
+	newins "${FILESDIR}/${PN}-0.12.0.config" config.xml || die
+	fperms 0600 /etc/mediatomb/config.xml
+	fowners mediatomb:mediatomb /etc/mediatomb/config.xml
+
+	keepdir /var/lib/mediatomb
+	fowners mediatomb:mediatomb /var/lib/mediatomb
+}
+
+pkg_postinst() {
+	if use mysql; then
+		elog "MediaTomb has been built with MySQL support and needs"
+		elog "to be configured before being started."
+		elog "For more information, please consult the MediaTomb"
+		elog "documentation: http://mediatomb.cc/pages/documentation"
+		elog
+	fi
+
+	elog "To configure MediaTomb edit:"
+	elog "/etc/mediatomb/config.xml"
+	elog
+	elog "The MediaTomb web interface can be reached at (after the service is started):"
+	elog "http://localhost:49152/"
+}
diff --git a/net-misc/wicd/metadata.xml b/net-misc/wicd/metadata.xml
index a672de5c0f06..c4cdd7183df9 100644
--- a/net-misc/wicd/metadata.xml
+++ b/net-misc/wicd/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
-  <email>tomka@gentoo.org</email>
-  <name>Thomas Kahle</name>
+	<email>tomka@gentoo.org</email>
+	<name>Thomas Kahle</name>
 </maintainer>
 <maintainer>
 	<email>c1pher@gentoo.org</email>
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index 65daf9de0f88..17ee4a38b98b 100644
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -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/profiles/arch/amd64/make.defaults,v 1.9 2011/10/14 22:52:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/make.defaults,v 1.10 2011/12/07 19:23:45 vapier Exp $
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="${ARCH}"
@@ -17,6 +17,8 @@ DEFAULT_ABI="amd64"
 ABI="amd64"
 
 # 64bit specific settings.
+CFLAGS_amd64="-m64"
+LDFLAGS_amd64="-m elf_x86_64"
 CHOST_amd64="x86_64-pc-linux-gnu"
 
 # 32bit specific settings.
@@ -24,6 +26,11 @@ CFLAGS_x86="-m32"
 LDFLAGS_x86="-m elf_i386"
 CHOST_x86="i686-pc-linux-gnu"
 
+# 64-32bit specific settings.
+CFLAGS_x32="-mx32"
+LDFLAGS_x32="-m elf32_x86_64"
+CHOST_x32="x86_64-pc-linux-gnu"
+
 # 2006/10/24 - Simon Stelling <blubb@gentoo.org>
 # They are masked, but we can enable them anyway for those who have 
 # >=portage-2.1.2_pre3-r4
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 509be85fe7ca..fd8dee7cc35f 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -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/profiles/arch/powerpc/package.use.mask,v 1.103 2011/11/25 08:00:02 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/package.use.mask,v 1.104 2011/12/07 21:27:03 xarthisius Exp $
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (25 Nov 2011)
 # Mask USE flags on gnome-3.2 packages due to missing keywords on deps;
@@ -37,10 +37,6 @@ media-video/x264-encoder ffmpegsource
 # Remove this for your arch after you keyword dev-utils/google-perftools (bug #381737
 dev-libs/libmemcached tcmalloc
 
-# Alexey Shvetsov <alexxy@gentoo.org> (31 Aug 2011)
-# Mask numa use flag per bug #381313
-sys-apps/hwloc numa
-
 # Kacper Kowalik <xarthisius@gentoo.org> (10 Aug 2011)
 # mask cuda dep for opencv bug 365451
 media-libs/opencv cuda
diff --git a/profiles/features/multilib/make.defaults b/profiles/features/multilib/make.defaults
index 9c230f885946..d7109b1cceba 100644
--- a/profiles/features/multilib/make.defaults
+++ b/profiles/features/multilib/make.defaults
@@ -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/profiles/features/multilib/make.defaults,v 1.7 2011/11/17 01:14:26 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/multilib/make.defaults,v 1.8 2011/12/07 19:21:37 vapier Exp $
 
 # Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
 # Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
@@ -15,13 +15,19 @@ MULTILIB_STRICT_EXEMPT="(perl5|gcc|gcc-lib|binutils|eclipse-3|debug|portage|udev
 # 64-bit LIBDIR
 LIBDIR_amd64="lib64"
 LIBDIR_amd64_fbsd="lib64"
+LIBDIR_n64="lib64"	# MIPS n64
 LIBDIR_ppc64="lib64"
-LIBDIR_sparc64="lib64"
 LIBDIR_s390x="lib64"
+LIBDIR_sparc64="lib64"
 
 # 32-bit LIBDIR
-LIBDIR_ppc="lib"
 LIBDIR_x86="lib"
 LIBDIR_x86_fbsd="lib"
-LIBDIR_sparc32="lib"
+LIBDIR_o32="lib"	# MIPS o32
+LIBDIR_ppc="lib"
 LIBDIR_s390="lib"
+LIBDIR_sparc32="lib"
+
+# Somewhere in-between!
+LIBDIR_x32="libx32"	# x86-64 x32
+LIBDIR_n32="lib32"	# MIPS n32
diff --git a/profiles/license_groups b/profiles/license_groups
index 2df971c06b52..cb112e84e3cd 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -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/profiles/license_groups,v 1.92 2011/12/06 19:56:54 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.95 2011/12/07 18:06:24 ulm Exp $
 
 # Please report bugs or other requests at bugs.gentoo.org and assign to
 # licenses@gentoo.org
@@ -23,7 +23,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artist
 # Licenses in this list should NOT appear directly or indirectly in @FSF-APPROVED or @OSI-APPROVED
 # TODO: maybe add a category for BSD-alike MISC-FREE licenses for easy seperation?
 # BSD-4 alikes: dom4j FastCGI icu jaxen JDOM saxpath
-MISC-FREE Allegro ANTLR bea.ri.jsr173 BEER-WARE BSD-1 BZIP2 CC0-1.0-Universal CDDL-Schily CMake CPL-0.5 CRACKLIB cryptopp dom4j eGenixPublic-1.1 ElementTree Emacs EPL FastCGI FLEX FLTK FVWM gnuplot gsm HTML-Tidy iASL icu IDPL imagemagick Info-ZIP JamesClark JasPer2.0 jaxen JDOM JNIC LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib mplus-fonts NCSA-HDF OpenSoftware otter PBZIP2 perforce PHP-2.02 Princeton pysqlite RSA-MD4 RSA-MD5 saxpath Scintilla Sendmail SMAIL Subversion tcp_wrappers_license TeX UbuntuFontLicense-1.0 vlgothic w3m wxWinLL-3 Xdebug zpaq ZSH
+MISC-FREE Allegro ANTLR bea.ri.jsr173 BEER-WARE BSD-1 BZIP2 CC0-1.0-Universal CDDL-Schily CMake CPL-0.5 CRACKLIB cryptopp dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI FLEX FLTK FVWM gnuplot gsm HTML-Tidy iASL icu IDPL imagemagick Info-ZIP JamesClark JasPer2.0 jaxen JDOM JNIC LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib mplus-fonts NCSA-HDF OpenSoftware otter PBZIP2 perforce PHP-2.02 Princeton pysqlite RSA-MD4 RSA-MD5 saxpath Scintilla Sendmail SMAIL Subversion tcp_wrappers_license TeX UbuntuFontLicense-1.0 vlgothic w3m wxWinLL-3 Xdebug zpaq ZSH
 # The following are NOT valid in @MISC-FREE:
 # arj - usage restrictions
 # freedist - Doesn't grant the right to do modifications.
@@ -57,3 +57,8 @@ EULA AdobeFlash-10 AdobeFlash-10.1 AdobeFlash-9.0.31.0 BCS Broadcom cadsoft dlj-
 #   MUST cause a copy of the license to be installed in a file
 #   location compliant with the license,
 BINARY-REDISTRIBUTABLE @FREE Adaptec adobe-ps atheros-hal intel-psb intel-ucode ipw2100-fw ipw2200-fw ipw3945 NVIDIA qlogic-fibre-channel-firmware radeon-ucode ralink-firmware SmartLabs libertas-fw
+
+# Local Variables:
+# mode: conf-space
+# eval: (visual-line-mode 1)
+# End:
diff --git a/profiles/package.mask b/profiles/package.mask
index 7bd4b316ee78..91a124c6ad35 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13309 2011/12/06 23:08:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13311 2011/12/07 19:16:28 maksbotan Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -31,6 +31,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Alexandre Rostovtsev <tetromino@gentoo.org> (07 Dec 2011)
+# spidermonkey-1.9.2.x was renamed to 1.8.2.x; mask 1.9.2.x for bug #393473.
+=dev-lang/spidermonkey-1.9.2*
+
 # Alexis Ballier <aballier@gentoo.org> (06 Dec 2011)
 # lyx2html is unmaintained for almost 10 years, won't work with current lyx
 # formats, morevoer from lyx 2.0 there is lyx internal html export.
@@ -342,11 +346,6 @@ dev-java/jnlp-bin
 # (bug https://bugs.gentoo.org/show_bug.cgi?id=377967)
 app-misc/openjnlp
 
-# Markos Chandras <hwoarang@gentoo.org> (16 Oct 2011)
-# Runtime problems which makes it pretty much useless
-# Bug #246264. No maintainer. Removal in 30 days
-app-admin/stow
-
 # Markos Chandras <hwoarang@gentoo.org> (16 Oct 2011)
 # Multiple open bugs (375071, 256850, 214192, 202497)
 # No maintainer. Removal in 30 days
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index eb14d4b8f077..b0a8014786d1 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1476,6 +1476,7 @@ dev-scheme/bigloo:ssl - Adds support for SSL connections through dev-libs/openss
 dev-scheme/bigloo:text - Library for dealing with text (e.g. BibTeX parser)
 dev-scheme/bigloo:threads - Enable thread support, it depends on dev-libs/boehm-gc built with threads use flag
 dev-scheme/bigloo:web - Library for web programming (e.g. XML, CGI parsers). Needed for dev-scheme/hop
+dev-scheme/chicken:parallel-build - Enable testing parallel build mode added in 4.7.3 version. Can still be not working
 dev-scheme/gauche-gl:cg - Enable NVidia Cg binding
 dev-scheme/gauche-gtk:glgd - Enable GL graph draw
 dev-scheme/guile:debug-freelist - Include garbage collector freelist debugging code
diff --git a/sci-geosciences/gpsd/gpsd-3.3-r1.ebuild b/sci-geosciences/gpsd/gpsd-3.3-r1.ebuild
index 923dc28c6c4b..66882ebccdae 100644
--- a/sci-geosciences/gpsd/gpsd-3.3-r1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.3-r1.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/sci-geosciences/gpsd/gpsd-3.3-r1.ebuild,v 1.2 2011/12/06 22:39:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-3.3-r1.ebuild,v 1.3 2011/12/07 16:17:42 vapier Exp $
 
 EAPI="4"
 
@@ -100,7 +100,7 @@ src_configure() {
 		$(use_scons ntp ntpshm)
 		$(use_scons ntp pps)
 		$(use_scons shm shm_export)
-		$(use_scons sockets sockets_export)
+		$(use_scons sockets socket_export)
 		$(use_scons qt4 libQgpsmm)
 		$(use_scons usb)
 	)
diff --git a/sci-libs/clapack/clapack-3.2.1-r6.ebuild b/sci-libs/clapack/clapack-3.2.1-r6.ebuild
index 05db7fd782a3..b8400d15d6b3 100644
--- a/sci-libs/clapack/clapack-3.2.1-r6.ebuild
+++ b/sci-libs/clapack/clapack-3.2.1-r6.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/sci-libs/clapack/clapack-3.2.1-r6.ebuild,v 1.2 2011/08/02 14:23:24 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/clapack/clapack-3.2.1-r6.ebuild,v 1.4 2011/12/07 22:09:32 hwoarang Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.netlib.org/${PN}/${P}-CMAKE.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux"
 IUSE="test"
 
 RDEPEND=">=dev-libs/libf2c-20090407-r1
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index e7aade803dbb..311fc4ccf243 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -3,4 +3,5 @@ DIST ethtool-2.6.37.tar.bz2 158183 RMD160 d4ee3f7e59d82f05e312d17c4282111cdba63e
 DIST ethtool-2.6.38.tar.bz2 160413 RMD160 4fbd5243fae17e9e7ba461ce0e550ad89c575fed SHA1 e564ff516d55ea015cbab099852a9429d6df5b00 SHA256 1dca4573d5dbe65f54aebddf6da626ef0db30c2739bfdb6234953a6603f3c536
 DIST ethtool-2.6.39.tar.bz2 169029 RMD160 88e66eb1fd95794c0b556e91c7bd181132f5db62 SHA1 d9a8256fc85f46f1a14abf70811b8ebd4244170f SHA256 9c437ddfa0410273a076e414a8818fb322f3cb686aca537b915c868044819df4
 DIST ethtool-3.0.tar.bz2 170196 RMD160 e46d4fb5f8e85143a9c2be6684bbd54003e84cfb SHA1 7e6a0d8e2274a49812e3648fd2a81ee781f43170 SHA256 095844d67c1dbe4a2ce3bebc72841475fcee23be0359802e594a202b25ffad7d
+DIST ethtool-3.1.tar.bz2 184118 RMD160 f1f2bff964d3bc5437ad4f8eaea05bf8bbec2c29 SHA1 60b4f859bd9e55341e9b61a77d37174180623e41 SHA256 8df3150af0b76a207cd0af3a2394ed34b5bf98fd39dfd297b7d216cc0bf8fbf5
 DIST ethtool-6.tar.gz 129849 RMD160 f49265b31b0330e1c7acf1b7bd23efd0736609cb SHA1 808fda9c353714ad1d5f0428e7347fca8c0c23f6 SHA256 5046f573e7dd77f689c33c5f0aa0f2b7f96c79e0b37d6ecc78bae74c094fb4c6
diff --git a/sys-apps/ethtool/ethtool-3.1.ebuild b/sys-apps/ethtool/ethtool-3.1.ebuild
new file mode 100644
index 000000000000..7a5379e38189
--- /dev/null
+++ b/sys-apps/ethtool/ethtool-3.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ethtool/ethtool-3.1.ebuild,v 1.1 2011/12/07 22:47:00 radhermit Exp $
+
+EAPI="4"
+
+DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
+HOMEPAGE="http://www.kernel.org/pub/software/network/ethtool/"
+SRC_URI="mirror://kernel/software/network/ethtool/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE=""
diff --git a/sys-apps/hwloc/hwloc-1.2.1.ebuild b/sys-apps/hwloc/hwloc-1.2.1.ebuild
index f9c5135c3b15..662743d86b54 100644
--- a/sys-apps/hwloc/hwloc-1.2.1.ebuild
+++ b/sys-apps/hwloc/hwloc-1.2.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/sys-apps/hwloc/hwloc-1.2.1.ebuild,v 1.2 2011/09/01 16:20:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/hwloc-1.2.1.ebuild,v 1.3 2011/12/07 22:01:17 binki Exp $
 
 EAPI="4"
 
@@ -24,6 +24,11 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	numa? ( sys-process/numactl )"
 
+pkg_setup() {
+	# Fix bug #393467, hwloc ignores PKG_CONFIG environment variable.
+	[[ ${PKG_CONFIG} ]] && export HWLOC_PKG_CONFIG=${PKG_CONFIG}
+}
+
 src_configure() {
 	econf \
 		--docdir="${EPREFIX}/usr/share/doc/${P}" \
diff --git a/sys-apps/hwloc/hwloc-1.3.ebuild b/sys-apps/hwloc/hwloc-1.3.ebuild
index 740f9ec67400..e8b4eaabc753 100644
--- a/sys-apps/hwloc/hwloc-1.3.ebuild
+++ b/sys-apps/hwloc/hwloc-1.3.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/sys-apps/hwloc/hwloc-1.3.ebuild,v 1.1 2011/11/20 14:13:21 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/hwloc-1.3.ebuild,v 1.2 2011/12/07 22:01:17 binki Exp $
 
 EAPI=4
 
@@ -27,6 +27,11 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS NEWS README VERSION )
 
+pkg_setup() {
+	# Fix bug #393467, hwloc ignores PKG_CONFIG environment variable.
+	[[ ${PKG_CONFIG} ]] && export HWLOC_PKG_CONFIG=${PKG_CONFIG}
+}
+
 src_configure() {
 	econf \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
diff --git a/sys-apps/less/files/lesspipe.sh b/sys-apps/less/files/lesspipe.sh
index 4fc04acec660..c27ff0583f11 100644
--- a/sys-apps/less/files/lesspipe.sh
+++ b/sys-apps/less/files/lesspipe.sh
@@ -123,7 +123,7 @@ lesspipe() {
 	*.cab)        cabextract -l -- "$1" ;;
 	*.lha|*.lzh)  lha v "$1" ;;
 	*.zoo)        zoo -list "$1" || unzoo -l "$1" ;;
-	*.7z|*.exe)   7z l -- "$1" || 7za l -- "$1" ;;
+	*.7z|*.exe)   7z l -- "$1" || 7za l -- "$1" || 7zr l -- "$1" ;;
 	*.a)          ar tv "$1" ;;
 	*.elf)        readelf -a -- "$1" ;;
 	*.so)         readelf -h -d -s -- "$1" ;;
@@ -233,7 +233,7 @@ if [[ -z $1 ]] ; then
 elif [[ $1 == "-V" || $1 == "--version" ]] ; then
 	Id="cvsid"
 	cat <<-EOF
-		$Id: lesspipe.sh,v 1.46 2011/10/09 19:19:07 vapier Exp $
+		$Id: lesspipe.sh,v 1.47 2011/12/07 20:29:25 vapier Exp $
 		Copyright 2001-2010 Gentoo Foundation
 		Mike Frysinger <vapier@gentoo.org>
 		     (with plenty of ideas stolen from other projects/distros)
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index 1a8b0c8460d1..5f017308d890 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -1,3 +1,4 @@
 DIST polkit-0.101-CVE-2011-1485.tar.xz 6804 RMD160 2117a01ad8fe6019c78c3da49a89f6a2d48ba1bc SHA1 efae676c2611c50013bbfddf3c0d00ff5b0472ed SHA256 f70b2ec3ddbc1fcef59f4eefc84803bb46681c74785142e4718dc3009b4c09fa
 DIST polkit-0.101.tar.gz 1066155 RMD160 692dfbcc275c0711940f29b8c7d500144b6b921a SHA1 9d1f58a99d40889ceebbde142f93c305471fc151 SHA256 927f65760e4fce23d7cdeae90245c22986eb0a39335a344915302158f73f9f1b
 DIST polkit-0.102.tar.gz 880132 RMD160 c0eedf088a54947afdd6135ed744cd64eeeab217 SHA1 62907e1c9ffc45a8cd5f2cec2b5eabb168551f0e SHA256 0a6573da841c6f5c428218f1456aed45724a0127932af0de563d568bb9058641
+DIST polkit-0.103.tar.gz 1065419 RMD160 50aad2a95649771727b8fc42e8bbbe2ad5f7b5e8 SHA1 024e213dde0b96e1fc94524e21e0706462a87892 SHA256 36607c8ce576980ee55bd12bab1944f13217eb8e9d04ab56022545861ece3bc5
diff --git a/sys-auth/polkit/polkit-0.103.ebuild b/sys-auth/polkit/polkit-0.103.ebuild
new file mode 100644
index 000000000000..3391f04343fd
--- /dev/null
+++ b/sys-auth/polkit/polkit-0.103.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.103.ebuild,v 1.1 2011/12/07 16:09:26 ssuominen Exp $
+
+EAPI=4
+inherit eutils pam
+
+DESCRIPTION="Policy framework for controlling privileges for system-wide services"
+HOMEPAGE="http://hal.freedesktop.org/docs/polkit/"
+SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc examples gtk +introspection kde nls pam"
+
+RDEPEND=">=dev-libs/glib-2.28
+	dev-libs/expat
+	introspection? ( >=dev-libs/gobject-introspection-0.6.2 )
+	pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-util/pkgconfig
+	dev-util/intltool
+	doc? ( >=dev-util/gtk-doc-1.13 )"
+PDEPEND=">=sys-auth/consolekit-0.4.5[policykit]
+	pam? ( sys-auth/pambase[consolekit] )
+	gtk? ( || ( >=gnome-extra/polkit-gnome-${PV} lxde-base/lxpolkit ) )
+	kde? ( sys-auth/polkit-kde-agent )"
+
+DOCS=( docs/TODO HACKING NEWS README )
+
+src_configure() {
+	local myauth="--with-authfw=shadow"
+	use pam && myauth="--with-authfw=pam --with-pam-module-dir=$(getpam_mod_dir)"
+
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--disable-static \
+		$(use_enable debug verbose-mode) \
+		--enable-man-pages \
+		$(use_enable doc gtk-doc) \
+		$(use_enable introspection) \
+		--disable-examples \
+		$(use_enable nls) \
+		--with-os-type=gentoo \
+		${myauth}
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -exec rm -f {} +
+
+	# We disable example compilation above, and handle it here
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins src/examples/{*.c,*.policy*}
+	fi
+
+	# Need to keep a few directories around...
+	diropts -m0700 -o root -g root
+	keepdir /var/lib/polkit-1
+	#keepdir /var/run/polkit-1 #387903
+}
+
+pkg_postinst() {
+	# Make sure that the user has consolekit sessions working so that the
+	# 'allow_active' directive in polkit action policies works
+	if has_version 'gnome-base/gdm' && ! has_version 'gnome-base/gdm[consolekit]'; then
+		# If user has GDM installed, but USE=-consolekit, warn them
+		ewarn "You have GDM installed, but it does not have USE=consolekit"
+		ewarn "If you login using GDM, polkit authorizations will not work"
+		ewarn "unless you enable USE=consolekit"
+		einfo
+	fi
+	if has_version 'kde-base/kdm' && ! has_version 'kde-base/kdm[consolekit]'; then
+		# If user has KDM installed, but USE=-consolekit, warn them
+		ewarn "You have KDM installed, but it does not have USE=consolekit"
+		ewarn "If you login using KDM, polkit authorizations will not work"
+		ewarn "unless you enable USE=consolekit"
+		einfo
+	fi
+	if ! has_version 'gnome-base/gdm[consolekit]' && \
+		! has_version 'kde-base/kdm[consolekit]'; then
+		# Inform user about the alternative method
+		ewarn "If you don't use GDM or KDM for logging in,"
+		ewarn "you must start your desktop environment (DE) as follows:"
+		ewarn "	ck-launch-session \$STARTGUI"
+		ewarn "Where \$STARTGUI is a DE-starting command such as 'gnome-session'."
+		ewarn "You should add this to your ~/.xinitrc if you use startx."
+	fi
+}
diff --git a/sys-boot/unetbootin/Manifest b/sys-boot/unetbootin/Manifest
index 8ce7bb7fbabb..c6ab99d25ca7 100644
--- a/sys-boot/unetbootin/Manifest
+++ b/sys-boot/unetbootin/Manifest
@@ -1,3 +1 @@
-DIST unetbootin-source-549.tar.gz 707808 RMD160 7e72e2562f3a2797ec77d48b0c65373e5aa8cab7 SHA1 b25a37af50cb285ba5c99c8aea7a71bc850c0ac6 SHA256 42cc38d93a52dc1a96dab33315c58b78ac22b3a48e762d797e14d922205b9b66
-DIST unetbootin-source-555.tar.gz 707818 RMD160 022ed71601c16c2f60ae4ba7e1139fafa4490eab SHA1 52adee7c2bf05834d59231e6a06ff8522203f4de SHA256 a5985b97dc3457b80f2d4146972597f858a623469db3322628800d2dfbde0288
 DIST unetbootin-source-563.tar.gz 713669 RMD160 67a4df0f275df971648174ae86fab0aae596acf2 SHA1 4c9fa0ccad6940ac4fd96a79f891dc47fff232d0 SHA256 69a4ce4d83c8b130bf20b1ac932083d4fda4666e6e5db21a83531527b35193c8
diff --git a/sys-boot/unetbootin/unetbootin-549.ebuild b/sys-boot/unetbootin/unetbootin-549.ebuild
deleted file mode 100644
index f81e50c56259..000000000000
--- a/sys-boot/unetbootin/unetbootin-549.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/sys-boot/unetbootin/unetbootin-549.ebuild,v 1.4 2011/09/06 18:48:30 jer Exp $
-
-EAPI="3"
-
-inherit qt4-r2
-
-DESCRIPTION="Universal Netboot Installer creates Live USB systems for various OS
-distributions."
-HOMEPAGE="http://unetbootin.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-DEPEND="x11-libs/qt-gui"
-RDEPEND="${DEPEND}
-		 sys-fs/mtools
-		 sys-boot/syslinux
-		 app-arch/p7zip"
-
-src_configure() {
-	lupdate ${PN}.pro || die
-	lrelease ${PN}.pro || die
-	eqmake4 ${PN}.pro || die
-}
-
-src_install() {
-	dobin ${PN} || die
-	insinto /usr/share/applications
-	doins ${PN}.desktop || die
-	for file in ${PN}*.png; do
-		size="${file/unetbootin_}"
-		size="${size/.png}x${size/.png}"
-		insinto /usr/share/icons/hicolor/${size}/apps
-		newins ${file} ${PN}.png
-	done
-}
diff --git a/sys-boot/unetbootin/unetbootin-555.ebuild b/sys-boot/unetbootin/unetbootin-555.ebuild
deleted file mode 100644
index a9c83afa764b..000000000000
--- a/sys-boot/unetbootin/unetbootin-555.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/sys-boot/unetbootin/unetbootin-555.ebuild,v 1.2 2011/09/06 18:48:30 jer Exp $
-
-EAPI="3"
-
-inherit qt4-r2
-
-DESCRIPTION="Universal Netboot Installer creates Live USB systems for various OS
-distributions."
-HOMEPAGE="http://unetbootin.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-DEPEND="x11-libs/qt-gui"
-RDEPEND="${DEPEND}
-		 sys-fs/mtools
-		 sys-boot/syslinux
-		 app-arch/p7zip"
-
-src_configure() {
-	lupdate ${PN}.pro || die
-	lrelease ${PN}.pro || die
-	eqmake4 ${PN}.pro || die
-}
-
-src_install() {
-	dobin ${PN} || die
-	insinto /usr/share/applications
-	doins ${PN}.desktop || die
-	for file in ${PN}*.png; do
-		size="${file/unetbootin_}"
-		size="${size/.png}x${size/.png}"
-		insinto /usr/share/icons/hicolor/${size}/apps
-		newins ${file} ${PN}.png
-	done
-}
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 08c9a5123393..b01ea69d339b 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -89,7 +89,7 @@ DIST gcc-4.6.1-piepatches-v0.4.5.tar.bz2 14127 RMD160 7064e73833e3d58cc90c3bba19
 DIST gcc-4.6.1-uclibc-patches-1.0.tar.bz2 3018 RMD160 e97a93577aad033d4a8537a8bebf1bbf8e963a59 SHA1 fc4dc8ad2c49d49433b3e0eb22c00bde579bff1d SHA256 2f211e60f9150eb6075017c0d341bf14d5dd5a9b1b35e72aab9eccf948599442
 DIST gcc-4.6.1.tar.bz2 71688404 RMD160 e12a50dc951b02c62916acfbb181c00cae176fd0 SHA1 8bf66f7a71534ba564563a0ba0b2517aead8ac30 SHA256 8eebf51c908151d1f1a3756c8899c5e71572e8469a547ad72a1ef16a08a31b59
 DIST gcc-4.6.2-patches-1.2.tar.bz2 79475 RMD160 dcaba19446dd5a30ec4b3884267e21305c4e7622 SHA1 c446a8b58081e82e7132dc5d9c5b66101d85cf66 SHA256 40f504cfc2ca57dcb14b0ae385776979e9d1024addbe523236ed6cc3b869d80f
-DIST gcc-4.6.2-piepatches-v0.4.5.tar.bz2 14156 RMD160 101546367ae798f9080d111e4f9ccc0914ec74c8 SHA1 2ad14aa580d65cbc7dd35b5d05977890e9fb1679 SHA256 a18bea1bc2cad2efde5481a5777a97cf539d206dcbca33758d56d7fbdb43a554
+DIST gcc-4.6.2-piepatches-v0.5.0.tar.bz2 14397 RMD160 77bd51e94cf71b9582f0a1e9f01dec1a9c6eea68 SHA1 03fd5104eeef7f6e12b0cd86732593d082643ba7 SHA256 19bf8797bb9a999c3396613e28b0fda3bad80a0815ab30ea08bc1c98a8a51b71
 DIST gcc-4.6.2-uclibc-patches-1.0.tar.bz2 3019 RMD160 7e991775c15d4126bd8d85aceb677c675559606f SHA1 0d316aaf94966cc52b1582282723a932ac065639 SHA256 25e902a6d2db7181394df5ad11fafaad064bf28a6ffebd889033f744613ac201
 DIST gcc-4.6.2.tar.bz2 71995338 RMD160 e7041933b39629f9524848dcf81a1a4c02a225c6 SHA1 691974613b1c1f15ed0182ec539fa54a12dd6f93 SHA256 60b05463dfe18d40d68fb8a71b25b408a01f86cc6ceaf5e6b22238b6b0f450c2
 DIST gdc-0.24-src.tar.bz2 1012099 RMD160 f0f33cc02d88ea1174030988c2006cb90029392a SHA1 2be913fe061429c1a279e4cf882e947d34946303 SHA256 cc6a97c76c9e6db31e76ff97014d24b3d43e21f018a3c6218e3fb2a4500fc79a
diff --git a/sys-devel/gcc/gcc-4.6.2.ebuild b/sys-devel/gcc/gcc-4.6.2.ebuild
index 55e058cfee0a..71c275804484 100644
--- a/sys-devel/gcc/gcc-4.6.2.ebuild
+++ b/sys-devel/gcc/gcc-4.6.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.2.ebuild,v 1.5 2011/12/06 21:40:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.2.ebuild,v 1.6 2011/12/07 20:22:07 zorry Exp $
 
 PATCH_VER="1.2"
 UCLIBC_VER="1.0"
 
 # Hardened gcc 4 stuff
-PIE_VER="0.4.5"
+PIE_VER="0.5.0"
 SPECS_VER="0.2.0"
 SPECS_GCC_VER="4.4.3"
 # arch/libc configurations known to be stable with {PIE,SSP}-by-default
diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
index ef92a4637bdb..f657797d675f 100644
--- a/sys-freebsd/boot0/Manifest
+++ b/sys-freebsd/boot0/Manifest
@@ -2,3 +2,4 @@ DIST freebsd-sys-7.2.tar.bz2 23005928 RMD160 0ecdff9fbefe9e16325e09a76310ca2b4a7
 DIST freebsd-sys-8.0.tar.bz2 22552771 RMD160 08f5b09dc0b4353658a309e9e1198dbab1f5ab83 SHA1 9c5e4bdc7af2b9947c55751325880c27f80df225 SHA256 2d822bdeecbbea660aea06ba147a23878cbae7f0640b0b822552d6fa1836d8c9
 DIST freebsd-sys-8.2.tar.bz2 25835329 RMD160 e8fe34f792c1102fe237af7c87ba9c259cd46d22 SHA1 f2a52be8011126a3882d8df2907a22293ad1c581 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16
 DIST freebsd-sys-9.0_rc1.tar.bz2 30257152 RMD160 725bbc8ab49ede1e5ea821b9ceae0c5a3713ffb6 SHA1 a0f0deaee50708e1626eea91e216367fc6ca7c9c SHA256 fb4cf5e7b9ec58077d5c629f62dc5ced8cd28b296e5bdb4888d969494fd71585
+DIST freebsd-sys-9.0_rc2.tar.bz2 30234083 RMD160 e53db15b13f6e50f0ae91c317fd77b92faadddc6 SHA1 b0ffd76b2fc5bcfa293dd5e5512ceb17ad7ed185 SHA256 2990d5603f8043a1da435b75b74eb453f7304923ed4ae3200b8b40cfe7396245
diff --git a/sys-freebsd/boot0/boot0-9.0_rc2.ebuild b/sys-freebsd/boot0/boot0-9.0_rc2.ebuild
new file mode 100644
index 000000000000..dd33bff65a9d
--- /dev/null
+++ b/sys-freebsd/boot0/boot0-9.0_rc2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-9.0_rc2.ebuild,v 1.1 2011/12/07 17:04:42 aballier Exp $
+
+EAPI=2
+
+inherit bsdmk freebsd flag-o-matic
+
+DESCRIPTION="FreeBSD's bootloader"
+SLOT="0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+
+IUSE="bzip2 ieee1394 tftp zfs"
+
+SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
+
+RDEPEND=""
+DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
+	=sys-freebsd/freebsd-lib-${RV}*"
+
+S="${WORKDIR}/sys/boot"
+
+boot0_use_enable() {
+	use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\""
+}
+
+pkg_setup() {
+	boot0_use_enable ieee1394 FIREWIRE
+	boot0_use_enable zfs ZFS
+	boot0_use_enable tftp TFTP
+	boot0_use_enable bzip2 BZIP2
+}
+
+src_prepare() {
+	sed -e '/-fomit-frame-pointer/d' -e '/-mno-align-long-strings/d' \
+		-i "${S}"/i386/boot2/Makefile \
+		-i "${S}"/i386/gptboot/Makefile \
+		-i "${S}"/i386/gptzfsboot/Makefile \
+		-i "${S}"/i386/zfsboot/Makefile || die
+}
+
+src_compile() {
+	strip-flags
+	append-flags "-I/usr/include/libstand/"
+	append-flags "-fno-strict-aliasing"
+	NOFLAGSTRIP="yes" freebsd_src_compile
+}
+
+src_install() {
+	dodir /boot/defaults
+	mkinstall FILESDIR=/boot || die "mkinstall failed"
+}
diff --git a/sys-freebsd/freebsd-bin/Manifest b/sys-freebsd/freebsd-bin/Manifest
index eead6ad82839..63a1a69d105c 100644
--- a/sys-freebsd/freebsd-bin/Manifest
+++ b/sys-freebsd/freebsd-bin/Manifest
@@ -2,12 +2,16 @@ DIST freebsd-bin-7.2.tar.bz2 406772 RMD160 5cb15516cfc080c7ddf4b5b6e7eb880b2e101
 DIST freebsd-bin-8.0.tar.bz2 415822 RMD160 58a2acf990148fd45cbc99bc1bded81c8e352434 SHA1 3177c02e752b9a06175b5ba6556441ed8cd91c33 SHA256 d122c0c55e75c342962dfa8ba04e8bd213730f887d3a6e158c40476f8a5f2460
 DIST freebsd-bin-8.2.tar.bz2 415900 RMD160 3a49919ef24848006ba4b95933ec072f643148c1 SHA1 2d01891f76359c2de12f2270f9b907d417d4ad15 SHA256 fb31b7fab259bda8396e615246f85dc99c3c9f7e98f4e4a613e20b6a394c4921
 DIST freebsd-bin-9.0_rc1.tar.bz2 392261 RMD160 b5c8fb881871009fe2a8907256f2cf1745ee51c5 SHA1 4354950359adb751e2b351bc5b7d26149d85d9c9 SHA256 b084316c5f8986ef4da6cd993c3466c5ade517022e5f00bd1a44d375ab8f5dd6
+DIST freebsd-bin-9.0_rc2.tar.bz2 392321 RMD160 f3a45b69627944ad91d5494e39366d028b422b0c SHA1 3d7d746f04839aa8b67df0d58373e3d78e051cfc SHA256 317cb81441dd9f0121622ffe50fb8bdcb1eac573173d85c8ebc961c30ef1a23f
 DIST freebsd-lib-7.2.tar.bz2 2970356 RMD160 d676e9bfd3a32293ac1190ff3c42861fb987394e SHA1 15749e43f5ed16316c5311bfa40f42ed546b69e9 SHA256 80b54a23068b806aede48700884a5ed2aa33f5d813309ef7497a7b951d62aab0
 DIST freebsd-lib-8.0.tar.bz2 3253452 RMD160 30e9b16e2ad5e2196ea722324a6dd932326bffe1 SHA1 f9ab976ad968a391393671f488ff5ddba190bc28 SHA256 2d15fbb8c71f9f747e722b281f341b749938875d9e08206323e1609073c0e3bb
 DIST freebsd-lib-8.2.tar.bz2 3323878 RMD160 64d8915611a8a4ae58b4b39e9f835398aa6bc1b9 SHA1 9ea3105191fbd72680d66f67d28f22fcf10863d7 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0
 DIST freebsd-lib-9.0_rc1.tar.bz2 3546378 RMD160 71b0b4cac09d8dc6160a56cd57f8643d7957e233 SHA1 e1c9801140d41bd73c20e08e2d592f51281a123c SHA256 237b88ea2b77a870e3b6075fa9293d5bba2920e66ae7b98b6cf209b4d0a937ec
+DIST freebsd-lib-9.0_rc2.tar.bz2 3547324 RMD160 da9ff86bdd1cdca7d4d4045239372a8c6065ed18 SHA1 2363db2131aff3389b1bb03bbe4d95ae611b946e SHA256 13d20c60b3ab7769a440f492a81aef4ed0428c2bcbbeaed43c69c80c65d94a9e
 DIST freebsd-sbin-7.2.tar.bz2 1131189 RMD160 f05c364f49623153f809152a64e5bea8632ed0ec SHA1 f4241733b291f322d21c65cbb683aa1c4c5375e3 SHA256 d5c3c2fe1689bfa13b78117778ca066ad68a1bbefbaa092074c31bdc1b57e876
 DIST freebsd-sbin-8.0.tar.bz2 1140122 RMD160 30cd0c309c46d554114b2a47765f3592a6c4b481 SHA1 7130394dd596d26e6c296167f761745f61ec5993 SHA256 6dbf9aa405ed93d5f2e364946830f60e3c2615df6315120f40817824f8ea78df
 DIST freebsd-sbin-8.2.tar.bz2 1211665 RMD160 32167422cb273ccad18af0dadff551eddb153e7e SHA1 f36a0cd90c90f94941d2013b013947c405e8e152 SHA256 8b7e21a66b4696e8763d29b8b02b2d35f29fc51820a194d1e469e7cace84c527
 DIST freebsd-sbin-9.0_rc1.tar.bz2 1267674 RMD160 0755ac9ebf54aba4f9755c961a1f4ffd3f26723c SHA1 08702291ccacd62bb4e6f157a0529260be9822b1 SHA256 ad4ec7a8ae4ac0dec9e172add7eda30209b5d80c30e85d69b9b03c7d174716d7
+DIST freebsd-sbin-9.0_rc2.tar.bz2 1267485 RMD160 8fbc9120be3fc1cc58dda8838e486e7f637f62b2 SHA1 691e1412813fa0a3725aa77d29870cddb4ad0213 SHA256 f43465c3c31a2aa3605092affec167cf1694a756b9cd9ebe80a4579e9cd4f24a
 DIST freebsd-ubin-9.0_rc1.tar.bz2 1962093 RMD160 2dc189b6359feaf60b6b443d80348136e0d75f8e SHA1 e25b15e1c394cc326e56dcc1d4ebf71e07bf610e SHA256 897b4d10a891adc307861311952bb4df8002a80c8cef96567b28df21a3f81b39
+DIST freebsd-ubin-9.0_rc2.tar.bz2 1962807 RMD160 d9a0124f845abe3fd8f359115c296e036ee08323 SHA1 d2cd3859f0f4047a40aa834a192b936bce063879 SHA256 1ebefae6d8b4882d070c46ffe67091563c33aa5ddf2221105c12a1aa06bd17f1
diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-9.0_rc2.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-9.0_rc2.ebuild
new file mode 100644
index 000000000000..565d5d87fd81
--- /dev/null
+++ b/sys-freebsd/freebsd-bin/freebsd-bin-9.0_rc2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/freebsd-bin-9.0_rc2.ebuild,v 1.1 2011/12/07 17:05:10 aballier Exp $
+
+inherit bsdmk freebsd
+
+DESCRIPTION="FreeBSD /bin tools"
+SLOT="0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+
+IUSE=""
+
+SRC_URI="mirror://gentoo/${BIN}.tar.bz2
+		mirror://gentoo/${UBIN}.tar.bz2
+		mirror://gentoo/${SBIN}.tar.bz2
+		mirror://gentoo/${LIB}.tar.bz2"
+
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
+	sys-libs/ncurses
+	sys-apps/ed
+	!app-misc/realpath
+	!<sys-freebsd/freebsd-ubin-8"
+DEPEND="${RDEPEND}
+	=sys-freebsd/freebsd-mk-defs-${RV}*
+	>=sys-devel/flex-2.5.31-r2"
+
+S=${WORKDIR}/bin
+
+# csh and tcsh are provided by tcsh package, rmail is sendmail stuff.
+REMOVE_SUBDIRS="csh rmail ed"
+
+pkg_setup() {
+	mymakeopts="${mymakeopts} WITHOUT_TCSH= WITHOUT_SENDMAIL= WITHOUT_RCMDS= "
+}
diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest
index 3a89066febdb..2ed455890bad 100644
--- a/sys-freebsd/freebsd-cddl/Manifest
+++ b/sys-freebsd/freebsd-cddl/Manifest
@@ -2,27 +2,34 @@ DIST freebsd-cddl-7.2.tar.bz2 696078 RMD160 44aac7c838c53f7d4b418bae204e7b1d66ba
 DIST freebsd-cddl-8.0.tar.bz2 774011 RMD160 bd4d595a18afc51e68ee0db0b55a4043c9770ea7 SHA1 efe03cb40ecb1a9150c0800c052992c8ffc9103f SHA256 46a863d910e7a193435ab29d993635a07503052e52acdfb5a552915ff1dddb1a
 DIST freebsd-cddl-8.2.tar.bz2 823706 RMD160 fded2d9be9dfd52e7eef5312c1b462e27fde1c91 SHA1 3ffeb2e80fdab24c4c71afcd49bc015495cde83f SHA256 6d2b2362ce60538bcba4afa47bd6baa98b05292babae4b20d6ba08592ce98698
 DIST freebsd-cddl-9.0_rc1.tar.bz2 878394 RMD160 dcc3fdb5394122634f50ca8101572df9bbe51468 SHA1 0b6cb8dd0f26dcf1d49581fce3659d70ec42ccc3 SHA256 9dfc4bcd8b46024705f9c9a594daa5626760908683168814a5f8a3c609aa43fd
+DIST freebsd-cddl-9.0_rc2.tar.bz2 878163 RMD160 8be8138fa2ba64bea4a0a98bf5ecf9cc1b5d8ffc SHA1 520d4dd4763787cdc2a0bb895ce25cb59f1e3649 SHA256 15b3ef388abb898a352df0f1a30cd42b985025dc78e2b478fa3386aaac33a598
 DIST freebsd-contrib-7.2.tar.bz2 41156304 RMD160 d32da79d66aa9e5cd113bd7b3a16b7d83849dca2 SHA1 8f3778a1638bfe852f95d746d181a56258446182 SHA256 e6b5b4320552185d64a1d17676ca4376ca43f147eafaee7e2b0885571e4ee1f2
 DIST freebsd-contrib-8.0.tar.bz2 40637930 RMD160 8130bff1c601e16196f4c108a4bf0e2fef9d8b31 SHA1 a1f3b078079e1716892c80749d43e061d7150aaa SHA256 66cb1b535d8f31ed3f0976ae3cceaee5688052776dd2eafdd44aadad2ddea1b6
 DIST freebsd-contrib-8.2.tar.bz2 40931651 RMD160 f69f61a3154843e5daa722f0a0757686f2effe87 SHA1 28c367a0c21e7cb59bcb013bb54f5576be0d67b1 SHA256 8b9cb688e81c2980b3fc66411d00ab277a24dadd50d5bdd5e0e6c63ac687b9b6
 DIST freebsd-contrib-9.0_rc1.tar.bz2 53684757 RMD160 e489cfd9f5df72254a29df93ef3122fdfe88abd8 SHA1 559a913a0ee1817ab3dba4b78e78efd76cbac7d7 SHA256 071bcb18f61ef6223ea8bf9525ec6853357f5b8f4e57b1b0b8b9a8afff8eb015
+DIST freebsd-contrib-9.0_rc2.tar.bz2 53992312 RMD160 74227385c37bd88bab6698feeddda82ac4fb07db SHA1 cf8f6b65f8512827473d0e25d7fdc307691bc336 SHA256 962d94502f5fa280ba37d4f77b3725844962910cd99486433120df5b4ce9081c
 DIST freebsd-include-7.2.tar.bz2 135657 RMD160 ee9db50e6fcf218929fdff06aabcf31ad2035965 SHA1 3c2369272005c1f2620b9dcc760047de7cab963a SHA256 8640d655e3cefeea14250dbe5e7fd7f56d1de78d79c4adcc6232f70bba89f5d4
 DIST freebsd-include-8.0.tar.bz2 138728 RMD160 7f50c45fe855f666954610827c77ac6c97922274 SHA1 803b1f8a9d369a199f8cf82f6540f17fcc2503f5 SHA256 23dfcc3845b6a36a38abcb79bd75786100575478fdfdc3358be1a114a6c65ffa
 DIST freebsd-include-8.2.tar.bz2 138992 RMD160 b5f9fcc43c2d902a4da2cf86c56355238e619010 SHA1 6a460e7972bf7518da6c3ab8c9fa97547e4bd4bc SHA256 fade90621a8e4880c9583c1ee49965400c88e53ac6c07cb5dcf320e4f069271d
 DIST freebsd-include-9.0_rc1.tar.bz2 141667 RMD160 b9b2fb0d7fdeac02a33c3ff532ef79110bcc747c SHA1 b231997214bae2681b9e49685bac08964f54fd9a SHA256 086bb1b30f8494fc011a735b6f41c83067f59f39997bf3026cdc2855ee7e088f
+DIST freebsd-include-9.0_rc2.tar.bz2 141724 RMD160 5b45818668c30c1bfed8d40ce9dbad3398235bce SHA1 eea0bc64e1b14165eef1183867029caaf7622ee0 SHA256 8c54ec436526f48b344b2843565340007f60902504021c14cf81664745498119
 DIST freebsd-lib-7.2.tar.bz2 2970356 RMD160 d676e9bfd3a32293ac1190ff3c42861fb987394e SHA1 15749e43f5ed16316c5311bfa40f42ed546b69e9 SHA256 80b54a23068b806aede48700884a5ed2aa33f5d813309ef7497a7b951d62aab0
 DIST freebsd-lib-8.0.tar.bz2 3253452 RMD160 30e9b16e2ad5e2196ea722324a6dd932326bffe1 SHA1 f9ab976ad968a391393671f488ff5ddba190bc28 SHA256 2d15fbb8c71f9f747e722b281f341b749938875d9e08206323e1609073c0e3bb
 DIST freebsd-lib-8.2.tar.bz2 3323878 RMD160 64d8915611a8a4ae58b4b39e9f835398aa6bc1b9 SHA1 9ea3105191fbd72680d66f67d28f22fcf10863d7 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0
 DIST freebsd-lib-9.0_rc1.tar.bz2 3546378 RMD160 71b0b4cac09d8dc6160a56cd57f8643d7957e233 SHA1 e1c9801140d41bd73c20e08e2d592f51281a123c SHA256 237b88ea2b77a870e3b6075fa9293d5bba2920e66ae7b98b6cf209b4d0a937ec
+DIST freebsd-lib-9.0_rc2.tar.bz2 3547324 RMD160 da9ff86bdd1cdca7d4d4045239372a8c6065ed18 SHA1 2363db2131aff3389b1bb03bbe4d95ae611b946e SHA256 13d20c60b3ab7769a440f492a81aef4ed0428c2bcbbeaed43c69c80c65d94a9e
 DIST freebsd-sbin-7.2.tar.bz2 1131189 RMD160 f05c364f49623153f809152a64e5bea8632ed0ec SHA1 f4241733b291f322d21c65cbb683aa1c4c5375e3 SHA256 d5c3c2fe1689bfa13b78117778ca066ad68a1bbefbaa092074c31bdc1b57e876
 DIST freebsd-sbin-8.0.tar.bz2 1140122 RMD160 30cd0c309c46d554114b2a47765f3592a6c4b481 SHA1 7130394dd596d26e6c296167f761745f61ec5993 SHA256 6dbf9aa405ed93d5f2e364946830f60e3c2615df6315120f40817824f8ea78df
 DIST freebsd-sbin-8.2.tar.bz2 1211665 RMD160 32167422cb273ccad18af0dadff551eddb153e7e SHA1 f36a0cd90c90f94941d2013b013947c405e8e152 SHA256 8b7e21a66b4696e8763d29b8b02b2d35f29fc51820a194d1e469e7cace84c527
 DIST freebsd-sbin-9.0_rc1.tar.bz2 1267674 RMD160 0755ac9ebf54aba4f9755c961a1f4ffd3f26723c SHA1 08702291ccacd62bb4e6f157a0529260be9822b1 SHA256 ad4ec7a8ae4ac0dec9e172add7eda30209b5d80c30e85d69b9b03c7d174716d7
+DIST freebsd-sbin-9.0_rc2.tar.bz2 1267485 RMD160 8fbc9120be3fc1cc58dda8838e486e7f637f62b2 SHA1 691e1412813fa0a3725aa77d29870cddb4ad0213 SHA256 f43465c3c31a2aa3605092affec167cf1694a756b9cd9ebe80a4579e9cd4f24a
 DIST freebsd-sys-7.2.tar.bz2 23005928 RMD160 0ecdff9fbefe9e16325e09a76310ca2b4a7751b8 SHA1 1c2d6894371a8650288ebf1a4831a4b08c2e4f09 SHA256 38e1fc670b8438be42947b1512ca7d10b0f8c62c58d3234afd8ce2e55b6cae11
 DIST freebsd-sys-8.0.tar.bz2 22552771 RMD160 08f5b09dc0b4353658a309e9e1198dbab1f5ab83 SHA1 9c5e4bdc7af2b9947c55751325880c27f80df225 SHA256 2d822bdeecbbea660aea06ba147a23878cbae7f0640b0b822552d6fa1836d8c9
 DIST freebsd-sys-8.2.tar.bz2 25835329 RMD160 e8fe34f792c1102fe237af7c87ba9c259cd46d22 SHA1 f2a52be8011126a3882d8df2907a22293ad1c581 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16
 DIST freebsd-sys-9.0_rc1.tar.bz2 30257152 RMD160 725bbc8ab49ede1e5ea821b9ceae0c5a3713ffb6 SHA1 a0f0deaee50708e1626eea91e216367fc6ca7c9c SHA256 fb4cf5e7b9ec58077d5c629f62dc5ced8cd28b296e5bdb4888d969494fd71585
+DIST freebsd-sys-9.0_rc2.tar.bz2 30234083 RMD160 e53db15b13f6e50f0ae91c317fd77b92faadddc6 SHA1 b0ffd76b2fc5bcfa293dd5e5512ceb17ad7ed185 SHA256 2990d5603f8043a1da435b75b74eb453f7304923ed4ae3200b8b40cfe7396245
 DIST freebsd-ubin-7.2.tar.bz2 1851174 RMD160 b56cdc06fe0ce1ea47762a75c33ed9ed6d1abfde SHA1 1739eceebc41d9a4cbf10d21ef4e8d55b586f640 SHA256 5ca9f185a5af59993ddf83ece155bfcea1340a93d2540035b35c5acbfc3a2625
 DIST freebsd-ubin-8.0.tar.bz2 1787358 RMD160 08814da95905ba2cd6037c41507eade30b007e72 SHA1 0de52ddd7522b73c876ed967ac96aa278260f5b6 SHA256 2bd1529107e3b70df64bc4d7d3117122cac03b49b874a6653860b13d567af250
 DIST freebsd-ubin-8.2.tar.bz2 1808012 RMD160 b927dcb67de4367ea148643203e0056dd90a0c36 SHA1 0d5e58642ab4555f15ab144feaec6fe90f7a2f2c SHA256 6b99554f3ad6ee052069b347eb6e6219b71598d7b222acb90a24cbfc805c7b68
 DIST freebsd-ubin-9.0_rc1.tar.bz2 1962093 RMD160 2dc189b6359feaf60b6b443d80348136e0d75f8e SHA1 e25b15e1c394cc326e56dcc1d4ebf71e07bf610e SHA256 897b4d10a891adc307861311952bb4df8002a80c8cef96567b28df21a3f81b39
+DIST freebsd-ubin-9.0_rc2.tar.bz2 1962807 RMD160 d9a0124f845abe3fd8f359115c296e036ee08323 SHA1 d2cd3859f0f4047a40aa834a192b936bce063879 SHA256 1ebefae6d8b4882d070c46ffe67091563c33aa5ddf2221105c12a1aa06bd17f1
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0_rc2.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0_rc2.ebuild
new file mode 100644
index 000000000000..92c7fb2dd4ed
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0_rc2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0_rc2.ebuild,v 1.1 2011/12/07 17:05:37 aballier Exp $
+
+inherit bsdmk freebsd flag-o-matic eutils
+
+DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software"
+SLOT="0"
+KEYWORDS="~x86-fbsd"
+
+IUSE="build"
+LICENSE="CDDL"
+
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+		mirror://gentoo/${CONTRIB}.tar.bz2
+		mirror://gentoo/${UBIN}.tar.bz2
+		mirror://gentoo/${LIB}.tar.bz2
+		mirror://gentoo/${SBIN}.tar.bz2
+		mirror://gentoo/${SYS}.tar.bz2
+		build? ( mirror://gentoo/${SYS}.tar.bz2
+			mirror://gentoo/${INCLUDE}.tar.bz2 )"
+
+# sys is required.
+
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
+	=sys-freebsd/freebsd-libexec-${RV}*
+	build? ( sys-apps/baselayout )
+	dev-libs/libelf"
+
+DEPEND="${RDEPEND}
+	=sys-freebsd/freebsd-mk-defs-${RV}*
+	!build? ( =sys-freebsd/freebsd-sources-${RV}* )"
+
+S="${WORKDIR}/cddl"
+
+PATCHES=( "${FILESDIR}/${PN}-9.0-bsdxml.patch"
+	"${FILESDIR}/${PN}-9.0-underlink.patch" )
+
+src_unpack() {
+	freebsd_src_unpack
+	# Link in include headers.
+	ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.."
+	# Force linking to new libraries
+	for i in "${S}/lib/"lib* ; do
+		append-ldflags " -L${i}"
+	done
+}
+
+src_install() {
+	freebsd_src_install
+	# Install zfs volinit script.
+	newinitd "${FILESDIR}"/zvol.initd zvol
+}
diff --git a/sys-freebsd/freebsd-contrib/Manifest b/sys-freebsd/freebsd-contrib/Manifest
index 785e764f3a84..6f25f27dae9a 100644
--- a/sys-freebsd/freebsd-contrib/Manifest
+++ b/sys-freebsd/freebsd-contrib/Manifest
@@ -2,7 +2,9 @@ DIST freebsd-contrib-7.2.tar.bz2 41156304 RMD160 d32da79d66aa9e5cd113bd7b3a16b7d
 DIST freebsd-contrib-8.0.tar.bz2 40637930 RMD160 8130bff1c601e16196f4c108a4bf0e2fef9d8b31 SHA1 a1f3b078079e1716892c80749d43e061d7150aaa SHA256 66cb1b535d8f31ed3f0976ae3cceaee5688052776dd2eafdd44aadad2ddea1b6
 DIST freebsd-contrib-8.2.tar.bz2 40931651 RMD160 f69f61a3154843e5daa722f0a0757686f2effe87 SHA1 28c367a0c21e7cb59bcb013bb54f5576be0d67b1 SHA256 8b9cb688e81c2980b3fc66411d00ab277a24dadd50d5bdd5e0e6c63ac687b9b6
 DIST freebsd-contrib-9.0_rc1.tar.bz2 53684757 RMD160 e489cfd9f5df72254a29df93ef3122fdfe88abd8 SHA1 559a913a0ee1817ab3dba4b78e78efd76cbac7d7 SHA256 071bcb18f61ef6223ea8bf9525ec6853357f5b8f4e57b1b0b8b9a8afff8eb015
+DIST freebsd-contrib-9.0_rc2.tar.bz2 53992312 RMD160 74227385c37bd88bab6698feeddda82ac4fb07db SHA1 cf8f6b65f8512827473d0e25d7fdc307691bc336 SHA256 962d94502f5fa280ba37d4f77b3725844962910cd99486433120df5b4ce9081c
 DIST freebsd-gnu-7.2.tar.bz2 814017 RMD160 6b4f742c236a095e919cc839a174e25310812535 SHA1 bc139f2323e7962619de89a7026b66050106256a SHA256 17b64c91d33c166ed909b349044dd4291e3295e36bb4e4c14d82e680b6491cd4
 DIST freebsd-gnu-8.0.tar.bz2 817829 RMD160 e0dfc3e77110b2f67defa10268cf4a41199e0883 SHA1 ff2a6ba45f655a804e1a0242d562b81ded5d1ba2 SHA256 b55a20f9d88611638c143f9fbedc83fca5faae1df599e928ef6e8b889411c49f
 DIST freebsd-gnu-8.2.tar.bz2 815379 RMD160 f4eece3343c71ed5a2387854c63a7fff3675f713 SHA1 04013b0bedcdc695687a2fadf030376632774a4d SHA256 34be1326b8e188427ea4a59de5dd24049f99adb5e172d61a645db1b7124f7876
 DIST freebsd-gnu-9.0_rc1.tar.bz2 783924 RMD160 aa13a8b6960320ed9fdb4ea7de0049ed7caae720 SHA1 7b05407f545f40bd687cc3b226a95401cdd3cef2 SHA256 7c50fa7cb4c5b7f6aeb9f87569b8d577a7ee5daf657cbb62c121ba203e83cb2c
+DIST freebsd-gnu-9.0_rc2.tar.bz2 783761 RMD160 de29867cd5b07a6a01f5ead4465d52e372586451 SHA1 15c08d87be1624324e90bd49afb7c4ed655cede7 SHA256 222492e714fe471cc644baa198b88a1b29b51ed4e4604be76ec8fee267a25a69
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.0_rc2.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.0_rc2.ebuild
new file mode 100644
index 000000000000..099ddfde90f8
--- /dev/null
+++ b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.0_rc2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-9.0_rc2.ebuild,v 1.1 2011/12/07 17:06:03 aballier Exp $
+
+inherit bsdmk freebsd flag-o-matic
+
+DESCRIPTION="Contributed sources for FreeBSD."
+SLOT="0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+LICENSE="BSD GPL-2 as-is"
+
+IUSE=""
+
+SRC_URI="mirror://gentoo/${GNU}.tar.bz2
+	mirror://gentoo/${P}.tar.bz2"
+
+RDEPEND=""
+DEPEND="=sys-freebsd/freebsd-sources-${RV}*
+	=sys-freebsd/freebsd-mk-defs-${RV}*"
+
+S="${WORKDIR}/gnu"
+
+src_unpack() {
+	echo ">>> Unpacking needed parts of ${GNU}.tar.bz2 to ${WORKDIR}"
+	tar -jxpf "${DISTDIR}/${GNU}.tar.bz2" gnu/lib/libodialog gnu/usr.bin/sort gnu/usr.bin/patch
+	echo ">>> Unpacking needed parts of ${CONTRIB}.tar.bz2 to ${WORKDIR}"
+	tar -jxpf "${DISTDIR}/${CONTRIB}.tar.bz2" contrib/gnu-sort
+
+	freebsd_do_patches
+	freebsd_rename_libraries
+}
+
+src_compile() {
+	cd "${S}/lib/libodialog"
+	freebsd_src_compile
+
+	cd "${S}/usr.bin/sort"
+	freebsd_src_compile
+
+	cd "${S}/usr.bin/patch"
+	freebsd_src_compile
+}
+
+src_install() {
+	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
+	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
+
+	cd "${S}/lib/libodialog"
+	mkinstall || die "libodialog install failed"
+
+	cd "${S}/usr.bin/sort"
+	mkinstall BINDIR="/bin/" || die "sort install failed"
+
+	cd "${S}/usr.bin/patch"
+	mkinstall BINDIR="/usr/bin/" || die "patch install failed"
+}
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 4f9245ef8ad1..5e0e8fe1ac97 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -2,34 +2,43 @@ DIST freebsd-contrib-7.2.tar.bz2 41156304 RMD160 d32da79d66aa9e5cd113bd7b3a16b7d
 DIST freebsd-contrib-8.0.tar.bz2 40637930 RMD160 8130bff1c601e16196f4c108a4bf0e2fef9d8b31 SHA1 a1f3b078079e1716892c80749d43e061d7150aaa SHA256 66cb1b535d8f31ed3f0976ae3cceaee5688052776dd2eafdd44aadad2ddea1b6
 DIST freebsd-contrib-8.2.tar.bz2 40931651 RMD160 f69f61a3154843e5daa722f0a0757686f2effe87 SHA1 28c367a0c21e7cb59bcb013bb54f5576be0d67b1 SHA256 8b9cb688e81c2980b3fc66411d00ab277a24dadd50d5bdd5e0e6c63ac687b9b6
 DIST freebsd-contrib-9.0_rc1.tar.bz2 53684757 RMD160 e489cfd9f5df72254a29df93ef3122fdfe88abd8 SHA1 559a913a0ee1817ab3dba4b78e78efd76cbac7d7 SHA256 071bcb18f61ef6223ea8bf9525ec6853357f5b8f4e57b1b0b8b9a8afff8eb015
+DIST freebsd-contrib-9.0_rc2.tar.bz2 53992312 RMD160 74227385c37bd88bab6698feeddda82ac4fb07db SHA1 cf8f6b65f8512827473d0e25d7fdc307691bc336 SHA256 962d94502f5fa280ba37d4f77b3725844962910cd99486433120df5b4ce9081c
 DIST freebsd-crypto-7.2.tar.bz2 4318008 RMD160 2dfa213a9384c4ab0358ebbf1d432cd58fac0f9c SHA1 d89fd8f2132c88b360f0c7f3861b55092f5118a4 SHA256 479defd73c8b67dff02beaeccd0bf5032cdd3772e0cdcb59bde577ce6179e178
 DIST freebsd-crypto-8.0.tar.bz2 5565696 RMD160 fcba7426382ef3c8726c943c72d4b7b34cb38f32 SHA1 74e7ccee22ef2620e26dfe9cd0fd25dfdaa9c70f SHA256 2673a97d4a5371f8a50d9d95ad78076eedb1ea357bdee319780c17e4853ea531
 DIST freebsd-crypto-8.2.tar.bz2 5561428 RMD160 1a88c31dd821c758476d5bc22bb54833a99b3328 SHA1 2e6b769ec399d92e5c7af56c65bf88617464f2a7 SHA256 89ddda3dfad2d46abacc27c296d7d58c18463e0fe1ce2fac2c7a8fcafe181890
 DIST freebsd-crypto-9.0_rc1.tar.bz2 5671559 RMD160 e6e3cf9d2efb81c623a13f32f4fdc3d6da0665cb SHA1 c8cecdad481cbf2d3de427c97677b08d6f6da07e SHA256 37617eb4cbe9ce44f2bc8b9726faa9c2f618074044a0a28746e08ec3c28a5186
+DIST freebsd-crypto-9.0_rc2.tar.bz2 5670968 RMD160 2aa7440f7fc1ecaf53374d5469654340db7c4cf4 SHA1 cf7ef0ecf825e184d37c8adbc5667d1d0faec326 SHA256 d95b5ada93a75c16021a2d362a8402f345107758a33613d11593f9156989ea6e
 DIST freebsd-etc-7.2.tar.bz2 199580 RMD160 f8954a1c590c918861b39cb414a079a960af9969 SHA1 a2fee43a6a6fffd864776eceab134002fc9292d2 SHA256 9a6ebd6877191e7ff5d734a77da16090123c5223cfe873177b9fe1ca4f12d653
 DIST freebsd-etc-8.0.tar.bz2 183231 RMD160 c1926470ee952a83e945cf0538785eb6711ad538 SHA1 611c75422d7f1a47158f9478d5c0c63ee7d4e45d SHA256 23ac89366dbc397c9d16f8509677289a06fc4e0807baf64728a308ff45fc9ec2
 DIST freebsd-etc-8.2.tar.bz2 188629 RMD160 915753c5926914964550ff831e05d59f4d6e5470 SHA1 170223195ce728242e3c1dbc9a448e95f8ae1afb SHA256 6bc745fa259f9fa2b65df865d45443a7b23c24445195e33a4ac50bf1040ae238
 DIST freebsd-etc-9.0_rc1.tar.bz2 207024 RMD160 44d79dae611d79c0a94d9c144497144d2399bce6 SHA1 6d37bc25f81b3dd763610ab762fe18a5e333077f SHA256 5ed8c871b71d013067ac97c67000e2186c87df313e2e9d49cc4e2d5cadfc5591
+DIST freebsd-etc-9.0_rc2.tar.bz2 207133 RMD160 4f630381be5eed6c8fa2fee302d773b58c55d8b6 SHA1 2c8c8023c04f6e93caa772e69844bbc9b10d6594 SHA256 1be6e9707b6c81b812f4a3f1ba905b1c9cbec58d80eb6bb583cbed2418f91ff5
 DIST freebsd-gnu-8.0.tar.bz2 817829 RMD160 e0dfc3e77110b2f67defa10268cf4a41199e0883 SHA1 ff2a6ba45f655a804e1a0242d562b81ded5d1ba2 SHA256 b55a20f9d88611638c143f9fbedc83fca5faae1df599e928ef6e8b889411c49f
 DIST freebsd-gnu-8.2.tar.bz2 815379 RMD160 f4eece3343c71ed5a2387854c63a7fff3675f713 SHA1 04013b0bedcdc695687a2fadf030376632774a4d SHA256 34be1326b8e188427ea4a59de5dd24049f99adb5e172d61a645db1b7124f7876
 DIST freebsd-gnu-9.0_rc1.tar.bz2 783924 RMD160 aa13a8b6960320ed9fdb4ea7de0049ed7caae720 SHA1 7b05407f545f40bd687cc3b226a95401cdd3cef2 SHA256 7c50fa7cb4c5b7f6aeb9f87569b8d577a7ee5daf657cbb62c121ba203e83cb2c
+DIST freebsd-gnu-9.0_rc2.tar.bz2 783761 RMD160 de29867cd5b07a6a01f5ead4465d52e372586451 SHA1 15c08d87be1624324e90bd49afb7c4ed655cede7 SHA256 222492e714fe471cc644baa198b88a1b29b51ed4e4604be76ec8fee267a25a69
 DIST freebsd-include-7.2.tar.bz2 135657 RMD160 ee9db50e6fcf218929fdff06aabcf31ad2035965 SHA1 3c2369272005c1f2620b9dcc760047de7cab963a SHA256 8640d655e3cefeea14250dbe5e7fd7f56d1de78d79c4adcc6232f70bba89f5d4
 DIST freebsd-include-8.0.tar.bz2 138728 RMD160 7f50c45fe855f666954610827c77ac6c97922274 SHA1 803b1f8a9d369a199f8cf82f6540f17fcc2503f5 SHA256 23dfcc3845b6a36a38abcb79bd75786100575478fdfdc3358be1a114a6c65ffa
 DIST freebsd-include-8.2.tar.bz2 138992 RMD160 b5f9fcc43c2d902a4da2cf86c56355238e619010 SHA1 6a460e7972bf7518da6c3ab8c9fa97547e4bd4bc SHA256 fade90621a8e4880c9583c1ee49965400c88e53ac6c07cb5dcf320e4f069271d
 DIST freebsd-include-9.0_rc1.tar.bz2 141667 RMD160 b9b2fb0d7fdeac02a33c3ff532ef79110bcc747c SHA1 b231997214bae2681b9e49685bac08964f54fd9a SHA256 086bb1b30f8494fc011a735b6f41c83067f59f39997bf3026cdc2855ee7e088f
+DIST freebsd-include-9.0_rc2.tar.bz2 141724 RMD160 5b45818668c30c1bfed8d40ce9dbad3398235bce SHA1 eea0bc64e1b14165eef1183867029caaf7622ee0 SHA256 8c54ec436526f48b344b2843565340007f60902504021c14cf81664745498119
 DIST freebsd-lib-7.2.tar.bz2 2970356 RMD160 d676e9bfd3a32293ac1190ff3c42861fb987394e SHA1 15749e43f5ed16316c5311bfa40f42ed546b69e9 SHA256 80b54a23068b806aede48700884a5ed2aa33f5d813309ef7497a7b951d62aab0
 DIST freebsd-lib-8.0.tar.bz2 3253452 RMD160 30e9b16e2ad5e2196ea722324a6dd932326bffe1 SHA1 f9ab976ad968a391393671f488ff5ddba190bc28 SHA256 2d15fbb8c71f9f747e722b281f341b749938875d9e08206323e1609073c0e3bb
 DIST freebsd-lib-8.2.tar.bz2 3323878 RMD160 64d8915611a8a4ae58b4b39e9f835398aa6bc1b9 SHA1 9ea3105191fbd72680d66f67d28f22fcf10863d7 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0
 DIST freebsd-lib-9.0_rc1.tar.bz2 3546378 RMD160 71b0b4cac09d8dc6160a56cd57f8643d7957e233 SHA1 e1c9801140d41bd73c20e08e2d592f51281a123c SHA256 237b88ea2b77a870e3b6075fa9293d5bba2920e66ae7b98b6cf209b4d0a937ec
+DIST freebsd-lib-9.0_rc2.tar.bz2 3547324 RMD160 da9ff86bdd1cdca7d4d4045239372a8c6065ed18 SHA1 2363db2131aff3389b1bb03bbe4d95ae611b946e SHA256 13d20c60b3ab7769a440f492a81aef4ed0428c2bcbbeaed43c69c80c65d94a9e
 DIST freebsd-libexec-7.2.tar.bz2 275993 RMD160 e3cfab5b89c304eeff76d92eaadaaadb6322c90e SHA1 747aa2365565fabb97aa910c01c06b340ddf3ea2 SHA256 375627cd871a4fbed4b7ec79d788bb5e62bc6cc818e971c613b3acd89b2db453
 DIST freebsd-libexec-8.0.tar.bz2 279159 RMD160 f4061f62f0773ca4dea4e1d7086e52759d030f4b SHA1 9e8cb7d674f91b4a36c79d6e0bf2be3176e620f8 SHA256 86d4ca63b605b91da26bfa981ddf667fb741ed9a983191c1d75a8762263f0599
 DIST freebsd-libexec-8.2.tar.bz2 289147 RMD160 81e2e000adbd04bb0b3da9786f95b8b53ec5f32e SHA1 646748e531fe5b40341f5ea61dda756d999a0b7c SHA256 10b996d1d8cd044ee2e7a877e5e6ad2bf050cce9b3bd402a5e0dea7d290b595d
 DIST freebsd-libexec-9.0_rc1.tar.bz2 298324 RMD160 b1270fb4e40538a12836e594b1a416329dd6e51b SHA1 03fd233c9d8aab8e56599f56711633c7d61cd7f4 SHA256 2a01f20e8d7717db130c494da0b91640d90e2659182fb61b42121090fd35cfde
+DIST freebsd-libexec-9.0_rc2.tar.bz2 298456 RMD160 f383937321521ca2520e627ac4a00d0d335028fa SHA1 3e8d5188baf3fa374f7a8d674b523649c72e62e7 SHA256 5943e61a1f7fbf7c59cfb25082a8d89a4310b788a48423fc5d6171a8359d7de4
 DIST freebsd-sys-7.2.tar.bz2 23005928 RMD160 0ecdff9fbefe9e16325e09a76310ca2b4a7751b8 SHA1 1c2d6894371a8650288ebf1a4831a4b08c2e4f09 SHA256 38e1fc670b8438be42947b1512ca7d10b0f8c62c58d3234afd8ce2e55b6cae11
 DIST freebsd-sys-8.0.tar.bz2 22552771 RMD160 08f5b09dc0b4353658a309e9e1198dbab1f5ab83 SHA1 9c5e4bdc7af2b9947c55751325880c27f80df225 SHA256 2d822bdeecbbea660aea06ba147a23878cbae7f0640b0b822552d6fa1836d8c9
 DIST freebsd-sys-8.2.tar.bz2 25835329 RMD160 e8fe34f792c1102fe237af7c87ba9c259cd46d22 SHA1 f2a52be8011126a3882d8df2907a22293ad1c581 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16
 DIST freebsd-sys-9.0_rc1.tar.bz2 30257152 RMD160 725bbc8ab49ede1e5ea821b9ceae0c5a3713ffb6 SHA1 a0f0deaee50708e1626eea91e216367fc6ca7c9c SHA256 fb4cf5e7b9ec58077d5c629f62dc5ced8cd28b296e5bdb4888d969494fd71585
+DIST freebsd-sys-9.0_rc2.tar.bz2 30234083 RMD160 e53db15b13f6e50f0ae91c317fd77b92faadddc6 SHA1 b0ffd76b2fc5bcfa293dd5e5512ceb17ad7ed185 SHA256 2990d5603f8043a1da435b75b74eb453f7304923ed4ae3200b8b40cfe7396245
 DIST freebsd-usbin-7.2.tar.bz2 2654480 RMD160 af0a94e0affce332cf30532ea45251563e65632e SHA1 b52db981e0250357b40d10ebc7ffd6ca3ea9cc4c SHA256 56574e81ac4ab54a20d83d9a2d1ba3a42b5677691675f1db162fde161da0907f
 DIST freebsd-usbin-8.0.tar.bz2 2411151 RMD160 f162437ab2e3c89c6635e5c567e39b60974ce3c1 SHA1 be7b4ccd767e64fa0dedced631c18a1c3969b417 SHA256 c38230af5d667a254ddcce0b77100ada2b7af6e17309f033950c2852f70cc1dd
 DIST freebsd-usbin-8.2.tar.bz2 2443024 RMD160 972723becd1ab16615bc45f9beab8483533cbf81 SHA1 16bcb5528f14cfeccb9f4c913a629b01d9873ebf SHA256 aa7cabf10f5c3a9daabea32e4de24d04ec312247842981476da666eff5054603
 DIST freebsd-usbin-9.0_rc1.tar.bz2 2605735 RMD160 672adbdfff912e6027bad8acd9db6645b1a14c27 SHA1 bf02bd5ff416026d90aac89d0256ac3fb13d8a5e SHA256 34666292f701ae88128b6416db78038ce04e13198ba74961b4a2ce7600a88f21
+DIST freebsd-usbin-9.0_rc2.tar.bz2 2606905 RMD160 d63519382e2405c6d255ff492677cc589103dc2c SHA1 f7f7dd4aa6a4a4621d402d76fcdc80bd3e672f24 SHA256 694e8137992c1747fcc9962106bc82352327605fef01cdcdc63e6b9452278080
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.0_rc2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.0_rc2.ebuild
new file mode 100644
index 000000000000..e2060857ea57
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.0_rc2.ebuild
@@ -0,0 +1,450 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0_rc2.ebuild,v 1.1 2011/12/07 17:06:59 aballier Exp $
+
+EAPI=2
+
+inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="FreeBSD's base system libraries"
+SLOT="0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+
+# Crypto is needed to have an internal OpenSSL header
+# sys is needed for libalias, probably we can just extract that instead of
+# extracting the whole tarball
+SRC_URI="mirror://gentoo/${LIB}.tar.bz2
+		mirror://gentoo/${CONTRIB}.tar.bz2
+		mirror://gentoo/${CRYPTO}.tar.bz2
+		mirror://gentoo/${LIBEXEC}.tar.bz2
+		mirror://gentoo/${ETC}.tar.bz2
+		mirror://gentoo/${INCLUDE}.tar.bz2
+		mirror://gentoo/${USBIN}.tar.bz2
+		mirror://gentoo/${GNU}.tar.bz2
+		build? (
+			mirror://gentoo/${SYS}.tar.bz2 )"
+
+if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
+	RDEPEND="ssl? ( dev-libs/openssl )
+		hesiod? ( net-dns/hesiod )
+		kerberos? ( virtual/krb5 )
+		usb? ( !dev-libs/libusb )
+		zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
+		>=dev-libs/expat-2.0.1
+		!dev-libs/libedit
+		!sys-freebsd/freebsd-headers"
+	DEPEND="${RDEPEND}
+		>=sys-devel/flex-2.5.31-r2
+		=sys-freebsd/freebsd-sources-${RV}*
+		!bootstrap? ( app-arch/bzip2 )"
+else
+	SRC_URI="${SRC_URI}
+			mirror://gentoo/${SYS}.tar.bz2"
+fi
+
+DEPEND="${DEPEND}
+		=sys-freebsd/freebsd-mk-defs-${RV}*"
+
+S="${WORKDIR}/lib"
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then
+	export CTARGET=${CATEGORY/cross-}
+fi
+
+IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
+	build bootstrap crosscompile_opts_headers-only zfs
+	userland_GNU userland_BSD"
+
+pkg_setup() {
+	[ -c /dev/zero ] || \
+		die "You forgot to mount /dev; the compiled libc would break."
+
+	if ! use ssl && use kerberos; then
+		eerror "If you want kerberos support you need to enable ssl support, too."
+	fi
+
+	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
+	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
+	use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= "
+	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= "
+	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
+	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
+	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
+	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
+	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
+
+	mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL= WITHOUT_CLANG= "
+
+	if [ "${CTARGET}" != "${CHOST}" ]; then
+		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
+		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
+	fi
+}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.0-gccfloat.patch"
+	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
+	"${FILESDIR}/${PN}-6.1-csu.patch"
+	"${FILESDIR}/${PN}-8.0-rpcsec_gss.patch"
+	"${FILESDIR}/${PN}-9.0-liblink.patch"
+	"${FILESDIR}/${PN}-9.0-mancol.patch"
+	"${FILESDIR}/${PN}-bsdxml2expat.patch" )
+
+# Here we disable and remove source which we don't need or want
+# In order:
+# - ncurses stuff
+# - libexpat creates a bsdxml library which is the same as expat
+# - archiving libraries (have their own ebuild)
+# - sendmail libraries (they are installed by sendmail)
+# - SNMP library and dependency (have their own ebuilds)
+#
+# The rest are libraries we already have somewhere else because
+# they are contribution.
+# Note: libtelnet is an internal lib used by telnet and telnetd programs
+# as it's not used in freebsd-lib package itself, it's pointless building
+# it here.
+REMOVE_SUBDIRS="ncurses \
+	libexpat \
+	libz libbz2 libarchive liblzma \
+	libsm libsmdb libsmutil \
+	libbegemot libbsnmp \
+	libpam libpcap bind libwrap libmagic \
+	libcom_err libtelnet
+	libelf"
+
+src_prepare() {
+	sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
+	sed -i.bak -e 's:histedit.h::' "${WORKDIR}/include/Makefile"
+
+	# Upstream Display Managers default to using VT7
+	# We should make FreeBSD allow this by default
+	local x=
+	for x in "${WORKDIR}"/etc/etc.*/ttys ; do
+		sed -i.bak \
+			-e '/ttyv5[[:space:]]/ a\
+# Display Managers default to VT7.\
+# If you use the xdm init script, keep ttyv6 commented out\
+# unless you force a different VT for the DM being used.' \
+			-e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \
+			|| die "Failed to sed ${x}"
+		rm "${x}".bak
+	done
+
+	# This one is here because it also
+	# patches "${WORKDIR}/include"
+	cd "${WORKDIR}"
+	epatch "${FILESDIR}/${PN}-includes.patch"
+	epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
+
+	# Don't install the hesiod man page or header
+	rm "${WORKDIR}"/include/hesiod.h || die
+	sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die
+	sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \
+	"${WORKDIR}"/lib/libc/net/Makefile.inc || die
+
+	# Fix the Makefiles of these few libraries that will overwrite our LDADD.
+	cd "${S}"
+	for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \
+		libsmb; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \
+		die "Problem fixing \"${dir}/Makefile"
+	done
+	if use build; then
+		cd "${WORKDIR}"
+		# This patch has to be applied on ${WORKDIR}/sys, so we do it here since it
+		# shouldn't be a symlink to /usr/src/sys (which should be already patched)
+		epatch "${FILESDIR}"/${PN}-7.1-types.h-fix.patch
+		# Preinstall includes so we don't use the system's ones.
+		mkdir "${WORKDIR}/include_proper" || die "Couldn't create ${WORKDIR}/include_proper"
+		install_includes "/include_proper"
+		return 0
+	fi
+
+	if [ "${CTARGET}" = "${CHOST}" ]; then
+		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
+	else
+		sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
+			"${S}/libc/rpc/Makefile.inc" \
+			"${S}/libc/yp/Makefile.inc"
+	fi
+
+	if install --version 2> /dev/null | grep -q GNU; then
+		sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
+	fi
+
+	# Preinstall includes so we don't use the system's ones.
+	mkdir "${WORKDIR}/include_proper" || die "Couldn't create ${WORKDIR}/include_proper"
+	install_includes "/include_proper"
+
+	# Let arch-specific includes to be found
+	local machine
+	machine=$(tc-arch-kernel ${CTARGET})
+	ln -s "${WORKDIR}/sys/${machine}/include" "${WORKDIR}/include/machine" || \
+		die "Couldn't make ${machine}/include symlink."
+
+	cd "${S}"
+	use bootstrap && dummy_mk libstand
+	# Call LD with LDFLAGS, rename them to RAW_LDFLAGS
+	sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
+		-i "${S}/csu/i386-elf/Makefile" \
+		-i "${S}/csu/ia64/Makefile" || die
+	# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
+	# BSD's sed on BSD.
+	if use userland_GNU; then
+		find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
+	fi
+}
+
+src_compile() {
+	# Does not work with GNU sed
+	# Force BSD's sed on BSD.
+	if use userland_BSD ; then
+		export ESED=/usr/bin/sed
+		unalias sed
+	fi
+
+	cd "${WORKDIR}/include"
+	$(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"
+
+	use crosscompile_opts_headers-only && return 0
+
+	# Bug #270098
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	strip-flags
+	if [ "${CTARGET}" != "${CHOST}" ]; then
+		export YACC='yacc -by'
+		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
+		mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NLS="
+
+		local machine
+		machine=$(tc-arch-kernel ${CTARGET})
+
+		local csudir
+		if [ -d "${S}/csu/${machine}-elf" ]; then
+			csudir="${S}/csu/${machine}-elf"
+		else
+			csudir="${S}/csu/${machine}"
+		fi
+		export RAW_LDFLAGS=$(raw-ldflags)
+		cd "${csudir}"
+		$(freebsd_get_bmake) ${mymakeopts} || die "make csu failed"
+
+		append-flags "-isystem /usr/${CTARGET}/usr/include"
+		append-flags "-isystem ${WORKDIR}/lib/libutil"
+		append-flags "-isystem ${WORKDIR}/lib/msun/${machine/i386/i387}"
+		append-flags "-B ${csudir}"
+		append-ldflags "-B ${csudir}"
+
+		# First compile libssp_nonshared.a and add it's path to LDFLAGS.
+		cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
+		$(freebsd_get_bmake) ${mymakeopts} || die "make libssp failed"
+		append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
+
+		export RAW_LDFLAGS=$(raw-ldflags)
+		cd "${S}/libc"
+		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
+		cd "${S}/msun"
+		append-ldflags "-L${WORKDIR}/lib/libc"
+		export RAW_LDFLAGS=$(raw-ldflags)
+		LDADD="-lssp_nonshared" $(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
+		cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp."
+		$(freebsd_get_bmake) ${mymakeopts} || die "make libssp failed"
+		cd "${WORKDIR}/lib/libthr/" || die "missing libthr"
+		$(freebsd_get_bmake) ${mymakeopts} || die "make libthr failed"
+	else
+		# Forces to use the local copy of headers as they might be outdated in
+		# the system
+		append-flags "-isystem '${WORKDIR}/include_proper'"
+
+		# First compile libssp_nonshared.a and add it's path to LDFLAGS.
+		einfo "Compiling libssp in \"${WORKDIR}/gnu/lib/libssp/\"."
+		cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp."
+		NOFLAGSTRIP=yes freebsd_src_compile
+		# Hack libssp_nonshared.a into libc & others since we don't have
+		# the linker script in place yet.
+		append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
+		einfo "Compiling libc."
+		cd "${S}"
+		export RAW_LDFLAGS=$(raw-ldflags)
+		NOFLAGSTRIP=yes LDADD="-lssp_nonshared" freebsd_src_compile
+		cd "${WORKDIR}/gnu/lib/libregex" || die
+		NOFLAGSTRIP=yes LDADD="-lssp_nonshared" freebsd_src_compile
+	fi
+}
+
+src_install() {
+	[ "${CTARGET}" = "${CHOST}" ] \
+		&& INCLUDEDIR="/usr/include" \
+		|| INCLUDEDIR="/usr/${CTARGET}/usr/include"
+	dodir ${INCLUDEDIR}
+	einfo "Installing for ${CTARGET} in ${CHOST}.."
+	install_includes ${INCLUDEDIR}
+
+	# Install math.h when crosscompiling, at this point
+	if [ "${CHOST}" != "${CTARGET}" ]; then
+		insinto "/usr/${CTARGET}/usr/include"
+		doins "${S}/msun/src/math.h"
+	fi
+
+	use crosscompile_opts_headers-only && return 0
+	local mylibdir=$(get_libdir)
+
+	if [ "${CTARGET}" != "${CHOST}" ]; then
+		local csudir
+		if [ -d "${S}/csu/$(tc-arch-kernel ${CTARGET})-elf" ]; then
+			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})-elf"
+		else
+			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})"
+		fi
+		cd "${csudir}"
+		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install \
+			FILESDIR="/usr/${CTARGET}/usr/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install csu failed"
+
+		cd "${S}/libc"
+		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
+			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install libc failed"
+
+		cd "${S}/msun"
+		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
+			INCLUDEDIR="/usr/${CTARGET}/usr/include" \
+			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install msun failed"
+
+		cd "${WORKDIR}/gnu/lib/libssp/"
+		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
+			INCLUDEDIR="/usr/${CTARGET}/usr/include" \
+			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install ssp failed"
+
+		cd "${WORKDIR}/lib/libthr/"
+		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
+			INCLUDEDIR="/usr/${CTARGET}/usr/include" \
+			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install libthr failed"
+
+		dosym "usr/include" "/usr/${CTARGET}/sys-include"
+	else
+		# Set SHLIBDIR and LIBDIR for multilib
+		cd "${WORKDIR}/gnu/lib/libssp"
+		SHLIBDIR="/${mylibdir}" LIBDIR="/usr/${mylibdir}" mkinstall || die "Install ssp failed."
+		cd "${S}"
+		SHLIBDIR="/${mylibdir}" LIBDIR="/usr/${mylibdir}" mkinstall || die "Install failed"
+		cd "${WORKDIR}/gnu/lib/libregex"
+		SHLIBDIR="/${mylibdir}" LIBDIR="/usr/${mylibdir}" mkinstall || die "Install libregex failed"
+	fi
+
+	# Don't install the rest of the configuration files if crosscompiling
+	if [ "${CTARGET}" != "${CHOST}" ] ; then
+		# This is to get it stripped with the correct tools, otherwise it gets
+		# stripped with the host strip.
+		export CHOST=${CTARGET}
+		return 0
+	fi
+
+	# Symlink libbsdxml to libexpat as we use expat in favor of the renaming done
+	# on FreeBSD.
+	dosym libexpat.so /usr/${mylibdir}/libbsdxml.so
+	dosym libexpat.a /usr/${mylibdir}/libbsdxml.a
+
+	# install libstand files
+	dodir /usr/include/libstand
+	insinto /usr/include/libstand
+	doins "${S}"/libstand/*.h
+
+	cd "${WORKDIR}/etc/"
+	insinto /etc
+	doins auth.conf nls.alias mac.conf netconfig
+
+	# Install ttys file
+	local MACHINE="$(tc-arch-kernel)"
+	doins "etc.${MACHINE}"/*
+
+	# Generate ldscripts, otherwise bad thigs are supposed to happen
+	gen_usr_ldscript libalias_cuseeme.so libalias_dummy.so libalias_ftp.so \
+		libalias_irc.so libalias_nbt.so libalias_pptp.so libalias_skinny.so \
+		libalias_smedia.so libssp.so
+	# These show on QA warnings too, however they're pretty much bsd only,
+	# aka, no autotools for them.
+	#	libbsdxml.so libcam.so libcrypt.so libdevstat.so libgeom.so \
+	#	libipsec.so libipx.so libkiconv.so libkvm.so libmd.so libsbuf.so libufs.so \
+	#	libutil.so
+
+	# Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking
+	# this is done to avoid having to touch gcc spec file as it is currently
+	# done on FreeBSD upstream, mostly because their binutils aren't able to
+	# cope with linker scripts yet.
+	# Taken from toolchain-funcs.eclass:
+	local output_format
+	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+	# Clear the symlink.
+	rm -f "${D}/usr/${mylibdir}/libc.so"
+	cat > "${D}/usr/${mylibdir}/libc.so" <<-END_LDSCRIPT
+/* GNU ld script
+   SSP (-fstack-protector) requires __stack_chk_fail_local to be local.
+   GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if
+   this symbol was provided by a shared libc. So we link in
+   libssp_nonshared.a from here.
+ */
+${output_format}
+GROUP ( /${mylibdir}/libc.so.7 /usr/${mylibdir}/libssp_nonshared.a )
+END_LDSCRIPT
+
+	dodir /etc/sandbox.d
+	cat - > "${D}"/etc/sandbox.d/00freebsd <<EOF
+# /dev/crypto is used mostly by OpenSSL on *BSD platforms
+# leave it available as packages might use OpenSSL commands
+# during compile or install phase.
+SANDBOX_PREDICT="/dev/crypto"
+EOF
+
+	# Install a libusb.pc for better compat with Linux's libusb
+	if use usb ; then
+		dodir /usr/$(get_libdir)/pkgconfig
+		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb.pc" || die
+	fi
+}
+
+install_includes()
+{
+	local INCLUDEDIR="$1"
+
+	# The idea is to be called from either install or unpack.
+	# During unpack it's required to install them as portage's user.
+	if [[ "${EBUILD_PHASE}" == "install" ]]; then
+		local DESTDIR="${D}"
+		BINOWN="root"
+		BINGRP="wheel"
+	else
+		local DESTDIR="${WORKDIR}"
+		[[ -z "${USER}" ]] && USER="portage"
+		BINOWN="${USER}"
+		[[ -z "${GROUPS}" ]] && GROUPS="portage"
+		BINGRP="${GROUPS}"
+	fi
+
+	# This is for ssp/ssp.h.
+	einfo "Building ssp.h"
+	cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp"
+	$(freebsd_get_bmake) ssp.h || die "problem building ssp.h"
+
+	# Must exist before we use it.
+	[[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes."
+	cd "${WORKDIR}/include"
+
+	local MACHINE="$(tc-arch-kernel)"
+
+	einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
+	$(freebsd_get_bmake) installincludes \
+		MACHINE=${MACHINE} DESTDIR="${DESTDIR}" \
+		INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
+		BINGRP="${BINGRP}" || die "install_includes() failed"
+	einfo "includes installed ok."
+	EXTRA_INCLUDES="gnu/lib/libssp lib/librtld_db gnu/lib/libregex"
+	for i in $EXTRA_INCLUDES; do
+		einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
+		cd "${WORKDIR}/$i" || die
+		$(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
+			MACHINE=${MACHINE} INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
+			BINGRP="${BINGRP}" || die "problem installing ssp includes."
+		einfo "$i includes installed ok."
+	done
+}
diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest
index 1ed32b9ca102..0965d9301c44 100644
--- a/sys-freebsd/freebsd-libexec/Manifest
+++ b/sys-freebsd/freebsd-libexec/Manifest
@@ -2,27 +2,34 @@ DIST freebsd-bin-7.2.tar.bz2 406772 RMD160 5cb15516cfc080c7ddf4b5b6e7eb880b2e101
 DIST freebsd-bin-8.0.tar.bz2 415822 RMD160 58a2acf990148fd45cbc99bc1bded81c8e352434 SHA1 3177c02e752b9a06175b5ba6556441ed8cd91c33 SHA256 d122c0c55e75c342962dfa8ba04e8bd213730f887d3a6e158c40476f8a5f2460
 DIST freebsd-bin-8.2.tar.bz2 415900 RMD160 3a49919ef24848006ba4b95933ec072f643148c1 SHA1 2d01891f76359c2de12f2270f9b907d417d4ad15 SHA256 fb31b7fab259bda8396e615246f85dc99c3c9f7e98f4e4a613e20b6a394c4921
 DIST freebsd-bin-9.0_rc1.tar.bz2 392261 RMD160 b5c8fb881871009fe2a8907256f2cf1745ee51c5 SHA1 4354950359adb751e2b351bc5b7d26149d85d9c9 SHA256 b084316c5f8986ef4da6cd993c3466c5ade517022e5f00bd1a44d375ab8f5dd6
+DIST freebsd-bin-9.0_rc2.tar.bz2 392321 RMD160 f3a45b69627944ad91d5494e39366d028b422b0c SHA1 3d7d746f04839aa8b67df0d58373e3d78e051cfc SHA256 317cb81441dd9f0121622ffe50fb8bdcb1eac573173d85c8ebc961c30ef1a23f
 DIST freebsd-contrib-7.2.tar.bz2 41156304 RMD160 d32da79d66aa9e5cd113bd7b3a16b7d83849dca2 SHA1 8f3778a1638bfe852f95d746d181a56258446182 SHA256 e6b5b4320552185d64a1d17676ca4376ca43f147eafaee7e2b0885571e4ee1f2
 DIST freebsd-contrib-8.0.tar.bz2 40637930 RMD160 8130bff1c601e16196f4c108a4bf0e2fef9d8b31 SHA1 a1f3b078079e1716892c80749d43e061d7150aaa SHA256 66cb1b535d8f31ed3f0976ae3cceaee5688052776dd2eafdd44aadad2ddea1b6
 DIST freebsd-contrib-8.2.tar.bz2 40931651 RMD160 f69f61a3154843e5daa722f0a0757686f2effe87 SHA1 28c367a0c21e7cb59bcb013bb54f5576be0d67b1 SHA256 8b9cb688e81c2980b3fc66411d00ab277a24dadd50d5bdd5e0e6c63ac687b9b6
 DIST freebsd-contrib-9.0_rc1.tar.bz2 53684757 RMD160 e489cfd9f5df72254a29df93ef3122fdfe88abd8 SHA1 559a913a0ee1817ab3dba4b78e78efd76cbac7d7 SHA256 071bcb18f61ef6223ea8bf9525ec6853357f5b8f4e57b1b0b8b9a8afff8eb015
+DIST freebsd-contrib-9.0_rc2.tar.bz2 53992312 RMD160 74227385c37bd88bab6698feeddda82ac4fb07db SHA1 cf8f6b65f8512827473d0e25d7fdc307691bc336 SHA256 962d94502f5fa280ba37d4f77b3725844962910cd99486433120df5b4ce9081c
 DIST freebsd-etc-7.2.tar.bz2 199580 RMD160 f8954a1c590c918861b39cb414a079a960af9969 SHA1 a2fee43a6a6fffd864776eceab134002fc9292d2 SHA256 9a6ebd6877191e7ff5d734a77da16090123c5223cfe873177b9fe1ca4f12d653
 DIST freebsd-etc-8.0.tar.bz2 183231 RMD160 c1926470ee952a83e945cf0538785eb6711ad538 SHA1 611c75422d7f1a47158f9478d5c0c63ee7d4e45d SHA256 23ac89366dbc397c9d16f8509677289a06fc4e0807baf64728a308ff45fc9ec2
 DIST freebsd-etc-8.2.tar.bz2 188629 RMD160 915753c5926914964550ff831e05d59f4d6e5470 SHA1 170223195ce728242e3c1dbc9a448e95f8ae1afb SHA256 6bc745fa259f9fa2b65df865d45443a7b23c24445195e33a4ac50bf1040ae238
 DIST freebsd-etc-9.0_rc1.tar.bz2 207024 RMD160 44d79dae611d79c0a94d9c144497144d2399bce6 SHA1 6d37bc25f81b3dd763610ab762fe18a5e333077f SHA256 5ed8c871b71d013067ac97c67000e2186c87df313e2e9d49cc4e2d5cadfc5591
+DIST freebsd-etc-9.0_rc2.tar.bz2 207133 RMD160 4f630381be5eed6c8fa2fee302d773b58c55d8b6 SHA1 2c8c8023c04f6e93caa772e69844bbc9b10d6594 SHA256 1be6e9707b6c81b812f4a3f1ba905b1c9cbec58d80eb6bb583cbed2418f91ff5
 DIST freebsd-lib-7.2.tar.bz2 2970356 RMD160 d676e9bfd3a32293ac1190ff3c42861fb987394e SHA1 15749e43f5ed16316c5311bfa40f42ed546b69e9 SHA256 80b54a23068b806aede48700884a5ed2aa33f5d813309ef7497a7b951d62aab0
 DIST freebsd-lib-8.0.tar.bz2 3253452 RMD160 30e9b16e2ad5e2196ea722324a6dd932326bffe1 SHA1 f9ab976ad968a391393671f488ff5ddba190bc28 SHA256 2d15fbb8c71f9f747e722b281f341b749938875d9e08206323e1609073c0e3bb
 DIST freebsd-lib-8.2.tar.bz2 3323878 RMD160 64d8915611a8a4ae58b4b39e9f835398aa6bc1b9 SHA1 9ea3105191fbd72680d66f67d28f22fcf10863d7 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0
 DIST freebsd-lib-9.0_rc1.tar.bz2 3546378 RMD160 71b0b4cac09d8dc6160a56cd57f8643d7957e233 SHA1 e1c9801140d41bd73c20e08e2d592f51281a123c SHA256 237b88ea2b77a870e3b6075fa9293d5bba2920e66ae7b98b6cf209b4d0a937ec
+DIST freebsd-lib-9.0_rc2.tar.bz2 3547324 RMD160 da9ff86bdd1cdca7d4d4045239372a8c6065ed18 SHA1 2363db2131aff3389b1bb03bbe4d95ae611b946e SHA256 13d20c60b3ab7769a440f492a81aef4ed0428c2bcbbeaed43c69c80c65d94a9e
 DIST freebsd-libexec-7.2.tar.bz2 275993 RMD160 e3cfab5b89c304eeff76d92eaadaaadb6322c90e SHA1 747aa2365565fabb97aa910c01c06b340ddf3ea2 SHA256 375627cd871a4fbed4b7ec79d788bb5e62bc6cc818e971c613b3acd89b2db453
 DIST freebsd-libexec-8.0.tar.bz2 279159 RMD160 f4061f62f0773ca4dea4e1d7086e52759d030f4b SHA1 9e8cb7d674f91b4a36c79d6e0bf2be3176e620f8 SHA256 86d4ca63b605b91da26bfa981ddf667fb741ed9a983191c1d75a8762263f0599
 DIST freebsd-libexec-8.2.tar.bz2 289147 RMD160 81e2e000adbd04bb0b3da9786f95b8b53ec5f32e SHA1 646748e531fe5b40341f5ea61dda756d999a0b7c SHA256 10b996d1d8cd044ee2e7a877e5e6ad2bf050cce9b3bd402a5e0dea7d290b595d
 DIST freebsd-libexec-9.0_rc1.tar.bz2 298324 RMD160 b1270fb4e40538a12836e594b1a416329dd6e51b SHA1 03fd233c9d8aab8e56599f56711633c7d61cd7f4 SHA256 2a01f20e8d7717db130c494da0b91640d90e2659182fb61b42121090fd35cfde
+DIST freebsd-libexec-9.0_rc2.tar.bz2 298456 RMD160 f383937321521ca2520e627ac4a00d0d335028fa SHA1 3e8d5188baf3fa374f7a8d674b523649c72e62e7 SHA256 5943e61a1f7fbf7c59cfb25082a8d89a4310b788a48423fc5d6171a8359d7de4
 DIST freebsd-ubin-7.2.tar.bz2 1851174 RMD160 b56cdc06fe0ce1ea47762a75c33ed9ed6d1abfde SHA1 1739eceebc41d9a4cbf10d21ef4e8d55b586f640 SHA256 5ca9f185a5af59993ddf83ece155bfcea1340a93d2540035b35c5acbfc3a2625
 DIST freebsd-ubin-8.0.tar.bz2 1787358 RMD160 08814da95905ba2cd6037c41507eade30b007e72 SHA1 0de52ddd7522b73c876ed967ac96aa278260f5b6 SHA256 2bd1529107e3b70df64bc4d7d3117122cac03b49b874a6653860b13d567af250
 DIST freebsd-ubin-8.2.tar.bz2 1808012 RMD160 b927dcb67de4367ea148643203e0056dd90a0c36 SHA1 0d5e58642ab4555f15ab144feaec6fe90f7a2f2c SHA256 6b99554f3ad6ee052069b347eb6e6219b71598d7b222acb90a24cbfc805c7b68
 DIST freebsd-ubin-9.0_rc1.tar.bz2 1962093 RMD160 2dc189b6359feaf60b6b443d80348136e0d75f8e SHA1 e25b15e1c394cc326e56dcc1d4ebf71e07bf610e SHA256 897b4d10a891adc307861311952bb4df8002a80c8cef96567b28df21a3f81b39
+DIST freebsd-ubin-9.0_rc2.tar.bz2 1962807 RMD160 d9a0124f845abe3fd8f359115c296e036ee08323 SHA1 d2cd3859f0f4047a40aa834a192b936bce063879 SHA256 1ebefae6d8b4882d070c46ffe67091563c33aa5ddf2221105c12a1aa06bd17f1
 DIST freebsd-usbin-7.2.tar.bz2 2654480 RMD160 af0a94e0affce332cf30532ea45251563e65632e SHA1 b52db981e0250357b40d10ebc7ffd6ca3ea9cc4c SHA256 56574e81ac4ab54a20d83d9a2d1ba3a42b5677691675f1db162fde161da0907f
 DIST freebsd-usbin-8.0.tar.bz2 2411151 RMD160 f162437ab2e3c89c6635e5c567e39b60974ce3c1 SHA1 be7b4ccd767e64fa0dedced631c18a1c3969b417 SHA256 c38230af5d667a254ddcce0b77100ada2b7af6e17309f033950c2852f70cc1dd
 DIST freebsd-usbin-8.2.tar.bz2 2443024 RMD160 972723becd1ab16615bc45f9beab8483533cbf81 SHA1 16bcb5528f14cfeccb9f4c913a629b01d9873ebf SHA256 aa7cabf10f5c3a9daabea32e4de24d04ec312247842981476da666eff5054603
 DIST freebsd-usbin-9.0_rc1.tar.bz2 2605735 RMD160 672adbdfff912e6027bad8acd9db6645b1a14c27 SHA1 bf02bd5ff416026d90aac89d0256ac3fb13d8a5e SHA256 34666292f701ae88128b6416db78038ce04e13198ba74961b4a2ce7600a88f21
+DIST freebsd-usbin-9.0_rc2.tar.bz2 2606905 RMD160 d63519382e2405c6d255ff492677cc589103dc2c SHA1 f7f7dd4aa6a4a4621d402d76fcdc80bd3e672f24 SHA256 694e8137992c1747fcc9962106bc82352327605fef01cdcdc63e6b9452278080
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-9.0_rc2.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.0_rc2.ebuild
new file mode 100644
index 000000000000..b234636394d1
--- /dev/null
+++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.0_rc2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/freebsd-libexec-9.0_rc2.ebuild,v 1.1 2011/12/07 17:06:30 aballier Exp $
+
+EAPI=2
+
+inherit bsdmk freebsd pam
+
+DESCRIPTION="FreeBSD libexec things"
+SLOT="0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+
+SRC_URI="mirror://gentoo/${LIBEXEC}.tar.bz2
+	mirror://gentoo/${UBIN}.tar.bz2
+	mirror://gentoo/${BIN}.tar.bz2
+	mirror://gentoo/${CONTRIB}.tar.bz2
+	mirror://gentoo/${LIB}.tar.bz2
+	mirror://gentoo/${ETC}.tar.bz2
+	mirror://gentoo/${USBIN}.tar.bz2"
+
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
+	pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	=sys-freebsd/freebsd-mk-defs-${RV}*
+	=sys-freebsd/freebsd-sources-${RV}*"
+RDEPEND="${RDEPEND}
+	xinetd? ( sys-apps/xinetd )"
+
+S="${WORKDIR}/libexec"
+
+# Remove sendmail, tcp_wrapper and other useless stuff
+REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind lukemftpd ftpd"
+
+IUSE="pam ssl kerberos ipv6 nis xinetd"
+
+pkg_setup() {
+	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
+	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
+	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
+	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
+	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
+
+	mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_PF= WITHOUT_RCMDS= "
+}
+
+src_prepare() {
+	ln -s /usr/include "${WORKDIR}/include"
+}
+
+src_install() {
+	freebsd_src_install
+
+	insinto /etc
+	doins "${WORKDIR}/etc/gettytab"
+	newinitd "${FILESDIR}/bootpd.initd" bootpd
+	newconfd "${FILESDIR}/bootpd.confd" bootpd
+
+	if use xinetd; then
+		for rpcd in rstatd rusersd walld rquotad sprayd; do
+			insinto /etc/xinetd.d
+			newins "${FILESDIR}/${rpcd}.xinetd" ${rpcd}
+		done
+	fi
+}
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index 87b8ccf47057..7e2eaed21124 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -2,3 +2,4 @@ DIST freebsd-share-7.2.tar.bz2 3878366 RMD160 11cdb0c952bd442a895a2c36c3c43e1592
 DIST freebsd-share-8.0.tar.bz2 3754795 RMD160 7da07595137e521dbc3e8bc618f875edf88792fc SHA1 542c46d447aeabbb0bb1f652bcc476713b310644 SHA256 4cbb577bb7e76f87a27d3974459d0e146736d5e8002c49f5661f95f68c2939d1
 DIST freebsd-share-8.2.tar.bz2 3797560 RMD160 88f52550c5656f9a4186eb56e5661218345b2d87 SHA1 5d38349cb2b61d639cae6212677309e8da23e131 SHA256 dd082c6ddbf8e08ec91d9810d51af4111339bed912b0f74d05be283780292ba0
 DIST freebsd-share-9.0_rc1.tar.bz2 6739216 RMD160 6b3e0a2532e80d36392d0632d796e5a8f3306f46 SHA1 dce6f6044e0114ef0e5b825c01a917e20791161e SHA256 c00cdb75f9322ef8964379ec6449c523cc734ed15fe804c413ff2d2db00ce0c9
+DIST freebsd-share-9.0_rc2.tar.bz2 6736237 RMD160 a4edb00ca20609d66268a978b6292bba082a636e SHA1 bde8a12e3bbda10cf6161dde08b2b17f8e17fa7a SHA256 094899b1a73eb84933f0e6a5189ea9e58dc8f02f5e6b892fe47ec0319411dc26
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.0_rc2.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.0_rc2.ebuild
new file mode 100644
index 000000000000..57d49dcf8ae1
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.0_rc2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.0_rc2.ebuild,v 1.1 2011/12/07 17:07:28 aballier Exp $
+
+EAPI=3
+
+inherit bsdmk freebsd
+
+DESCRIPTION="Makefiles definitions used for building and installing libraries and system files"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~sparc-fbsd ~x86-fbsd"
+
+IUSE="userland_GNU"
+
+SRC_URI="mirror://gentoo/${SHARE}.tar.bz2"
+
+RDEPEND=""
+DEPEND=""
+
+RESTRICT="strip"
+
+S="${WORKDIR}/share/mk"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-9.0-gentoo.patch"
+	use userland_GNU && epatch "${FILESDIR}/${PN}-9.0-gnu.patch"
+}
+
+src_compile() { :; }
+
+src_install() {
+	if [[ ${CHOST} != *-freebsd* ]]; then
+		insinto /usr/share/mk/freebsd
+	else
+		insinto /usr/share/mk
+	fi
+	doins *.mk *.awk
+}
diff --git a/sys-freebsd/freebsd-pam-modules/Manifest b/sys-freebsd/freebsd-pam-modules/Manifest
index 3aa1fcb9e075..768c330e0f4b 100644
--- a/sys-freebsd/freebsd-pam-modules/Manifest
+++ b/sys-freebsd/freebsd-pam-modules/Manifest
@@ -2,3 +2,4 @@ DIST freebsd-lib-7.2.tar.bz2 2970356 RMD160 d676e9bfd3a32293ac1190ff3c42861fb987
 DIST freebsd-lib-8.0.tar.bz2 3253452 RMD160 30e9b16e2ad5e2196ea722324a6dd932326bffe1 SHA1 f9ab976ad968a391393671f488ff5ddba190bc28 SHA256 2d15fbb8c71f9f747e722b281f341b749938875d9e08206323e1609073c0e3bb
 DIST freebsd-lib-8.2.tar.bz2 3323878 RMD160 64d8915611a8a4ae58b4b39e9f835398aa6bc1b9 SHA1 9ea3105191fbd72680d66f67d28f22fcf10863d7 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0
 DIST freebsd-lib-9.0_rc1.tar.bz2 3546378 RMD160 71b0b4cac09d8dc6160a56cd57f8643d7957e233 SHA1 e1c9801140d41bd73c20e08e2d592f51281a123c SHA256 237b88ea2b77a870e3b6075fa9293d5bba2920e66ae7b98b6cf209b4d0a937ec
+DIST freebsd-lib-9.0_rc2.tar.bz2 3547324 RMD160 da9ff86bdd1cdca7d4d4045239372a8c6065ed18 SHA1 2363db2131aff3389b1bb03bbe4d95ae611b946e SHA256 13d20c60b3ab7769a440f492a81aef4ed0428c2bcbbeaed43c69c80c65d94a9e
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.0_rc2.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.0_rc2.ebuild
new file mode 100644
index 000000000000..2d2115be3503
--- /dev/null
+++ b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.0_rc2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.0_rc2.ebuild,v 1.1 2011/12/07 17:07:54 aballier Exp $
+
+inherit bsdmk freebsd multilib pam
+
+DESCRIPTION="FreeBSD's PAM authentication modules"
+SLOT="0"
+KEYWORDS="~x86-fbsd ~sparc-fbsd"
+
+IUSE="kerberos nis"
+
+SRC_URI="mirror://gentoo/${LIB}.tar.bz2"
+
+RDEPEND=">=sys-auth/openpam-20050201-r1
+	kerberos? ( dev-libs/openssl
+		virtual/krb5 )"
+DEPEND="${RDEPEND}
+	=sys-freebsd/freebsd-mk-defs-${RV}*
+	=sys-freebsd/freebsd-sources-${RV}*"
+
+S=${WORKDIR}/lib/libpam/modules
+
+pkg_setup() {
+	# Avoid installing pam_ssh as that has its own ebuild.
+	mymakeopts="${mymakeopts} NO_OPENSSH= "
+	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
+	use nis || mymakeopts="${mymakeopts} NO_NIS= "
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${WORKDIR}"/lib
+
+	for module in pam_deny pam_passwdqc pam_permit; do
+		sed -i -e "s:${module}::" "${S}"/modules.inc
+	done
+
+	# Avoid using static versions; use gentoo /lib/security dir
+	epatch "${FILESDIR}"/${PN}-9.0-gentoo.patch
+}
+
+src_install() {
+	mkinstall "LIBDIR=/$(get_libdir)/security" || die "install failed"
+
+	dodoc "${FILESDIR}/README.pamd"
+}
diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest
index b5b02f247ce5..8f4865f57cc9 100644
--- a/sys-freebsd/freebsd-pf/Manifest
+++ b/sys-freebsd/freebsd-pf/Manifest
@@ -2,15 +2,19 @@ DIST freebsd-contrib-7.2.tar.bz2 41156304 RMD160 d32da79d66aa9e5cd113bd7b3a16b7d
 DIST freebsd-contrib-8.0.tar.bz2 40637930 RMD160 8130bff1c601e16196f4c108a4bf0e2fef9d8b31 SHA1 a1f3b078079e1716892c80749d43e061d7150aaa SHA256 66cb1b535d8f31ed3f0976ae3cceaee5688052776dd2eafdd44aadad2ddea1b6
 DIST freebsd-contrib-8.2.tar.bz2 40931651 RMD160 f69f61a3154843e5daa722f0a0757686f2effe87 SHA1 28c367a0c21e7cb59bcb013bb54f5576be0d67b1 SHA256 8b9cb688e81c2980b3fc66411d00ab277a24dadd50d5bdd5e0e6c63ac687b9b6
 DIST freebsd-contrib-9.0_rc1.tar.bz2 53684757 RMD160 e489cfd9f5df72254a29df93ef3122fdfe88abd8 SHA1 559a913a0ee1817ab3dba4b78e78efd76cbac7d7 SHA256 071bcb18f61ef6223ea8bf9525ec6853357f5b8f4e57b1b0b8b9a8afff8eb015
+DIST freebsd-contrib-9.0_rc2.tar.bz2 53992312 RMD160 74227385c37bd88bab6698feeddda82ac4fb07db SHA1 cf8f6b65f8512827473d0e25d7fdc307691bc336 SHA256 962d94502f5fa280ba37d4f77b3725844962910cd99486433120df5b4ce9081c
 DIST freebsd-etc-7.2.tar.bz2 199580 RMD160 f8954a1c590c918861b39cb414a079a960af9969 SHA1 a2fee43a6a6fffd864776eceab134002fc9292d2 SHA256 9a6ebd6877191e7ff5d734a77da16090123c5223cfe873177b9fe1ca4f12d653
 DIST freebsd-etc-8.0.tar.bz2 183231 RMD160 c1926470ee952a83e945cf0538785eb6711ad538 SHA1 611c75422d7f1a47158f9478d5c0c63ee7d4e45d SHA256 23ac89366dbc397c9d16f8509677289a06fc4e0807baf64728a308ff45fc9ec2
 DIST freebsd-etc-8.2.tar.bz2 188629 RMD160 915753c5926914964550ff831e05d59f4d6e5470 SHA1 170223195ce728242e3c1dbc9a448e95f8ae1afb SHA256 6bc745fa259f9fa2b65df865d45443a7b23c24445195e33a4ac50bf1040ae238
 DIST freebsd-etc-9.0_rc1.tar.bz2 207024 RMD160 44d79dae611d79c0a94d9c144497144d2399bce6 SHA1 6d37bc25f81b3dd763610ab762fe18a5e333077f SHA256 5ed8c871b71d013067ac97c67000e2186c87df313e2e9d49cc4e2d5cadfc5591
+DIST freebsd-etc-9.0_rc2.tar.bz2 207133 RMD160 4f630381be5eed6c8fa2fee302d773b58c55d8b6 SHA1 2c8c8023c04f6e93caa772e69844bbc9b10d6594 SHA256 1be6e9707b6c81b812f4a3f1ba905b1c9cbec58d80eb6bb583cbed2418f91ff5
 DIST freebsd-sbin-7.2.tar.bz2 1131189 RMD160 f05c364f49623153f809152a64e5bea8632ed0ec SHA1 f4241733b291f322d21c65cbb683aa1c4c5375e3 SHA256 d5c3c2fe1689bfa13b78117778ca066ad68a1bbefbaa092074c31bdc1b57e876
 DIST freebsd-sbin-8.0.tar.bz2 1140122 RMD160 30cd0c309c46d554114b2a47765f3592a6c4b481 SHA1 7130394dd596d26e6c296167f761745f61ec5993 SHA256 6dbf9aa405ed93d5f2e364946830f60e3c2615df6315120f40817824f8ea78df
 DIST freebsd-sbin-8.2.tar.bz2 1211665 RMD160 32167422cb273ccad18af0dadff551eddb153e7e SHA1 f36a0cd90c90f94941d2013b013947c405e8e152 SHA256 8b7e21a66b4696e8763d29b8b02b2d35f29fc51820a194d1e469e7cace84c527
 DIST freebsd-sbin-9.0_rc1.tar.bz2 1267674 RMD160 0755ac9ebf54aba4f9755c961a1f4ffd3f26723c SHA1 08702291ccacd62bb4e6f157a0529260be9822b1 SHA256 ad4ec7a8ae4ac0dec9e172add7eda30209b5d80c30e85d69b9b03c7d174716d7
+DIST freebsd-sbin-9.0_rc2.tar.bz2 1267485 RMD160 8fbc9120be3fc1cc58dda8838e486e7f637f62b2 SHA1 691e1412813fa0a3725aa77d29870cddb4ad0213 SHA256 f43465c3c31a2aa3605092affec167cf1694a756b9cd9ebe80a4579e9cd4f24a
 DIST freebsd-usbin-7.2.tar.bz2 2654480 RMD160 af0a94e0affce332cf30532ea45251563e65632e SHA1 b52db981e0250357b40d10ebc7ffd6ca3ea9cc4c SHA256 56574e81ac4ab54a20d83d9a2d1ba3a42b5677691675f1db162fde161da0907f
 DIST freebsd-usbin-8.0.tar.bz2 2411151 RMD160 f162437ab2e3c89c6635e5c567e39b60974ce3c1 SHA1 be7b4ccd767e64fa0dedced631c18a1c3969b417 SHA256 c38230af5d667a254ddcce0b77100ada2b7af6e17309f033950c2852f70cc1dd
 DIST freebsd-usbin-8.2.tar.bz2 2443024 RMD160 972723becd1ab16615bc45f9beab8483533cbf81 SHA1 16bcb5528f14cfeccb9f4c913a629b01d9873ebf SHA256 aa7cabf10f5c3a9daabea32e4de24d04ec312247842981476da666eff5054603
 DIST freebsd-usbin-9.0_rc1.tar.bz2 2605735 RMD160 672adbdfff912e6027bad8acd9db6645b1a14c27 SHA1 bf02bd5ff416026d90aac89d0256ac3fb13d8a5e SHA256 34666292f701ae88128b6416db78038ce04e13198ba74961b4a2ce7600a88f21
+DIST freebsd-usbin-9.0_rc2.tar.bz2 2606905 RMD160 d63519382e2405c6d255ff492677cc589103dc2c SHA1 f7f7dd4aa6a4a4621d402d76fcdc80bd3e672f24 SHA256 694e8137992c1747fcc9962106bc82352327605fef01cdcdc63e6b9452278080
diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-9.0_rc2.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-9.0_rc2.ebuild
new file mode 100644
index 000000000000..be7d6f11c161
--- /dev/null
+++ b/sys-freebsd/freebsd-pf/freebsd-pf-9.0_rc2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/freebsd-pf-9.0_rc2.ebuild,v 1.1 2011/12/07 17:08:21 aballier Exp $
+
+inherit bsdmk freebsd
+
+DESCRIPTION="FreeBSD's base system libraries"
+SLOT="0"
+KEYWORDS="~x86-fbsd"
+
+IUSE=""
+
+# Crypto is needed to have an internal OpenSSL header
+SRC_URI="mirror://gentoo/${USBIN}.tar.bz2
+		mirror://gentoo/${SBIN}.tar.bz2
+		mirror://gentoo/${CONTRIB}.tar.bz2
+		mirror://gentoo/${ETC}.tar.bz2"
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}
+	dev-libs/libevent
+	sys-freebsd/freebsd-mk-defs
+	=sys-freebsd/freebsd-sources-${RV}*"
+
+S="${WORKDIR}"
+
+SUBDIRS="usr.sbin/authpf sbin/pfctl sbin/pflogd usr.sbin/ftp-proxy/ftp-proxy"
+
+pkg_setup() {
+	enewgroup authpf 63
+	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
+}
+
+src_unpack() {
+	freebsd_src_unpack
+	# pcap-int.h redefines snprintf as pcap_snprintf
+	epatch "${FILESDIR}/${PN}-9.0-pcap_pollution.patch"
+	# Use system's libevent
+	epatch "${FILESDIR}/${PN}-9.0-libevent.patch"
+	epatch "${FILESDIR}/${PN}-9.0-pflogd.patch"
+	epatch "${FILESDIR}/${PN}-9.0-bpf.patch"
+	epatch "${FILESDIR}/${PN}-9.0-getline.patch"
+	# Link in kernel sources
+	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+}
+
+src_compile() {
+	for dir in ${SUBDIRS}; do
+		einfo "Starting make in ${dir}"
+		cd "${S}/${dir}"
+		mkmake || die "Make ${dir} failed"
+	done
+}
+
+src_install() {
+	for dir in ${SUBDIRS}; do
+		einfo "Starting install in ${dir}"
+		cd "${S}/${dir}"
+		mkinstall || die "Install ${dir} failed"
+	done
+
+	cd "${WORKDIR}"/etc
+	insinto /etc
+	doins pf.os
+	newdoc pf.conf pf.conf.example
+	# pf.initd provided by openrc, but no pf.confd
+	newconfd "${FILESDIR}/pf.confd" pf
+}
diff --git a/sys-freebsd/freebsd-rescue/Manifest b/sys-freebsd/freebsd-rescue/Manifest
index d9d63fb312bd..1069363ff174 100644
--- a/sys-freebsd/freebsd-rescue/Manifest
+++ b/sys-freebsd/freebsd-rescue/Manifest
@@ -2,42 +2,53 @@ DIST freebsd-bin-7.2.tar.bz2 406772 RMD160 5cb15516cfc080c7ddf4b5b6e7eb880b2e101
 DIST freebsd-bin-8.0.tar.bz2 415822 RMD160 58a2acf990148fd45cbc99bc1bded81c8e352434 SHA1 3177c02e752b9a06175b5ba6556441ed8cd91c33 SHA256 d122c0c55e75c342962dfa8ba04e8bd213730f887d3a6e158c40476f8a5f2460
 DIST freebsd-bin-8.2.tar.bz2 415900 RMD160 3a49919ef24848006ba4b95933ec072f643148c1 SHA1 2d01891f76359c2de12f2270f9b907d417d4ad15 SHA256 fb31b7fab259bda8396e615246f85dc99c3c9f7e98f4e4a613e20b6a394c4921
 DIST freebsd-bin-9.0_rc1.tar.bz2 392261 RMD160 b5c8fb881871009fe2a8907256f2cf1745ee51c5 SHA1 4354950359adb751e2b351bc5b7d26149d85d9c9 SHA256 b084316c5f8986ef4da6cd993c3466c5ade517022e5f00bd1a44d375ab8f5dd6
+DIST freebsd-bin-9.0_rc2.tar.bz2 392321 RMD160 f3a45b69627944ad91d5494e39366d028b422b0c SHA1 3d7d746f04839aa8b67df0d58373e3d78e051cfc SHA256 317cb81441dd9f0121622ffe50fb8bdcb1eac573173d85c8ebc961c30ef1a23f
 DIST freebsd-cddl-8.0.tar.bz2 774011 RMD160 bd4d595a18afc51e68ee0db0b55a4043c9770ea7 SHA1 efe03cb40ecb1a9150c0800c052992c8ffc9103f SHA256 46a863d910e7a193435ab29d993635a07503052e52acdfb5a552915ff1dddb1a
 DIST freebsd-cddl-8.2.tar.bz2 823706 RMD160 fded2d9be9dfd52e7eef5312c1b462e27fde1c91 SHA1 3ffeb2e80fdab24c4c71afcd49bc015495cde83f SHA256 6d2b2362ce60538bcba4afa47bd6baa98b05292babae4b20d6ba08592ce98698
 DIST freebsd-cddl-9.0_rc1.tar.bz2 878394 RMD160 dcc3fdb5394122634f50ca8101572df9bbe51468 SHA1 0b6cb8dd0f26dcf1d49581fce3659d70ec42ccc3 SHA256 9dfc4bcd8b46024705f9c9a594daa5626760908683168814a5f8a3c609aa43fd
+DIST freebsd-cddl-9.0_rc2.tar.bz2 878163 RMD160 8be8138fa2ba64bea4a0a98bf5ecf9cc1b5d8ffc SHA1 520d4dd4763787cdc2a0bb895ce25cb59f1e3649 SHA256 15b3ef388abb898a352df0f1a30cd42b985025dc78e2b478fa3386aaac33a598
 DIST freebsd-contrib-7.2.tar.bz2 41156304 RMD160 d32da79d66aa9e5cd113bd7b3a16b7d83849dca2 SHA1 8f3778a1638bfe852f95d746d181a56258446182 SHA256 e6b5b4320552185d64a1d17676ca4376ca43f147eafaee7e2b0885571e4ee1f2
 DIST freebsd-contrib-8.0.tar.bz2 40637930 RMD160 8130bff1c601e16196f4c108a4bf0e2fef9d8b31 SHA1 a1f3b078079e1716892c80749d43e061d7150aaa SHA256 66cb1b535d8f31ed3f0976ae3cceaee5688052776dd2eafdd44aadad2ddea1b6
 DIST freebsd-contrib-8.2.tar.bz2 40931651 RMD160 f69f61a3154843e5daa722f0a0757686f2effe87 SHA1 28c367a0c21e7cb59bcb013bb54f5576be0d67b1 SHA256 8b9cb688e81c2980b3fc66411d00ab277a24dadd50d5bdd5e0e6c63ac687b9b6
 DIST freebsd-contrib-9.0_rc1.tar.bz2 53684757 RMD160 e489cfd9f5df72254a29df93ef3122fdfe88abd8 SHA1 559a913a0ee1817ab3dba4b78e78efd76cbac7d7 SHA256 071bcb18f61ef6223ea8bf9525ec6853357f5b8f4e57b1b0b8b9a8afff8eb015
+DIST freebsd-contrib-9.0_rc2.tar.bz2 53992312 RMD160 74227385c37bd88bab6698feeddda82ac4fb07db SHA1 cf8f6b65f8512827473d0e25d7fdc307691bc336 SHA256 962d94502f5fa280ba37d4f77b3725844962910cd99486433120df5b4ce9081c
 DIST freebsd-gnu-7.2.tar.bz2 814017 RMD160 6b4f742c236a095e919cc839a174e25310812535 SHA1 bc139f2323e7962619de89a7026b66050106256a SHA256 17b64c91d33c166ed909b349044dd4291e3295e36bb4e4c14d82e680b6491cd4
 DIST freebsd-gnu-8.0.tar.bz2 817829 RMD160 e0dfc3e77110b2f67defa10268cf4a41199e0883 SHA1 ff2a6ba45f655a804e1a0242d562b81ded5d1ba2 SHA256 b55a20f9d88611638c143f9fbedc83fca5faae1df599e928ef6e8b889411c49f
 DIST freebsd-gnu-8.2.tar.bz2 815379 RMD160 f4eece3343c71ed5a2387854c63a7fff3675f713 SHA1 04013b0bedcdc695687a2fadf030376632774a4d SHA256 34be1326b8e188427ea4a59de5dd24049f99adb5e172d61a645db1b7124f7876
 DIST freebsd-gnu-9.0_rc1.tar.bz2 783924 RMD160 aa13a8b6960320ed9fdb4ea7de0049ed7caae720 SHA1 7b05407f545f40bd687cc3b226a95401cdd3cef2 SHA256 7c50fa7cb4c5b7f6aeb9f87569b8d577a7ee5daf657cbb62c121ba203e83cb2c
+DIST freebsd-gnu-9.0_rc2.tar.bz2 783761 RMD160 de29867cd5b07a6a01f5ead4465d52e372586451 SHA1 15c08d87be1624324e90bd49afb7c4ed655cede7 SHA256 222492e714fe471cc644baa198b88a1b29b51ed4e4604be76ec8fee267a25a69
 DIST freebsd-lib-7.2.tar.bz2 2970356 RMD160 d676e9bfd3a32293ac1190ff3c42861fb987394e SHA1 15749e43f5ed16316c5311bfa40f42ed546b69e9 SHA256 80b54a23068b806aede48700884a5ed2aa33f5d813309ef7497a7b951d62aab0
 DIST freebsd-lib-8.0.tar.bz2 3253452 RMD160 30e9b16e2ad5e2196ea722324a6dd932326bffe1 SHA1 f9ab976ad968a391393671f488ff5ddba190bc28 SHA256 2d15fbb8c71f9f747e722b281f341b749938875d9e08206323e1609073c0e3bb
 DIST freebsd-lib-8.2.tar.bz2 3323878 RMD160 64d8915611a8a4ae58b4b39e9f835398aa6bc1b9 SHA1 9ea3105191fbd72680d66f67d28f22fcf10863d7 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0
 DIST freebsd-lib-9.0_rc1.tar.bz2 3546378 RMD160 71b0b4cac09d8dc6160a56cd57f8643d7957e233 SHA1 e1c9801140d41bd73c20e08e2d592f51281a123c SHA256 237b88ea2b77a870e3b6075fa9293d5bba2920e66ae7b98b6cf209b4d0a937ec
+DIST freebsd-lib-9.0_rc2.tar.bz2 3547324 RMD160 da9ff86bdd1cdca7d4d4045239372a8c6065ed18 SHA1 2363db2131aff3389b1bb03bbe4d95ae611b946e SHA256 13d20c60b3ab7769a440f492a81aef4ed0428c2bcbbeaed43c69c80c65d94a9e
 DIST freebsd-libexec-7.2.tar.bz2 275993 RMD160 e3cfab5b89c304eeff76d92eaadaaadb6322c90e SHA1 747aa2365565fabb97aa910c01c06b340ddf3ea2 SHA256 375627cd871a4fbed4b7ec79d788bb5e62bc6cc818e971c613b3acd89b2db453
 DIST freebsd-libexec-8.0.tar.bz2 279159 RMD160 f4061f62f0773ca4dea4e1d7086e52759d030f4b SHA1 9e8cb7d674f91b4a36c79d6e0bf2be3176e620f8 SHA256 86d4ca63b605b91da26bfa981ddf667fb741ed9a983191c1d75a8762263f0599
 DIST freebsd-libexec-8.2.tar.bz2 289147 RMD160 81e2e000adbd04bb0b3da9786f95b8b53ec5f32e SHA1 646748e531fe5b40341f5ea61dda756d999a0b7c SHA256 10b996d1d8cd044ee2e7a877e5e6ad2bf050cce9b3bd402a5e0dea7d290b595d
 DIST freebsd-libexec-9.0_rc1.tar.bz2 298324 RMD160 b1270fb4e40538a12836e594b1a416329dd6e51b SHA1 03fd233c9d8aab8e56599f56711633c7d61cd7f4 SHA256 2a01f20e8d7717db130c494da0b91640d90e2659182fb61b42121090fd35cfde
+DIST freebsd-libexec-9.0_rc2.tar.bz2 298456 RMD160 f383937321521ca2520e627ac4a00d0d335028fa SHA1 3e8d5188baf3fa374f7a8d674b523649c72e62e7 SHA256 5943e61a1f7fbf7c59cfb25082a8d89a4310b788a48423fc5d6171a8359d7de4
 DIST freebsd-rescue-7.2.tar.bz2 4890 RMD160 836a9a438e0231fd0c1939923d8f75150a5d241e SHA1 9f043ada76a34ce2414a935d68726988bae67df7 SHA256 7058f082fde0f603df3821f06e5c7c26492583d131b129e499adeb0ebe5b2f3e
 DIST freebsd-rescue-8.0.tar.bz2 5003 RMD160 63146c49a01582e5afba26280753c49416490bb0 SHA1 ee6af006aace34e4d3d93178e481ae949e385f03 SHA256 8aef81670213a586bb8b0509f4c68c834362a4965e493fcc724ba86cc4d9185e
 DIST freebsd-rescue-8.2.tar.bz2 5041 RMD160 78d84261ca46584d72ed86f90d48fdd1e2dc5f1e SHA1 312af8fb4966fdfa2c92208b23fc29330d21668e SHA256 82f05e98c977771c87f416be80e3634df231c0a2cd26059fd7276ca3a4284031
 DIST freebsd-rescue-9.0_rc1.tar.bz2 3939 RMD160 4f42ae73a51ba174085d5537840a5c4cdbe3dcb4 SHA1 d9a5dcbb7b66b5219a6b879df591c8b1f7c77edf SHA256 f012424661567af203c6dc5a913c44c9b5d34e1c736092a3844a8f3c89fc2882
+DIST freebsd-rescue-9.0_rc2.tar.bz2 3952 RMD160 684dafa46087d554067d6eb1e7f32b47547b4bbd SHA1 b9ab9b6a8c00a94c2725f7363fa4a4aafd25b8f1 SHA256 eda7c71d00f86755d2d8aae87dd2b9169b03717f2eab0c69ba6fd9d6a28733d2
 DIST freebsd-sbin-7.2.tar.bz2 1131189 RMD160 f05c364f49623153f809152a64e5bea8632ed0ec SHA1 f4241733b291f322d21c65cbb683aa1c4c5375e3 SHA256 d5c3c2fe1689bfa13b78117778ca066ad68a1bbefbaa092074c31bdc1b57e876
 DIST freebsd-sbin-8.0.tar.bz2 1140122 RMD160 30cd0c309c46d554114b2a47765f3592a6c4b481 SHA1 7130394dd596d26e6c296167f761745f61ec5993 SHA256 6dbf9aa405ed93d5f2e364946830f60e3c2615df6315120f40817824f8ea78df
 DIST freebsd-sbin-8.2.tar.bz2 1211665 RMD160 32167422cb273ccad18af0dadff551eddb153e7e SHA1 f36a0cd90c90f94941d2013b013947c405e8e152 SHA256 8b7e21a66b4696e8763d29b8b02b2d35f29fc51820a194d1e469e7cace84c527
 DIST freebsd-sbin-9.0_rc1.tar.bz2 1267674 RMD160 0755ac9ebf54aba4f9755c961a1f4ffd3f26723c SHA1 08702291ccacd62bb4e6f157a0529260be9822b1 SHA256 ad4ec7a8ae4ac0dec9e172add7eda30209b5d80c30e85d69b9b03c7d174716d7
+DIST freebsd-sbin-9.0_rc2.tar.bz2 1267485 RMD160 8fbc9120be3fc1cc58dda8838e486e7f637f62b2 SHA1 691e1412813fa0a3725aa77d29870cddb4ad0213 SHA256 f43465c3c31a2aa3605092affec167cf1694a756b9cd9ebe80a4579e9cd4f24a
 DIST freebsd-sys-7.2.tar.bz2 23005928 RMD160 0ecdff9fbefe9e16325e09a76310ca2b4a7751b8 SHA1 1c2d6894371a8650288ebf1a4831a4b08c2e4f09 SHA256 38e1fc670b8438be42947b1512ca7d10b0f8c62c58d3234afd8ce2e55b6cae11
 DIST freebsd-sys-8.0.tar.bz2 22552771 RMD160 08f5b09dc0b4353658a309e9e1198dbab1f5ab83 SHA1 9c5e4bdc7af2b9947c55751325880c27f80df225 SHA256 2d822bdeecbbea660aea06ba147a23878cbae7f0640b0b822552d6fa1836d8c9
 DIST freebsd-sys-8.2.tar.bz2 25835329 RMD160 e8fe34f792c1102fe237af7c87ba9c259cd46d22 SHA1 f2a52be8011126a3882d8df2907a22293ad1c581 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16
 DIST freebsd-sys-9.0_rc1.tar.bz2 30257152 RMD160 725bbc8ab49ede1e5ea821b9ceae0c5a3713ffb6 SHA1 a0f0deaee50708e1626eea91e216367fc6ca7c9c SHA256 fb4cf5e7b9ec58077d5c629f62dc5ced8cd28b296e5bdb4888d969494fd71585
+DIST freebsd-sys-9.0_rc2.tar.bz2 30234083 RMD160 e53db15b13f6e50f0ae91c317fd77b92faadddc6 SHA1 b0ffd76b2fc5bcfa293dd5e5512ceb17ad7ed185 SHA256 2990d5603f8043a1da435b75b74eb453f7304923ed4ae3200b8b40cfe7396245
 DIST freebsd-ubin-7.2.tar.bz2 1851174 RMD160 b56cdc06fe0ce1ea47762a75c33ed9ed6d1abfde SHA1 1739eceebc41d9a4cbf10d21ef4e8d55b586f640 SHA256 5ca9f185a5af59993ddf83ece155bfcea1340a93d2540035b35c5acbfc3a2625
 DIST freebsd-ubin-8.0.tar.bz2 1787358 RMD160 08814da95905ba2cd6037c41507eade30b007e72 SHA1 0de52ddd7522b73c876ed967ac96aa278260f5b6 SHA256 2bd1529107e3b70df64bc4d7d3117122cac03b49b874a6653860b13d567af250
 DIST freebsd-ubin-8.2.tar.bz2 1808012 RMD160 b927dcb67de4367ea148643203e0056dd90a0c36 SHA1 0d5e58642ab4555f15ab144feaec6fe90f7a2f2c SHA256 6b99554f3ad6ee052069b347eb6e6219b71598d7b222acb90a24cbfc805c7b68
 DIST freebsd-ubin-9.0_rc1.tar.bz2 1962093 RMD160 2dc189b6359feaf60b6b443d80348136e0d75f8e SHA1 e25b15e1c394cc326e56dcc1d4ebf71e07bf610e SHA256 897b4d10a891adc307861311952bb4df8002a80c8cef96567b28df21a3f81b39
+DIST freebsd-ubin-9.0_rc2.tar.bz2 1962807 RMD160 d9a0124f845abe3fd8f359115c296e036ee08323 SHA1 d2cd3859f0f4047a40aa834a192b936bce063879 SHA256 1ebefae6d8b4882d070c46ffe67091563c33aa5ddf2221105c12a1aa06bd17f1
 DIST freebsd-usbin-7.2.tar.bz2 2654480 RMD160 af0a94e0affce332cf30532ea45251563e65632e SHA1 b52db981e0250357b40d10ebc7ffd6ca3ea9cc4c SHA256 56574e81ac4ab54a20d83d9a2d1ba3a42b5677691675f1db162fde161da0907f
 DIST freebsd-usbin-8.0.tar.bz2 2411151 RMD160 f162437ab2e3c89c6635e5c567e39b60974ce3c1 SHA1 be7b4ccd767e64fa0dedced631c18a1c3969b417 SHA256 c38230af5d667a254ddcce0b77100ada2b7af6e17309f033950c2852f70cc1dd
 DIST freebsd-usbin-8.2.tar.bz2 2443024 RMD160 972723becd1ab16615bc45f9beab8483533cbf81 SHA1 16bcb5528f14cfeccb9f4c913a629b01d9873ebf SHA256 aa7cabf10f5c3a9daabea32e4de24d04ec312247842981476da666eff5054603
 DIST freebsd-usbin-9.0_rc1.tar.bz2 2605735 RMD160 672adbdfff912e6027bad8acd9db6645b1a14c27 SHA1 bf02bd5ff416026d90aac89d0256ac3fb13d8a5e SHA256 34666292f701ae88128b6416db78038ce04e13198ba74961b4a2ce7600a88f21
+DIST freebsd-usbin-9.0_rc2.tar.bz2 2606905 RMD160 d63519382e2405c6d255ff492677cc589103dc2c SHA1 f7f7dd4aa6a4a4621d402d76fcdc80bd3e672f24 SHA256 694e8137992c1747fcc9962106bc82352327605fef01cdcdc63e6b9452278080
diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-9.0_rc2.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-9.0_rc2.ebuild
new file mode 100644
index 000000000000..750e61a988b8
--- /dev/null
+++ b/sys-freebsd/freebsd-rescue/freebsd-rescue-9.0_rc2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/freebsd-rescue-9.0_rc2.ebuild,v 1.1 2011/12/07 17:08:47 aballier Exp $
+
+EAPI=2
+
+inherit bsdmk freebsd
+
+DESCRIPTION="FreeBSD's rescue binaries"
+SLOT="0"
+KEYWORDS="~x86-fbsd"
+LICENSE="BSD zfs? ( CDDL )"
+
+IUSE="atm netware nis zfs"
+
+SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
+		mirror://gentoo/${CONTRIB}.tar.bz2
+		mirror://gentoo/${LIB}.tar.bz2
+		mirror://gentoo/${BIN}.tar.bz2
+		mirror://gentoo/${SBIN}.tar.bz2
+		mirror://gentoo/${USBIN}.tar.bz2
+		mirror://gentoo/${GNU}.tar.bz2
+		mirror://gentoo/${SYS}.tar.bz2
+		mirror://gentoo/${LIBEXEC}.tar.bz2
+		mirror://gentoo/${RESCUE}.tar.bz2
+		zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )"
+
+RDEPEND=""
+DEPEND="sys-devel/flex
+	>=app-arch/libarchive-2.7.1[static-libs]
+	app-arch/xz-utils[static-libs]
+	sys-libs/ncurses[static-libs]
+	dev-libs/expat[static-libs]
+	app-arch/bzip2[static-libs]
+	dev-libs/libxml2:2[static-libs]
+	dev-libs/openssl[static-libs]
+	sys-libs/zlib[static-libs]
+	dev-util/pkgconfig
+	=sys-freebsd/freebsd-lib-${RV}*[atm?,netware?]
+	=sys-freebsd/freebsd-sources-${RV}*
+	=sys-freebsd/freebsd-mk-defs-${RV}*"
+
+S="${WORKDIR}/rescue"
+
+pkg_setup() {
+	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
+	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= "
+	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
+	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
+}
+
+src_prepare() {
+	# As they are patches from ${WORKDIR} apply them by hand
+	cd "${WORKDIR}"
+	epatch "${FILESDIR}/${PN}"-8.0-pkgconfig_static_libarchive.patch
+	epatch "${FILESDIR}/${PN}"-7.1-zlib.patch
+	epatch "${FILESDIR}/${PN}"-8.2-libzcleverlink.patch
+	epatch "${FILESDIR}/freebsd-sbin-bsdxml2expat.patch"
+}
diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest
index b020dff97e14..b68a74d0936d 100644
--- a/sys-freebsd/freebsd-sbin/Manifest
+++ b/sys-freebsd/freebsd-sbin/Manifest
@@ -2,27 +2,34 @@ DIST freebsd-contrib-7.2.tar.bz2 41156304 RMD160 d32da79d66aa9e5cd113bd7b3a16b7d
 DIST freebsd-contrib-8.0.tar.bz2 40637930 RMD160 8130bff1c601e16196f4c108a4bf0e2fef9d8b31 SHA1 a1f3b078079e1716892c80749d43e061d7150aaa SHA256 66cb1b535d8f31ed3f0976ae3cceaee5688052776dd2eafdd44aadad2ddea1b6
 DIST freebsd-contrib-8.2.tar.bz2 40931651 RMD160 f69f61a3154843e5daa722f0a0757686f2effe87 SHA1 28c367a0c21e7cb59bcb013bb54f5576be0d67b1 SHA256 8b9cb688e81c2980b3fc66411d00ab277a24dadd50d5bdd5e0e6c63ac687b9b6
 DIST freebsd-contrib-9.0_rc1.tar.bz2 53684757 RMD160 e489cfd9f5df72254a29df93ef3122fdfe88abd8 SHA1 559a913a0ee1817ab3dba4b78e78efd76cbac7d7 SHA256 071bcb18f61ef6223ea8bf9525ec6853357f5b8f4e57b1b0b8b9a8afff8eb015
+DIST freebsd-contrib-9.0_rc2.tar.bz2 53992312 RMD160 74227385c37bd88bab6698feeddda82ac4fb07db SHA1 cf8f6b65f8512827473d0e25d7fdc307691bc336 SHA256 962d94502f5fa280ba37d4f77b3725844962910cd99486433120df5b4ce9081c
 DIST freebsd-etc-7.2.tar.bz2 199580 RMD160 f8954a1c590c918861b39cb414a079a960af9969 SHA1 a2fee43a6a6fffd864776eceab134002fc9292d2 SHA256 9a6ebd6877191e7ff5d734a77da16090123c5223cfe873177b9fe1ca4f12d653
 DIST freebsd-etc-8.0.tar.bz2 183231 RMD160 c1926470ee952a83e945cf0538785eb6711ad538 SHA1 611c75422d7f1a47158f9478d5c0c63ee7d4e45d SHA256 23ac89366dbc397c9d16f8509677289a06fc4e0807baf64728a308ff45fc9ec2
 DIST freebsd-etc-8.2.tar.bz2 188629 RMD160 915753c5926914964550ff831e05d59f4d6e5470 SHA1 170223195ce728242e3c1dbc9a448e95f8ae1afb SHA256 6bc745fa259f9fa2b65df865d45443a7b23c24445195e33a4ac50bf1040ae238
 DIST freebsd-etc-9.0_rc1.tar.bz2 207024 RMD160 44d79dae611d79c0a94d9c144497144d2399bce6 SHA1 6d37bc25f81b3dd763610ab762fe18a5e333077f SHA256 5ed8c871b71d013067ac97c67000e2186c87df313e2e9d49cc4e2d5cadfc5591
+DIST freebsd-etc-9.0_rc2.tar.bz2 207133 RMD160 4f630381be5eed6c8fa2fee302d773b58c55d8b6 SHA1 2c8c8023c04f6e93caa772e69844bbc9b10d6594 SHA256 1be6e9707b6c81b812f4a3f1ba905b1c9cbec58d80eb6bb583cbed2418f91ff5
 DIST freebsd-lib-7.2.tar.bz2 2970356 RMD160 d676e9bfd3a32293ac1190ff3c42861fb987394e SHA1 15749e43f5ed16316c5311bfa40f42ed546b69e9 SHA256 80b54a23068b806aede48700884a5ed2aa33f5d813309ef7497a7b951d62aab0
 DIST freebsd-lib-8.0.tar.bz2 3253452 RMD160 30e9b16e2ad5e2196ea722324a6dd932326bffe1 SHA1 f9ab976ad968a391393671f488ff5ddba190bc28 SHA256 2d15fbb8c71f9f747e722b281f341b749938875d9e08206323e1609073c0e3bb
 DIST freebsd-lib-8.2.tar.bz2 3323878 RMD160 64d8915611a8a4ae58b4b39e9f835398aa6bc1b9 SHA1 9ea3105191fbd72680d66f67d28f22fcf10863d7 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0
 DIST freebsd-lib-9.0_rc1.tar.bz2 3546378 RMD160 71b0b4cac09d8dc6160a56cd57f8643d7957e233 SHA1 e1c9801140d41bd73c20e08e2d592f51281a123c SHA256 237b88ea2b77a870e3b6075fa9293d5bba2920e66ae7b98b6cf209b4d0a937ec
+DIST freebsd-lib-9.0_rc2.tar.bz2 3547324 RMD160 da9ff86bdd1cdca7d4d4045239372a8c6065ed18 SHA1 2363db2131aff3389b1bb03bbe4d95ae611b946e SHA256 13d20c60b3ab7769a440f492a81aef4ed0428c2bcbbeaed43c69c80c65d94a9e
 DIST freebsd-libexec-7.2.tar.bz2 275993 RMD160 e3cfab5b89c304eeff76d92eaadaaadb6322c90e SHA1 747aa2365565fabb97aa910c01c06b340ddf3ea2 SHA256 375627cd871a4fbed4b7ec79d788bb5e62bc6cc818e971c613b3acd89b2db453
 DIST freebsd-libexec-8.0.tar.bz2 279159 RMD160 f4061f62f0773ca4dea4e1d7086e52759d030f4b SHA1 9e8cb7d674f91b4a36c79d6e0bf2be3176e620f8 SHA256 86d4ca63b605b91da26bfa981ddf667fb741ed9a983191c1d75a8762263f0599
 DIST freebsd-libexec-8.2.tar.bz2 289147 RMD160 81e2e000adbd04bb0b3da9786f95b8b53ec5f32e SHA1 646748e531fe5b40341f5ea61dda756d999a0b7c SHA256 10b996d1d8cd044ee2e7a877e5e6ad2bf050cce9b3bd402a5e0dea7d290b595d
 DIST freebsd-libexec-9.0_rc1.tar.bz2 298324 RMD160 b1270fb4e40538a12836e594b1a416329dd6e51b SHA1 03fd233c9d8aab8e56599f56711633c7d61cd7f4 SHA256 2a01f20e8d7717db130c494da0b91640d90e2659182fb61b42121090fd35cfde
+DIST freebsd-libexec-9.0_rc2.tar.bz2 298456 RMD160 f383937321521ca2520e627ac4a00d0d335028fa SHA1 3e8d5188baf3fa374f7a8d674b523649c72e62e7 SHA256 5943e61a1f7fbf7c59cfb25082a8d89a4310b788a48423fc5d6171a8359d7de4
 DIST freebsd-sbin-7.2.tar.bz2 1131189 RMD160 f05c364f49623153f809152a64e5bea8632ed0ec SHA1 f4241733b291f322d21c65cbb683aa1c4c5375e3 SHA256 d5c3c2fe1689bfa13b78117778ca066ad68a1bbefbaa092074c31bdc1b57e876
 DIST freebsd-sbin-8.0.tar.bz2 1140122 RMD160 30cd0c309c46d554114b2a47765f3592a6c4b481 SHA1 7130394dd596d26e6c296167f761745f61ec5993 SHA256 6dbf9aa405ed93d5f2e364946830f60e3c2615df6315120f40817824f8ea78df
 DIST freebsd-sbin-8.2.tar.bz2 1211665 RMD160 32167422cb273ccad18af0dadff551eddb153e7e SHA1 f36a0cd90c90f94941d2013b013947c405e8e152 SHA256 8b7e21a66b4696e8763d29b8b02b2d35f29fc51820a194d1e469e7cace84c527
 DIST freebsd-sbin-9.0_rc1.tar.bz2 1267674 RMD160 0755ac9ebf54aba4f9755c961a1f4ffd3f26723c SHA1 08702291ccacd62bb4e6f157a0529260be9822b1 SHA256 ad4ec7a8ae4ac0dec9e172add7eda30209b5d80c30e85d69b9b03c7d174716d7
+DIST freebsd-sbin-9.0_rc2.tar.bz2 1267485 RMD160 8fbc9120be3fc1cc58dda8838e486e7f637f62b2 SHA1 691e1412813fa0a3725aa77d29870cddb4ad0213 SHA256 f43465c3c31a2aa3605092affec167cf1694a756b9cd9ebe80a4579e9cd4f24a
 DIST freebsd-sys-7.2.tar.bz2 23005928 RMD160 0ecdff9fbefe9e16325e09a76310ca2b4a7751b8 SHA1 1c2d6894371a8650288ebf1a4831a4b08c2e4f09 SHA256 38e1fc670b8438be42947b1512ca7d10b0f8c62c58d3234afd8ce2e55b6cae11
 DIST freebsd-sys-8.0.tar.bz2 22552771 RMD160 08f5b09dc0b4353658a309e9e1198dbab1f5ab83 SHA1 9c5e4bdc7af2b9947c55751325880c27f80df225 SHA256 2d822bdeecbbea660aea06ba147a23878cbae7f0640b0b822552d6fa1836d8c9
 DIST freebsd-sys-8.2.tar.bz2 25835329 RMD160 e8fe34f792c1102fe237af7c87ba9c259cd46d22 SHA1 f2a52be8011126a3882d8df2907a22293ad1c581 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16
 DIST freebsd-sys-9.0_rc1.tar.bz2 30257152 RMD160 725bbc8ab49ede1e5ea821b9ceae0c5a3713ffb6 SHA1 a0f0deaee50708e1626eea91e216367fc6ca7c9c SHA256 fb4cf5e7b9ec58077d5c629f62dc5ced8cd28b296e5bdb4888d969494fd71585
+DIST freebsd-sys-9.0_rc2.tar.bz2 30234083 RMD160 e53db15b13f6e50f0ae91c317fd77b92faadddc6 SHA1 b0ffd76b2fc5bcfa293dd5e5512ceb17ad7ed185 SHA256 2990d5603f8043a1da435b75b74eb453f7304923ed4ae3200b8b40cfe7396245
 DIST freebsd-usbin-7.2.tar.bz2 2654480 RMD160 af0a94e0affce332cf30532ea45251563e65632e SHA1 b52db981e0250357b40d10ebc7ffd6ca3ea9cc4c SHA256 56574e81ac4ab54a20d83d9a2d1ba3a42b5677691675f1db162fde161da0907f
 DIST freebsd-usbin-8.0.tar.bz2 2411151 RMD160 f162437ab2e3c89c6635e5c567e39b60974ce3c1 SHA1 be7b4ccd767e64fa0dedced631c18a1c3969b417 SHA256 c38230af5d667a254ddcce0b77100ada2b7af6e17309f033950c2852f70cc1dd
 DIST freebsd-usbin-8.2.tar.bz2 2443024 RMD160 972723becd1ab16615bc45f9beab8483533cbf81 SHA1 16bcb5528f14cfeccb9f4c913a629b01d9873ebf SHA256 aa7cabf10f5c3a9daabea32e4de24d04ec312247842981476da666eff5054603
 DIST freebsd-usbin-9.0_rc1.tar.bz2 2605735 RMD160 672adbdfff912e6027bad8acd9db6645b1a14c27 SHA1 bf02bd5ff416026d90aac89d0256ac3fb13d8a5e SHA256 34666292f701ae88128b6416db78038ce04e13198ba74961b4a2ce7600a88f21
+DIST freebsd-usbin-9.0_rc2.tar.bz2 2606905 RMD160 d63519382e2405c6d255ff492677cc589103dc2c SHA1 f7f7dd4aa6a4a4621d402d76fcdc80bd3e672f24 SHA256 694e8137992c1747fcc9962106bc82352327605fef01cdcdc63e6b9452278080
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-9.0_rc2.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-9.0_rc2.ebuild
new file mode 100644
index 000000000000..2030f64dcae4
--- /dev/null
+++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-9.0_rc2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/freebsd-sbin-9.0_rc2.ebuild,v 1.1 2011/12/07 17:09:16 aballier Exp $
+
+EAPI=2
+
+inherit bsdmk freebsd
+
+DESCRIPTION="FreeBSD sbin utils"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+SLOT="0"
+
+SRC_URI="mirror://gentoo/${SBIN}.tar.bz2
+	mirror://gentoo/${CONTRIB}.tar.bz2
+	mirror://gentoo/${LIB}.tar.bz2
+	mirror://gentoo/${LIBEXEC}.tar.bz2
+	mirror://gentoo/${USBIN}.tar.bz2
+	mirror://gentoo/${ETC}.tar.bz2
+	build? ( mirror://gentoo/${SYS}.tar.bz2 )"
+
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[ipv6?,atm?,netware?]
+	=sys-freebsd/freebsd-libexec-${RV}*
+	>=dev-libs/expat-2.0.1
+	ssl? ( dev-libs/openssl )
+	sys-libs/readline
+	sys-process/vixie-cron
+	atm? ( net-analyzer/bsnmp )"
+DEPEND="${RDEPEND}
+	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
+	=sys-freebsd/freebsd-mk-defs-${RV}*"
+
+S="${WORKDIR}/sbin"
+
+IUSE="atm ipfilter +pf ipv6 build ssl +cxx netware"
+
+pkg_setup() {
+	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
+	use cxx || mymakeopts="${mymakeopts} WITHOUT_CXX="
+	use ipfilter || mymakeopts="${mymakeopts} WITHOUT_IPFILTER= "
+	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT="
+	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
+	use pf || mymakeopts="${mymakeopts} WITHOUT_PF= "
+	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL="
+}
+
+REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder"
+
+PATCHES=( "${FILESDIR}/${PN}-setXid.patch"
+	"${FILESDIR}/${PN}-7.1-zlib.patch"
+	"${FILESDIR}/${PN}-6.2-ldconfig.patch"
+	"${FILESDIR}/${PN}-6.1-pr102701.patch"
+	"${FILESDIR}/${PN}-bsdxml2expat.patch" )
+
+src_prepare() {
+	use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+}
+
+src_install() {
+	freebsd_src_install
+	keepdir /var/log
+	# Needed by ldconfig:
+	keepdir /var/run
+
+	# Maybe ship our own sysctl.conf so things like radvd work out of the box.
+	# New wireless config method requires regdomain.xml in /etc
+	cd "${WORKDIR}/etc/"
+	insinto /etc
+	doins minfree sysctl.conf regdomain.xml || die
+
+	# initd script for idmapd
+	newinitd "${FILESDIR}/idmapd.initd" idmapd
+
+	# Install a crontab for adjkerntz
+	insinto /etc/cron.d
+	newins "${FILESDIR}/adjkerntz-crontab" adjkerntz
+
+	# Install the periodic stuff (needs probably to be ported in a more
+	# gentooish way)
+	cd "${WORKDIR}/etc/periodic"
+
+	doperiodic security \
+		security/*.ipfwlimit \
+		security/*.ipfwdenied || die
+
+	use ipfilter && { doperiodic security \
+		security/*.ipfdenied || die ; }
+
+	use pf && { doperiodic security \
+		security/*.pfdenied || die ; }
+}
diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest
index 8b24d9631e39..9c235e2493ef 100644
--- a/sys-freebsd/freebsd-share/Manifest
+++ b/sys-freebsd/freebsd-share/Manifest
@@ -2,35 +2,44 @@ DIST freebsd-bin-7.2.tar.bz2 406772 RMD160 5cb15516cfc080c7ddf4b5b6e7eb880b2e101
 DIST freebsd-bin-8.0.tar.bz2 415822 RMD160 58a2acf990148fd45cbc99bc1bded81c8e352434 SHA1 3177c02e752b9a06175b5ba6556441ed8cd91c33 SHA256 d122c0c55e75c342962dfa8ba04e8bd213730f887d3a6e158c40476f8a5f2460
 DIST freebsd-bin-8.2.tar.bz2 415900 RMD160 3a49919ef24848006ba4b95933ec072f643148c1 SHA1 2d01891f76359c2de12f2270f9b907d417d4ad15 SHA256 fb31b7fab259bda8396e615246f85dc99c3c9f7e98f4e4a613e20b6a394c4921
 DIST freebsd-bin-9.0_rc1.tar.bz2 392261 RMD160 b5c8fb881871009fe2a8907256f2cf1745ee51c5 SHA1 4354950359adb751e2b351bc5b7d26149d85d9c9 SHA256 b084316c5f8986ef4da6cd993c3466c5ade517022e5f00bd1a44d375ab8f5dd6
+DIST freebsd-bin-9.0_rc2.tar.bz2 392321 RMD160 f3a45b69627944ad91d5494e39366d028b422b0c SHA1 3d7d746f04839aa8b67df0d58373e3d78e051cfc SHA256 317cb81441dd9f0121622ffe50fb8bdcb1eac573173d85c8ebc961c30ef1a23f
 DIST freebsd-contrib-7.2.tar.bz2 41156304 RMD160 d32da79d66aa9e5cd113bd7b3a16b7d83849dca2 SHA1 8f3778a1638bfe852f95d746d181a56258446182 SHA256 e6b5b4320552185d64a1d17676ca4376ca43f147eafaee7e2b0885571e4ee1f2
 DIST freebsd-contrib-8.0.tar.bz2 40637930 RMD160 8130bff1c601e16196f4c108a4bf0e2fef9d8b31 SHA1 a1f3b078079e1716892c80749d43e061d7150aaa SHA256 66cb1b535d8f31ed3f0976ae3cceaee5688052776dd2eafdd44aadad2ddea1b6
 DIST freebsd-contrib-8.2.tar.bz2 40931651 RMD160 f69f61a3154843e5daa722f0a0757686f2effe87 SHA1 28c367a0c21e7cb59bcb013bb54f5576be0d67b1 SHA256 8b9cb688e81c2980b3fc66411d00ab277a24dadd50d5bdd5e0e6c63ac687b9b6
 DIST freebsd-contrib-9.0_rc1.tar.bz2 53684757 RMD160 e489cfd9f5df72254a29df93ef3122fdfe88abd8 SHA1 559a913a0ee1817ab3dba4b78e78efd76cbac7d7 SHA256 071bcb18f61ef6223ea8bf9525ec6853357f5b8f4e57b1b0b8b9a8afff8eb015
+DIST freebsd-contrib-9.0_rc2.tar.bz2 53992312 RMD160 74227385c37bd88bab6698feeddda82ac4fb07db SHA1 cf8f6b65f8512827473d0e25d7fdc307691bc336 SHA256 962d94502f5fa280ba37d4f77b3725844962910cd99486433120df5b4ce9081c
 DIST freebsd-etc-7.2.tar.bz2 199580 RMD160 f8954a1c590c918861b39cb414a079a960af9969 SHA1 a2fee43a6a6fffd864776eceab134002fc9292d2 SHA256 9a6ebd6877191e7ff5d734a77da16090123c5223cfe873177b9fe1ca4f12d653
 DIST freebsd-etc-8.0.tar.bz2 183231 RMD160 c1926470ee952a83e945cf0538785eb6711ad538 SHA1 611c75422d7f1a47158f9478d5c0c63ee7d4e45d SHA256 23ac89366dbc397c9d16f8509677289a06fc4e0807baf64728a308ff45fc9ec2
 DIST freebsd-etc-8.2.tar.bz2 188629 RMD160 915753c5926914964550ff831e05d59f4d6e5470 SHA1 170223195ce728242e3c1dbc9a448e95f8ae1afb SHA256 6bc745fa259f9fa2b65df865d45443a7b23c24445195e33a4ac50bf1040ae238
 DIST freebsd-etc-9.0_rc1.tar.bz2 207024 RMD160 44d79dae611d79c0a94d9c144497144d2399bce6 SHA1 6d37bc25f81b3dd763610ab762fe18a5e333077f SHA256 5ed8c871b71d013067ac97c67000e2186c87df313e2e9d49cc4e2d5cadfc5591
+DIST freebsd-etc-9.0_rc2.tar.bz2 207133 RMD160 4f630381be5eed6c8fa2fee302d773b58c55d8b6 SHA1 2c8c8023c04f6e93caa772e69844bbc9b10d6594 SHA256 1be6e9707b6c81b812f4a3f1ba905b1c9cbec58d80eb6bb583cbed2418f91ff5
 DIST freebsd-gnu-7.2.tar.bz2 814017 RMD160 6b4f742c236a095e919cc839a174e25310812535 SHA1 bc139f2323e7962619de89a7026b66050106256a SHA256 17b64c91d33c166ed909b349044dd4291e3295e36bb4e4c14d82e680b6491cd4
 DIST freebsd-gnu-8.0.tar.bz2 817829 RMD160 e0dfc3e77110b2f67defa10268cf4a41199e0883 SHA1 ff2a6ba45f655a804e1a0242d562b81ded5d1ba2 SHA256 b55a20f9d88611638c143f9fbedc83fca5faae1df599e928ef6e8b889411c49f
 DIST freebsd-gnu-8.2.tar.bz2 815379 RMD160 f4eece3343c71ed5a2387854c63a7fff3675f713 SHA1 04013b0bedcdc695687a2fadf030376632774a4d SHA256 34be1326b8e188427ea4a59de5dd24049f99adb5e172d61a645db1b7124f7876
 DIST freebsd-gnu-9.0_rc1.tar.bz2 783924 RMD160 aa13a8b6960320ed9fdb4ea7de0049ed7caae720 SHA1 7b05407f545f40bd687cc3b226a95401cdd3cef2 SHA256 7c50fa7cb4c5b7f6aeb9f87569b8d577a7ee5daf657cbb62c121ba203e83cb2c
+DIST freebsd-gnu-9.0_rc2.tar.bz2 783761 RMD160 de29867cd5b07a6a01f5ead4465d52e372586451 SHA1 15c08d87be1624324e90bd49afb7c4ed655cede7 SHA256 222492e714fe471cc644baa198b88a1b29b51ed4e4604be76ec8fee267a25a69
 DIST freebsd-lib-7.2.tar.bz2 2970356 RMD160 d676e9bfd3a32293ac1190ff3c42861fb987394e SHA1 15749e43f5ed16316c5311bfa40f42ed546b69e9 SHA256 80b54a23068b806aede48700884a5ed2aa33f5d813309ef7497a7b951d62aab0
 DIST freebsd-lib-8.0.tar.bz2 3253452 RMD160 30e9b16e2ad5e2196ea722324a6dd932326bffe1 SHA1 f9ab976ad968a391393671f488ff5ddba190bc28 SHA256 2d15fbb8c71f9f747e722b281f341b749938875d9e08206323e1609073c0e3bb
 DIST freebsd-lib-8.2.tar.bz2 3323878 RMD160 64d8915611a8a4ae58b4b39e9f835398aa6bc1b9 SHA1 9ea3105191fbd72680d66f67d28f22fcf10863d7 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0
 DIST freebsd-lib-9.0_rc1.tar.bz2 3546378 RMD160 71b0b4cac09d8dc6160a56cd57f8643d7957e233 SHA1 e1c9801140d41bd73c20e08e2d592f51281a123c SHA256 237b88ea2b77a870e3b6075fa9293d5bba2920e66ae7b98b6cf209b4d0a937ec
+DIST freebsd-lib-9.0_rc2.tar.bz2 3547324 RMD160 da9ff86bdd1cdca7d4d4045239372a8c6065ed18 SHA1 2363db2131aff3389b1bb03bbe4d95ae611b946e SHA256 13d20c60b3ab7769a440f492a81aef4ed0428c2bcbbeaed43c69c80c65d94a9e
 DIST freebsd-sbin-7.2.tar.bz2 1131189 RMD160 f05c364f49623153f809152a64e5bea8632ed0ec SHA1 f4241733b291f322d21c65cbb683aa1c4c5375e3 SHA256 d5c3c2fe1689bfa13b78117778ca066ad68a1bbefbaa092074c31bdc1b57e876
 DIST freebsd-sbin-8.0.tar.bz2 1140122 RMD160 30cd0c309c46d554114b2a47765f3592a6c4b481 SHA1 7130394dd596d26e6c296167f761745f61ec5993 SHA256 6dbf9aa405ed93d5f2e364946830f60e3c2615df6315120f40817824f8ea78df
 DIST freebsd-sbin-8.2.tar.bz2 1211665 RMD160 32167422cb273ccad18af0dadff551eddb153e7e SHA1 f36a0cd90c90f94941d2013b013947c405e8e152 SHA256 8b7e21a66b4696e8763d29b8b02b2d35f29fc51820a194d1e469e7cace84c527
 DIST freebsd-sbin-9.0_rc1.tar.bz2 1267674 RMD160 0755ac9ebf54aba4f9755c961a1f4ffd3f26723c SHA1 08702291ccacd62bb4e6f157a0529260be9822b1 SHA256 ad4ec7a8ae4ac0dec9e172add7eda30209b5d80c30e85d69b9b03c7d174716d7
+DIST freebsd-sbin-9.0_rc2.tar.bz2 1267485 RMD160 8fbc9120be3fc1cc58dda8838e486e7f637f62b2 SHA1 691e1412813fa0a3725aa77d29870cddb4ad0213 SHA256 f43465c3c31a2aa3605092affec167cf1694a756b9cd9ebe80a4579e9cd4f24a
 DIST freebsd-share-7.2.tar.bz2 3878366 RMD160 11cdb0c952bd442a895a2c36c3c43e15927e5706 SHA1 e389971377f4bad980db2dba01936794296742b1 SHA256 15f28ba51609d319d3edc930cf6fc20850bb493707df907fdeace23d35118bf2
 DIST freebsd-share-8.0.tar.bz2 3754795 RMD160 7da07595137e521dbc3e8bc618f875edf88792fc SHA1 542c46d447aeabbb0bb1f652bcc476713b310644 SHA256 4cbb577bb7e76f87a27d3974459d0e146736d5e8002c49f5661f95f68c2939d1
 DIST freebsd-share-8.2.tar.bz2 3797560 RMD160 88f52550c5656f9a4186eb56e5661218345b2d87 SHA1 5d38349cb2b61d639cae6212677309e8da23e131 SHA256 dd082c6ddbf8e08ec91d9810d51af4111339bed912b0f74d05be283780292ba0
 DIST freebsd-share-9.0_rc1.tar.bz2 6739216 RMD160 6b3e0a2532e80d36392d0632d796e5a8f3306f46 SHA1 dce6f6044e0114ef0e5b825c01a917e20791161e SHA256 c00cdb75f9322ef8964379ec6449c523cc734ed15fe804c413ff2d2db00ce0c9
+DIST freebsd-share-9.0_rc2.tar.bz2 6736237 RMD160 a4edb00ca20609d66268a978b6292bba082a636e SHA1 bde8a12e3bbda10cf6161dde08b2b17f8e17fa7a SHA256 094899b1a73eb84933f0e6a5189ea9e58dc8f02f5e6b892fe47ec0319411dc26
 DIST freebsd-ubin-7.2.tar.bz2 1851174 RMD160 b56cdc06fe0ce1ea47762a75c33ed9ed6d1abfde SHA1 1739eceebc41d9a4cbf10d21ef4e8d55b586f640 SHA256 5ca9f185a5af59993ddf83ece155bfcea1340a93d2540035b35c5acbfc3a2625
 DIST freebsd-ubin-8.0.tar.bz2 1787358 RMD160 08814da95905ba2cd6037c41507eade30b007e72 SHA1 0de52ddd7522b73c876ed967ac96aa278260f5b6 SHA256 2bd1529107e3b70df64bc4d7d3117122cac03b49b874a6653860b13d567af250
 DIST freebsd-ubin-8.2.tar.bz2 1808012 RMD160 b927dcb67de4367ea148643203e0056dd90a0c36 SHA1 0d5e58642ab4555f15ab144feaec6fe90f7a2f2c SHA256 6b99554f3ad6ee052069b347eb6e6219b71598d7b222acb90a24cbfc805c7b68
 DIST freebsd-ubin-9.0_rc1.tar.bz2 1962093 RMD160 2dc189b6359feaf60b6b443d80348136e0d75f8e SHA1 e25b15e1c394cc326e56dcc1d4ebf71e07bf610e SHA256 897b4d10a891adc307861311952bb4df8002a80c8cef96567b28df21a3f81b39
+DIST freebsd-ubin-9.0_rc2.tar.bz2 1962807 RMD160 d9a0124f845abe3fd8f359115c296e036ee08323 SHA1 d2cd3859f0f4047a40aa834a192b936bce063879 SHA256 1ebefae6d8b4882d070c46ffe67091563c33aa5ddf2221105c12a1aa06bd17f1
 DIST freebsd-usbin-7.2.tar.bz2 2654480 RMD160 af0a94e0affce332cf30532ea45251563e65632e SHA1 b52db981e0250357b40d10ebc7ffd6ca3ea9cc4c SHA256 56574e81ac4ab54a20d83d9a2d1ba3a42b5677691675f1db162fde161da0907f
 DIST freebsd-usbin-8.0.tar.bz2 2411151 RMD160 f162437ab2e3c89c6635e5c567e39b60974ce3c1 SHA1 be7b4ccd767e64fa0dedced631c18a1c3969b417 SHA256 c38230af5d667a254ddcce0b77100ada2b7af6e17309f033950c2852f70cc1dd
 DIST freebsd-usbin-8.2.tar.bz2 2443024 RMD160 972723becd1ab16615bc45f9beab8483533cbf81 SHA1 16bcb5528f14cfeccb9f4c913a629b01d9873ebf SHA256 aa7cabf10f5c3a9daabea32e4de24d04ec312247842981476da666eff5054603
 DIST freebsd-usbin-9.0_rc1.tar.bz2 2605735 RMD160 672adbdfff912e6027bad8acd9db6645b1a14c27 SHA1 bf02bd5ff416026d90aac89d0256ac3fb13d8a5e SHA256 34666292f701ae88128b6416db78038ce04e13198ba74961b4a2ce7600a88f21
+DIST freebsd-usbin-9.0_rc2.tar.bz2 2606905 RMD160 d63519382e2405c6d255ff492677cc589103dc2c SHA1 f7f7dd4aa6a4a4621d402d76fcdc80bd3e672f24 SHA256 694e8137992c1747fcc9962106bc82352327605fef01cdcdc63e6b9452278080
diff --git a/sys-freebsd/freebsd-share/freebsd-share-9.0_rc2.ebuild b/sys-freebsd/freebsd-share/freebsd-share-9.0_rc2.ebuild
new file mode 100644
index 000000000000..548ccdc834e0
--- /dev/null
+++ b/sys-freebsd/freebsd-share/freebsd-share-9.0_rc2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-9.0_rc2.ebuild,v 1.1 2011/12/07 17:09:42 aballier Exp $
+
+inherit bsdmk freebsd
+
+DESCRIPTION="FreeBSD shared tools/files"
+SLOT="0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+
+IUSE="doc isdn"
+
+SRC_URI="mirror://gentoo/${SHARE}.tar.bz2
+	mirror://gentoo/${CONTRIB}.tar.bz2
+	mirror://gentoo/${GNU}.tar.bz2
+	mirror://gentoo/${UBIN}.tar.bz2
+	mirror://gentoo/${USBIN}.tar.bz2
+	mirror://gentoo/${SBIN}.tar.bz2
+	mirror://gentoo/${BIN}.tar.bz2
+	mirror://gentoo/${LIB}.tar.bz2
+	mirror://gentoo/${ETC}.tar.bz2"
+
+DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
+		=sys-freebsd/freebsd-sources-${RV}*"
+RDEPEND="sys-apps/miscfiles"
+
+RESTRICT="strip"
+
+S="${WORKDIR}/share"
+
+pkg_setup() {
+	use isdn || mymakeopts="${mymakeopts} NO_I4B= "
+	use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= "
+
+	mymakeopts="${mymakeopts} NO_SENDMAIL= NO_MANCOMPRESS= NO_INFOCOMPRESS= "
+}
+
+REMOVE_SUBDIRS="mk termcap zoneinfo tabset"
+
+PATCHES=( "${FILESDIR}/${PN}-5.3-doc-locations.patch"
+	"${FILESDIR}/${PN}-5.4-gentoo-skel.patch"
+	"${FILESDIR}/${PN}-8.0-gnu-miscfiles.patch" )
+
+src_unpack() {
+	freebsd_src_unpack
+
+	# Remove make.conf manpage as it describes bsdmk's make.conf.
+	sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile"
+	# Remove mailer.conf manpage
+	sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile"
+	# Remove pbm and moduli(ssh) manpages
+	sed -i -e 's:pbm.5::' -e 's:moduli.5::' "${S}/man/man5/Makefile"
+	# Remove builtins manpage
+	sed -i -e '/builtins\.1/d' "${S}/man/man1/Makefile"
+	# Remove rc manpages
+	sed -i -e '/rc.8/d' "${S}/man/man8/Makefile"
+
+	# Don't install the arch-specific directories in subdirectories
+	sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{i386,sparc64}/Makefile
+
+	# Remove them so that they can't be included by error
+	rm -rf "${S}"/mk/*.mk
+
+	# Make proper symlinks by defining the full target.
+	local sdir
+	for sdir in colldef mklocale monetdef msgdef numericdef timedef
+	do
+		sed -e 's:\${enc2}$:\${enc2}/\${FILESNAME}:g' -i \
+			"${S}/${sdir}/Makefile" || \
+			die "Error fixing ${sdir}/Makefile"
+	done
+	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "failed to set sys symlink"
+}
+
+src_compile() {
+	export ESED="/usr/bin/sed"
+
+	# This is a groff problem and not a -shared problem.
+	export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.19.1/tmac/"
+	mkmake || die "emake failed"
+}
+
+src_install() {
+	mkmake -j1 DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed"
+}
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index ef92a4637bdb..f657797d675f 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -2,3 +2,4 @@ DIST freebsd-sys-7.2.tar.bz2 23005928 RMD160 0ecdff9fbefe9e16325e09a76310ca2b4a7
 DIST freebsd-sys-8.0.tar.bz2 22552771 RMD160 08f5b09dc0b4353658a309e9e1198dbab1f5ab83 SHA1 9c5e4bdc7af2b9947c55751325880c27f80df225 SHA256 2d822bdeecbbea660aea06ba147a23878cbae7f0640b0b822552d6fa1836d8c9
 DIST freebsd-sys-8.2.tar.bz2 25835329 RMD160 e8fe34f792c1102fe237af7c87ba9c259cd46d22 SHA1 f2a52be8011126a3882d8df2907a22293ad1c581 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16
 DIST freebsd-sys-9.0_rc1.tar.bz2 30257152 RMD160 725bbc8ab49ede1e5ea821b9ceae0c5a3713ffb6 SHA1 a0f0deaee50708e1626eea91e216367fc6ca7c9c SHA256 fb4cf5e7b9ec58077d5c629f62dc5ced8cd28b296e5bdb4888d969494fd71585
+DIST freebsd-sys-9.0_rc2.tar.bz2 30234083 RMD160 e53db15b13f6e50f0ae91c317fd77b92faadddc6 SHA1 b0ffd76b2fc5bcfa293dd5e5512ceb17ad7ed185 SHA256 2990d5603f8043a1da435b75b74eb453f7304923ed4ae3200b8b40cfe7396245
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.0_rc2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.0_rc2.ebuild
new file mode 100644
index 000000000000..16bc71f3f80f
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.0_rc2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.0_rc2.ebuild,v 1.1 2011/12/07 17:10:09 aballier Exp $
+
+inherit bsdmk freebsd flag-o-matic
+
+DESCRIPTION="FreeBSD kernel sources"
+SLOT="${PVR}"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+
+IUSE="symlink"
+
+SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
+
+RDEPEND=">=sys-freebsd/freebsd-mk-defs-8.0"
+DEPEND=""
+
+RESTRICT="strip binchecks"
+
+S="${WORKDIR}/sys"
+
+MY_PVR="${PVR}"
+
+[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# This replaces the gentoover patch, it doesn't need reapply every time.
+	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
+		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
+		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
+		"${S}/conf/newvers.sh"
+
+	# __FreeBSD_cc_version comes from FreeBSD's gcc.
+	# on 8.2-RELEASE it's 800001.
+	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=800001:g" \
+		-i "${S}/conf/kern.pre.mk" \
+		-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
+
+	# Remove -Werror
+	sed -e "s:-Werror:-Wno-error:g" \
+		-i "${S}/conf/kern.pre.mk" \
+		-i "${S}/conf/kmod.mk" || die
+
+	epatch "${FILESDIR}/${PN}-9.0-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
+	sed -e 's/elf64-sparc/elf64-sparc-freebsd/g' -i	"${S}/conf/ldscript.sparc64" || die
+	epatch "${FILESDIR}/${PN}-6.1-ntfs.patch"
+	epatch "${FILESDIR}/${PN}-7.1-types.h-fix.patch"
+	epatch "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
+	epatch "${FILESDIR}/${PN}-7.1-includes.patch"
+
+	# By adding -DGENTOO_LIVECD to CFLAGS activate this stub
+	# vop_whiteout to tmpfs, so it can be used as an overlay
+	# unionfs filesystem over the cd9660 readonly filesystem.
+	epatch "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch"
+
+	# See http://sourceware.org/bugzilla/show_bug.cgi?id=5391
+	# ld doesn't provide symbols constructed as the __start_set_(s) ones
+	# are on FreeBSD modules.
+	# This patch adds code to generate a list of these and adds them
+	# as undefined references to ld's commandline to get them.
+	# Without this kernel modules will not load.
+	#epatch "${FILESDIR}/${PN}-7.1-binutils_link.patch"
+}
+
+src_compile() {
+	einfo "Nothing to compile.."
+}
+
+src_install() {
+	insinto "/usr/src/sys-${MY_PVR}"
+	doins -r "${S}/"*
+}
+
+pkg_postinst() {
+	if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
+		einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${MY_PVR}..."
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
+		# just in case...
+		[[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}"
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
+	elif use symlink; then
+		einfo "Updating /usr/src/sys symlink to sys-${MY_PVR}..."
+		rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \
+			eerror "Couldn't remove previous symlinks, please fix manually."
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
+	fi
+
+	if use sparc-fbsd ; then
+		ewarn "WARNING: kldload currently causes kernel panics"
+		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
+		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
+		ewarn "Please compile all modules you need into the kernel"
+	fi
+}
diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
index 244c4ed01c94..b5f7c4e16e33 100644
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -2,30 +2,38 @@ DIST freebsd-bin-7.2.tar.bz2 406772 RMD160 5cb15516cfc080c7ddf4b5b6e7eb880b2e101
 DIST freebsd-bin-8.0.tar.bz2 415822 RMD160 58a2acf990148fd45cbc99bc1bded81c8e352434 SHA1 3177c02e752b9a06175b5ba6556441ed8cd91c33 SHA256 d122c0c55e75c342962dfa8ba04e8bd213730f887d3a6e158c40476f8a5f2460
 DIST freebsd-bin-8.2.tar.bz2 415900 RMD160 3a49919ef24848006ba4b95933ec072f643148c1 SHA1 2d01891f76359c2de12f2270f9b907d417d4ad15 SHA256 fb31b7fab259bda8396e615246f85dc99c3c9f7e98f4e4a613e20b6a394c4921
 DIST freebsd-bin-9.0_rc1.tar.bz2 392261 RMD160 b5c8fb881871009fe2a8907256f2cf1745ee51c5 SHA1 4354950359adb751e2b351bc5b7d26149d85d9c9 SHA256 b084316c5f8986ef4da6cd993c3466c5ade517022e5f00bd1a44d375ab8f5dd6
+DIST freebsd-bin-9.0_rc2.tar.bz2 392321 RMD160 f3a45b69627944ad91d5494e39366d028b422b0c SHA1 3d7d746f04839aa8b67df0d58373e3d78e051cfc SHA256 317cb81441dd9f0121622ffe50fb8bdcb1eac573173d85c8ebc961c30ef1a23f
 DIST freebsd-cddl-8.0.tar.bz2 774011 RMD160 bd4d595a18afc51e68ee0db0b55a4043c9770ea7 SHA1 efe03cb40ecb1a9150c0800c052992c8ffc9103f SHA256 46a863d910e7a193435ab29d993635a07503052e52acdfb5a552915ff1dddb1a
 DIST freebsd-cddl-8.2.tar.bz2 823706 RMD160 fded2d9be9dfd52e7eef5312c1b462e27fde1c91 SHA1 3ffeb2e80fdab24c4c71afcd49bc015495cde83f SHA256 6d2b2362ce60538bcba4afa47bd6baa98b05292babae4b20d6ba08592ce98698
 DIST freebsd-cddl-9.0_rc1.tar.bz2 878394 RMD160 dcc3fdb5394122634f50ca8101572df9bbe51468 SHA1 0b6cb8dd0f26dcf1d49581fce3659d70ec42ccc3 SHA256 9dfc4bcd8b46024705f9c9a594daa5626760908683168814a5f8a3c609aa43fd
+DIST freebsd-cddl-9.0_rc2.tar.bz2 878163 RMD160 8be8138fa2ba64bea4a0a98bf5ecf9cc1b5d8ffc SHA1 520d4dd4763787cdc2a0bb895ce25cb59f1e3649 SHA256 15b3ef388abb898a352df0f1a30cd42b985025dc78e2b478fa3386aaac33a598
 DIST freebsd-contrib-7.2.tar.bz2 41156304 RMD160 d32da79d66aa9e5cd113bd7b3a16b7d83849dca2 SHA1 8f3778a1638bfe852f95d746d181a56258446182 SHA256 e6b5b4320552185d64a1d17676ca4376ca43f147eafaee7e2b0885571e4ee1f2
 DIST freebsd-contrib-8.0.tar.bz2 40637930 RMD160 8130bff1c601e16196f4c108a4bf0e2fef9d8b31 SHA1 a1f3b078079e1716892c80749d43e061d7150aaa SHA256 66cb1b535d8f31ed3f0976ae3cceaee5688052776dd2eafdd44aadad2ddea1b6
 DIST freebsd-contrib-8.2.tar.bz2 40931651 RMD160 f69f61a3154843e5daa722f0a0757686f2effe87 SHA1 28c367a0c21e7cb59bcb013bb54f5576be0d67b1 SHA256 8b9cb688e81c2980b3fc66411d00ab277a24dadd50d5bdd5e0e6c63ac687b9b6
 DIST freebsd-contrib-9.0_rc1.tar.bz2 53684757 RMD160 e489cfd9f5df72254a29df93ef3122fdfe88abd8 SHA1 559a913a0ee1817ab3dba4b78e78efd76cbac7d7 SHA256 071bcb18f61ef6223ea8bf9525ec6853357f5b8f4e57b1b0b8b9a8afff8eb015
+DIST freebsd-contrib-9.0_rc2.tar.bz2 53992312 RMD160 74227385c37bd88bab6698feeddda82ac4fb07db SHA1 cf8f6b65f8512827473d0e25d7fdc307691bc336 SHA256 962d94502f5fa280ba37d4f77b3725844962910cd99486433120df5b4ce9081c
 DIST freebsd-etc-7.2.tar.bz2 199580 RMD160 f8954a1c590c918861b39cb414a079a960af9969 SHA1 a2fee43a6a6fffd864776eceab134002fc9292d2 SHA256 9a6ebd6877191e7ff5d734a77da16090123c5223cfe873177b9fe1ca4f12d653
 DIST freebsd-etc-8.0.tar.bz2 183231 RMD160 c1926470ee952a83e945cf0538785eb6711ad538 SHA1 611c75422d7f1a47158f9478d5c0c63ee7d4e45d SHA256 23ac89366dbc397c9d16f8509677289a06fc4e0807baf64728a308ff45fc9ec2
 DIST freebsd-etc-8.2.tar.bz2 188629 RMD160 915753c5926914964550ff831e05d59f4d6e5470 SHA1 170223195ce728242e3c1dbc9a448e95f8ae1afb SHA256 6bc745fa259f9fa2b65df865d45443a7b23c24445195e33a4ac50bf1040ae238
 DIST freebsd-etc-9.0_rc1.tar.bz2 207024 RMD160 44d79dae611d79c0a94d9c144497144d2399bce6 SHA1 6d37bc25f81b3dd763610ab762fe18a5e333077f SHA256 5ed8c871b71d013067ac97c67000e2186c87df313e2e9d49cc4e2d5cadfc5591
+DIST freebsd-etc-9.0_rc2.tar.bz2 207133 RMD160 4f630381be5eed6c8fa2fee302d773b58c55d8b6 SHA1 2c8c8023c04f6e93caa772e69844bbc9b10d6594 SHA256 1be6e9707b6c81b812f4a3f1ba905b1c9cbec58d80eb6bb583cbed2418f91ff5
 DIST freebsd-include-7.2.tar.bz2 135657 RMD160 ee9db50e6fcf218929fdff06aabcf31ad2035965 SHA1 3c2369272005c1f2620b9dcc760047de7cab963a SHA256 8640d655e3cefeea14250dbe5e7fd7f56d1de78d79c4adcc6232f70bba89f5d4
 DIST freebsd-include-8.0.tar.bz2 138728 RMD160 7f50c45fe855f666954610827c77ac6c97922274 SHA1 803b1f8a9d369a199f8cf82f6540f17fcc2503f5 SHA256 23dfcc3845b6a36a38abcb79bd75786100575478fdfdc3358be1a114a6c65ffa
 DIST freebsd-include-8.2.tar.bz2 138992 RMD160 b5f9fcc43c2d902a4da2cf86c56355238e619010 SHA1 6a460e7972bf7518da6c3ab8c9fa97547e4bd4bc SHA256 fade90621a8e4880c9583c1ee49965400c88e53ac6c07cb5dcf320e4f069271d
 DIST freebsd-include-9.0_rc1.tar.bz2 141667 RMD160 b9b2fb0d7fdeac02a33c3ff532ef79110bcc747c SHA1 b231997214bae2681b9e49685bac08964f54fd9a SHA256 086bb1b30f8494fc011a735b6f41c83067f59f39997bf3026cdc2855ee7e088f
+DIST freebsd-include-9.0_rc2.tar.bz2 141724 RMD160 5b45818668c30c1bfed8d40ce9dbad3398235bce SHA1 eea0bc64e1b14165eef1183867029caaf7622ee0 SHA256 8c54ec436526f48b344b2843565340007f60902504021c14cf81664745498119
 DIST freebsd-lib-7.2.tar.bz2 2970356 RMD160 d676e9bfd3a32293ac1190ff3c42861fb987394e SHA1 15749e43f5ed16316c5311bfa40f42ed546b69e9 SHA256 80b54a23068b806aede48700884a5ed2aa33f5d813309ef7497a7b951d62aab0
 DIST freebsd-lib-8.0.tar.bz2 3253452 RMD160 30e9b16e2ad5e2196ea722324a6dd932326bffe1 SHA1 f9ab976ad968a391393671f488ff5ddba190bc28 SHA256 2d15fbb8c71f9f747e722b281f341b749938875d9e08206323e1609073c0e3bb
 DIST freebsd-lib-8.2.tar.bz2 3323878 RMD160 64d8915611a8a4ae58b4b39e9f835398aa6bc1b9 SHA1 9ea3105191fbd72680d66f67d28f22fcf10863d7 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0
 DIST freebsd-lib-9.0_rc1.tar.bz2 3546378 RMD160 71b0b4cac09d8dc6160a56cd57f8643d7957e233 SHA1 e1c9801140d41bd73c20e08e2d592f51281a123c SHA256 237b88ea2b77a870e3b6075fa9293d5bba2920e66ae7b98b6cf209b4d0a937ec
+DIST freebsd-lib-9.0_rc2.tar.bz2 3547324 RMD160 da9ff86bdd1cdca7d4d4045239372a8c6065ed18 SHA1 2363db2131aff3389b1bb03bbe4d95ae611b946e SHA256 13d20c60b3ab7769a440f492a81aef4ed0428c2bcbbeaed43c69c80c65d94a9e
 DIST freebsd-sys-7.2.tar.bz2 23005928 RMD160 0ecdff9fbefe9e16325e09a76310ca2b4a7751b8 SHA1 1c2d6894371a8650288ebf1a4831a4b08c2e4f09 SHA256 38e1fc670b8438be42947b1512ca7d10b0f8c62c58d3234afd8ce2e55b6cae11
 DIST freebsd-sys-8.0.tar.bz2 22552771 RMD160 08f5b09dc0b4353658a309e9e1198dbab1f5ab83 SHA1 9c5e4bdc7af2b9947c55751325880c27f80df225 SHA256 2d822bdeecbbea660aea06ba147a23878cbae7f0640b0b822552d6fa1836d8c9
 DIST freebsd-sys-8.2.tar.bz2 25835329 RMD160 e8fe34f792c1102fe237af7c87ba9c259cd46d22 SHA1 f2a52be8011126a3882d8df2907a22293ad1c581 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16
 DIST freebsd-sys-9.0_rc1.tar.bz2 30257152 RMD160 725bbc8ab49ede1e5ea821b9ceae0c5a3713ffb6 SHA1 a0f0deaee50708e1626eea91e216367fc6ca7c9c SHA256 fb4cf5e7b9ec58077d5c629f62dc5ced8cd28b296e5bdb4888d969494fd71585
+DIST freebsd-sys-9.0_rc2.tar.bz2 30234083 RMD160 e53db15b13f6e50f0ae91c317fd77b92faadddc6 SHA1 b0ffd76b2fc5bcfa293dd5e5512ceb17ad7ed185 SHA256 2990d5603f8043a1da435b75b74eb453f7304923ed4ae3200b8b40cfe7396245
 DIST freebsd-ubin-7.2.tar.bz2 1851174 RMD160 b56cdc06fe0ce1ea47762a75c33ed9ed6d1abfde SHA1 1739eceebc41d9a4cbf10d21ef4e8d55b586f640 SHA256 5ca9f185a5af59993ddf83ece155bfcea1340a93d2540035b35c5acbfc3a2625
 DIST freebsd-ubin-8.0.tar.bz2 1787358 RMD160 08814da95905ba2cd6037c41507eade30b007e72 SHA1 0de52ddd7522b73c876ed967ac96aa278260f5b6 SHA256 2bd1529107e3b70df64bc4d7d3117122cac03b49b874a6653860b13d567af250
 DIST freebsd-ubin-8.2.tar.bz2 1808012 RMD160 b927dcb67de4367ea148643203e0056dd90a0c36 SHA1 0d5e58642ab4555f15ab144feaec6fe90f7a2f2c SHA256 6b99554f3ad6ee052069b347eb6e6219b71598d7b222acb90a24cbfc805c7b68
 DIST freebsd-ubin-9.0_rc1.tar.bz2 1962093 RMD160 2dc189b6359feaf60b6b443d80348136e0d75f8e SHA1 e25b15e1c394cc326e56dcc1d4ebf71e07bf610e SHA256 897b4d10a891adc307861311952bb4df8002a80c8cef96567b28df21a3f81b39
+DIST freebsd-ubin-9.0_rc2.tar.bz2 1962807 RMD160 d9a0124f845abe3fd8f359115c296e036ee08323 SHA1 d2cd3859f0f4047a40aa834a192b936bce063879 SHA256 1ebefae6d8b4882d070c46ffe67091563c33aa5ddf2221105c12a1aa06bd17f1
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.0_rc2.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.0_rc2.ebuild
new file mode 100644
index 000000000000..59dde23a11f9
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.0_rc2.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-9.0_rc2.ebuild,v 1.1 2011/12/07 17:10:37 aballier Exp $
+
+EAPI=2
+
+inherit bsdmk freebsd flag-o-matic pam
+
+DESCRIPTION="FreeBSD's base system source for /usr/bin"
+SLOT="0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
+LICENSE="BSD zfs? ( CDDL )"
+
+SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
+		mirror://gentoo/${CONTRIB}.tar.bz2
+		mirror://gentoo/${LIB}.tar.bz2
+		mirror://gentoo/${ETC}.tar.bz2
+		mirror://gentoo/${BIN}.tar.bz2
+		mirror://gentoo/${INCLUDE}.tar.bz2
+		zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )
+		build? ( mirror://gentoo/${SYS}.tar.bz2 )"
+
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?]
+	ssl? ( dev-libs/openssl )
+	kerberos? ( virtual/krb5 )
+	ar? ( app-arch/libarchive )
+	virtual/pam
+	sys-libs/zlib
+	>=sys-libs/ncurses-5.9
+	!sys-process/fuser-bsd
+	!dev-util/csup"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
+	=sys-freebsd/freebsd-mk-defs-${RV}*"
+
+RDEPEND="${RDEPEND}
+	>=sys-auth/pambase-20080219.1
+	sys-process/cronbase"
+
+S="${WORKDIR}/usr.bin"
+
+PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch"
+	"${FILESDIR}/${PN}-9.0-fixmakefiles.patch"
+	"${FILESDIR}/${PN}-setXid.patch"
+	"${FILESDIR}/${PN}-lint-stdarg.patch"
+	"${FILESDIR}/${PN}-6.0-kdump-ioctl.patch"
+	"${FILESDIR}/${PN}-8.0-xinstall.patch"
+	"${FILESDIR}/${PN}-8.0-bsdar.patch" )
+
+# Here we remove some sources we don't need because they are already
+# provided by portage's packages or similar. In order:
+# - Archiving tools, provided by their own ebuilds
+# - ncurses stuff
+# - less stuff
+# - bind utils
+# - rsh stuff
+# - binutils gprof
+# and the rest are misc utils we already provide somewhere else.
+REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio
+	gzip gprof
+	lzmainfo xz xzdec
+	unzip
+	tput tset tabs
+	less lessecho lesskey
+	dig hesinfo nslookup nsupdate host
+	rsh rlogin rusers rwho ruptime
+	compile_et lex vi smbutil file vacation nc ftp telnet
+	c99 c89
+	whois tftp man"
+
+pkg_setup() {
+	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
+	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
+	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
+	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
+	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
+	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
+	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
+	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
+	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
+	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
+	mymakeopts="${mymakeopts} WITHOUT_CLANG= "
+}
+
+pkg_preinst() {
+	# bison installs a /usr/bin/yacc symlink ...
+	# we need to remove it to avoid triggering
+	# collision-protect errors
+	if [[ -L ${ROOT}/usr/bin/yacc ]] ; then
+		rm -f "${ROOT}"/usr/bin/yacc
+	fi
+}
+
+src_prepare() {
+	use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+
+	# Rename manpage for renamed cmp
+	mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 || die
+	# Rename manpage for renamed ar
+	mv "${S}"/ar/ar.1 "${S}"/ar/freebsd-ar.1 || die
+	# Fix whereis(1) manpath search.
+	sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h"
+
+	# Build a dynamic make
+	sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/make/Makefile || die
+
+	# Disable it here otherwise our patch wont apply
+	use ar || dummy_mk ar
+}
+
+src_install() {
+	freebsd_src_install
+
+	# baselayout requires these in /bin
+	dodir /bin
+	for bin in sed printf fuser; do
+		mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed"
+		dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed"
+	done
+
+	for pamdfile in login passwd su; do
+		newpamd "${FILESDIR}/${pamdfile}.1.pamd" ${pamdfile} || die
+	done
+
+	cd "${WORKDIR}/etc"
+	insinto /etc
+	doins remote phones opieaccess fbtab || die
+
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb || die
+
+	# tip requires /var/spool/lock/, bug #200700
+	keepdir /var/spool/lock
+}
+
+pkg_postinst() {
+	# We need to ensure that login.conf.db is up-to-date.
+	if [[ -e "${ROOT}"etc/login.conf ]] ; then
+		einfo "Updating ${ROOT}etc/login.conf.db"
+		"${ROOT}"usr/bin/cap_mkdb	-f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf
+		elog "Remember to run cap_mkdb /etc/login.conf after making changes to it"
+	fi
+}
+
+pkg_postrm() {
+	# and if we uninstall yacc but keep bison,
+	# lets restore the /usr/bin/yacc symlink
+	if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then
+		ln -s yacc.bison "${ROOT}"/usr/bin/yacc
+	fi
+}
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index 1eb2b70e04a9..4366e150fc1d 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -2,39 +2,49 @@ DIST freebsd-contrib-7.2.tar.bz2 41156304 RMD160 d32da79d66aa9e5cd113bd7b3a16b7d
 DIST freebsd-contrib-8.0.tar.bz2 40637930 RMD160 8130bff1c601e16196f4c108a4bf0e2fef9d8b31 SHA1 a1f3b078079e1716892c80749d43e061d7150aaa SHA256 66cb1b535d8f31ed3f0976ae3cceaee5688052776dd2eafdd44aadad2ddea1b6
 DIST freebsd-contrib-8.2.tar.bz2 40931651 RMD160 f69f61a3154843e5daa722f0a0757686f2effe87 SHA1 28c367a0c21e7cb59bcb013bb54f5576be0d67b1 SHA256 8b9cb688e81c2980b3fc66411d00ab277a24dadd50d5bdd5e0e6c63ac687b9b6
 DIST freebsd-contrib-9.0_rc1.tar.bz2 53684757 RMD160 e489cfd9f5df72254a29df93ef3122fdfe88abd8 SHA1 559a913a0ee1817ab3dba4b78e78efd76cbac7d7 SHA256 071bcb18f61ef6223ea8bf9525ec6853357f5b8f4e57b1b0b8b9a8afff8eb015
+DIST freebsd-contrib-9.0_rc2.tar.bz2 53992312 RMD160 74227385c37bd88bab6698feeddda82ac4fb07db SHA1 cf8f6b65f8512827473d0e25d7fdc307691bc336 SHA256 962d94502f5fa280ba37d4f77b3725844962910cd99486433120df5b4ce9081c
 DIST freebsd-etc-7.2.tar.bz2 199580 RMD160 f8954a1c590c918861b39cb414a079a960af9969 SHA1 a2fee43a6a6fffd864776eceab134002fc9292d2 SHA256 9a6ebd6877191e7ff5d734a77da16090123c5223cfe873177b9fe1ca4f12d653
 DIST freebsd-etc-8.0.tar.bz2 183231 RMD160 c1926470ee952a83e945cf0538785eb6711ad538 SHA1 611c75422d7f1a47158f9478d5c0c63ee7d4e45d SHA256 23ac89366dbc397c9d16f8509677289a06fc4e0807baf64728a308ff45fc9ec2
 DIST freebsd-etc-8.2.tar.bz2 188629 RMD160 915753c5926914964550ff831e05d59f4d6e5470 SHA1 170223195ce728242e3c1dbc9a448e95f8ae1afb SHA256 6bc745fa259f9fa2b65df865d45443a7b23c24445195e33a4ac50bf1040ae238
 DIST freebsd-etc-9.0_rc1.tar.bz2 207024 RMD160 44d79dae611d79c0a94d9c144497144d2399bce6 SHA1 6d37bc25f81b3dd763610ab762fe18a5e333077f SHA256 5ed8c871b71d013067ac97c67000e2186c87df313e2e9d49cc4e2d5cadfc5591
+DIST freebsd-etc-9.0_rc2.tar.bz2 207133 RMD160 4f630381be5eed6c8fa2fee302d773b58c55d8b6 SHA1 2c8c8023c04f6e93caa772e69844bbc9b10d6594 SHA256 1be6e9707b6c81b812f4a3f1ba905b1c9cbec58d80eb6bb583cbed2418f91ff5
 DIST freebsd-gnu-7.2.tar.bz2 814017 RMD160 6b4f742c236a095e919cc839a174e25310812535 SHA1 bc139f2323e7962619de89a7026b66050106256a SHA256 17b64c91d33c166ed909b349044dd4291e3295e36bb4e4c14d82e680b6491cd4
 DIST freebsd-gnu-8.0.tar.bz2 817829 RMD160 e0dfc3e77110b2f67defa10268cf4a41199e0883 SHA1 ff2a6ba45f655a804e1a0242d562b81ded5d1ba2 SHA256 b55a20f9d88611638c143f9fbedc83fca5faae1df599e928ef6e8b889411c49f
 DIST freebsd-gnu-8.2.tar.bz2 815379 RMD160 f4eece3343c71ed5a2387854c63a7fff3675f713 SHA1 04013b0bedcdc695687a2fadf030376632774a4d SHA256 34be1326b8e188427ea4a59de5dd24049f99adb5e172d61a645db1b7124f7876
 DIST freebsd-gnu-9.0_rc1.tar.bz2 783924 RMD160 aa13a8b6960320ed9fdb4ea7de0049ed7caae720 SHA1 7b05407f545f40bd687cc3b226a95401cdd3cef2 SHA256 7c50fa7cb4c5b7f6aeb9f87569b8d577a7ee5daf657cbb62c121ba203e83cb2c
+DIST freebsd-gnu-9.0_rc2.tar.bz2 783761 RMD160 de29867cd5b07a6a01f5ead4465d52e372586451 SHA1 15c08d87be1624324e90bd49afb7c4ed655cede7 SHA256 222492e714fe471cc644baa198b88a1b29b51ed4e4604be76ec8fee267a25a69
 DIST freebsd-include-7.2.tar.bz2 135657 RMD160 ee9db50e6fcf218929fdff06aabcf31ad2035965 SHA1 3c2369272005c1f2620b9dcc760047de7cab963a SHA256 8640d655e3cefeea14250dbe5e7fd7f56d1de78d79c4adcc6232f70bba89f5d4
 DIST freebsd-include-8.0.tar.bz2 138728 RMD160 7f50c45fe855f666954610827c77ac6c97922274 SHA1 803b1f8a9d369a199f8cf82f6540f17fcc2503f5 SHA256 23dfcc3845b6a36a38abcb79bd75786100575478fdfdc3358be1a114a6c65ffa
 DIST freebsd-include-8.2.tar.bz2 138992 RMD160 b5f9fcc43c2d902a4da2cf86c56355238e619010 SHA1 6a460e7972bf7518da6c3ab8c9fa97547e4bd4bc SHA256 fade90621a8e4880c9583c1ee49965400c88e53ac6c07cb5dcf320e4f069271d
 DIST freebsd-include-9.0_rc1.tar.bz2 141667 RMD160 b9b2fb0d7fdeac02a33c3ff532ef79110bcc747c SHA1 b231997214bae2681b9e49685bac08964f54fd9a SHA256 086bb1b30f8494fc011a735b6f41c83067f59f39997bf3026cdc2855ee7e088f
+DIST freebsd-include-9.0_rc2.tar.bz2 141724 RMD160 5b45818668c30c1bfed8d40ce9dbad3398235bce SHA1 eea0bc64e1b14165eef1183867029caaf7622ee0 SHA256 8c54ec436526f48b344b2843565340007f60902504021c14cf81664745498119
 DIST freebsd-lib-7.2.tar.bz2 2970356 RMD160 d676e9bfd3a32293ac1190ff3c42861fb987394e SHA1 15749e43f5ed16316c5311bfa40f42ed546b69e9 SHA256 80b54a23068b806aede48700884a5ed2aa33f5d813309ef7497a7b951d62aab0
 DIST freebsd-lib-8.0.tar.bz2 3253452 RMD160 30e9b16e2ad5e2196ea722324a6dd932326bffe1 SHA1 f9ab976ad968a391393671f488ff5ddba190bc28 SHA256 2d15fbb8c71f9f747e722b281f341b749938875d9e08206323e1609073c0e3bb
 DIST freebsd-lib-8.2.tar.bz2 3323878 RMD160 64d8915611a8a4ae58b4b39e9f835398aa6bc1b9 SHA1 9ea3105191fbd72680d66f67d28f22fcf10863d7 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0
 DIST freebsd-lib-9.0_rc1.tar.bz2 3546378 RMD160 71b0b4cac09d8dc6160a56cd57f8643d7957e233 SHA1 e1c9801140d41bd73c20e08e2d592f51281a123c SHA256 237b88ea2b77a870e3b6075fa9293d5bba2920e66ae7b98b6cf209b4d0a937ec
+DIST freebsd-lib-9.0_rc2.tar.bz2 3547324 RMD160 da9ff86bdd1cdca7d4d4045239372a8c6065ed18 SHA1 2363db2131aff3389b1bb03bbe4d95ae611b946e SHA256 13d20c60b3ab7769a440f492a81aef4ed0428c2bcbbeaed43c69c80c65d94a9e
 DIST freebsd-libexec-7.2.tar.bz2 275993 RMD160 e3cfab5b89c304eeff76d92eaadaaadb6322c90e SHA1 747aa2365565fabb97aa910c01c06b340ddf3ea2 SHA256 375627cd871a4fbed4b7ec79d788bb5e62bc6cc818e971c613b3acd89b2db453
 DIST freebsd-libexec-8.0.tar.bz2 279159 RMD160 f4061f62f0773ca4dea4e1d7086e52759d030f4b SHA1 9e8cb7d674f91b4a36c79d6e0bf2be3176e620f8 SHA256 86d4ca63b605b91da26bfa981ddf667fb741ed9a983191c1d75a8762263f0599
 DIST freebsd-libexec-8.2.tar.bz2 289147 RMD160 81e2e000adbd04bb0b3da9786f95b8b53ec5f32e SHA1 646748e531fe5b40341f5ea61dda756d999a0b7c SHA256 10b996d1d8cd044ee2e7a877e5e6ad2bf050cce9b3bd402a5e0dea7d290b595d
 DIST freebsd-libexec-9.0_rc1.tar.bz2 298324 RMD160 b1270fb4e40538a12836e594b1a416329dd6e51b SHA1 03fd233c9d8aab8e56599f56711633c7d61cd7f4 SHA256 2a01f20e8d7717db130c494da0b91640d90e2659182fb61b42121090fd35cfde
+DIST freebsd-libexec-9.0_rc2.tar.bz2 298456 RMD160 f383937321521ca2520e627ac4a00d0d335028fa SHA1 3e8d5188baf3fa374f7a8d674b523649c72e62e7 SHA256 5943e61a1f7fbf7c59cfb25082a8d89a4310b788a48423fc5d6171a8359d7de4
 DIST freebsd-sbin-7.2.tar.bz2 1131189 RMD160 f05c364f49623153f809152a64e5bea8632ed0ec SHA1 f4241733b291f322d21c65cbb683aa1c4c5375e3 SHA256 d5c3c2fe1689bfa13b78117778ca066ad68a1bbefbaa092074c31bdc1b57e876
 DIST freebsd-sbin-8.0.tar.bz2 1140122 RMD160 30cd0c309c46d554114b2a47765f3592a6c4b481 SHA1 7130394dd596d26e6c296167f761745f61ec5993 SHA256 6dbf9aa405ed93d5f2e364946830f60e3c2615df6315120f40817824f8ea78df
 DIST freebsd-sbin-8.2.tar.bz2 1211665 RMD160 32167422cb273ccad18af0dadff551eddb153e7e SHA1 f36a0cd90c90f94941d2013b013947c405e8e152 SHA256 8b7e21a66b4696e8763d29b8b02b2d35f29fc51820a194d1e469e7cace84c527
 DIST freebsd-sbin-9.0_rc1.tar.bz2 1267674 RMD160 0755ac9ebf54aba4f9755c961a1f4ffd3f26723c SHA1 08702291ccacd62bb4e6f157a0529260be9822b1 SHA256 ad4ec7a8ae4ac0dec9e172add7eda30209b5d80c30e85d69b9b03c7d174716d7
+DIST freebsd-sbin-9.0_rc2.tar.bz2 1267485 RMD160 8fbc9120be3fc1cc58dda8838e486e7f637f62b2 SHA1 691e1412813fa0a3725aa77d29870cddb4ad0213 SHA256 f43465c3c31a2aa3605092affec167cf1694a756b9cd9ebe80a4579e9cd4f24a
 DIST freebsd-sys-7.2.tar.bz2 23005928 RMD160 0ecdff9fbefe9e16325e09a76310ca2b4a7751b8 SHA1 1c2d6894371a8650288ebf1a4831a4b08c2e4f09 SHA256 38e1fc670b8438be42947b1512ca7d10b0f8c62c58d3234afd8ce2e55b6cae11
 DIST freebsd-sys-8.0.tar.bz2 22552771 RMD160 08f5b09dc0b4353658a309e9e1198dbab1f5ab83 SHA1 9c5e4bdc7af2b9947c55751325880c27f80df225 SHA256 2d822bdeecbbea660aea06ba147a23878cbae7f0640b0b822552d6fa1836d8c9
 DIST freebsd-sys-8.2.tar.bz2 25835329 RMD160 e8fe34f792c1102fe237af7c87ba9c259cd46d22 SHA1 f2a52be8011126a3882d8df2907a22293ad1c581 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16
 DIST freebsd-sys-9.0_rc1.tar.bz2 30257152 RMD160 725bbc8ab49ede1e5ea821b9ceae0c5a3713ffb6 SHA1 a0f0deaee50708e1626eea91e216367fc6ca7c9c SHA256 fb4cf5e7b9ec58077d5c629f62dc5ced8cd28b296e5bdb4888d969494fd71585
+DIST freebsd-sys-9.0_rc2.tar.bz2 30234083 RMD160 e53db15b13f6e50f0ae91c317fd77b92faadddc6 SHA1 b0ffd76b2fc5bcfa293dd5e5512ceb17ad7ed185 SHA256 2990d5603f8043a1da435b75b74eb453f7304923ed4ae3200b8b40cfe7396245
 DIST freebsd-ubin-7.2.tar.bz2 1851174 RMD160 b56cdc06fe0ce1ea47762a75c33ed9ed6d1abfde SHA1 1739eceebc41d9a4cbf10d21ef4e8d55b586f640 SHA256 5ca9f185a5af59993ddf83ece155bfcea1340a93d2540035b35c5acbfc3a2625
 DIST freebsd-ubin-8.0.tar.bz2 1787358 RMD160 08814da95905ba2cd6037c41507eade30b007e72 SHA1 0de52ddd7522b73c876ed967ac96aa278260f5b6 SHA256 2bd1529107e3b70df64bc4d7d3117122cac03b49b874a6653860b13d567af250
 DIST freebsd-ubin-8.2.tar.bz2 1808012 RMD160 b927dcb67de4367ea148643203e0056dd90a0c36 SHA1 0d5e58642ab4555f15ab144feaec6fe90f7a2f2c SHA256 6b99554f3ad6ee052069b347eb6e6219b71598d7b222acb90a24cbfc805c7b68
 DIST freebsd-ubin-9.0_rc1.tar.bz2 1962093 RMD160 2dc189b6359feaf60b6b443d80348136e0d75f8e SHA1 e25b15e1c394cc326e56dcc1d4ebf71e07bf610e SHA256 897b4d10a891adc307861311952bb4df8002a80c8cef96567b28df21a3f81b39
+DIST freebsd-ubin-9.0_rc2.tar.bz2 1962807 RMD160 d9a0124f845abe3fd8f359115c296e036ee08323 SHA1 d2cd3859f0f4047a40aa834a192b936bce063879 SHA256 1ebefae6d8b4882d070c46ffe67091563c33aa5ddf2221105c12a1aa06bd17f1
 DIST freebsd-usbin-7.2.tar.bz2 2654480 RMD160 af0a94e0affce332cf30532ea45251563e65632e SHA1 b52db981e0250357b40d10ebc7ffd6ca3ea9cc4c SHA256 56574e81ac4ab54a20d83d9a2d1ba3a42b5677691675f1db162fde161da0907f
 DIST freebsd-usbin-8.0.tar.bz2 2411151 RMD160 f162437ab2e3c89c6635e5c567e39b60974ce3c1 SHA1 be7b4ccd767e64fa0dedced631c18a1c3969b417 SHA256 c38230af5d667a254ddcce0b77100ada2b7af6e17309f033950c2852f70cc1dd
 DIST freebsd-usbin-8.2.tar.bz2 2443024 RMD160 972723becd1ab16615bc45f9beab8483533cbf81 SHA1 16bcb5528f14cfeccb9f4c913a629b01d9873ebf SHA256 aa7cabf10f5c3a9daabea32e4de24d04ec312247842981476da666eff5054603
 DIST freebsd-usbin-9.0_rc1.tar.bz2 2605735 RMD160 672adbdfff912e6027bad8acd9db6645b1a14c27 SHA1 bf02bd5ff416026d90aac89d0256ac3fb13d8a5e SHA256 34666292f701ae88128b6416db78038ce04e13198ba74961b4a2ce7600a88f21
+DIST freebsd-usbin-9.0_rc2.tar.bz2 2606905 RMD160 d63519382e2405c6d255ff492677cc589103dc2c SHA1 f7f7dd4aa6a4a4621d402d76fcdc80bd3e672f24 SHA256 694e8137992c1747fcc9962106bc82352327605fef01cdcdc63e6b9452278080
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.0_rc2.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.0_rc2.ebuild
new file mode 100644
index 000000000000..f76c9e3be663
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.0_rc2.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-9.0_rc2.ebuild,v 1.1 2011/12/07 17:11:06 aballier Exp $
+
+EAPI=2
+
+inherit bsdmk freebsd flag-o-matic eutils
+
+DESCRIPTION="FreeBSD /usr/sbin tools"
+SLOT="0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+		mirror://gentoo/${CONTRIB}.tar.bz2
+		mirror://gentoo/${UBIN}.tar.bz2
+		mirror://gentoo/${LIB}.tar.bz2
+		mirror://gentoo/${SBIN}.tar.bz2
+		mirror://gentoo/${ETC}.tar.bz2
+		mirror://gentoo/${GNU}.tar.bz2
+		nis? ( mirror://gentoo/${LIBEXEC}.tar.bz2 )
+		build? ( mirror://gentoo/${SYS}.tar.bz2
+			mirror://gentoo/${INCLUDE}.tar.bz2 )"
+
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
+	=sys-freebsd/freebsd-libexec-${RV}*
+	=sys-freebsd/freebsd-contrib-${RV}*
+	acpi? ( sys-power/iasl )
+	build? ( sys-apps/baselayout )
+	ssl? ( dev-libs/openssl )
+	sys-apps/tcp-wrappers
+	dev-util/dialog
+	dev-libs/libelf
+	net-libs/libpcap"
+DEPEND="${RDEPEND}
+	=sys-freebsd/freebsd-mk-defs-${RV}*
+	=sys-freebsd/freebsd-ubin-${RV}*
+	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
+	sys-apps/texinfo
+	sys-devel/flex"
+
+S="${WORKDIR}/usr.sbin"
+
+IUSE="acpi atm audit bluetooth floppy ipv6 isdn minimal netware nis pam ssl usb build"
+
+pkg_setup() {
+	# Release crunch is something like minimal. It seems to remove everything
+	# which is not needed to work.
+	use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= "
+
+	use acpi || mymakeopts="${mymakeopts} WITHOUT_ACPI= "
+	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
+	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
+	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
+	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
+	use isdn || mymakeopts="${mymakeopts} WITHOUT_I4B= "
+	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
+	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
+	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
+	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
+	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
+	use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= "
+
+	mymakeopts="${mymakeopts} WITHOUT_BIND_NAMED= WITHOUT_BIND_DNSSEC= WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= "
+
+	append-flags $(test-flags -fno-strict-aliasing)
+}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-adduser.patch"
+	"${FILESDIR}/${PN}-9.0-newsyslog.patch"
+	"${FILESDIR}/${PN}-9.0-libarchive.patch"
+	)
+
+REMOVE_SUBDIRS="
+	named named-checkzone named-checkconf rndc rndc-confgen
+	dnssec-keygen dnssec-signzone
+	tcpdchk tcpdmatch
+	sendmail praliases editmap mailstats makemap
+	sysinstall cron mailwrapper ntp bsnmpd
+	tcpdump ndp inetd
+	wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase
+	zic amd
+	pkg_install freebsd-update"
+
+src_prepare() {
+	if ! use build; then
+		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+		ln -s "/usr/include" "${WORKDIR}/include"
+	else
+		dummy_mk mount_smbfs
+	fi
+	# Don't install mtree format manpage
+	# it's installed by libarchive.
+	sed -e "s: mtree.5::g" -i "${S}"/mtree/Makefile
+}
+
+src_install() {
+	# By creating these directories we avoid having to do a
+	# more complex hack
+	dodir /usr/share/doc
+	dodir /sbin
+	dodir /usr/libexec
+	dodir /usr/bin
+
+	# FILESDIR is used by some makefiles which will install files
+	# in the wrong place, just put it in the doc directory.
+	mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed"
+
+	# Most of these now come from openrc.
+	for util in nfs rpc.statd rpc.lockd; do
+		newinitd "${FILESDIR}/"${util}.initd ${util} || die
+		if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
+			newconfd "${FILESDIR}"/${util}.confd ${util} || die
+		fi
+	done
+
+	for class in daily monthly weekly; do
+		cat - > "${T}/periodic.${class}" <<EOS
+#!/bin/sh
+/usr/sbin/periodic ${class}
+EOS
+		exeinto /etc/cron.${class}
+		newexe "${T}/periodic.${class}" periodic
+	done
+
+	# Install the pw.conf file to let pw use Gentoo's skel location
+	insinto /etc
+	doins "${FILESDIR}/pw.conf" || die
+
+	cd "${WORKDIR}/etc"
+	doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die
+
+	insinto /etc/ppp
+	doins ppp/ppp.conf || die
+
+	if use isdn; then
+		insinto /etc/isdn
+		doins isdn/* || die
+		rm -f "${D}"/etc/isdn/Makefile
+	fi
+
+	if use bluetooth; then
+		insinto /etc/bluetooth
+		doins bluetooth/* || die
+		rm -f "${D}"/etc/bluetooth/Makefile
+	fi
+
+	# Install the periodic stuff (needs probably to be ported in a more
+	# gentooish way)
+	cd "${WORKDIR}/etc/periodic"
+
+	doperiodic daily daily/*.accounting
+	doperiodic monthly monthly/*.accounting
+}
+
+pkg_postinst() {
+	# We need to run pwd_mkdb if key files are not present
+	# If they are, then there is no need to run pwd_mkdb
+	if [[ ! -e "${ROOT}etc/passwd" || ! -e "${ROOT}etc/pwd.db" || ! -e "${ROOT}etc/spwd.db" ]] ; then
+		if [[ -e "${ROOT}etc/master.passwd" ]] ; then
+			einfo "Generating passwd files from ${ROOT}etc/master.passwd"
+			"${ROOT}"usr/sbin/pwd_mkdb -p -d "${ROOT}etc" "${ROOT}etc/master.passwd"
+		else
+			eerror "${ROOT}etc/master.passwd does not exist!"
+			eerror "You will no be able to log into your system!"
+		fi
+	fi
+
+	for logfile in messages security auth.log maillog lpd-errs xferlog cron \
+		debug.log slip.log ppp.log; do
+		[[ -f "${ROOT}/var/log/${logfile}" ]] || touch "${ROOT}/var/log/${logfile}"
+	done
+}
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 246ac9975cc3..a800e913933b 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,4 +1,4 @@
 DIST e2fsprogs-1.41.12.tar.gz 4496194 RMD160 aa7f9a2e350fcab85c72deaaee5fdc2a5e9fb6e7 SHA1 62b002fe507b2ddafc24b89532e472fe4b55a14f SHA256 9c26d0dc20bfdafd0f27f3564791d6121d1c1876549d4f2ff1e41955c9bb9f20
 DIST e2fsprogs-1.41.14.tar.gz 4512157 RMD160 bdd22a93f57de1145007bffd6fc45323098e27e8 SHA1 24f9364fa3d4c0d7d00cb627b819d0e51055d6c5 SHA256 3f8ac1fedd7c4bec480afcbe4acabdd4ac59ec0446a0fd50c8975cd0aad7b176
 DIST e2fsprogs-1.41.7.tar.gz 4425159 RMD160 ad001d9d2b7c2e19b2f410b92446330fb5fbdf11 SHA1 0d5acf71bb81256e470d7f5ffa714f10e674172f SHA256 2e2eeb5201e952dd02b77f609a0e630acdbce5d2b823ec11668e34f6bfde2f2c
-DIST e2fsprogs-1.42-WIP-0702.tar.gz 5544716 RMD160 a07f7031ce13bc72c44d5f2f2df74954c7cc8664 SHA1 66f0ca4a959b2a54e0e3a528aabdd176e6b906ef SHA256 dbd229ede377a6a299317a461c951575ca4a5acf2a534cffeb4ce407ff56e6a0
+DIST e2fsprogs-1.42.tar.gz 5709827 RMD160 91136a82c35f86f54f6573f9788d32da66b972cb SHA1 e69bc63bc319e4d1e4242cc278bfd442a60646e6 SHA256 55b46db0cec3e2eb0e5de14494a88b01ff6c0500edf8ca8927cad6da7b5e4a46
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42_pre0702.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild
similarity index 93%
rename from sys-fs/e2fsprogs/e2fsprogs-1.42_pre0702.ebuild
rename to sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild
index 900d84f4868a..0ad546099c46 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42_pre0702.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.42.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/sys-fs/e2fsprogs/e2fsprogs-1.42_pre0702.ebuild,v 1.1 2011/09/01 19:32:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild,v 1.1 2011/12/07 16:51:08 vapier Exp $
 
 case ${PV} in
 *_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz"
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
-IUSE="nls elibc_FreeBSD"
+IUSE="nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
 	>=sys-apps/util-linux-2.16
@@ -43,6 +43,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch
 	epatch "${FILESDIR}"/${PN}-1.41.12-getpagesize.patch
 	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
+	epatch "${FILESDIR}"/${PN}-1.42-no-quota.patch
 	# use symlinks rather than hardlinks
 	sed -i \
 		-e 's:$(LN) -f $(DESTDIR).*/:$(LN_S) -f :' \
@@ -62,9 +63,6 @@ src_prepare() {
 	sed -i -r \
 		-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
 		Makefile.in || die "remove subdirs"
-	sed -i \
-		-e '/^#define _XOPEN/i#define _GNU_SOURCE' \
-		misc/mke2fs.c || die # needs open64() prototype
 
 	# Avoid rebuild
 	touch lib/ss/ss_err.h
@@ -84,6 +82,7 @@ src_configure() {
 	esac
 
 	ac_cv_path_LDCONFIG=: \
+	QUOTA_CMT='#' \
 	econf \
 		--with-root-prefix="${EPREFIX}/" \
 		${libtype} \
@@ -92,6 +91,7 @@ src_configure() {
 		$(use_enable nls) \
 		--disable-libblkid \
 		--disable-libuuid \
+		--disable-quota \
 		--disable-fsck \
 		--disable-uuidd
 	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
@@ -135,9 +135,9 @@ src_install() {
 
 	# Move shared libraries to /lib/, install static libraries to
 	# /usr/lib/, and install linker scripts to /usr/lib/.
-	set -- "${ED}"/usr/$(get_libdir)/*.a
-	set -- ${@/*\/lib}
-	gen_usr_ldscript -a "${@/.a}"
+	gen_usr_ldscript -a e2p ext2fs
+	# configure doesn't have an option to disable static libs :/
+	find "${D}" -name '*.a' -delete
 
 	if use elibc_FreeBSD ; then
 		# Install helpers for us
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.42-no-quota.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42-no-quota.patch
new file mode 100644
index 000000000000..775b820dac21
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.42-no-quota.patch
@@ -0,0 +1,62 @@
+quota was meant to be turned off in the 1.42 release as it's half
+baked, but the commit to disable didn't really work either.
+
+--- a/lib/quota/Makefile.in
++++ b/lib/quota/Makefile.in
+@@ -76,7 +76,8 @@
+ 		$(DESTDIR)$(includedir)/quota $(DESTDIR)$(man3dir) \
+ 		$(DESTDIR)$(libdir)/pkgconfig
+ 
+-install:: all installdirs
++install::
++disabled:: all installdirs
+ 	$(E) "	INSTALL_DATA $(libdir)/libquota.a"
+ 	$(Q) $(INSTALL_DATA) libquota.a $(DESTDIR)$(libdir)/libquota.a
+ 	-$(Q) $(RANLIB) $(DESTDIR)$(libdir)/libquota.a
+--- a/configure
++++ b/configure
+@@ -5224,11 +5224,11 @@
+ 
+ fi
+ 
+-LIBQUOTA='$(LIB)/libquota'$LIB_EXT
++LIBQUOTA=
+ DEPLIBQUOTA=$LIBQUOTA
+-STATIC_LIBQUOTA='$(LIB)/libquota'$STATIC_LIB_EXT
++STATIC_LIBQUOTA=
+ DEPSTATIC_LIBQUOTA=$STATIC_LIBQUOTA
+-PROFILED_LIBQUOTA='$(LIB)/libquota'$PROFILED_LIB_EXT
++PROFILED_LIBQUOTA=
+ DEPPROFILED_LIBQUOTA=$PROFILED_LIBQUOTA
+ 
+ 
+--- a/lib/quota/mkquota.h
++++ b/lib/quota/mkquota.h
+@@ -60,4 +60,17 @@
+ int quota_file_exists(ext2_filsys fs, int qtype, int fmt);
+ void quota_set_sb_inum(ext2_filsys fs, ext2_ino_t ino, int qtype);
+ 
++#define quota_init_context(a, ...)
++#define quota_data_inodes(a, ...)
++#define quota_data_add(a, ...)
++#define quota_data_sub(a, ...)
++#define quota_write_inode(a, ...)
++#define quota_update_inode(a, ...) 0
++#define quota_compute_usage(a, ...)
++#define quota_release_context(a, ...)
++#define quota_remove_inode(a, ...)
++#define quota_is_on(a, ...)
++#define quota_file_exists(a, ...) -1
++#define quota_set_sb_inum(a, ...)
++
+ #endif  /* __QUOTA_QUOTAIO_H__ */
+--- a/lib/quota/quotaio.h
++++ b/lib/quota/quotaio.h
+@@ -167,4 +167,7 @@
+ const char *quota_get_qf_path(const char *mntpt, int qtype, int fmt,
+ 			      char *path_buf, size_t path_buf_size);
+ 
++#define quota_get_qf_name(a, ...)
++#define quota_get_qf_path(a, ...)
++
+ #endif /* GUARD_QUOTAIO_H */
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index fd4169c9ea81..803313ed18d3 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -1,4 +1,4 @@
 DIST e2fsprogs-libs-1.41.12.tar.gz 490781 RMD160 f44ad14cc6787a6353111967cbb445bada805598 SHA1 6af0664190f46d5b93889d1e54c386f3c21ad271 SHA256 2f2dfc223c3ccaf7064abf13b692561fdc103fa5fbeea895253fe169b6598d2b
 DIST e2fsprogs-libs-1.41.14.tar.gz 489703 RMD160 7bdbe03f21a8ac58179fc98083c7e07d8e37708b SHA1 9182ca542c5368d3e1df1a70040f28006771e240 SHA256 dbc7a138a3218d9b80a0626b5b692d76934d6746d8cbb762751be33785d8d9f5
 DIST e2fsprogs-libs-1.41.7.tar.gz 494463 RMD160 e6ba0e313e3edd1a5c001b799c0826bc75c61ae6 SHA1 0863c9291385c42eefe7cfe6787a30af62a7cace SHA256 b6d9c9ec405ad1d644cf35d57f0f1e878fa6af6ad45b97683de847ff49cbdf84
-DIST e2fsprogs-libs-1.42-WIP-0702.tar.gz 502022 RMD160 0f877a83b820b936ac4a156444302b805357b1aa SHA1 8a7bcd9ab939076fb5cb4c64ed45f539a56dddeb SHA256 76cd42684e7b65d663445b71eda32ed3d7e8baaf53c6c34fcb7c0d9ada9f9316
+DIST e2fsprogs-libs-1.42.tar.gz 512745 RMD160 425306efda913b39e2eabb3165808562d35ca4e9 SHA1 5a18043c4933eb1eae9cb316ee47b89ad59c3875 SHA256 21ab3a769988bba04c11a028b767b048a0a4c37a4b20b1991175f7c7276006b4
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42_pre0702.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild
similarity index 85%
rename from sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42_pre0702.ebuild
rename to sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild
index e11067612d59..085f3d504144 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42_pre0702.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.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/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42_pre0702.ebuild,v 1.2 2011/11/09 04:30:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild,v 1.1 2011/12/07 16:50:09 vapier Exp $
 
 case ${PV} in
 *_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="nls"
+IUSE="nls static-libs"
 
 RDEPEND="!sys-libs/com_err
 	!sys-libs/ss
@@ -45,9 +45,10 @@ src_configure() {
 	ac_cv_lib_uuid_uuid_generate=yes \
 	ac_cv_lib_blkid_blkid_get_cache=yes \
 	ac_cv_path_LDCONFIG=: \
+	QUOTA_CMT='#' \
 	econf \
-		--disable-libblkid \
-		--disable-libuuid \
+		--disable-lib{blkid,uuid} \
+		--disable-quota \
 		--enable-${libtype}-shlibs \
 		$(tc-has-tls || echo --disable-tls) \
 		$(use_enable nls)
@@ -56,4 +57,6 @@ src_configure() {
 src_install() {
 	emake STRIP=: DESTDIR="${D}" install || die
 	gen_usr_ldscript -a com_err ss
+	# configure doesn't have an option to disable static libs :/
+	find "${D}" -name '*.a' -delete
 }
diff --git a/sys-libs/gdbm/gdbm-1.9.1-r2.ebuild b/sys-libs/gdbm/gdbm-1.9.1-r2.ebuild
index c30cd09f0c69..d006f2f95335 100644
--- a/sys-libs/gdbm/gdbm-1.9.1-r2.ebuild
+++ b/sys-libs/gdbm/gdbm-1.9.1-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/gdbm-1.9.1-r2.ebuild,v 1.2 2011/11/01 14:54:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/gdbm-1.9.1-r2.ebuild,v 1.3 2011/12/07 20:32:55 zmedico Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit eutils libtool flag-o-matic
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/gdbm/${P}.tar.gz
 
 LICENSE="GPL-3"
 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 ~x86-linux"
 IUSE="+berkdb exporter static-libs"
 
 EX_S="${WORKDIR}"/${EX_P}
@@ -36,7 +36,7 @@ src_configure() {
 	fi
 
 	econf \
-		--includedir=/usr/include/gdbm \
+		--includedir="${EPREFIX}"/usr/include/gdbm \
 		--with-gdbm183-libdir="${EX_S}/.libs" \
 		--with-gdbm183-includedir="${EX_S}" \
 		$(use_enable berkdb libgdbm-compat) \
@@ -54,8 +54,8 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	use static-libs || find "${D}" -name '*.la' -delete
-	mv "${D}"/usr/include/gdbm/gdbm.h "${D}"/usr/include/ || die
+	use static-libs || find "${ED}" -name '*.la' -delete
+	mv "${ED}"/usr/include/gdbm/gdbm.h "${ED}"/usr/include/ || die
 	dodoc ChangeLog NEWS README
 }
 
diff --git a/sys-process/numactl/numactl-2.0.7-r1.ebuild b/sys-process/numactl/numactl-2.0.7-r1.ebuild
index 61d793858f98..7bd15733a350 100644
--- a/sys-process/numactl/numactl-2.0.7-r1.ebuild
+++ b/sys-process/numactl/numactl-2.0.7-r1.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/sys-process/numactl/numactl-2.0.7-r1.ebuild,v 1.1 2011/09/14 19:28:59 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/numactl-2.0.7-r1.ebuild,v 1.2 2011/12/07 21:25:40 xarthisius Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://oss.sgi.com/www/projects/libnuma/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="perl"
 
 RDEPEND="perl? ( dev-lang/perl )"
diff --git a/virtual/perl-Pod-Simple/perl-Pod-Simple-3.160.0-r2.ebuild b/virtual/perl-Pod-Simple/perl-Pod-Simple-3.160.0-r2.ebuild
index 1f8f8c282124..210a10c0104b 100644
--- a/virtual/perl-Pod-Simple/perl-Pod-Simple-3.160.0-r2.ebuild
+++ b/virtual/perl-Pod-Simple/perl-Pod-Simple-3.160.0-r2.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/virtual/perl-Pod-Simple/perl-Pod-Simple-3.160.0-r2.ebuild,v 1.2 2011/07/30 11:57:53 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Pod-Simple/perl-Pod-Simple-3.160.0-r2.ebuild,v 1.3 2011/12/07 13:39:35 tove Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="|| ( =dev-lang/perl-5.14* ~perl-core/${PN#perl-}-${PV} )"
diff --git a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.972.200.ebuild b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.972.200.ebuild
index c54f09952668..81c308700509 100644
--- a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.972.200.ebuild
+++ b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.972.200.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/virtual/perl-Time-HiRes/perl-Time-HiRes-1.972.200.ebuild,v 1.1 2011/05/19 13:35:41 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Time-HiRes/perl-Time-HiRes-1.972.200.ebuild,v 1.2 2011/12/07 13:43:37 tove Exp $
 
 DESCRIPTION="Virtual for Time-HiRes"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 3b952184bd29..381d8878652c 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -1,6 +1,3 @@
-DIST moodle-1.9.14.tgz 14051677 RMD160 5ff9da737c0351bf5af16d5845a4223247882458 SHA1 de6b1d109fe6a24bd6cd4e87744fc04e25881592 SHA256 6b0f597f918cd57c05619ac735266bbf1fe50ee57fc89713c389d9f59868b86f
 DIST moodle-1.9.15.tgz 14050069 RMD160 024355d0a027d72e6ac757301679337d1604a79f SHA1 211f83574cb5ef25cb5db2cc5d1ced7f9a05118e SHA256 680b84a9147a442b8d401337eef10a6767ff5479952ba41c96ced1980b51c173
-DIST moodle-2.0.5.tgz 22492451 RMD160 9e6ee15c802c11aa611bf7d6720038abd5e1352c SHA1 52c9e5e55ecd7a3cb425e4811676366b35334002 SHA256 bcab6de69178c2d98d841d2adf54adeb4dc096c58d784182de28d8b872b1e9eb
 DIST moodle-2.0.6.tgz 22505675 RMD160 9215424a23ef660e95fe7d17845068f03846d9ce SHA1 e227737282a34ca4b9743dc7fc42d829c96b9762 SHA256 d9f64b294157aa44dc7c70b0d522538392a3ba976887ea3e0c4fdfedcb3e0833
-DIST moodle-2.1.2.tgz 23195175 RMD160 9a815b725a7d042bbea675b7409de46dd399205c SHA1 c00d29ab3e51f8f7a70166d4fc62983a386a98c3 SHA256 060cb729ab483f3e05a4021dc2fd8cfbce9fd496dcec7977b9515034fbe398ff
 DIST moodle-2.1.3.tgz 23918210 RMD160 dfec8f76a46cbb7e95e46e4a5372f27c04e570a5 SHA1 6b600c8126b9dcb585b6df5c211ed094e1b894be SHA256 59eefd04a3cf9cbf875e954b4297d861a7ec64e9ba9c3188d150cabbcd743d07
diff --git a/www-apps/moodle/moodle-1.9.14.ebuild b/www-apps/moodle/moodle-1.9.14.ebuild
deleted file mode 100644
index 2162b923332f..000000000000
--- a/www-apps/moodle/moodle-1.9.14.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-1.9.14.ebuild,v 1.1 2011/10/09 14:57:46 blueness Exp $
-
-EAPI="4"
-
-inherit versionator webapp
-
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
-
-DESCRIPTION="The Moodle Course Management System"
-HOMEPAGE="http://moodle.org"
-SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-#SLOT empty due to webapp
-
-DBFLAGS="mysql?,postgres?"
-DBTYPES=${DBFLAGS//\?/}
-DBTYPES=${DBTYPES//,/ }
-
-AUTHFLAGS="imap?,ldap?,odbc?"
-AUTHMODES=${AUTHFLAGS//\?/}
-AUTHMODES=${AUTHMODES//,/ }
-
-PHPFLAGS_A="ctype,curl,gd,iconv,ssl,tokenizer,xml,xmlrpc,zlib"
-PHPFLAGS_B="ctype,curl,gd-external,iconv,ssl,tokenizer,xml,xmlrpc,zlib"
-
-IUSE="${DBTYPES} ${AUTHMODES} vhosts"
-
-# No forced dependency on
-#  mysql? ( virtual/mysql )
-#  postgres? ( dev-db/postgresql-server-7* )
-# which may live on another server
-DEPEND=""
-RDEPEND="
-	|| (
-		>=dev-lang/php-4.3.0[${DBFLAGS},${AUTHFLAGS},${PHPFLAGS_A}]
-		>=dev-lang/php-4.3.0[${DBFLAGS},${AUTHFLAGS},${PHPFLAGS_B}]
-	)
-	virtual/httpd-php
-	virtual/cron"
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	# How many dbs were selected? If one and only one, which one is it?
-	MYDB=""
-	DB_COUNT=0
-	for db in ${DBTYPES}; do
-		if use ${db}; then
-			MYDB=${db}
-			DB_COUNT=$(($DB_COUNT+1))
-		fi
-	done
-
-	if [[ ${DB_COUNT} -eq 0 ]]; then
-		eerror
-		eerror "\033[1;31m**************************************************\033[1;31m"
-		eerror "No database selected in your USE flags,"
-		eerror "You must select at least one."
-		eerror "\033[1;31m**************************************************\033[1;31m"
-		eerror
-		die
-	fi
-
-	if [[ ${DB_COUNT} -gt 1 ]]; then
-		MYDB=""
-		ewarn
-		ewarn "\033[1;33m**************************************************\033[1;33m"
-		ewarn "Multiple databases selected in your USE flags,"
-		ewarn "You will have to choose your database manually."
-		ewarn "\033[1;33m**************************************************\033[1;33m"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	rm COPYING.txt
-	cp "${FILESDIR}"/config.php .
-
-	#
-	# Moodle expect postgres7, not postgres
-	#
-	MYDB=${MYDB/postgres/postgres7}
-	if [[ ${DB_COUNT} -eq 1 ]] ; then
-		sed -i -e "s|mydb|${MYDB}|" config.php
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
-	dodir ${MOODLEDATA}
-	webapp_serverowned -R "${MOODLEDATA}"
-
-	local MOODLEROOT="${MY_HTDOCSDIR}"
-	insinto ${MOODLEROOT}
-	doins -r *
-
-	webapp_configfile "${MOODLEROOT}"/config.php
-
-	if [[ ${DB_COUNT} -eq 1 ]]; then
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	else
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
-	fi
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	einfo
-	einfo "\033[1;32m**************************************************\033[1;32m"
-	einfo
-	einfo "To see the post install instructions, do"
-	einfo
-	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
-	einfo
-	einfo "\033[1;32m**************************************************\033[1;32m"
-	einfo
-}
diff --git a/www-apps/moodle/moodle-2.0.5.ebuild b/www-apps/moodle/moodle-2.0.5.ebuild
deleted file mode 100644
index e82858938750..000000000000
--- a/www-apps/moodle/moodle-2.0.5.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/www-apps/moodle/moodle-2.0.5.ebuild,v 1.1 2011/10/09 14:57:46 blueness Exp $
-
-EAPI="4"
-
-inherit versionator webapp
-
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
-
-DESCRIPTION="The Moodle Course Management System"
-HOMEPAGE="http://moodle.org"
-SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-#SLOT empty due to webapp
-
-DB_FLAGS="mysqli?,postgres?"
-DB_TYPES=${DB_FLAGS//\?/}
-DB_TYPES=${DB_TYPES//,/ }
-
-AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
-AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
-AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
-
-PHP_REQUIRED_FLAGS_52="ctype,curl,iconv,json,pcre,simplexml,spl,xml,zip"
-PHP_OPTIONAL_FLAGS_52_A="gd,soap,ssl,tokenizer,xmlrpc"
-PHP_OPTIONAL_FLAGS_52_B="gd-external,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS_52_A="${PHP_REQUIRED_FLAGS_52},${PHP_OPTIONAL_FLAGS_52_A}"
-PHP_FLAGS_52_B="${PHP_REQUIRED_FLAGS_52},${PHP_OPTIONAL_FLAGS_52_B}"
-
-PHP_REQUIRED_FLAGS_53="ctype,curl,iconv,json,simplexml,xml,zip"
-PHP_OPTIONAL_FLAGS_53_A="gd,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_OPTIONAL_FLAGS_53_B="gd-external,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS_53_A="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53_A}"
-PHP_FLAGS_53_B="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53_B}"
-
-IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
-
-# No forced dependency on
-#  mysql? ( virtual/mysql )
-#  postgres? ( dev-db/postgresql-server-7* )
-# which may live on another server
-DEPEND=""
-RDEPEND="
-	|| (
-		=dev-lang/php-5.2*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_52_A}]
-		=dev-lang/php-5.2*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_52_B}]
-		=dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53_A}]
-		=dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53_B}]
-	)
-	virtual/httpd-php
-	virtual/cron"
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	# How many dbs were selected? If one and only one, which one is it?
-	MYDB=""
-	DB_COUNT=0
-	for db in ${DB_TYPES}; do
-		if use ${db}; then
-			MYDB=${db}
-			DB_COUNT=$(($DB_COUNT+1))
-		fi
-	done
-
-	if [[ ${DB_COUNT} -eq 0 ]]; then
-		eerror
-		eerror "\033[1;31m**************************************************\033[1;31m"
-		eerror "No database selected in your USE flags,"
-		eerror "You must select at least one."
-		eerror "\033[1;31m**************************************************\033[1;31m"
-		eerror
-		die
-	fi
-
-	if [[ ${DB_COUNT} -gt 1 ]]; then
-		MYDB=""
-		ewarn
-		ewarn "\033[1;33m**************************************************\033[1;33m"
-		ewarn "Multiple databases selected in your USE flags,"
-		ewarn "You will have to choose your database manually."
-		ewarn "\033[1;33m**************************************************\033[1;33m"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	rm COPYING.txt
-	cp "${FILESDIR}"/config.php .
-
-	# Moodle expect postgres7, not postgres
-	MYDB=${MYDB/postgres/postgres7}
-
-	# Moodle expects mysql, not mysqli
-	MYDB=${MYDB/mysqli/mysql}
-
-	if [[ ${DB_COUNT} -eq 1 ]] ; then
-		sed -i -e "s|mydb|${MYDB}|" config.php
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
-	dodir ${MOODLEDATA}
-	webapp_serverowned -R "${MOODLEDATA}"
-
-	local MOODLEROOT="${MY_HTDOCSDIR}"
-	insinto ${MOODLEROOT}
-	doins -r *
-
-	webapp_configfile "${MOODLEROOT}"/config.php
-
-	if [[ ${DB_COUNT} -eq 1 ]]; then
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	else
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
-	fi
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	einfo
-	einfo "\033[1;32m**************************************************\033[1;32m"
-	einfo
-	einfo "To see the post install instructions, do"
-	einfo
-	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
-	einfo
-	einfo "\033[1;32m**************************************************\033[1;32m"
-	einfo
-}
diff --git a/www-apps/moodle/moodle-2.1.2.ebuild b/www-apps/moodle/moodle-2.1.2.ebuild
deleted file mode 100644
index 1271a0bd5662..000000000000
--- a/www-apps/moodle/moodle-2.1.2.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/www-apps/moodle/moodle-2.1.2.ebuild,v 1.1 2011/10/09 14:57:46 blueness Exp $
-
-EAPI="4"
-
-inherit versionator webapp
-
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
-
-DESCRIPTION="The Moodle Course Management System"
-HOMEPAGE="http://moodle.org"
-SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-#SLOT empty due to webapp
-
-DB_FLAGS="mysqli?,postgres?"
-DB_TYPES=${DB_FLAGS//\?/}
-DB_TYPES=${DB_TYPES//,/ }
-
-AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
-AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
-AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
-
-PHP_REQUIRED_FLAGS_52="ctype,curl,iconv,json,pcre,simplexml,spl,xml,zip"
-PHP_OPTIONAL_FLAGS_52_A="gd,soap,ssl,tokenizer,xmlrpc"
-PHP_OPTIONAL_FLAGS_52_B="gd-external,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS_52_A="${PHP_REQUIRED_FLAGS_52},${PHP_OPTIONAL_FLAGS_52_A}"
-PHP_FLAGS_52_B="${PHP_REQUIRED_FLAGS_52},${PHP_OPTIONAL_FLAGS_52_B}"
-
-PHP_REQUIRED_FLAGS_53="ctype,curl,iconv,json,simplexml,xml,zip"
-PHP_OPTIONAL_FLAGS_53_A="gd,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_OPTIONAL_FLAGS_53_B="gd-external,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS_53_A="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53_A}"
-PHP_FLAGS_53_B="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53_B}"
-
-IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
-
-# No forced dependency on
-#  mysql? ( virtual/mysql )
-#  postgres? ( dev-db/postgresql-server-7* )
-# which may live on another server
-DEPEND=""
-RDEPEND="
-	|| (
-		=dev-lang/php-5.2*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_52_A}]
-		=dev-lang/php-5.2*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_52_B}]
-		=dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53_A}]
-		=dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53_B}]
-	)
-	virtual/httpd-php
-	virtual/cron"
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	# How many dbs were selected? If one and only one, which one is it?
-	MYDB=""
-	DB_COUNT=0
-	for db in ${DB_TYPES}; do
-		if use ${db}; then
-			MYDB=${db}
-			DB_COUNT=$(($DB_COUNT+1))
-		fi
-	done
-
-	if [[ ${DB_COUNT} -eq 0 ]]; then
-		eerror
-		eerror "\033[1;31m**************************************************\033[1;31m"
-		eerror "No database selected in your USE flags,"
-		eerror "You must select at least one."
-		eerror "\033[1;31m**************************************************\033[1;31m"
-		eerror
-		die
-	fi
-
-	if [[ ${DB_COUNT} -gt 1 ]]; then
-		MYDB=""
-		ewarn
-		ewarn "\033[1;33m**************************************************\033[1;33m"
-		ewarn "Multiple databases selected in your USE flags,"
-		ewarn "You will have to choose your database manually."
-		ewarn "\033[1;33m**************************************************\033[1;33m"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	rm COPYING.txt
-	cp "${FILESDIR}"/config.php .
-
-	# Moodle expect postgres7, not postgres
-	MYDB=${MYDB/postgres/postgres7}
-
-	# Moodle expects mysql, not mysqli
-	MYDB=${MYDB/mysqli/mysql}
-
-	if [[ ${DB_COUNT} -eq 1 ]] ; then
-		sed -i -e "s|mydb|${MYDB}|" config.php
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
-	dodir ${MOODLEDATA}
-	webapp_serverowned -R "${MOODLEDATA}"
-
-	local MOODLEROOT="${MY_HTDOCSDIR}"
-	insinto ${MOODLEROOT}
-	doins -r *
-
-	webapp_configfile "${MOODLEROOT}"/config.php
-
-	if [[ ${DB_COUNT} -eq 1 ]]; then
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	else
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
-	fi
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	einfo
-	einfo "\033[1;32m**************************************************\033[1;32m"
-	einfo
-	einfo "To see the post install instructions, do"
-	einfo
-	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
-	einfo
-	einfo "\033[1;32m**************************************************\033[1;32m"
-	einfo
-}
diff --git a/www-client/opera-next/Manifest b/www-client/opera-next/Manifest
index f4d0d65d280b..15815851b89f 100644
--- a/www-client/opera-next/Manifest
+++ b/www-client/opera-next/Manifest
@@ -1,12 +1,6 @@
-DIST opera-next-12.00-1105.i386.freebsd.tar.xz 11416100 RMD160 c04a986ac5a8103934201a0100935dfcc483b506 SHA1 1d73447dbd724caa2f0e2bfc4eda5e0dca1078a7 SHA256 fe36ceb0f0347bb03b1a4433ed969510885ce3a8f22b16818abe20e4266a83e9
-DIST opera-next-12.00-1105.i386.linux.tar.xz 11451408 RMD160 b526d43e2ae7b148e76dc4f1bd48faa4cdbdbcf7 SHA1 26396e5a23359d14a12b6bd1f89f9d3249a647b0 SHA256 55005a86dd262abc1f6778951dd417dc905d317ffc725c6dbb37a6ac25127dad
-DIST opera-next-12.00-1105.x86_64.linux.tar.xz 12283792 RMD160 d68fe56fad56a97b4be439db80adcdec8b26aacd SHA1 2dd6581b791e15cb5b71d8c210ccd707c4445381 SHA256 5dd664027011a58997e8acf435668f20c2058e18c0ed87d1ebc150bcbfe53b04
-DIST opera-next-12.00-1116.i386.freebsd.tar.xz 11421756 RMD160 2724e280b8d13744981bb6a8c08d0d7f7cd40946 SHA1 61ad2b3303976ea4ae3a418a4e78b4194a4e10bc SHA256 66d0fdbc85cf91d3f033c9b820340274c944a7a568156b5f585e0df3d0b0c13f
-DIST opera-next-12.00-1116.i386.linux.tar.xz 11441244 RMD160 79081f12b6a188a4b9127c45cc143d35980dbcf0 SHA1 6a6ba2e599e9807e8c2ba0b6a8c59a56cb77587e SHA256 3cf161689f6aba7d880c31f642f88242de0bd89c3f05ac401bc5c252ecd4bb2f
-DIST opera-next-12.00-1116.x86_64.linux.tar.xz 12262800 RMD160 d86d24f921275d6bdd2aab803284f33c33ed06ca SHA1 806633092025b929d2a9d06e570439e0ac618f5b SHA256 8f6b5516fed0e5743123be36c34a7fedaf2d5e4210de5c2fb58bd794c56b3231
-DIST opera-next-12.00-1155.i386.freebsd.tar.xz 11675104 RMD160 c98dbd25bd2356de71bbffa637af163c948f555a SHA1 62980e51997eb4541166c8c144887727f21f0c81 SHA256 efd2049595ed05ca04cadcb9bf1d72797f436fcf2c8638efd3ba6c5b226bac44
-DIST opera-next-12.00-1155.i386.linux.tar.xz 11679532 RMD160 c0c304e31017c03152086a65828b3fe7afb3cb53 SHA1 5a16b54d8fbfef05a70623492b1871150ef5115e SHA256 2dc151c006357c7dc232fb43fc59e367ff86dca2b1fba0453ce7f394d42636af
-DIST opera-next-12.00-1155.x86_64.linux.tar.xz 12528336 RMD160 7118054a20159d29e36bc746a582da673e256b52 SHA1 e13351714accf8c2ddb879d518a1905ec2d1cf27 SHA256 1c1d0561225b47f31d72e7d90673c58005f50bf4de1ebb3527dd15f6bfd32415
 DIST opera-next-12.00-1174.i386.freebsd.tar.xz 11797008 RMD160 98be901be59a5724c3dcd6350fd506da397b1580 SHA1 f8309afbf132c43329d885a6089a82b4a36f73e1 SHA256 c3568720607f178a012b51c8739912fa9d83c45c4063639397e123306fa84515
 DIST opera-next-12.00-1174.i386.linux.tar.xz 11799364 RMD160 6ba396354997c0f90d95cff0a08ea780e0378546 SHA1 7cc0070e71a50bff87f151e0c01f4dfcb09d51a1 SHA256 b67fc99a23d83f5aac435aaf37ee10a11248d57dad9d959babd7004f9e7182b6
 DIST opera-next-12.00-1174.x86_64.linux.tar.xz 12635968 RMD160 bd91ae22ee1683432b2c16f8bdb37805c7018c40 SHA1 27382a8287f052a903c71d1b009d161722ef9c74 SHA256 2d530e081b560eef65e1fdfd422ebb951e2e4e3d231572c4ce01ef9911db7eb8
+DIST opera-next-12.00-1191.i386.freebsd.tar.xz 11676048 RMD160 f52abb73c5ac211653da3aa482a43d74590e70db SHA1 5e8a07b72febf09ef06a0a271de1d57fa4658b15 SHA256 483e7f0ac191332d57d5aec5f95484c2fb543bf5953798ebe20452ac37e2e2cc
+DIST opera-next-12.00-1191.i386.linux.tar.xz 11676256 RMD160 c2ac25f7a1e7a4732fe17707ef19258ea7f99b5e SHA1 8d98423569cb1b147daa6a94213964e6b5fcfb66 SHA256 9e48ec6918787a3b7afe83cb32ddccfe1fd91abeda649d3d3253416282655522
+DIST opera-next-12.00-1191.x86_64.linux.tar.xz 12514172 RMD160 c25f436eb7d0df94033a971e9bc868fe9616c82f SHA1 d1ac9604c959e27453fe42c06221b11a6c7ede15 SHA256 2dd3b65f2c329b47c83f96e11af158199f79e7dae3476d3dbbcb2561109c0270
diff --git a/www-client/opera-next/opera-next-12.00.1105.ebuild b/www-client/opera-next/opera-next-12.00.1105.ebuild
deleted file mode 100644
index d875b9bf1996..000000000000
--- a/www-client/opera-next/opera-next-12.00.1105.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.00.1105.ebuild,v 1.3 2011/11/12 15:44:11 jer Exp $
-
-EAPI="4"
-
-inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
-
-DESCRIPTION="A fast and secure web browser and Internet suite"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-11 LGPL-2 LGPL-3"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="elibc_FreeBSD gtk kde +gstreamer"
-
-O_V="$(get_version_component_range 1-2)" # Major version, i.e. 11.00
-O_B="$(get_version_component_range 3)"   # Build version, i.e. 1156
-
-O_D="alpha_${O_V}-${O_B}"
-O_P="${PN}-${O_V}-${O_B}"
-O_U="http://snapshot.opera.com/unix/"
-
-SRC_URI="
-	amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz )
-	x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz )
-	x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz )
-"
-
-OPREFIX="/usr/$(get_libdir)"
-
-QA_DT_HASH="${OPREFIX}/${PN}/.*"
-QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
-
-O_LINGUAS="af az be bg bn cs da de el en-GB es-ES es-LA et fi fr fr-CA fy gd hi
-hr hu id it ja ka ko lt me mk ms nb nl nn pa pl pt pt-BR ro ru sk sr sv sw ta te
-th tl tr uk uz vi zh-CN zh-TW zu"
-
-for O_LINGUA in ${O_LINGUAS}; do
-	IUSE="${IUSE} linguas_${O_LINGUA/-/_}"
-done
-
-DEPEND="
-	>=sys-apps/sed-4
-	app-arch/xz-utils
-"
-GTKRDEPEND="
-	dev-libs/atk
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/pango
-	x11-libs/pixman
-"
-KDERDEPEND="
-	kde-base/kdelibs
-	x11-libs/qt-core
-	x11-libs/qt-gui
-"
-GSTRDEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2
-	media-plugins/gst-plugins-meta
-	media-libs/gstreamer
-"
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXrender
-	gtk? ( ${GTKRDEPEND} )
-	kde? ( ${KDERDEPEND} )
-	gstreamer? ( ${GSTRDEPEND} )
-"
-
-pkg_setup() {
-	echo -e \
-		" ${GOOD}****************************************************${NORMAL}"
-	elog "If you seek support, please file a bug report at"
-	elog "https://bugs.gentoo.org and post the output of"
-	elog " \`emerge --info =${CATEGORY}/${P}'"
-	echo -e \
-		" ${GOOD}****************************************************${NORMAL}"
-}
-
-src_unpack() {
-	unpack ${A}
-	mv -v ${PN}* "${S}" || die
-}
-
-src_prepare() {
-	local LNGDIR="share/${PN}/locale"
-
-	# Count linguas
-	count() { echo ${#}; }
-	local lingua_count=$(count ${O_LINGUAS} en)
-	local locale_count=$(count ${LNGDIR}/*)
-	[[ ${lingua_count} = ${locale_count} ]] \
-		|| die "Number of LINGUAS does not match number of locales"
-	unset count
-
-	# Remove unwanted linguas
-	einfo "Keeping these locales (linguas): ${LINGUAS}."
-	for LINGUA in ${O_LINGUAS}; do
-		if ! use linguas_${LINGUA/-/_}; then
-			LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
-			rm -r "${LINGUA}" || die "The list of linguas needs to be fixed"
-		fi
-	done
-
-	# Remove doc directory but keep the LICENSE under another name (bug #315473)
-	mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt
-	rm -rf share/doc
-	for locale in share/${PN}/locale/*; do
-		rm -f "${locale}/license.txt"
-		ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \
-			|| die
-	done
-
-	# Remove package directory
-	rm -rf share/${PN}/package
-
-	# Optional libraries
-	if ! use gtk; then
-		rm lib/${PN}/liboperagtk2.so || die
-	fi
-	if ! use kde; then
-		rm lib/${PN}/liboperakde4.so || die
-	fi
-	if ! use gstreamer; then
-		rm -r lib/${PN}/gstreamer || die
-	fi
-
-	# Unzip the man pages before sedding
-	gunzip share/man/man1/* || die
-
-	# Replace PREFIX, SUFFIX and PN in various files
-	sed -i \
-		-e "s:@@{PREFIX}:/usr:g" \
-		-e "s:@@{SUFFIX}::g" \
-		-e "s:@@{_SUFFIX}::g" \
-		-e "s:@@{USUFFIX}::g" \
-		-e "s:opera:${PN}:g" \
-		share/man/man1/* \
-		share/applications/${PN}-*.desktop \
-		|| die
-
-	# Replace "Opera" with "Opera Next"
-	if [[ ${PN} = opera-next ]]; then
-		sed -i share/applications/${PN}-*.desktop \
-			-e "/^Name=Opera\|^ Next/s:Opera:& Next:" || die
-	fi
-
-	# Create /usr/bin/opera wrapper
-	echo '#!/bin/sh' > ${PN}
-	echo 'export OPERA_DIR=/usr/share/'"${PN}" >> ${PN}
-	echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \
-		>> ${PN}
-	echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN}
-
-	# Change libz.so.3 to libz.so.1 for gentoo/freebsd
-	if use elibc_FreeBSD; then
-		scanelf -qR -N libz.so.3 -F "#N" lib/${PN}/ | \
-		while read i; do
-			if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]];
-			then
-				export SANITY_CHECK_LIBZ_FAILED=1
-				break
-			fi
-			sed -i \
-				"$i" \
-				-e 's/libz\.so\.3/libz.so.1/g'
-		done
-		[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die
-	fi
-}
-
-src_install() {
-	# We install into usr instead of opt as Opera does not support the latter
-	dodir /usr
-	mv lib/ "${D}/${OPREFIX}" || die
-	mv share/ "${D}/usr/" || die
-
-	# Install startup scripts
-	dobin ${PN}
-
-	# Stop revdep-rebuild from checking opera binaries
-	dodir /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \
-		> "${D}"/etc/revdep-rebuild/90${PN}
-
-	# Set PaX markings for hardened/PaX (bug #344267)
-	pax-mark m \
-		"${D}/${OPREFIX}/${PN}/${PN}" \
-		"${D}/${OPREFIX}/${PN}/operaplugincleaner" \
-		"${D}/${OPREFIX}/${PN}/operapluginwrapper"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	if use elibc_FreeBSD; then
-		elog
-		elog "To improve shared memory usage please set:"
-		elog "$ sysctl kern.ipc.shm_allow_removed=1"
-	fi
-
-	# Update desktop file database and gtk icon cache (bug #334993)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	# Update desktop file database and gtk icon cache (bug #334993)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
diff --git a/www-client/opera-next/opera-next-12.00.1116.ebuild b/www-client/opera-next/opera-next-12.00.1116.ebuild
deleted file mode 100644
index 0d342b83db86..000000000000
--- a/www-client/opera-next/opera-next-12.00.1116.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.00.1116.ebuild,v 1.4 2011/11/12 15:44:11 jer Exp $
-
-EAPI="4"
-
-inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
-
-DESCRIPTION="A fast and secure web browser and Internet suite"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-11 LGPL-2 LGPL-3"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="elibc_FreeBSD gtk gtk3 kde +gstreamer"
-
-O_V="$(get_version_component_range 1-2)" # Major version, i.e. 11.00
-O_B="$(get_version_component_range 3)"   # Build version, i.e. 1156
-
-O_D="quack_${O_V}-${O_B}"
-O_P="${PN}-${O_V}-${O_B}"
-O_U="http://snapshot.opera.com/unix/"
-
-SRC_URI="
-	amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz )
-	x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz )
-	x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz )
-"
-
-OPREFIX="/usr/$(get_libdir)"
-
-QA_DT_HASH="${OPREFIX}/${PN}/.*"
-QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
-
-O_LINGUAS="af az be bg bn cs da de el en-GB es-ES es-LA et fi fr fr-CA fy gd hi
-hr hu id it ja ka ko lt me mk ms nb nl nn pa pl pt pt-BR ro ru sk sr sv sw ta te
-th tl tr uk uz vi zh-CN zh-TW zu"
-
-for O_LINGUA in ${O_LINGUAS}; do
-	IUSE="${IUSE} linguas_${O_LINGUA/-/_}"
-done
-
-DEPEND="
-	>=sys-apps/sed-4
-	app-arch/xz-utils
-"
-GTKRDEPEND="
-	dev-libs/atk
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	x11-libs/pango
-	x11-libs/pixman
-"
-KDERDEPEND="
-	kde-base/kdelibs
-	x11-libs/qt-core
-	x11-libs/qt-gui
-"
-GSTRDEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2
-	media-libs/gst-plugins-base
-	media-libs/gstreamer
-	media-plugins/gst-plugins-meta
-"
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXrender
-	x11-libs/libXt
-	gtk? ( ${GTKRDEPEND} )
-	gtk3? ( ${GTKRDEPEND} )
-	kde? ( ${KDERDEPEND} )
-	gstreamer? ( ${GSTRDEPEND} )
-"
-
-pkg_setup() {
-	echo -e \
-		" ${GOOD}****************************************************${NORMAL}"
-	elog "If you seek support, please file a bug report at"
-	elog "https://bugs.gentoo.org and post the output of"
-	elog " \`emerge --info =${CATEGORY}/${P}'"
-	echo -e \
-		" ${GOOD}****************************************************${NORMAL}"
-}
-
-src_unpack() {
-	unpack ${A}
-	mv -v ${PN}* "${S}" || die
-}
-
-src_prepare() {
-	local LNGDIR="share/${PN}/locale"
-
-	# Count linguas
-	count() { echo ${#}; }
-	local lingua_count=$(count ${O_LINGUAS} en)
-	local locale_count=$(count ${LNGDIR}/*)
-	[[ ${lingua_count} = ${locale_count} ]] \
-		|| die "Number of LINGUAS does not match number of locales"
-	unset count
-
-	# Remove unwanted linguas
-	einfo "Keeping these locales (linguas): ${LINGUAS}."
-	for LINGUA in ${O_LINGUAS}; do
-		if ! use linguas_${LINGUA/-/_}; then
-			LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
-			rm -r "${LINGUA}" || die "The list of linguas needs to be fixed"
-		fi
-	done
-
-	# Remove doc directory but keep the LICENSE under another name (bug #315473)
-	mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt
-	rm -rf share/doc
-	for locale in share/${PN}/locale/*; do
-		rm -f "${locale}/license.txt"
-		ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \
-			|| die
-	done
-
-	# Remove package directory
-	rm -rf share/${PN}/package
-
-	# Optional libraries
-	if ! use gtk; then
-		rm lib/${PN}/liboperagtk2.so || die
-	fi
-	if ! use gtk3; then
-		rm lib/${PN}/liboperagtk3.so || die
-	fi
-	if ! use kde; then
-		rm lib/${PN}/liboperakde4.so || die
-	fi
-	if ! use gstreamer; then
-		rm -r lib/${PN}/gstreamer || die
-	fi
-
-	# Unzip the man pages before sedding
-	gunzip share/man/man1/* || die
-
-	# Replace PREFIX, SUFFIX and PN in various files
-	sed -i \
-		-e "s:@@{PREFIX}:/usr:g" \
-		-e "s:@@{SUFFIX}::g" \
-		-e "s:@@{_SUFFIX}::g" \
-		-e "s:@@{USUFFIX}::g" \
-		-e "s:opera:${PN}:g" \
-		share/man/man1/* \
-		share/applications/${PN}-*.desktop \
-		|| die
-
-	# Replace "Opera" with "Opera Next"
-	if [[ ${PN} = opera-next ]]; then
-		sed -i share/applications/${PN}-*.desktop \
-			-e "/^Name=Opera\|^ Next/s:Opera:& Next:" || die
-	fi
-
-	# Create /usr/bin/opera wrapper
-	echo '#!/bin/sh' > ${PN}
-	echo 'export OPERA_DIR="/usr/share/'"${PN}"'"' >> ${PN}
-	echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \
-		>> ${PN}
-	echo 'export LD_PRELOAD="/usr/'$(get_libdir)'/libgtk-x11-2.0.so"' >> ${PN}
-	echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN}
-
-	# Change libz.so.3 to libz.so.1 for gentoo/freebsd
-	if use elibc_FreeBSD; then
-		scanelf -qR -N libz.so.3 -F "#N" lib/${PN}/ | \
-		while read i; do
-			if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]];
-			then
-				export SANITY_CHECK_LIBZ_FAILED=1
-				break
-			fi
-			sed -i \
-				"$i" \
-				-e 's/libz\.so\.3/libz.so.1/g'
-		done
-		[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die
-	fi
-}
-
-src_install() {
-	# We install into usr instead of opt as Opera does not support the latter
-	dodir /usr
-	mv lib/ "${D}/${OPREFIX}" || die
-	mv share/ "${D}/usr/" || die
-
-	# Install startup scripts
-	dobin ${PN}
-
-	# Stop revdep-rebuild from checking opera binaries
-	dodir /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \
-		> "${D}"/etc/revdep-rebuild/90${PN}
-
-	# Set PaX markings for hardened/PaX (bug #344267)
-	pax-mark m \
-		"${D}/${OPREFIX}/${PN}/${PN}" \
-		"${D}/${OPREFIX}/${PN}/operaplugincleaner" \
-		"${D}/${OPREFIX}/${PN}/operapluginwrapper"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	if use elibc_FreeBSD; then
-		elog
-		elog "To improve shared memory usage please set:"
-		elog "$ sysctl kern.ipc.shm_allow_removed=1"
-	fi
-
-	# Update desktop file database and gtk icon cache (bug #334993)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	# Update desktop file database and gtk icon cache (bug #334993)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
diff --git a/www-client/opera-next/opera-next-12.00.1155.ebuild b/www-client/opera-next/opera-next-12.00.1191.ebuild
similarity index 98%
rename from www-client/opera-next/opera-next-12.00.1155.ebuild
rename to www-client/opera-next/opera-next-12.00.1191.ebuild
index c376188b63f3..758c23cd8c11 100644
--- a/www-client/opera-next/opera-next-12.00.1155.ebuild
+++ b/www-client/opera-next/opera-next-12.00.1191.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/www-client/opera-next/opera-next-12.00.1155.ebuild,v 1.1 2011/11/15 16:09:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.00.1191.ebuild,v 1.1 2011/12/07 16:20:37 jer Exp $
 
 EAPI="4"
 
@@ -17,7 +17,7 @@ IUSE="elibc_FreeBSD gtk gtk3 kde +gstreamer"
 O_V="$(get_version_component_range 1-2)" # Major version, i.e. 11.00
 O_B="$(get_version_component_range 3)"   # Build version, i.e. 1156
 
-O_D="hwa_${O_V}-${O_B}"
+O_D="kisskiss_${O_V}-${O_B}"
 O_P="${PN}-${O_V}-${O_B}"
 O_U="http://snapshot.opera.com/unix/"
 
diff --git a/www-client/rekonq/rekonq-0.8.0.ebuild b/www-client/rekonq/rekonq-0.8.0.ebuild
index bdbfbc449eba..b18c615de0c9 100644
--- a/www-client/rekonq/rekonq-0.8.0.ebuild
+++ b/www-client/rekonq/rekonq-0.8.0.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/www-client/rekonq/rekonq-0.8.0.ebuild,v 1.1 2011/10/16 10:08:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/rekonq/rekonq-0.8.0.ebuild,v 1.3 2011/12/07 22:09:56 hwoarang Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ HOMEPAGE="http://rekonq.kde.org/"
 
 LICENSE="GPL-3"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/www-plugins/gecko-mediaplayer/Manifest b/www-plugins/gecko-mediaplayer/Manifest
index a75f0be4cb87..e6b2f6389cfe 100644
--- a/www-plugins/gecko-mediaplayer/Manifest
+++ b/www-plugins/gecko-mediaplayer/Manifest
@@ -1,4 +1,3 @@
 DIST gecko-mediaplayer-1.0.4.tar.gz 275024 RMD160 163dd0363a8369c66fa04533791e1977c1fd0d7b SHA1 1ad7de0a3ac5a9fa4680228f1b5f58831a8079f9 SHA256 575f4dfe4c06013c4f4a7b45eae9d1127b6d3299e570ce3a1b603c8b75ef5aa1
-DIST gecko-mediaplayer-1.0.5_beta1_p20111203.tar.xz 194736 RMD160 dc695698f7411c936ac0e740638fac66cf8cc3a4 SHA1 3ff2d3a588b1b0dbe323f59b2ca7e2f34c6e93ec SHA256 d39cd0b3bb1143fe3a9d47f419235266a4d238d73b682e457fae65cee249fd1d
-DIST gecko-mediaplayer-1.0.5b1.tar.gz 260120 RMD160 30722136572f350400220d08ff58cd98f74aae15 SHA1 c5e8e927325b7503d8dc082407a89177ef93874e SHA256 1fb2dc17060e9748ead2e0ad2b37824e48c529af4718e939dbff5b8f5736f973
+DIST gecko-mediaplayer-1.0.5_beta1_p20111207.tar.xz 195360 RMD160 d459eeb29fba2b0fd614868c734febab5437d0f3 SHA1 c6b32e5a095086b00d8ed7e30cb40a227adb194c SHA256 03958bac82b2b5f2303feed31db71efa7059fe7c4a06e82e1a4e5cc3913a42cd
 DIST gecko-mediaplayer-gconf-2.m4.xz 692 RMD160 2e5a6883c6ded9ec6a6fc363182528be46fd8e9e SHA1 afd3a4b0d8a0f4193e57658707f12a4811f2a1ad SHA256 f37ad46b4c999b4e62217201406c4314ab3e1aa6f4969f7830965b15d3a86829
diff --git a/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-1.0.5_beta1-firefox-8.x.patch b/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-1.0.5_beta1-firefox-8.x.patch
deleted file mode 100644
index 63f9233a8e60..000000000000
--- a/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-1.0.5_beta1-firefox-8.x.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- src/np_entry.cpp
-+++ src/np_entry.cpp
-@@ -80,9 +80,9 @@
-
- #endif                          /* XP_WIN */
-
--char *NPP_GetMIMEDescription();
-+const char *NPP_GetMIMEDescription();
-
--char *NP_GetMIMEDescription()
-+const char *NP_GetMIMEDescription()
- {
-     return NPP_GetMIMEDescription();
- }
---- src/npp_gate.cpp
-+++ src/npp_gate.cpp
-@@ -44,7 +44,7 @@
- #include "plugin_types.h"
- #include "plugin_setup.h"
-
--char *NPP_GetMIMEDescription(void)
-+const char *NPP_GetMIMEDescription(void)
- {
-     return GetMIMEDescription();
- }
---- src/npupp.h
-+++ src/npupp.h
-@@ -684,7 +684,7 @@
-
-     NPError OSCALL NP_Shutdown();
-
--    char *NP_GetMIMEDescription();
-+    const char *NP_GetMIMEDescription();
-
- #ifdef __cplusplus
- }
-@@ -700,7 +700,7 @@
-
- /* plugin meta member functions */
-
--    NP_EXPORT(char *) NP_GetMIMEDescription(void);
-+    NP_EXPORT(const char *) NP_GetMIMEDescription(void);
-      NP_EXPORT(NPError) NP_Initialize(NPNetscapeFuncs *, NPPluginFuncs *);
-      NP_EXPORT(NPError) NP_Shutdown(void);
-      NP_EXPORT(NPError) NP_GetValue(void *future, NPPVariable aVariable, void *aValue);
diff --git a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.5_beta1.ebuild b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.5_beta1.ebuild
deleted file mode 100644
index 5878603b387c..000000000000
--- a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.5_beta1.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/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.5_beta1.ebuild,v 1.2 2011/11/24 21:41:09 ssuominen Exp $
-
-EAPI=4
-inherit eutils multilib nsplugins
-
-MY_P=${PN}-${PV/_beta/b}
-
-DESCRIPTION="A browser plugin that uses GNOME MPlayer"
-HOMEPAGE="http://code.google.com/p/gecko-mediaplayer/"
-SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+curl"
-
-RDEPEND=">=dev-libs/dbus-glib-0.92
-	>=dev-libs/glib-2.26:2
-	dev-libs/nspr
-	>=media-libs/gmtk-${PV}
-	>=media-video/gnome-mplayer-${PV}[dbus]
-	|| ( >=www-client/firefox-8 >=net-libs/xulrunner-1.9.2:1.9 )
-	curl? ( net-misc/curl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-DOCS="ChangeLog DOCS/tech/*.txt"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	if has_version ">=www-client/firefox-8"; then
-		epatch "${FILESDIR}"/${P}-firefox-8.x.patch
-
-		cat <<-EOF > "${T}"/libxul.pc
-		Name: libxul
-		Description: Missing npapi-sdk support
-		Requires: nspr
-		Version: 8.0
-		Cflags: -I/usr/include/firefox
-		EOF
-	fi
-}
-
-src_configure() {
-	export PKG_CONFIG_PATH="${T}"
-
-	econf \
-		--with-plugin-dir=/usr/$(get_libdir)/${PLUGINS_DIR} \
-		$(use_with curl libcurl)
-}
-
-src_install() {
-	default
-	rm -rf "${ED}"/usr/share/doc/${PN}
-}
diff --git a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.5_beta1_p20111203.ebuild b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.5_beta1_p20111207.ebuild
similarity index 78%
rename from www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.5_beta1_p20111203.ebuild
rename to www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.5_beta1_p20111207.ebuild
index 2627549ddd6d..761f160cd596 100644
--- a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.5_beta1_p20111203.ebuild
+++ b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.5_beta1_p20111207.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/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.5_beta1_p20111203.ebuild,v 1.1 2011/12/02 22:46:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.5_beta1_p20111207.ebuild,v 1.1 2011/12/07 15:04:17 ssuominen Exp $
 
 EAPI=4
 inherit autotools eutils multilib nsplugins
@@ -9,12 +9,13 @@ MY_P=${PN}-${PV/_beta/b}
 
 DESCRIPTION="A browser plugin that uses GNOME MPlayer"
 HOMEPAGE="http://code.google.com/p/gecko-mediaplayer/"
-SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.xz
-	http://dev.gentoo.org/~ssuominen/${PN}-gconf-2.m4.xz"
+DEV_URI="http://dev.gentoo.org/~ssuominen"
+SRC_URI="${DEV_URI}/${P}.tar.xz
+	${DEV_URI}/${PN}-gconf-2.m4.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86" # ~ppc64 missing in npapi-sdk
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="+curl"
 
 RDEPEND=">=dev-libs/dbus-glib-0.98
@@ -24,6 +25,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.98
 	>=media-video/gnome-mplayer-1.0.5_beta[dbus]
 	curl? ( net-misc/curl )"
 DEPEND="${RDEPEND}
+	app-arch/xz-utils
 	dev-util/pkgconfig
 	>=net-misc/npapi-sdk-0.27
 	sys-devel/gettext"
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 88d26878070d..dc96798788c1 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,4 +1,3 @@
-DIST NVIDIA-FreeBSD-x86-173.14.30.tar.gz 17992540 RMD160 9f064bb71e2cb65ed386c7e40d7ae55c10548837 SHA1 089448c56ec85334917119712a241d463045ffa5 SHA256 9e59d02ffadb4ea8dd57e07f60c1e1c0b7267c86ec3fc22bd1a86a884a2bb0a3
 DIST NVIDIA-FreeBSD-x86-173.14.31.tar.gz 17991684 RMD160 b7171b05847400a1f7a008bc9b46ea061a9f765d SHA1 d7603732598990c3c22e39643e7021da5a57a57c SHA256 98699bc8dc1dad86cebc2ed067b4fc5cd37b8540e897bb218f38ac80c4b4d875
 DIST NVIDIA-FreeBSD-x86-275.09.07.tar.gz 30304023 RMD160 aaa3ad3339fa1450612d8f7995f4407a976f1cc9 SHA1 8ff6558a019aa28bb894db1275a9a96490cd4fd4 SHA256 d5d119c2f066539da0f2d1926193f6bc2bfbf2a1dcdff77322a23b42c5df91d9
 DIST NVIDIA-FreeBSD-x86-275.28.tar.gz 30478616 RMD160 123a2e8cb3b783ddd6fa055d04e9a791ca90c165 SHA1 141ea0ad39c7d1ed8f768b270015c9e20cb092ee SHA256 5c11f7c1792476e8ac9b2e3a6f0bac4b9eff206972f0f4c1566fbcc4c7da918e
@@ -6,9 +5,7 @@ DIST NVIDIA-FreeBSD-x86-275.36.tar.gz 30477916 RMD160 c02c1127a34103e1082175b890
 DIST NVIDIA-FreeBSD-x86-285.05.09.tar.gz 30697710 RMD160 e08981374a67a8e9e9bff42d5cbb5f5ecef0568c SHA1 d3e4cb6cac7af0392d0f294cf67b029456a48100 SHA256 d3ad51145cd57c70678ee659112a0973187b1b02e3062addadd0fe094b3c46fb
 DIST NVIDIA-FreeBSD-x86-290.06.tar.gz 32025027 RMD160 0ed1f6413d3b93b524a7160356d89640af18bae4 SHA1 69f389da4afc0fe0053fade5002b479e1e1503f2 SHA256 30356d8d25b2dd97d76f851632bef3f550631e31276358870dd22f987985ce0c
 DIST NVIDIA-FreeBSD-x86-290.10.tar.gz 32042469 RMD160 712cd816ab24319d03ae475af0ac2a56518ef58b SHA1 4fe79060b9e475e4a74b7b17e95410bad1f33427 SHA256 f5accbdac0b231a8073f76c1d1d8ace7cb98ebe167888c31183a2752a669ee92
-DIST NVIDIA-FreeBSD-x86-96.43.19.tar.gz 13352481 RMD160 376311eb6708f4b7f20b6326bb88d9a33e7b3d37 SHA1 72555f3da8a796e491eaa67192334ccefcdd2256 SHA256 b5dce181cc654a729ba06dd528a180d14a792b0328fcfbf86bb0f819285c0dd5
 DIST NVIDIA-FreeBSD-x86-96.43.20.tar.gz 14060884 RMD160 2323ef0e85c4383558ea61ff4906b28f85a5952c SHA1 1d7397eaf1e42866595144af550a1df84369fd80 SHA256 e75fce272e72644d53e6ad3c0957fe173735a4b621726ce227ba8ecf9bd9c5cf
-DIST NVIDIA-Linux-x86-173.14.30-pkg0.run 13407793 RMD160 8c0acf5738db9aeac079a128083437aec859878b SHA1 924a04cdcc30df27dca59f7fd20bfc371622c49b SHA256 ecb2ff94ca1b2a7498bc1fc37383194cfafa4198644308428ad7c09f2273f554
 DIST NVIDIA-Linux-x86-173.14.31-pkg0.run 13407481 RMD160 87f5bfb9aee83c3edb41894df540840a9eec343d SHA1 470e19fdfa75f18522745de285e256808fe14d48 SHA256 e855a62f16a9d0eff1bf470a8fcedd48cd1b718e969ad5ebe89a557d039d1924
 DIST NVIDIA-Linux-x86-275.09.07.run 30930605 RMD160 3543dd353b488f501899ce37ea034eb0dd1a98c7 SHA1 068b007bb08603689ada3ebb342dc87849f50b7c SHA256 27d1b2073c11bd56e423ed80bd22773f1f282c39ab3b76773144cfa680a1ff0c
 DIST NVIDIA-Linux-x86-275.28.run 31102995 RMD160 d70becaa6fe2b58948519fc65c890edaa4559a70 SHA1 d747febac267a7dd39832af3dc579209626b9a74 SHA256 ba4ff7a7a3a5d4242621f9a104f64d4ab573619fcad7adf4657f82ab417553ea
@@ -16,9 +13,7 @@ DIST NVIDIA-Linux-x86-275.36.run 31117123 RMD160 f92aa5c49e09d3b74baab7b619b846b
 DIST NVIDIA-Linux-x86-285.05.09.run 33592492 RMD160 e5fb559c3eb6f928649a94bfd73d80d0b1561dd3 SHA1 e42112d15ba217fc1c16afbae45f0493f795966c SHA256 ce03fa99b62081b52bd5dae3594ac5942413ed530cda3d76a82f4ab0afd36f96
 DIST NVIDIA-Linux-x86-290.06.run 34665645 RMD160 5075ce544cfeab03ef2ea8daf62df9981c4b15f2 SHA1 8f3e3e6a61470679f17619d688094cc4adaf9048 SHA256 bf2529e29d39136212c586ddc809661a32fef56e6342682f191a04f0ce0cd5bb
 DIST NVIDIA-Linux-x86-290.10.run 34691272 RMD160 ddcee14e7b474a646a707fd966cc1d223d3177eb SHA1 dfc095db2bdca672e6cfe7878a75c5d25d8c54a9 SHA256 99be8f53aa1f777445e5a4cac27acd7d85990db712b5c29caac865145fc5adaa
-DIST NVIDIA-Linux-x86-96.43.19-pkg0.run 9721273 RMD160 ca40f0572e36479bfdd4d921be45da7055692762 SHA1 dc5f0d5b068756991a7d7e50e17bfcf09684702f SHA256 e25810e809ea56ab33ebb3e79e885eb19784dcce2bb0102c0cb5daa372aaf1c8
 DIST NVIDIA-Linux-x86-96.43.20-pkg0.run 10323541 RMD160 8e1a56ea7992018a405214aaa857cd932d7c3274 SHA1 714632bf918eaae50d46e9a4a5252ebbe9e6cfb1 SHA256 bc778062cf745ee4916de77a702f702312d33eeb3b6f379b63e4366fa5197517
-DIST NVIDIA-Linux-x86_64-173.14.30-pkg2.run 18967055 RMD160 167137380c8f75530498c00302c80cb15adb4adf SHA1 93f10be314021adebcc5c0e675e0d83653adceb3 SHA256 aebf3655337d813d4a0cd779ac6b1fa5d3fee26b00188bad66914cd3f876a556
 DIST NVIDIA-Linux-x86_64-173.14.31-pkg2.run 18967067 RMD160 729f5e12e4c7ed26f9445ec2981aec3b9f5f83e5 SHA1 155f1951897a274a0c693912015e049d0d4cbec1 SHA256 c56cfe43c4fa95102d099e4f1c4e75e58b57d73b4b36a858d54a2a339aad56d9
 DIST NVIDIA-Linux-x86_64-275.09.07.run 51646025 RMD160 ea9bd2a3e960234a9a9e69a6ada31d2bb5939eff SHA1 b40418b7cd17694873007c547dac36b7078f76ab SHA256 747c09b0a0a8d60e1b5fee49fb1ea07ee5812f8e85a87b2403011af6de58164d
 DIST NVIDIA-Linux-x86_64-275.28.run 51855215 RMD160 9f4d65c0a88bac60dd2389a53ae95d8b4b9365da SHA1 957a5fd0f4d43ba8cee72d765e9076c43fbc0be1 SHA256 fc1dfded42d21b08f40fa7f50589c6c0c4922cc0d30af71bf721ab8682b00648
@@ -26,5 +21,4 @@ DIST NVIDIA-Linux-x86_64-275.36.run 51854948 RMD160 401e3bd9ca6cc1af35da71dfba06
 DIST NVIDIA-Linux-x86_64-285.05.09.run 56674677 RMD160 e178cc5109bbf254c80eb123acd6276bf34d7790 SHA1 26c99d119f39a9201943a4f44cdc110988ec2349 SHA256 7159a1f7e898b50dd49ea2273ac6facb870546ad5496bf70c6fbe1642d2c4970
 DIST NVIDIA-Linux-x86_64-290.06.run 58311386 RMD160 370028cdd5d7a5573935ecf88812cb9db4b823c1 SHA1 1837772ccd4b6e3499dd703b76d09267e33b41ae SHA256 48df72cd225043ebecbe1a6a9a575d692e0a9fa0b0bb65c037800d83ba54f3ec
 DIST NVIDIA-Linux-x86_64-290.10.run 58334192 RMD160 a850a83643d507ff84be76691188a5ecd870c4d8 SHA1 f3e8b43248d9d167b1c3f67a8cba9c1f2c53e583 SHA256 34a2ab07f4ae7afdeb2c8415f3f37c1099e6690eb25f3dbef92eca771f7ce4cd
-DIST NVIDIA-Linux-x86_64-96.43.19-pkg2.run 13829870 RMD160 c9b2edd825d30f8deea101d5dfd51f86dbf09ffe SHA1 f3cdb5d95c5bb9057d09331395e72fe8d5006f17 SHA256 81939f9ee45255cc137719a10b8947bc90cf5697da9e27991cee5a7061d5de19
 DIST NVIDIA-Linux-x86_64-96.43.20-pkg2.run 14572507 RMD160 51d5838d1c0e63a1abf479d155e4df3a854d98f6 SHA1 b5ab8b3e9f06418720971187d53837db90af5f8a SHA256 562107a262e250b836966e29851628f6162ee2857d53252221c780d9b201de18
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.30.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.30.ebuild
deleted file mode 100644
index 2a33f28a109b..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.30.ebuild
+++ /dev/null
@@ -1,497 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.30.ebuild,v 1.4 2011/07/31 13:05:31 maekke Exp $
-
-EAPI="2"
-
-inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
-
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-
-DESCRIPTION="NVIDIA X11 driver and GLX libraries"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}-pkg0.run )
-	 amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}-pkg2.run )
-	 x86-fbsd? ( ftp://download.nvidia.com/freebsd/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* amd64 x86 ~x86-fbsd"
-IUSE="acpi custom-cflags gtk multilib kernel_linux"
-RESTRICT="strip"
-EMULTILIB_PKG="true"
-
-COMMON="x11-base/xorg-server
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	multilib? ( app-emulation/emul-linux-x86-opengl )
-	>=app-admin/eselect-opengl-1.0.9"
-DEPEND="${COMMON}
-	kernel_linux? ( virtual/linux-sources )"
-RDEPEND="${COMMON}
-	acpi? ( sys-power/acpid )"
-PDEPEND="gtk? ( media-video/nvidia-settings )"
-
-QA_TEXTRELS_x86="usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib/xorg/modules/drivers/nvidia_drv.so
-	usr/lib/libcuda.so.${PV}
-	usr/lib/libnvidia-cfg.so.${PV}
-	usr/lib/libvdpau_nvidia.so.${PV}
-	usr/lib/libXvMCNVIDIA.so.${PV}"
-
-QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko
-	usr/lib/opengl/nvidia/lib/libGL.so.1
-	usr/lib/opengl/nvidia/lib/libGLcore.so.1
-	usr/lib/libnvidia-cfg.so.1
-	usr/lib/opengl/nvidia/extensions/libglx.so.1
-	usr/lib/xorg/modules/drivers/nvidia_drv.so"
-
-QA_TEXTRELS_amd64="usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/libcuda.so.${PV}
-	usr/lib32/libvdpau_nvidia.so.${PV}"
-
-QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib/xorg/modules/drivers/nvidia_drv.so
-	usr/lib/libXvMCNVIDIA.a:NVXVMC.o"
-
-QA_EXECSTACK_amd64="usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/libnvcompiler.so.${PV}
-	usr/lib64/libXvMCNVIDIA.so.${PV}
-	usr/lib64/libXvMCNVIDIA.a:NVXVMC.o
-	usr/lib64/libnvidia-cfg.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib64/xorg/modules/drivers/nvidia_drv.so
-	usr/bin/nvidia-smi
-	usr/bin/nvidia-xconfig"
-
-QA_WX_LOAD_x86="usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib/libXvMCNVIDIA.a"
-
-QA_WX_LOAD_amd64="usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}"
-
-QA_SONAME_amd64="usr/lib64/libnvcompiler.so.${PV}"
-
-QA_DT_HASH_amd64="usr/lib32/libcuda.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib32/libvdpau_nvidia.so.${PV}
-	usr/lib64/libXvMCNVIDIA.so.${PV}
-	usr/lib64/libcuda.so.${PV}
-	usr/lib64/libnvidia-cfg.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib64/xorg/modules/drivers/nvidia_drv.so
-	usr/lib64/libvdpau_nvidia.so.${PV}
-	usr/bin/nvidia-smi
-	usr/bin/nvidia-xconfig"
-
-QA_DT_HASH_x86="usr/lib/libcuda.so.${PV}
-	usr/lib/libnvidia-cfg.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib/xorg/modules/drivers/nvidia_drv.so
-	usr/lib/libXvMCNVIDIA.so.${PV}
-	usr/lib/libvdpau_nvidia.so.${PV}
-	usr/bin/nvidia-smi
-	usr/bin/nvidia-xconfig"
-
-if use x86; then
-	PKG_V="-pkg0"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="-pkg2"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-elif use x86-fbsd; then
-	PKG_V=""
-	NV_PACKAGE="${X86_FBSD_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}${PKG_V}"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-lockdep_check() {
-	if linux_chkconfig_present LOCKDEP; then
-		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
-		eerror "Unfortunately, this option exports the symbol 'lockdep_init_map' as GPL-only"
-		eerror "which will prevent ${P} from compiling."
-		eerror "Please make sure the following options have been unset:"
-		eerror "    Kernel hacking  --->"
-		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
-		eerror "        [ ] Lock debugging: prove locking correctness"
-		eerror "        [ ] Lock usage statistics"
-		eerror "in 'menuconfig'"
-		die "LOCKDEP enabled"
-	fi
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default abi."
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-
-	if use kernel_linux; then
-		linux-mod_pkg_setup
-		MODULE_NAMES="nvidia(video:${S}/usr/src/nv)"
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
-		mtrr_check
-		lockdep_check
-	fi
-
-	# On BSD userland it wants real make command
-	use userland_BSD && MAKE="$(get_bmake)"
-
-	export _POSIX2_VERSION="199209"
-
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		NV_DOC="${S}/doc"
-		NV_EXEC="${S}/obj"
-		NV_LIB="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_X11_DRV="${NV_X11}"
-		NV_X11_EXT="${NV_X11}"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}/usr/share/doc"
-		NV_EXEC="${S}/usr/bin"
-		NV_LIB="${S}/usr/lib"
-		NV_SRC="${S}/usr/src/nv"
-		NV_MAN="${S}/usr/share/man/man1"
-		NV_X11="${S}/usr/X11R6/lib"
-		NV_X11_DRV="${NV_X11}/modules/drivers"
-		NV_X11_EXT="${NV_X11}/modules/extensions"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_unpack() {
-	if use kernel_linux && kernel_is lt 2 6 7; then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	if ! use x86-fbsd; then
-		mkdir "${S}"
-		cd "${S}"
-		unpack_makeself
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-	use x86-fbsd && cd doc
-
-	# Use the correct defines to make gtkglext build work
-	epatch "${FILESDIR}"/NVIDIA_glx-defines.patch
-	# Use some more sensible gl headers and make way for new glext.h
-	epatch "${FILESDIR}"/NVIDIA_glx-glheader.patch
-
-	if use kernel_linux; then
-		# Quiet down warnings the user does not need to see
-		sed -i \
-			-e 's:-Wpointer-arith::g' \
-			-e 's:-Wsign-compare::g' \
-			"${NV_SRC}"/Makefile.kbuild
-
-		# If you set this then it's your own fault when stuff breaks :)
-		use custom-cflags && sed -i "s:-O:${CFLAGS}:" "${NV_SRC}"/Makefile.*
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use x86-fbsd; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use kernel_linux; then
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-
-		VIDEOGROUP="$(egetent group video | cut -d ':' -f 3)"
-		if [ -z "$VIDEOGROUP" ]; then
-			eerror "Failed to determine the video group gid."
-			die "Failed to determine the video group gid."
-		fi
-
-		# Add the aliases
-		[ -f "${FILESDIR}/nvidia-169.07" ] || die "nvidia missing in FILESDIR"
-		sed -e 's:PACKAGE:'${PF}':g' \
-			-e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-169.07 > \
-			"${WORKDIR}"/nvidia
-		insinto /etc/modprobe.d
-		newins "${WORKDIR}"/nvidia nvidia.conf || die
-	elif use x86-fbsd; then
-		insinto /boot/modules
-		doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld" || die
-
-		exeinto /boot/modules
-		doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko" || die
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	dolib.so ${NV_LIB}/libnvidia-cfg.so.${NV_SOVER} || \
-		die "failed to install libnvidia-cfg"
-
-	# Xorg DDX driver
-	insinto /usr/$(get_libdir)/xorg/modules/drivers
-	doins ${NV_X11_DRV}/nvidia_drv.so || die "failed to install nvidia_drv.so"
-
-	# Xorg GLX driver
-	insinto /usr/$(get_libdir)/opengl/nvidia/extensions
-	doins ${NV_X11_EXT}/libglx.so.${NV_SOVER} || \
-		die "failed to install libglx.so"
-	dosym /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so.${NV_SOVER} \
-		/usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so || \
-		die "failed to create libglx.so symlink"
-
-	# XvMC driver
-	dolib.a ${NV_X11}/libXvMCNVIDIA.a || \
-		die "failed to install libXvMCNVIDIA.so"
-	dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER} || \
-		die "failed to install libXvMCNVIDIA.so"
-	dosym libXvMCNVIDIA.so.${NV_SOVER} /usr/$(get_libdir)/libXvMCNVIDIA.so || \
-		die "failed to create libXvMCNVIDIA.so symlink"
-
-	# CUDA headers (driver to come)
-	if use kernel_linux && [[ -d ${S}/usr/include/cuda ]]; then
-		dodir /usr/include/cuda
-		insinto /usr/include/cuda
-		doins usr/include/cuda/*.h || die "failed to install cuda headers"
-	fi
-
-	# OpenCL headers (driver to come)
-	if [[ -d ${S}/usr/include/CL ]]; then
-		dodir /usr/include/CL
-		insinto /usr/include/CL
-		doins usr/include/CL/*.h || die "failed to install OpenCL headers"
-	fi
-
-	# Documentation
-	dodoc ${NV_DOC}/XF86Config.sample
-	dohtml ${NV_DOC}/html/*
-	if use x86-fbsd; then
-		dodoc "${NV_DOC}/README"
-		doman "${NV_MAN}/nvidia-xconfig.1"
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-#		doman "${NV_MAN}/nvidia-smi.1.gz"
-		doman "${NV_MAN}/nvidia-xconfig.1.gz"
-	fi
-
-	# Helper Apps
-	dobin ${NV_EXEC}/nvidia-xconfig || die
-	dobin ${NV_EXEC}/nvidia-bug-report.sh || die
-	if use kernel_linux; then
-		dobin ${NV_EXEC}/nvidia-smi || die
-	fi
-
-	if has_multilib_profile ; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis) ; do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-}
-
-# Install nvidia library:
-# the first parameter is the place where to install it
-# the second parameter is the base name of the library
-# the third parameter is the provided soversion
-donvidia() {
-	dodir $1
-	exeinto $1
-
-	libname=$(basename $2)
-
-	doexe $2.$3 || die "failed to install $2"
-	dosym ${libname}.$3 $1/${libname} || die "failed to symlink $2"
-	[[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
-	local libdir= sover=
-
-	if use kernel_linux; then
-		if has_multilib_profile && [[ ${ABI} == "x86" ]] ; then
-			libdir=usr/lib32
-		else
-			libdir=usr/lib
-		fi
-		sover=${PV}
-	else
-		libdir=obj
-		# on FreeBSD it has just .1 suffix
-		sover=1
-	fi
-
-	# The GLX libraries
-	donvidia ${NV_ROOT}/lib ${libdir}/libGL.so ${sover}
-	donvidia ${NV_ROOT}/lib ${libdir}/libGLcore.so ${sover}
-	if use x86-fbsd; then
-		donvidia ${NV_ROOT}/lib ${libdir}/libnvidia-tls.so ${sover}
-	else
-		donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover}
-	fi
-
-	#cuda
-	if [[ -f ${libdir}/libcuda.so.${sover} ]]; then
-		dolib.so ${libdir}/libcuda.so.${sover}
-		[[ "${sover}" != "1" ]] && dosym libcuda.so.${sover} /usr/${inslibdir}/libcuda.so.1
-		dosym libcuda.so.1 /usr/${inslibdir}/libcuda.so
-	fi
-
-	#vdpau
-	if [[ -f ${libdir}/libvdpau_nvidia.so.${sover} ]]; then
-		dolib.so ${libdir}/libvdpau_nvidia.so.${sover}
-		dosym libvdpau_nvidia.so.${sover} /usr/${inslibdir}/libvdpau_nvidia.so
-	fi
-
-	# OpenCL
-	# NOTE: This isn't currently available in the publicly released drivers.
-	if [[ -f ${libdir}/libOpenCL.so.1.0.0 ]]; then
-
-		dolib.so ${libdir}/libnvcompiler.so.${sover}
-		[[ "${sover}" != "1" ]] && dosym libnvcompiler.so.${sover} /usr/${inslibdir}/libnvcompiler.so.1
-		dosym libnvcompiler.so.1 /usr/${inslibdir}/libnvcompiler.so
-
-		dolib.so ${libdir}/libOpenCL.so.1.0.0
-		dosym libOpenCL.so.1.0.0 /usr/${inslibdir}/libOpenCL.so.1
-		dosym libOpenCL.so.1 /usr/${inslibdir}/libOpenCL.so
-	fi
-}
-
-pkg_preinst() {
-	if use kernel_linux; then
-		linux-mod_pkg_postinst
-	fi
-
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-}
-
-pkg_postinst() {
-	if use kernel_linux; then
-		linux-mod_pkg_postinst
-	fi
-
-	# Switch to the nvidia implementation
-	eselect opengl set --use-old nvidia
-
-	echo
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-
-	elog "This ebuild installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-
-	elog "To use the NVIDIA GLX, run \"eselect opengl set nvidia\""
-	elog
-	elog "NVIDIA has requested that any bug reports submitted have the"
-	elog "output of /usr/bin/nvidia-bug-report.sh included."
-	elog
-	elog "To work with compiz, you must enable the AddARGBGLXVisuals option."
-	elog
-	elog "If you are having resolution problems, try disabling DynamicTwinView."
-	echo
-}
-
-pkg_postrm() {
-	if use kernel_linux; then
-		linux-mod_pkg_postrm
-	fi
-	eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.19.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.19.ebuild
deleted file mode 100644
index 86d891d06c51..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.19.ebuild
+++ /dev/null
@@ -1,514 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.19.ebuild,v 1.9 2011/07/14 22:50:38 jer Exp $
-
-EAPI="2"
-
-inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
-
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-
-DESCRIPTION="NVIDIA X11 driver and GLX libraries"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}-pkg0.run )
-	 amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}-pkg2.run )
-	 x86-fbsd? ( ftp://download.nvidia.com/freebsd/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* amd64 x86 ~x86-fbsd"
-IUSE="acpi custom-cflags gtk multilib kernel_linux"
-RESTRICT="strip"
-EMULTILIB_PKG="true"
-
-COMMON="<x11-base/xorg-server-1.10
-	gtk? (
-		!media-video/nvidia-settings
-		dev-libs/atk
-		dev-libs/glib
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/pango
-	)
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	multilib? ( app-emulation/emul-linux-x86-opengl )
-	>=app-admin/eselect-opengl-1.0.9"
-DEPEND="${COMMON}
-	kernel_linux? ( virtual/linux-sources )"
-RDEPEND="${COMMON}
-	acpi? ( sys-power/acpid )"
-
-QA_TEXTRELS_x86="usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib/xorg/modules/drivers/nvidia_drv.so
-	usr/lib/libcuda.so.${PV}
-	usr/lib/libnvidia-cfg.so.${PV}
-	usr/lib/libvdpau_nvidia.so.${PV}
-	usr/lib/libXvMCNVIDIA.so.${PV}"
-
-QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko
-	usr/lib/opengl/nvidia/lib/libGL.so.1
-	usr/lib/opengl/nvidia/lib/libGLcore.so.1
-	usr/lib/libnvidia-cfg.so.1
-	usr/lib/opengl/nvidia/extensions/libglx.so.1
-	usr/lib/xorg/modules/drivers/nvidia_drv.so"
-
-QA_TEXTRELS_amd64="usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/libcuda.so.${PV}
-	usr/lib32/libvdpau_nvidia.so.${PV}"
-
-QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib/xorg/modules/drivers/nvidia_drv.so
-	usr/lib/libXvMCNVIDIA.a:NVXVMC.o"
-
-QA_EXECSTACK_amd64="usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/libnvcompiler.so.${PV}
-	usr/lib64/libXvMCNVIDIA.so.${PV}
-	usr/lib64/libXvMCNVIDIA.a:NVXVMC.o
-	usr/lib64/libnvidia-cfg.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib64/xorg/modules/drivers/nvidia_drv.so
-	usr/bin/nvidia-settings
-	usr/bin/nvidia-smi
-	usr/bin/nvidia-xconfig"
-
-QA_WX_LOAD_x86="usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib/libXvMCNVIDIA.a"
-
-QA_WX_LOAD_amd64="usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}"
-
-QA_SONAME_amd64="usr/lib64/libnvcompiler.so.${PV}"
-
-QA_DT_HASH_amd64="usr/lib32/libcuda.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib32/libvdpau_nvidia.so.${PV}
-	usr/lib64/libXvMCNVIDIA.so.${PV}
-	usr/lib64/libcuda.so.${PV}
-	usr/lib64/libnvidia-cfg.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib64/xorg/modules/drivers/nvidia_drv.so
-	usr/lib64/libvdpau_nvidia.so.${PV}
-	usr/bin/nvidia-settings
-	usr/bin/nvidia-smi
-	usr/bin/nvidia-xconfig"
-
-QA_DT_HASH_x86="usr/lib/libcuda.so.${PV}
-	usr/lib/libnvidia-cfg.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib/xorg/modules/drivers/nvidia_drv.so
-	usr/lib/libXvMCNVIDIA.so.${PV}
-	usr/lib/libvdpau_nvidia.so.${PV}
-	usr/bin/nvidia-settings
-	usr/bin/nvidia-smi
-	usr/bin/nvidia-xconfig"
-
-if use x86; then
-	PKG_V="-pkg0"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="-pkg2"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-elif use x86-fbsd; then
-	PKG_V=""
-	NV_PACKAGE="${X86_FBSD_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}${PKG_V}"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-lockdep_check() {
-	if linux_chkconfig_present LOCKDEP; then
-		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
-		eerror "Unfortunately, this option exports the symbol 'lockdep_init_map' as GPL-only"
-		eerror "which will prevent ${P} from compiling."
-		eerror "Please make sure the following options have been unset:"
-		eerror "    Kernel hacking  --->"
-		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
-		eerror "        [ ] Lock debugging: prove locking correctness"
-		eerror "        [ ] Lock usage statistics"
-		eerror "in 'menuconfig'"
-		die "LOCKDEP enabled"
-	fi
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default abi."
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-
-	if use kernel_linux; then
-		linux-mod_pkg_setup
-		MODULE_NAMES="nvidia(video:${S}/usr/src/nv)"
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
-		mtrr_check
-		lockdep_check
-	fi
-
-	# On BSD userland it wants real make command
-	use userland_BSD && MAKE="$(get_bmake)"
-
-	export _POSIX2_VERSION="199209"
-
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		NV_DOC="${S}/doc"
-		NV_EXEC="${S}/obj"
-		NV_LIB="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_X11_DRV="${NV_X11}"
-		NV_X11_EXT="${NV_X11}"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}/usr/share/doc"
-		NV_EXEC="${S}/usr/bin"
-		NV_LIB="${S}/usr/lib"
-		NV_SRC="${S}/usr/src/nv"
-		NV_MAN="${S}/usr/share/man/man1"
-		NV_X11="${S}/usr/X11R6/lib"
-		NV_X11_DRV="${NV_X11}/modules/drivers"
-		NV_X11_EXT="${NV_X11}/modules/extensions"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_unpack() {
-	if use kernel_linux && kernel_is lt 2 6 7; then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	if ! use x86-fbsd; then
-		mkdir "${S}"
-		cd "${S}"
-		unpack_makeself
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-	use x86-fbsd && cd doc
-
-	# Use the correct defines to make gtkglext build work
-	epatch "${FILESDIR}"/NVIDIA_glx-defines.patch
-	# Use some more sensible gl headers and make way for new glext.h
-	epatch "${FILESDIR}"/NVIDIA_glx-glheader.patch
-
-	if use kernel_linux; then
-		# Quiet down warnings the user does not need to see
-		sed -i \
-			-e 's:-Wpointer-arith::g' \
-			-e 's:-Wsign-compare::g' \
-			"${NV_SRC}"/Makefile.kbuild
-
-		epatch "${FILESDIR}"/${PN}-173.14.30-2.6.39.patch #368939
-
-		# If you set this then it's your own fault when stuff breaks :)
-		use custom-cflags && sed -i "s:-O:${CFLAGS}:" "${NV_SRC}"/Makefile.*
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use x86-fbsd; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use kernel_linux; then
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-
-		VIDEOGROUP="$(egetent group video | cut -d ':' -f 3)"
-		if [ -z "$VIDEOGROUP" ]; then
-			eerror "Failed to determine the video group gid."
-			die "Failed to determine the video group gid."
-		fi
-
-		# Add the aliases
-		[ -f "${FILESDIR}/nvidia-169.07" ] || die "nvidia missing in FILESDIR"
-		sed -e 's:PACKAGE:'${PF}':g' \
-			-e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-169.07 > \
-			"${WORKDIR}"/nvidia
-		insinto /etc/modprobe.d
-		newins "${WORKDIR}"/nvidia nvidia.conf || die
-	elif use x86-fbsd; then
-		insinto /boot/modules
-		doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld" || die
-
-		exeinto /boot/modules
-		doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko" || die
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	dolib.so ${NV_LIB}/libnvidia-cfg.so.${NV_SOVER} || \
-		die "failed to install libnvidia-cfg"
-
-	# Xorg DDX driver
-	insinto /usr/$(get_libdir)/xorg/modules/drivers
-	doins ${NV_X11_DRV}/nvidia_drv.so || die "failed to install nvidia_drv.so"
-
-	# Xorg GLX driver
-	insinto /usr/$(get_libdir)/opengl/nvidia/extensions
-	doins ${NV_X11_EXT}/libglx.so.${NV_SOVER} || \
-		die "failed to install libglx.so"
-	dosym /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so.${NV_SOVER} \
-		/usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so || \
-		die "failed to create libglx.so symlink"
-
-	# XvMC driver
-	dolib.a ${NV_X11}/libXvMCNVIDIA.a || \
-		die "failed to install libXvMCNVIDIA.so"
-	dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER} || \
-		die "failed to install libXvMCNVIDIA.so"
-	dosym libXvMCNVIDIA.so.${NV_SOVER} /usr/$(get_libdir)/libXvMCNVIDIA.so || \
-		die "failed to create libXvMCNVIDIA.so symlink"
-
-	# CUDA headers (driver to come)
-	if [[ -d ${S}/usr/include/cuda ]]; then
-		dodir /usr/include/cuda
-		insinto /usr/include/cuda
-		doins usr/include/cuda/*.h || die "failed to install cuda headers"
-	fi
-
-	# OpenCL headers (driver to come)
-	if [[ -d ${S}/usr/include/CL ]]; then
-		dodir /usr/include/CL
-		insinto /usr/include/CL
-		doins usr/include/CL/*.h || die "failed to install OpenCL headers"
-	fi
-
-	# Documentation
-	dodoc ${NV_DOC}/XF86Config.sample
-	dohtml ${NV_DOC}/html/*
-	if use x86-fbsd; then
-		dodoc "${NV_DOC}/README"
-		doman "${NV_MAN}/nvidia-xconfig.1"
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-#		doman "${NV_MAN}/nvidia-smi.1.gz"
-		doman "${NV_MAN}/nvidia-xconfig.1.gz"
-	fi
-
-	# Helper Apps
-	dobin ${NV_EXEC}/nvidia-xconfig || die
-	dobin ${NV_EXEC}/nvidia-bug-report.sh || die
-	if use gtk; then
-		dobin usr/bin/nvidia-settings || die
-	fi
-#	if use kernel_linux; then
-#		dobin ${NV_EXEC}/nvidia-smi || die
-#	fi
-
-	if has_multilib_profile ; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis) ; do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-}
-
-# Install nvidia library:
-# the first parameter is the place where to install it
-# the second parameter is the base name of the library
-# the third parameter is the provided soversion
-donvidia() {
-	dodir $1
-	exeinto $1
-
-	libname=$(basename $2)
-
-	doexe $2.$3 || die "failed to install $2"
-	dosym ${libname}.$3 $1/${libname} || die "failed to symlink $2"
-	[[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
-	local libdir= sover=
-
-	if use kernel_linux; then
-		if has_multilib_profile && [[ ${ABI} == "x86" ]] ; then
-			libdir=usr/lib32
-		else
-			libdir=usr/lib
-		fi
-		sover=${PV}
-	else
-		libdir=obj
-		# on FreeBSD it has just .1 suffix
-		sover=1
-	fi
-
-	# The GLX libraries
-	donvidia ${NV_ROOT}/lib ${libdir}/libGL.so ${sover}
-	donvidia ${NV_ROOT}/lib ${libdir}/libGLcore.so ${sover}
-	if use x86-fbsd; then
-		donvidia ${NV_ROOT}/lib ${libdir}/libnvidia-tls.so ${sover}
-	else
-		donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover}
-	fi
-
-	#cuda
-	if [[ -f ${libdir}/libcuda.so.${sover} ]]; then
-		dolib.so ${libdir}/libcuda.so.${sover}
-		[[ "${sover}" != "1" ]] && dosym libcuda.so.${sover} /usr/${inslibdir}/libcuda.so.1
-		dosym libcuda.so.1 /usr/${inslibdir}/libcuda.so
-	fi
-
-	#vdpau
-	if [[ -f ${libdir}/libvdpau_nvidia.so.${sover} ]]; then
-		dolib.so ${libdir}/libvdpau_nvidia.so.${sover}
-		dosym libvdpau_nvidia.so.${sover} /usr/${inslibdir}/libvdpau_nvidia.so
-	fi
-
-	# OpenCL
-	# NOTE: This isn't currently available in the publicly released drivers.
-	if [[ -f ${libdir}/libOpenCL.so.1.0.0 ]]; then
-
-		dolib.so ${libdir}/libnvcompiler.so.${sover}
-		[[ "${sover}" != "1" ]] && dosym libnvcompiler.so.${sover} /usr/${inslibdir}/libnvcompiler.so.1
-		dosym libnvcompiler.so.1 /usr/${inslibdir}/libnvcompiler.so
-
-		dolib.so ${libdir}/libOpenCL.so.1.0.0
-		dosym libOpenCL.so.1.0.0 /usr/${inslibdir}/libOpenCL.so.1
-		dosym libOpenCL.so.1 /usr/${inslibdir}/libOpenCL.so
-	fi
-}
-
-pkg_preinst() {
-	if use kernel_linux; then
-		linux-mod_pkg_postinst
-	fi
-
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-}
-
-pkg_postinst() {
-	if use kernel_linux; then
-		linux-mod_pkg_postinst
-	fi
-
-	# Switch to the nvidia implementation
-	eselect opengl set --use-old nvidia
-
-	echo
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-
-	elog "This ebuild installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-
-	elog "To use the NVIDIA GLX, run \"eselect opengl set nvidia\""
-	elog
-	elog "NVIDIA has requested that any bug reports submitted have the"
-	elog "output of /usr/bin/nvidia-bug-report.sh included."
-	elog
-	elog "To work with compiz, you must enable the AddARGBGLXVisuals option."
-	elog
-	elog "If you are having resolution problems, try disabling DynamicTwinView."
-	echo
-}
-
-pkg_postrm() {
-	if use kernel_linux; then
-		linux-mod_pkg_postrm
-	fi
-	eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.4.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.4.ebuild
index fbe32c4d12ac..0b136cd64d51 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.4.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.4.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/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.4.ebuild,v 1.3 2011/11/07 15:44:13 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.4.ebuild,v 1.4 2011/12/07 17:29:09 phajdan.jr Exp $
 
 EAPI=2
 
@@ -13,7 +13,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dri"
 
 RDEPEND="x11-base/xorg-server[-minimal]"
diff --git a/x11-libs/libfm/libfm-9999.ebuild b/x11-libs/libfm/libfm-9999.ebuild
index 92b27369daa0..116a729067d3 100644
--- a/x11-libs/libfm/libfm-9999.ebuild
+++ b/x11-libs/libfm/libfm-9999.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/x11-libs/libfm/libfm-9999.ebuild,v 1.19 2011/12/04 09:56:00 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild,v 1.20 2011/12/07 18:52:22 hwoarang Exp $
 
 EAPI=3
 
@@ -24,6 +24,7 @@ RDEPEND="${COMMON_DEPEND}
 	x11-misc/shared-mime-info
 	udev? ( sys-fs/udisks )"
 DEPEND="${COMMON_DEPEND}
+	>=dev-lang/vala-0.14.0
 	dev-util/gtk-doc-am
 	doc? (
 		dev-util/gtk-doc
@@ -46,6 +47,10 @@ src_prepare() {
 		echo "data/ui/"${trans}.ui >> po/POTFILES.in
 	done
 	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" "${S}"/configure.ac || die
+	myvalaver="$(best_version dev-lang/vala | sed -e's@dev-lang/vala-\([0-9]*\.[0-9]*\)\..*@\1@g')"
+	myvalac="$(type -p valac-${myvalaver})"
+	[[ -x "${myvalac}" ]] || die "Vala compiler ${myvalac} not found"
+	export VALAC=${myvalac}
 	eautoreconf
 }
 
diff --git a/x11-misc/colord/colord-0.1.15.ebuild b/x11-misc/colord/colord-0.1.15.ebuild
index aae575e2e24a..701c6aba7070 100644
--- a/x11-misc/colord/colord-0.1.15.ebuild
+++ b/x11-misc/colord/colord-0.1.15.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/x11-misc/colord/colord-0.1.15.ebuild,v 1.3 2011/12/06 17:51:45 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-0.1.15.ebuild,v 1.4 2011/12/07 14:00:02 naota Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~x86-fbsd"
 IUSE="doc elibc_FreeBSD examples gusb +introspection scanner +udev vala"
 
 # FIXME: raise to libusb-1.0.9:1 when available
diff --git a/x11-terms/terminator/terminator-0.95.ebuild b/x11-terms/terminator/terminator-0.95.ebuild
index be7218513d64..bc5a8f7a76fa 100644
--- a/x11-terms/terminator/terminator-0.95.ebuild
+++ b/x11-terms/terminator/terminator-0.95.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/x11-terms/terminator/terminator-0.95.ebuild,v 1.7 2011/12/07 02:28:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminator/terminator-0.95.ebuild,v 1.8 2011/12/07 09:49:09 jlec Exp $
 
 EAPI="2"
 
@@ -9,7 +9,7 @@ PYTHON_MODNAME="terminatorlib"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
 
-inherit distutils eutils
+inherit gnome2 distutils eutils
 
 DESCRIPTION="Multiple GNOME terminals in one window"
 HOMEPAGE="http://www.tenshu.net/p/terminator.html"
@@ -36,3 +36,17 @@ src_prepare() {
 	epatch "${FILESDIR}"/0.94-session.patch
 	distutils_src_prepare
 }
+
+src_configure() {
+:
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	distutils_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	distutils_pkg_postrm
+}
diff --git a/x11-terms/terminator/terminator-0.96.ebuild b/x11-terms/terminator/terminator-0.96-r1.ebuild
similarity index 78%
rename from x11-terms/terminator/terminator-0.96.ebuild
rename to x11-terms/terminator/terminator-0.96-r1.ebuild
index 6ee062873f85..d47e1a393b87 100644
--- a/x11-terms/terminator/terminator-0.96.ebuild
+++ b/x11-terms/terminator/terminator-0.96-r1.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/x11-terms/terminator/terminator-0.96.ebuild,v 1.2 2011/12/07 02:28:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminator/terminator-0.96-r1.ebuild,v 1.1 2011/12/07 09:49:09 jlec Exp $
 
 EAPI="2"
 
@@ -9,7 +9,7 @@ PYTHON_MODNAME="terminatorlib"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
 
-inherit distutils eutils
+inherit gnome2 distutils eutils
 
 DESCRIPTION="Multiple GNOME terminals in one window"
 HOMEPAGE="http://www.tenshu.net/p/terminator.html"
@@ -36,3 +36,17 @@ src_prepare() {
 	epatch "${FILESDIR}"/0.94-session.patch
 	distutils_src_prepare
 }
+
+src_configure() {
+:
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	distutils_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	distutils_pkg_postrm
+}
diff --git a/xfce-extra/xfce4-dict/files/xfce4-dict-0.6.0-underlinking.patch b/xfce-extra/xfce4-dict/files/xfce4-dict-0.6.0-underlinking.patch
new file mode 100644
index 000000000000..9366f0b059b7
--- /dev/null
+++ b/xfce-extra/xfce4-dict/files/xfce4-dict-0.6.0-underlinking.patch
@@ -0,0 +1,21 @@
+http://bugzilla.xfce.org/show_bug.cgi?id=8229
+
+Fix underlinking. See below. Function "floor" and math.h is used in common.c which is part of libdict.
+
+/path/to/ld: ../lib/.libs/libdict.a(libdict_la-common.o): undefined reference to symbol 'floor@@GLIBC_2.2.5'
+/path/to/ld: note: 'floor@@GLIBC_2.2.5' is defined in DSO /lib64/libm.so.6 so try adding it to the linker command line
+/lib/libm.so.6: could not read symbols: Invalid operation
+collect2: ld returned 1 exit status
+
+--- lib/Makefile.am
++++ lib/Makefile.am
+@@ -34,7 +34,8 @@
+ libdict_la_LIBADD =								\
+ 	$(LIBXFCE4PANEL_LIBS)						\
+ 	$(LIBXFCEGUI4_LIBS)							\
+-	@GTHREAD_LIBS@
++	@GTHREAD_LIBS@								\
++	-lm
+ 
+ 
+ noinst_DATA = 									\
diff --git a/xfce-extra/xfce4-dict/xfce4-dict-0.6.0.ebuild b/xfce-extra/xfce4-dict/xfce4-dict-0.6.0.ebuild
index e617e7b3bda9..5874d1c5dc0b 100644
--- a/xfce-extra/xfce4-dict/xfce4-dict-0.6.0.ebuild
+++ b/xfce-extra/xfce4-dict/xfce4-dict-0.6.0.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-dict/xfce4-dict-0.6.0.ebuild,v 1.9 2011/05/19 20:46:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-dict/xfce4-dict-0.6.0.ebuild,v 1.10 2011/12/07 15:28:28 ssuominen Exp $
 
 EAPI=4
+EAUTORECONF=yes
 inherit xfconf
 
 DESCRIPTION="A dict.org querying application and panel plug-in for the Xfce desktop"
@@ -12,7 +13,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/0.6/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="debug"
+IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.6:2
 	>=x11-libs/gtk+-2.6:2
@@ -24,6 +25,6 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 pkg_setup() {
-	XFCONF=( $(xfconf_use_debug) )
+	PATCHES=( "${FILESDIR}"/${P}-underlinking.patch )
 	DOCS=( AUTHORS ChangeLog README )
 }
diff --git a/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.3.0-underlinking.patch b/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.3.0-underlinking.patch
new file mode 100644
index 000000000000..35a1209c509e
--- /dev/null
+++ b/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.3.0-underlinking.patch
@@ -0,0 +1,21 @@
+http://bugzilla.xfce.org/show_bug.cgi?id=7982
+
+panel-plugin/main.c is using function round, so explicitely link against -lm.  see below.
+
+/path/to/ld: xfce4_diskperf_plugin-main.o: undefined reference to symbol 'round@@GLIBC_2.2.5'
+/path/to/ld: note: 'round@@GLIBC_2.2.5' is defined in DSO /lib64/libm.so.6 so try adding it to the linker command line
+/lib64/libm.so.6: could not read symbols: Invalid operation
+collect2: ld returned 1 exit status
+
+--- panel-plugin/Makefile.am
++++ panel-plugin/Makefile.am
+@@ -25,7 +25,8 @@
+ 
+ xfce4_diskperf_plugin_LDADD=					\
+ 	$(LIBXFCE4PANEL_LIBS)					\
+-	$(LIBXFCEGUI4_LIBS)
++	$(LIBXFCEGUI4_LIBS)					\
++	-lm
+ 
+ #
+ # Desktop file
diff --git a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.3.0.ebuild b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.3.0.ebuild
index 4bcc5e7d2d0d..5236e08bc793 100644
--- a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.3.0.ebuild
+++ b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.3.0.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.3.0.ebuild,v 1.8 2011/05/19 21:30:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.3.0.ebuild,v 1.9 2011/12/07 15:43:53 ssuominen Exp $
 
 EAPI=4
+EAUTORECONF=yes
 inherit xfconf
 
 DESCRIPTION="Xfce's disk usage and performance panel plugin"
@@ -12,7 +13,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/2.3/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="debug"
+IUSE=""
 
 RDEPEND=">=xfce-base/libxfcegui4-4.8
 	>=xfce-base/xfce4-panel-4.8"
@@ -21,6 +22,6 @@ DEPEND="${RDEPEND}
 	dev-util/intltool"
 
 pkg_setup() {
-	XFCONF=( $(xfconf_use_debug) )
+	PATCHES=( "${FILESDIR}"/${P}-underlinking.patch )
 	DOCS=( AUTHORS ChangeLog NEWS README )
 }
diff --git a/xfce-extra/xfce4-screenshooter/files/xfce4-screenshooter-1.8.0-underlinking.patch b/xfce-extra/xfce4-screenshooter/files/xfce4-screenshooter-1.8.0-underlinking.patch
new file mode 100644
index 000000000000..03ff37d1e9ad
--- /dev/null
+++ b/xfce-extra/xfce4-screenshooter/files/xfce4-screenshooter-1.8.0-underlinking.patch
@@ -0,0 +1,16 @@
+Function floor is required, so link to libmath to avoid linking failure (underlinking)
+
+http://bugzilla.xfce.org/show_bug.cgi?id=8230
+
+--- Makefile.am
++++ Makefile.am
+@@ -51,7 +51,8 @@
+ 	@SOUP_LIBS@ \
+ 	@LIBXEXT_LIBS@ \
+ 	@LIBX11_LIBS@ \
+-	@XFIXES_LIBS@
++	@XFIXES_LIBS@ \
++	-lm
+ 
+ lib_libscreenshooter_built_sources = \
+ 	lib/screenshooter-marshal.c lib/screenshooter-marshal.h
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.8.0.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.8.0.ebuild
index 04dc7d621396..8123a7da7748 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.8.0.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.8.0.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/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.8.0.ebuild,v 1.6 2011/11/26 18:14:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.8.0.ebuild,v 1.7 2011/12/07 15:53:35 ssuominen Exp $
 
 EAPI=4
 EAUTORECONF=yes
@@ -31,7 +31,13 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 pkg_setup() {
-	XFCONF=( $(xfconf_use_debug) --enable-xfixes )
+	PATCHES=( "${FILESDIR}"/${P}-underlinking.patch )
+
+	XFCONF=(
+		$(xfconf_use_debug)
+		--enable-xfixes
+		)
+
 	DOCS=( AUTHORS ChangeLog NEWS README TODO )
 }