[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)

1 files changed, 8 insertions, 48 deletions

diff --git a/kde-base/kde-env/kde-env-9999.ebuild b/kde-base/kde-env/kde-env-9999.ebuild
index 55c2e8b965..d99319a26c 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() {