[kde-base] Remove all mentions of kdeprefix, start cleaning up some slotting

(Portage version: 2.2.0_alpha38/git/Linux x86_64, signed Manifest commit with key 229E5838)

53 files changed, 405 insertions, 805 deletions

diff --git a/kde-base/filelight/Manifest b/kde-base/filelight/Manifest
index 2e2658a3081..5d4cc1f92e5 100644
--- a/kde-base/filelight/Manifest
+++ b/kde-base/filelight/Manifest
@@ -1,7 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST kdeutils-4.6.4.tar.bz2 3699173 RMD160 48d7d040aa406bb24f5a142535b4e357e6874e8c SHA1 787653b60ce17e0e5900f9ec30f198b8d7bf1edf SHA256 f78d3e683f905da3f16c9848193c50f4df6d1c15d8a46a92829a24b8b4a96233
 DIST kdeutils-4.6.80.tar.bz2 3703905 RMD160 5f74fb68501f6fb9ae693574ecfdc632215ca8c3 SHA1 90b5e5bd95ec2de2d36db20c6155d23dbeab2d60 SHA256 353cf13dae809490967bc65c6f0d048af36e6b9884cbbd10335cd2b91cfbe9d1
-EBUILD filelight-4.6.4.ebuild 462 RMD160 629c99350ce81811f01ed04ee87fd0ab696703bd SHA1 d2d0f67b37202dd46b7de24296fa26f749479c77 SHA256 961b3a2720caca96569327efa1984c044ccb34dabe02eec8fc9a8c46a50fd88e
-EBUILD filelight-4.6.80.ebuild 450 RMD160 64e579f1f06b3cc6ed63b58073a78bcbfb672e52 SHA1 ba3b620ca78b710b072e3aa834dcb284ec3e00e7 SHA256 d5c2d905dc9ee2d2af0b8110c2c99cbff9605631a56eded194a6386ea480c736
-EBUILD filelight-4.6.9999.ebuild 415 RMD160 1b75ffcbf511ed49c135556867ab4827cf8c1de7 SHA1 2d1ab33626df3e77dd913b63e14b563aad3e65d3 SHA256 0ecb2ba89b7995f316ba61a3ca73b596f7493d081710ea9b05823cbf1b29cd26
-EBUILD filelight-9999.ebuild 415 RMD160 1b75ffcbf511ed49c135556867ab4827cf8c1de7 SHA1 2d1ab33626df3e77dd913b63e14b563aad3e65d3 SHA256 0ecb2ba89b7995f316ba61a3ca73b596f7493d081710ea9b05823cbf1b29cd26
+EBUILD filelight-4.6.4.ebuild 446 RMD160 65fd24136dce13ec6a309df458f6c9fdb3fb56e0 SHA1 7d0aa734244faea684766a67357fdfeb57a7493a SHA256 e7b31176c1b03fb9720e35dc6c6d67f00c3c75ec242349a6658e08763b7a3ae1
+EBUILD filelight-4.6.80.ebuild 434 RMD160 dd4a67d10304074de7268ee786c1e461e64d5746 SHA1 5b581c9bfe916192d3ce114a77c5187117545642 SHA256 d1b7431e18a60e259cdb780b05f6d09bba70963c8aacc83c691ade4334ac2d71
+EBUILD filelight-4.6.9999.ebuild 399 RMD160 ffdc1ed09c827c4d9740dceea3deed8e2b6eda1c SHA1 71481ffac8969259fd4660defebefb102d7fc449 SHA256 92b1256f6c0f85aaeee213b61450eb73bc723dc82ca856719b6c49aff1feedb0
+EBUILD filelight-9999.ebuild 399 RMD160 ffdc1ed09c827c4d9740dceea3deed8e2b6eda1c SHA1 71481ffac8969259fd4660defebefb102d7fc449 SHA256 92b1256f6c0f85aaeee213b61450eb73bc723dc82ca856719b6c49aff1feedb0
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJN7S7oAAoJELHSF2kinlg4M2sQAJ/ML65fPjSJxtWRa+LJvl2r
+WkTOC8KrYlAq9m0AzCaiJ9ycznYq13WCJ0TwHYVZ/JDN8/7SB6pE0DYcBOyno3z+
+xV2ZEqE5ZqscBJ3QqI+7xLftxlkOS2+A2q2asdrY7F7Yzk2RIBwUjfv7UkSDysnT
+SWIEquaHkLjivZHnW+1HSzJ070MS4Ly3LcQHptyYS6PRjn6QYtdVbYwurAA5psat
+gHYzY2UudqjUNKuY+RHrUgeCvj97m+3uia5NA/BxSiHhrjTMOX9gNePwg3ctt8no
+kecTqZj9ubp/cIYP+7uPVwdufsXs4XQaf27t32qEMxQhCYGPtL2dhYlYnC5pfCAm
+u65blkuOMkIgK2sNCk80gmqo40ZPe/cUeWuYqxP2uUm9GQfb7TeanxedTkUfWhQC
+9oG86RX9tAQmzsLIhDBsq6N7KNSih5mUgu+ilKtoLXdtjAT3jIh+DcRgKTwcGWuH
+HPJZOzYH0XlfsQNZWaan/iKNUjtOYQxAhxm6cUmFZwJpGRgFM6ebAs45lMW/vow8
+18W6KkpGvJ+gVs6T/XUKiskhRMsDA6b+81iaTTp8C60CxVjz3FvE/nveW/NqQ88X
+Q4Anhj6xIW0D2obUiZ9Ayx9b18VDARQutPC6OUZ/ZbojQNSopismJJIvwJusOk2M
+Kea/iKjyKxkexyWzZtw+
+=MG41
+-----END PGP SIGNATURE-----
diff --git a/kde-base/filelight/filelight-4.6.4.ebuild b/kde-base/filelight/filelight-4.6.4.ebuild
index 6ac2be517ce..91c963e1d32 100644
--- a/kde-base/filelight/filelight-4.6.4.ebuild
+++ b/kde-base/filelight/filelight-4.6.4.ebuild
@@ -15,6 +15,6 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
-	!kdeprefix? ( !kde-misc/filelight )
+	!kde-misc/filelight
 	x11-apps/xdpyinfo
 "
