[kde-base/kde-env] EPREFIXify

4 files changed, 48 insertions, 42 deletions

diff --git a/kde-base/kde-env/Manifest b/kde-base/kde-env/Manifest
index 5db3580753..6c4551200d 100644
--- a/kde-base/kde-env/Manifest
+++ b/kde-base/kde-env/Manifest
@@ -1,4 +1,4 @@
-EBUILD kde-env-4.3.80.ebuild 1802 RMD160 237897955d8c97d4cdf266e708ba61b5d37c41b6 SHA1 888c871d0f28a539bb15ad0fb44623c67eb35ed5 SHA256 8b72910af2af36a84dab6dd3f2f9165b863b9b0cb68578b52cfcf68585f30ed6
-EBUILD kde-env-4.3.9999.ebuild 1732 RMD160 cdbaec4159f432f43b1d0b690ba0c1d6dcb1ddcb SHA1 dbf61e75535de687de34edd38f19b2e9cf351c78 SHA256 02ce9cd322d4f95f6c90466a4adc9b3b5aa332285d5cbcee3f27b8ad0cac239a
-EBUILD kde-env-9999.ebuild 1753 RMD160 cf834a87bd876d40fb9ae55819c4ccac7f4f0bac SHA1 fc1a950c7d6f7566b4bc562ef352d5380dc1bc45 SHA256 7195f972b3ea7a3d7cf65bf480a689b82dc311a6f020a29040022f765af6750a
+EBUILD kde-env-4.3.80.ebuild 1856 RMD160 a0f97c6f26a721e53cda9e174c54dd963ca92a09 SHA1 09331c8ec278b1cea57285df295c50c9376eefd7 SHA256 ca1d0b141e2d8b0906100865bae0c3a645b5c62b109fee6a195c07bacfb7a3c5
+EBUILD kde-env-4.3.9999.ebuild 1786 RMD160 c2f6cef48a3981782851e105fbca66dbe07b917b SHA1 a5fab4509c3f8cad4a3065bb41c33c10bc20ef43 SHA256 d7ff1ee39149924b93abcf8c1a134b2ba5b3952f9e143695ef3b9f2277750c3f
+EBUILD kde-env-9999.ebuild 1807 RMD160 d8eec3ea627b0868d99a7a09779a43f89ca980b6 SHA1 8a064ef471c9f644ca5d7d8e2af451cb73b56551 SHA256 825b70a3c59aaabf052670cb22ddca2fe24a1d41942ecedaf3ad6730dacc465d
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kde-env/kde-env-4.3.80.ebuild b/kde-base/kde-env/kde-env-4.3.80.ebuild
index 43871d4b76..1fe298edeb 100644
--- a/kde-base/kde-env/kde-env-4.3.80.ebuild
+++ b/kde-base/kde-env/kde-env-4.3.80.ebuild
@@ -34,14 +34,16 @@ src_compile() {
 }
 
 src_install() {
+	use prefix || ED=$D
+
 	dodir /etc/env.d
 	dodir /etc/revdep-rebuild
-	dodir "${PREFIX}/share/config"
+	dodir ${KDEDIR}/share/config
 
 	# List all the multilib libdirs
 	local _libdir _libdirs
 	for _libdir in $(get_all_libdirs); do
-		_libdirs="${_libdirs}:${PREFIX}/${_libdir}"
+		_libdirs+=":${EKDEDIR}/${_libdir}"
 	done
 	_libdirs=${_libdirs#:}
 
@@ -49,24 +51,24 @@ src_install() {
 
 		# number goes down with version
 		cat <<-EOF > "${T}/43kdepaths-${SLOT}"
-PATH="${PREFIX}/bin"
-ROOTPATH="${PREFIX}/sbin:${PREFIX}/bin"
+PATH="${EKDEDIR}/bin"
+ROOTPATH="${EKDEDIR}/sbin:${EKDEDIR}/bin"
 LDPATH="${_libdirs}"
-MANPATH="${PREFIX}/share/man"
-CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
+MANPATH="${EKDEDIR}/share/man"
+CONFIG_PROTECT="${EKDEDIR}/share/config ${EKDEDIR}/env ${EKDEDIR}/shutdown ${EPREFIX}/usr/share/config"
 #KDE_IS_PRELINKED=1
-PKG_CONFIG_PATH="${PREFIX}/$(get_libdir)/pkgconfig"
-XDG_DATA_DIRS="${PREFIX}/share"
+PKG_CONFIG_PATH="${EKDEDIR}/$(get_libdir)/pkgconfig"
+XDG_DATA_DIRS="${EKDEDIR}/share"
 EOF
 		doenvd "${T}/43kdepaths-${SLOT}"
-		cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}"
-SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
+		cat <<-EOF > "${ED}/etc/revdep-rebuild/50-kde-${SLOT}"
+SEARCH_DIRS="${EKDEDIR}/bin ${EKDEDIR}/lib*"
 EOF
 
 		# kdeglobals needed to make third party apps installed in /usr work
-		cat <<-EOF > "${D}/${PREFIX}/share/config/kdeglobals"
+		cat <<-EOF > "${ED}/${KDEDIR}/share/config/kdeglobals"
 [Directories][\$i]
-prefixes=/usr
+prefixes=${EPREFIX}/usr
 EOF
 
 	else
@@ -74,7 +76,7 @@ EOF
 		# Much simpler for the FHS compliant -kdeprefix install
 		# number goes down with version
 		cat <<-EOF > "${T}/43kdepaths"
-CONFIG_PROTECT="/usr/share/config"
+CONFIG_PROTECT="${EPREFIX}/usr/share/config"
 #KDE_IS_PRELINKED=1
 EOF
 		doenvd "${T}/43kdepaths"
diff --git a/kde-base/kde-env/kde-env-4.3.9999.ebuild b/kde-base/kde-env/kde-env-4.3.9999.ebuild
index 764d568498..b3c111bcbb 100644
--- a/kde-base/kde-env/kde-env-4.3.9999.ebuild
+++ b/kde-base/kde-env/kde-env-4.3.9999.ebuild
@@ -33,14 +33,16 @@ src_compile() {
 }
 
 src_install() {
+	use prefix || ED=$D
+
 	dodir /etc/env.d
 	dodir /etc/revdep-rebuild
-	dodir "${PREFIX}/share/config"
+	dodir ${KDEDIR}/share/config
 
 	# List all the multilib libdirs
 	local _libdir _libdirs
 	for _libdir in $(get_all_libdirs); do
-		_libdirs="${_libdirs}:${PREFIX}/${_libdir}"
+		_libdirs+=":${EKDEDIR}/${_libdir}"
 	done
 	_libdirs=${_libdirs#:}
 
@@ -48,24 +50,24 @@ src_install() {
 
 		# number goes down with version
 		cat <<-EOF > "${T}/43kdepaths-${SLOT}"
-PATH="${PREFIX}/bin"
-ROOTPATH="${PREFIX}/sbin:${PREFIX}/bin"
+PATH="${EKDEDIR}/bin"
+ROOTPATH="${EKDEDIR}/sbin:${EKDEDIR}/bin"
 LDPATH="${_libdirs}"
-MANPATH="${PREFIX}/share/man"
-CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
+MANPATH="${EKDEDIR}/share/man"
+CONFIG_PROTECT="${EKDEDIR}/share/config ${EKDEDIR}/env ${EKDEDIR}/shutdown ${EPREFIX}/usr/share/config"
 #KDE_IS_PRELINKED=1
-PKG_CONFIG_PATH="${PREFIX}/$(get_libdir)/pkgconfig"
-XDG_DATA_DIRS="${PREFIX}/share"
+PKG_CONFIG_PATH="${EKDEDIR}/$(get_libdir)/pkgconfig"
+XDG_DATA_DIRS="${EKDEDIR}/share"
 EOF
 		doenvd "${T}/43kdepaths-${SLOT}"
-		cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}"
-SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
+		cat <<-EOF > "${ED}/etc/revdep-rebuild/50-kde-${SLOT}"
+SEARCH_DIRS="${EKDEDIR}/bin ${EKDEDIR}/lib*"
 EOF
 
 		# kdeglobals needed to make third party apps installed in /usr work
-		cat <<-EOF > "${D}/${PREFIX}/share/config/kdeglobals"
+		cat <<-EOF > "${ED}/${KDEDIR}/share/config/kdeglobals"
 [Directories][\$i]
-prefixes=/usr
+prefixes=${EPREFIX}/usr
 EOF
 
 	else
@@ -73,7 +75,7 @@ EOF
 		# Much simpler for the FHS compliant -kdeprefix install
 		# number goes down with version
 		cat <<-EOF > "${T}/43kdepaths"
-CONFIG_PROTECT="/usr/share/config"
+CONFIG_PROTECT="${EPREFIX}/usr/share/config"
 #KDE_IS_PRELINKED=1
 EOF
 		doenvd "${T}/43kdepaths"
diff --git a/kde-base/kde-env/kde-env-9999.ebuild b/kde-base/kde-env/kde-env-9999.ebuild
index ab003bd88e..b13498b4ac 100644
--- a/kde-base/kde-env/kde-env-9999.ebuild
+++ b/kde-base/kde-env/kde-env-9999.ebuild
@@ -34,14 +34,16 @@ src_compile() {
 }
 
 src_install() {
+	use prefix || ED=$D
+
 	dodir /etc/env.d
 	dodir /etc/revdep-rebuild
-	dodir "${PREFIX}/share/config"
+	dodir ${KDEDIR}/share/config
 
 	# List all the multilib libdirs
 	local _libdir _libdirs
 	for _libdir in $(get_all_libdirs); do
-		_libdirs="${_libdirs}:${PREFIX}/${_libdir}"
+		_libdirs+=":${EKDEDIR}/${_libdir}"
 	done
 	_libdirs=${_libdirs#:}
 
@@ -49,24 +51,24 @@ src_install() {
 
 		# number goes down with version
 		cat <<-EOF > "${T}/43kdepaths-${SLOT}"
-PATH="${PREFIX}/bin"
-ROOTPATH="${PREFIX}/sbin:${PREFIX}/bin"
+PATH="${EKDEDIR}/bin"
+ROOTPATH="${EKDEDIR}/sbin:${EKDEDIR}/bin"
 LDPATH="${_libdirs}"
-MANPATH="${PREFIX}/share/man"
-CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
+MANPATH="${EKDEDIR}/share/man"
+CONFIG_PROTECT="${EKDEDIR}/share/config ${EKDEDIR}/env ${EKDEDIR}/shutdown ${EPREFIX}/usr/share/config"
 #KDE_IS_PRELINKED=1
-PKG_CONFIG_PATH="${PREFIX}/$(get_libdir)/pkgconfig"
-XDG_DATA_DIRS="${PREFIX}/share"
+PKG_CONFIG_PATH="${EKDEDIR}/$(get_libdir)/pkgconfig"
+XDG_DATA_DIRS="${EKDEDIR}/share"
 EOF
 		doenvd "${T}/43kdepaths-${SLOT}"
-		cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}"
-SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
+		cat <<-EOF > "${ED}/etc/revdep-rebuild/50-kde-${SLOT}"
+SEARCH_DIRS="${EKDEDIR}/bin ${EKDEDIR}/lib*"
 EOF
 
 		# kdeglobals needed to make third party apps installed in /usr work
-		cat <<-EOF > "${D}/${PREFIX}/share/config/kdeglobals"
+		cat <<-EOF > "${ED}/${KDEDIR}/share/config/kdeglobals"
 [Directories][\$i]
-prefixes=/usr
+prefixes=${EPREFIX}/usr
 EOF
 
 	else
@@ -74,7 +76,7 @@ EOF
 		# Much simpler for the FHS compliant -kdeprefix install
 		# number goes down with version
 		cat <<-EOF > "${T}/43kdepaths"
-CONFIG_PROTECT="/usr/share/config"
+CONFIG_PROTECT="${EPREFIX}/usr/share/config"
 #KDE_IS_PRELINKED=1
 EOF
 		doenvd "${T}/43kdepaths"