diff --git a/kde-base/filelight/filelight-4.6.80.ebuild b/kde-base/filelight/filelight-4.6.80.ebuild
index cbd88a760cb..37d0a5c1e92 100644
--- a/kde-base/filelight/filelight-4.6.80.ebuild
+++ b/kde-base/filelight/filelight-4.6.80.ebuild
@@ -15,6 +15,6 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
-	!kdeprefix? ( !kde-misc/filelight )
+	!kde-misc/filelight
 	x11-apps/xdpyinfo
 "
diff --git a/kde-base/filelight/filelight-4.6.9999.ebuild b/kde-base/filelight/filelight-4.6.9999.ebuild
index f184fdefebf..c091455e79e 100644
--- a/kde-base/filelight/filelight-4.6.9999.ebuild
+++ b/kde-base/filelight/filelight-4.6.9999.ebuild
@@ -15,6 +15,6 @@ KEYWORDS=""
 IUSE="debug"
 
 RDEPEND="
-	!kdeprefix? ( !kde-misc/filelight )
+	!kde-misc/filelight
 	x11-apps/xdpyinfo
 "
diff --git a/kde-base/filelight/filelight-9999.ebuild b/kde-base/filelight/filelight-9999.ebuild
index f184fdefebf..c091455e79e 100644
--- a/kde-base/filelight/filelight-9999.ebuild
+++ b/kde-base/filelight/filelight-9999.ebuild
@@ -15,6 +15,6 @@ KEYWORDS=""
 IUSE="debug"
 
 RDEPEND="
-	!kdeprefix? ( !kde-misc/filelight )
+	!kde-misc/filelight
 	x11-apps/xdpyinfo
 "
diff --git a/kde-base/kde-env/Manifest b/kde-base/kde-env/Manifest
index 52d3fe3b167..9d16acfc524 100644
--- a/kde-base/kde-env/Manifest
+++ b/kde-base/kde-env/Manifest
@@ -1,5 +1,25 @@
-EBUILD kde-env-4.6.4.ebuild 2079 RMD160 8290fd70e6ab2e019f64185ef200f5c9937f0e47 SHA1 ed4652b1108626c94a2961f16461889c70f5ee22 SHA256 005bb29cea0ac6bc08eeaa17be13e6f4f8d79c76bcee9397b4d4bf64d95802b4
-EBUILD kde-env-4.6.80.ebuild 2052 RMD160 1caa6cc202c6698fecf8e268bd7c6cf4a55fb584 SHA1 def3808523e093749f46af193db11834a993f4b5 SHA256 41b35c99814d9c01949d8e3a6dc99e5d9a100020ea8e1f2d429a517f032f56bd
-EBUILD kde-env-4.6.9999.ebuild 2017 RMD160 13bcbbbc3f9d431888d1c1891b33da28505e050f SHA1 8f3539ee842362838ba6b4f87656cf4b781180f3 SHA256 e888a33531d3d43f1838958550783cc5b782dd29f187cbae7ed96a8e9df481c5
-EBUILD kde-env-9999.ebuild 2017 RMD160 13bcbbbc3f9d431888d1c1891b33da28505e050f SHA1 8f3539ee842362838ba6b4f87656cf4b781180f3 SHA256 e888a33531d3d43f1838958550783cc5b782dd29f187cbae7ed96a8e9df481c5
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD kde-env-4.6.4.ebuild 1001 RMD160 7e8ad8b9f0f2239aaf4183e071077991a5417a73 SHA1 1a4813b78afaeea7de4323104dd0477b71e8c2ce SHA256 fa7c7cc79be3608fd52443741d426b843249d6595f41ae1fde44d0bd5343ed9a
+EBUILD kde-env-4.6.80.ebuild 994 RMD160 240bbe42fda254d453ec780e592f5f41fe77777a SHA1 818f6819554a266aace978575f1014b3c0b6c077 SHA256 69819552a63a655919f335bef84454dc5cff5b42eacff1b90ec23ce6301ac4fb
+EBUILD kde-env-4.6.9999.ebuild 939 RMD160 d00aacf4b6dc551b1f987d8ee50e029266abd89d SHA1 62f64f85fcdc193aa4ce44718e87db611514bab9 SHA256 75728c1c056051611f5e145e05b7b7c2295f230dce59a930360344ad38343708
+EBUILD kde-env-9999.ebuild 937 RMD160 78adf09c975e8be0f9d340369a0662fabc111b83 SHA1 525d96ad5e1d41dc688755a50fa2d66bcf34f41e SHA256 d059ecb481525f8a7967cdd6d672f4be9d5e50914ca9d24d500ec7ef42cf8d75
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJN7S7oAAoJELHSF2kinlg4cNoP+wZBrmeDUJ3FYoVqAagD8xQz
+6FUVguDfoGhB/fRFtq9OIFN1JfM4Jo/x2N5OvDIqaZRd+HbLILGfMtw7eObqDFqE
+bekAADWRWxr3pIt9I2pCKDbcMFL9X3j8Rt4PvjvnDfuCj4fJ5YKMAnGsEnMJjrE9
+4alclAlVn12AaOfsdCmrSy4J7H8oYkovR1Mm8wgCpcGI4z2YnZYjnOF+4j5RVkux
+3/wL63R/PLQ65GbPc0hPDjL3MdCZjR3ewS3jsu1ak7Kj3vVsqtfuYtG3CCETST7J
+yyG70fS0CLptb/ggVpOLUYFHbhET+MP+1veckrUdsHdHnycq8V29Fkh5/RUWQN6M
+KW5whxhboDuBbWpYuxHvy94Y2JkYQhH3FG3kYd9kNyqD9dTfWu+oP4t3GzuJXVRq
+lm737EisMTJdR9MWwZgwZ9MUnLYBfMw1c0OtdYWerA3CasDYUQCRjn+MweYQEHyD
+GUAA/OYtAV6coJyZAqUtnlwIayOWb8xxo79X7uHSKF8PsCQxEeQUX9uHvKZBjeXF
+cHYXcPAInIbMM9yOCG19SV5894uAY0SkwT9q0D2qcT35QwBA/eAZuHPchxPXaL9P
+vgOpOWHCntq9x/RXNFAnwZWVijS5t1GgZ1N9rmIoP+rSaotqys/Qo/MXL5+c+2qY
+4tSVplC/d96ff9koeLCI
+=a9hZ
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kde-env/kde-env-4.6.4.ebuild b/kde-base/kde-env/kde-env-4.6.4.ebuild
index 3b6d4ffefa1..3bea01f5e36 100644
--- a/kde-base/kde-env/kde-env-4.6.4.ebuild
+++ b/kde-base/kde-env/kde-env-4.6.4.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 LICENSE="as-is"
 IUSE="aqua"
 
-add_blocker kdelibs 4.2.2-r1 '<3.5.10-r3:3.5' 4.2.70:4.3
+add_blocker kdelibs '<4.6.4' '<3.5.10-r3:3.5'
 
 S=${WORKDIR}
 
@@ -29,63 +29,23 @@ src_prepare() {
 }
 
 src_install() {
-	if use kdeprefix; then
-		# List all the multilib libdirs
-		local _libdir _libdirs
-		for _libdir in $(get_all_libdirs); do
-			_libdirs+=":${EKDEDIR}/${_libdir}"
-		done
-		_libdirs=${_libdirs#:}
-
-		# number goes down with version
-		cat <<-EOF > 43kdepaths-${SLOT}
-PATH="${EKDEDIR}/bin"
-ROOTPATH="${EKDEDIR}/sbin:${EKDEDIR}/bin"
-LDPATH="${_libdirs}"
-MANPATH="${EKDEDIR}/share/man"
-CONFIG_PROTECT="${KDEDIR}/share/config ${KDEDIR}/env ${KDEDIR}/shutdown /usr/share/config"
-#KDE_IS_PRELINKED=1
-PKG_CONFIG_PATH="${EKDEDIR}/$(get_libdir)/pkgconfig"
-XDG_DATA_DIRS="${EKDEDIR}/share"
-EOF
-		doenvd 43kdepaths-${SLOT}
-		cat <<-EOF > 50-kde-${SLOT}
-SEARCH_DIRS="${EKDEDIR}/bin ${EKDEDIR}/lib*"
-EOF
-		insinto /etc/revdep-rebuild
-		doins 50-kde-${SLOT}
-
-		# kdeglobals needed to make third party apps installed in /usr work
-		cat <<-EOF > kdeglobals
-[Directories][\$i]
-prefixes=${EPREFIX}/usr
-EOF
-		insinto ${KDEDIR}/share/config
-		doins kdeglobals
-
-		KDE_X="KDE-${SLOT}"
-	else
-		# Much simpler for the FHS compliant -kdeprefix install
-		# number goes down with version
-		cat <<-EOF > 43kdepaths
+	# number goes down with version
+	cat <<-EOF > 43kdepaths
 CONFIG_PROTECT="/usr/share/config"
 #KDE_IS_PRELINKED=1
 EOF
-		doenvd 43kdepaths
-
-		KDE_X="KDE-4"
-	fi
+	doenvd 43kdepaths
 
 	# Properly place xinitrc.d file that exports XDG_MENU_PREFIX to env
-	cat <<EOF > 11-xdg-menu-kde-${SLOT}
+	cat <<EOF > 11-xdg-menu-kde-4
 #!/bin/sh
 
-if [ -z \${XDG_MENU_PREFIX} ] && [ "\${DESKTOP_SESSION}" = "${KDE_X}" ]; then
-	export XDG_MENU_PREFIX="kde-${SLOT}-"
+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-${SLOT} || die "doexe failed"
+	doexe 11-xdg-menu-kde-4 || die "doexe failed"
 }
 
 pkg_preinst() {
diff --git a/kde-base/kde-env/kde-env-4.6.80.ebuild b/kde-base/kde-env/kde-env-4.6.80.ebuild
index 166bd2f6583..188deab857a 100644
--- a/kde-base/kde-env/kde-env-4.6.80.ebuild
+++ b/kde-base/kde-env/kde-env-4.6.80.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 LICENSE="as-is"
 IUSE="aqua"
 
-add_blocker kdelibs 4.2.2-r1 '<3.5.10-r3:3.5' 4.2.70:4.3
+add_blocker kdelibs 4.6.80 '<3.5.10-r3:3.5'
 
 S=${WORKDIR}
 
@@ -29,63 +29,25 @@ src_prepare() {
 }
 
 src_install() {
-	if use kdeprefix; then
-		# List all the multilib libdirs
-		local _libdir _libdirs
-		for _libdir in $(get_all_libdirs); do
-			_libdirs+=":${EKDEDIR}/${_libdir}"
-		done
-		_libdirs=${_libdirs#:}
-
-		# number goes down with version
-		cat <<-EOF > 43kdepaths-${SLOT}
-PATH="${EKDEDIR}/bin"
-ROOTPATH="${EKDEDIR}/sbin:${EKDEDIR}/bin"
-LDPATH="${_libdirs}"
-MANPATH="${EKDEDIR}/share/man"
-CONFIG_PROTECT="${KDEDIR}/share/config ${KDEDIR}/env ${KDEDIR}/shutdown /usr/share/config"
-#KDE_IS_PRELINKED=1
-PKG_CONFIG_PATH="${EKDEDIR}/$(get_libdir)/pkgconfig"
-XDG_DATA_DIRS="${EKDEDIR}/share"
-EOF
-		doenvd 43kdepaths-${SLOT}
-		cat <<-EOF > 50-kde-${SLOT}
-SEARCH_DIRS="${EKDEDIR}/bin ${EKDEDIR}/lib*"
-EOF
-		insinto /etc/revdep-rebuild
-		doins 50-kde-${SLOT}
-
-		# kdeglobals needed to make third party apps installed in /usr work
-		cat <<-EOF > kdeglobals
-[Directories][\$i]
-prefixes=${EPREFIX}/usr
-EOF
-		insinto ${KDEDIR}/share/config
-		doins kdeglobals
-
-		KDE_X="KDE-${SLOT}"
-	else
-		# Much simpler for the FHS compliant -kdeprefix install
-		# number goes down with version
-		cat <<-EOF > 43kdepaths
+	# number goes down with version
+	cat <<-EOF > 43kdepaths
 CONFIG_PROTECT="/usr/share/config"
 #KDE_IS_PRELINKED=1
 EOF
-		doenvd 43kdepaths
+	doenvd 43kdepaths
 
-		KDE_X="KDE-4"
-	fi
+	KDE_X="KDE-4"
 
 	# Properly place xinitrc.d file that exports XDG_MENU_PREFIX to env
-	cat <<EOF > 11-xdg-menu-kde-${SLOT}
+	cat <<EOF > 11-xdg-menu-kde-4
 #!/bin/sh
 
-if [ -z \${XDG_MENU_PREFIX} ] && [ "\${DESKTOP_SESSION}" = "${KDE_X}" ]; then
+if [ -z \${XDG_MENU_PREFIX} ] && [ "\${DESKTOP_SESSION}" = "KDE-4" ]; then
 	export XDG_MENU_PREFIX="kde-${SLOT}-"
 fi
 EOF
 	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe 11-xdg-menu-kde-${SLOT} || die "doexe failed"
+	doexe 11-xdg-menu-kde-4 || die "doexe failed"
 }
 
 pkg_preinst() {
diff --git a/kde-base/kde-env/kde-env-4.6.9999.ebuild b/kde-base/kde-env/kde-env-4.6.9999.ebuild
index 55c2e8b965f..afe176abe1b 100644
--- a/kde-base/kde-env/kde-env-4.6.9999.ebuild
+++ b/kde-base/kde-env/kde-env-4.6.9999.ebuild
@@ -16,7 +16,7 @@ KEYWORDS=""
 LICENSE="as-is"
 IUSE="aqua"
 
-add_blocker kdelibs 4.2.2-r1 '<3.5.10-r3:3.5' 4.2.70:4.3
+add_blocker kdelibs '<4.6.4' '<3.5.10-r3:3.5'
 
 S=${WORKDIR}
 
@@ -29,63 +29,23 @@ src_prepare() {
 }
 
 src_install() {
-	if use kdeprefix; then
-		# List all the multilib libdirs
-		local _libdir _libdirs
-		for _libdir in $(get_all_libdirs); do
-			_libdirs+=":${EKDEDIR}/${_libdir}"
-		done
-		_libdirs=${_libdirs#:}
-
-		# number goes down with version
-		cat <<-EOF > 43kdepaths-${SLOT}
-PATH="${EKDEDIR}/bin"
-ROOTPATH="${EKDEDIR}/sbin:${EKDEDIR}/bin"
-LDPATH="${_libdirs}"
-MANPATH="${EKDEDIR}/share/man"
-CONFIG_PROTECT="${KDEDIR}/share/config ${KDEDIR}/env ${KDEDIR}/shutdown /usr/share/config"
-#KDE_IS_PRELINKED=1
-PKG_CONFIG_PATH="${EKDEDIR}/$(get_libdir)/pkgconfig"
-XDG_DATA_DIRS="${EKDEDIR}/share"
-EOF
-		doenvd 43kdepaths-${SLOT}
-		cat <<-EOF > 50-kde-${SLOT}
-SEARCH_DIRS="${EKDEDIR}/bin ${EKDEDIR}/lib*"
-EOF
-		insinto /etc/revdep-rebuild
-		doins 50-kde-${SLOT}
-
-		# kdeglobals needed to make third party apps installed in /usr work
-		cat <<-EOF > kdeglobals
-[Directories][\$i]
-prefixes=${EPREFIX}/usr
-EOF
-		insinto ${KDEDIR}/share/config
-		doins kdeglobals
-
-		KDE_X="KDE-${SLOT}"
-	else
-		# Much simpler for the FHS compliant -kdeprefix install
-		# number goes down with version
-		cat <<-EOF > 43kdepaths
+	# number goes down with version
+	cat <<-EOF > 43kdepaths
 CONFIG_PROTECT="/usr/share/config"
 #KDE_IS_PRELINKED=1
 EOF
-		doenvd 43kdepaths
-
-		KDE_X="KDE-4"
-	fi
+	doenvd 43kdepaths
 
 	# Properly place xinitrc.d file that exports XDG_MENU_PREFIX to env
-	cat <<EOF > 11-xdg-menu-kde-${SLOT}
+	cat <<EOF > 11-xdg-menu-kde-4
 #!/bin/sh
 
-if [ -z \${XDG_MENU_PREFIX} ] && [ "\${DESKTOP_SESSION}" = "${KDE_X}" ]; then
-	export XDG_MENU_PREFIX="kde-${SLOT}-"
+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-${SLOT} || die "doexe failed"
+	doexe 11-xdg-menu-kde-4 || die "doexe failed"
 }
 
 pkg_preinst() {
diff --git a/kde-base/kde-env/kde-env-9999.ebuild b/kde-base/kde-env/kde-env-9999.ebuild
index 55c2e8b965f..d99319a26c1 100644
--- a/kde-base/kde-env/kde-env-9999.ebuild
+++ b/kde-base/kde-env/kde-env-9999.ebuild
@@ -16,7 +16,7 @@ KEYWORDS=""
 LICENSE="as-is"
 IUSE="aqua"
 
-add_blocker kdelibs 4.2.2-r1 '<3.5.10-r3:3.5' 4.2.70:4.3
+add_blocker kdelibs 4.6.80 '<3.5.10-r3:3.5'
 
 S=${WORKDIR}
 
@@ -29,63 +29,23 @@ src_prepare() {
 }
 
 src_install() {
-	if use kdeprefix; then
-		# List all the multilib libdirs
-		local _libdir _libdirs
-		for _libdir in $(get_all_libdirs); do
-			_libdirs+=":${EKDEDIR}/${_libdir}"
-		done
-		_libdirs=${_libdirs#:}
-
-		# number goes down with version
-		cat <<-EOF > 43kdepaths-${SLOT}
-PATH="${EKDEDIR}/bin"
-ROOTPATH="${EKDEDIR}/sbin:${EKDEDIR}/bin"
-LDPATH="${_libdirs}"
-MANPATH="${EKDEDIR}/share/man"
-CONFIG_PROTECT="${KDEDIR}/share/config ${KDEDIR}/env ${KDEDIR}/shutdown /usr/share/config"
-#KDE_IS_PRELINKED=1
-PKG_CONFIG_PATH="${EKDEDIR}/$(get_libdir)/pkgconfig"
-XDG_DATA_DIRS="${EKDEDIR}/share"
-EOF
-		doenvd 43kdepaths-${SLOT}
-		cat <<-EOF > 50-kde-${SLOT}
-SEARCH_DIRS="${EKDEDIR}/bin ${EKDEDIR}/lib*"
-EOF
-		insinto /etc/revdep-rebuild
-		doins 50-kde-${SLOT}
-
-		# kdeglobals needed to make third party apps installed in /usr work
-		cat <<-EOF > kdeglobals
-[Directories][\$i]
-prefixes=${EPREFIX}/usr
-EOF
-		insinto ${KDEDIR}/share/config
-		doins kdeglobals
-
-		KDE_X="KDE-${SLOT}"
-	else
-		# Much simpler for the FHS compliant -kdeprefix install
-		# number goes down with version
-		cat <<-EOF > 43kdepaths
+	# number goes down with version
+	cat <<-EOF > 43kdepaths
 CONFIG_PROTECT="/usr/share/config"
 #KDE_IS_PRELINKED=1
 EOF
-		doenvd 43kdepaths
-
-		KDE_X="KDE-4"
-	fi
+	doenvd 43kdepaths
 
 	# Properly place xinitrc.d file that exports XDG_MENU_PREFIX to env
-	cat <<EOF > 11-xdg-menu-kde-${SLOT}
+	cat <<EOF > 11-xdg-menu-kde-4
 #!/bin/sh
 
-if [ -z \${XDG_MENU_PREFIX} ] && [ "\${DESKTOP_SESSION}" = "${KDE_X}" ]; then
-	export XDG_MENU_PREFIX="kde-${SLOT}-"
+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-${SLOT} || die "doexe failed"
+	doexe 11-xdg-menu-kde-4 || die "doexe failed"
 }
 
 pkg_preinst() {
diff --git a/kde-base/kdeartwork-iconthemes/Manifest b/kde-base/kdeartwork-iconthemes/Manifest
index 4ca37258606..9c8e5f27594 100644
--- a/kde-base/kdeartwork-iconthemes/Manifest
+++ b/kde-base/kdeartwork-iconthemes/Manifest
@@ -1,7 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST kdeartwork-4.6.4.tar.bz2 116889409 RMD160 3e5663f8c8d706f83ae9d0dfe5c931dfe91d6917 SHA1 460b8bff5f6799f0e2553e1b78112e3192ade2b3 SHA256 30114bd00e15d06a9e3401e4a4e00f0c46374970ee4e9e3b28794da2e38efc57
 DIST kdeartwork-4.6.80.tar.bz2 122164313 RMD160 be403eb42ce91b5125b7861b2be22e8ab8f43cf8 SHA1 70c5274f2c933b87c10a1ae53eb6971ae3887e87 SHA256 6d20c2f37bbbb51a4b3102210e15f292f313d882ba4fefdf87d730387fca7134
-EBUILD kdeartwork-iconthemes-4.6.4.ebuild 369 RMD160 8605854d0560491b9fa63483b9848e2f107804a8 SHA1 077f00d2148ccd735b7a4833b916676e2536bec9 SHA256 96e80e743705ee79351c84463280185753593e25c7d0641ea4e38b97a72e80cd
-EBUILD kdeartwork-iconthemes-4.6.80.ebuild 418 RMD160 d3da4e0e91231db518ca588c8c8cb156804dd702 SHA1 4b4af240f3de5514baa0e7e51114486836c3d0c4 SHA256 ff403a46fdf59e92315b6b707993d41a57caac129cfb24a552c5b424c35fe21e
-EBUILD kdeartwork-iconthemes-4.6.9999.ebuild 322 RMD160 b31380dfb180279681ee53069f3bce83c1845222 SHA1 e00f258b3391db5d946553e521d34d253a153252 SHA256 c89a1234d0a931768eb5475f0ccc1fac4e419d31f06cbc59b334e82e4fb421f6
-EBUILD kdeartwork-iconthemes-9999.ebuild 383 RMD160 e4d535f9019d82a1d601f2a8b2ffed47f4fcaf18 SHA1 411c7f9152f2b4c8c1453dbff082684a3f21a0ef SHA256 cffa5f8baa54ba9b6a6082542238a5144cb0fb54a93459cb07363634936bb4d0
+EBUILD kdeartwork-iconthemes-4.6.4.ebuild 353 RMD160 9be007c75fccec2900d521d85e491efd51a6f778 SHA1 bd34a56760e62742dc399facdc49fab66266d285 SHA256 7a31bc77c927a1e1efd3fd778ea892f55459240a5e1c6c647578f7a1135b18ce
+EBUILD kdeartwork-iconthemes-4.6.80.ebuild 402 RMD160 23a838a955cf6db0c85407a1491f760536872eca SHA1 6322b1d2b6e9b85be0db79b7259937d0e951f49b SHA256 0fa04e04a190c21ae2fc42fddff70d2a0ba35c2bde4e73d79683beb5c5091338
+EBUILD kdeartwork-iconthemes-4.6.9999.ebuild 306 RMD160 28fe1841eabc7fb954ae400f115b577f103dac5e SHA1 1539d4ccbdc3e163ff47ce2a4c4cc2537228dfab SHA256 141966bd16e8e69bdba30bdf19ffdfc4b625ed184a5ccd33e8b9d47df68290f0
+EBUILD kdeartwork-iconthemes-9999.ebuild 367 RMD160 47387aa7d2b57366793a5938085efb10a8d81208 SHA1 3bcf5a38ff635b7f3829429fca81d86fd3329af0 SHA256 a0d2a802b483b96c1e9b1190a3a8ee9e60211588fd7a2009963edf80d366ddf8
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJN7S7oAAoJELHSF2kinlg4WKgP+gJHQpBfiQweoFVgnbJ7RFlI
+yxd8IFjg4pOOwRm5DVmdyIV6VjviDMy198QdM/vRWOjYNUcGZNHILeZ/967SqgN7
+oSyIPJPKcyIY42quktAA7p01vYA06TOEChBObh2I4fQ83PwA7E1XIHkYa6evAOqn
+niijHquscAymI2s34CPZuNu6u338MgDQqUnlD/GFd8f1riUyf8E9TVqwVjTMcvGm
+D5T3Q3aB4UykKR3h3Gi1XkWXx99CUz0vowebSWLvOINkN40ZcxqlUg2mdu90VXGM
+Dyks96y+TjasnPuYc2T0hwyWHJy712BjH4Nyn+fAVu3TePnfXfLsiASgIVEdcjsy
+UYWpiTmY0KP6GFSa+LrgeIm82octBv+zshVnTdgEj69pPCEpqqa7/RenY46/sHXe
+CNEDT04/BZVmkRRBcljNrmAwKUAxxrNr2NPwJNSy6qUBxVNRA1z4zbnHNecczITJ
+uqK3C8UT6/n0aoiyq92l2FYF8YHm3QvNRmIvhtNGreIZoTC9DLw8OCf+Y0kTeMh1
+0dDAjBxI2jU32Mv6aM2kxo7eoEFBzdLXx2Lv2cep1qjfyuttB1QLbW7yO3NFDNw/
+cF1EjDWKYpmfhoJOHFUREhbQ/blDsDQCLecTg0Lazrp1MfHH9Za3snKoGdweKq+T
+KBaxr9BLjod4ufiaWdHu
+=D8/7
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.6.4.ebuild b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.6.4.ebuild
index 4bd1d8d9684..6dfbf386b4a 100644
--- a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.6.4.ebuild
+++ b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.6.4.ebuild
@@ -14,5 +14,5 @@ IUSE=""
 
 # Provides nuvola icon theme
 RDEPEND="
-	!kdeprefix? ( !x11-themes/nuvola )
+	!x11-themes/nuvola
 "
diff --git a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.6.80.ebuild b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.6.80.ebuild
index 1893ff717d5..761f94e8c78 100644
--- a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.6.80.ebuild
+++ b/