fix this packages

4 files changed, 21 insertions, 17 deletions

diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest
index a93fd37df02..e94ef3d2615 100644
--- a/kde-base/kdebase-startkde/Manifest
+++ b/kde-base/kdebase-startkde/Manifest
@@ -2,6 +2,6 @@ AUX agent-shutdown.sh 323 RMD160 9a0451c1e58e688c022ecd2b37f08cac433b187d SHA1 1
 AUX agent-startup.sh 955 RMD160 bbe8abb4734bb7364edc45265b10ae2a2887db66 SHA1 f7dfd044b6f09e5ad0f04842e51c7f9e62fad718 SHA256 c63fd6233b1711ede4fbb5b30460c5b1ddee840f0f5123db953ee3ab298da8f9
 AUX gentoo-startkde4.patch 2183 RMD160 2a60c1ca52d5a578bbe610b1912c76a37895da64 SHA1 bd78a9d592992adff4b0abbc4203a99375a617d8 SHA256 a1a7365b3d8b0a0438e8eca2d630ad037a89176fe8ee3e8d8b460efb9afc2bd5
 DIST kdebase-workspace-4.1.71.tar.bz2 48459455 RMD160 04d6c23459f17f9d75ec8b4e2f379c1ce9d7701a SHA1 f8450f7ce28239e55d5cade51e39aefd55ad52c0 SHA256 0a5f25d903832054c2aa44b399272322bfb110c77db2bbc50074797af985b8a7
-EBUILD kdebase-startkde-4.1.71.ebuild 3777 RMD160 61fcde9a5cd5d59b7fe91feb2ad9401c572d99cf SHA1 20fef3aea74dfd542e293762827f47b7a09b46c3 SHA256 ca7284f14c4072ff318d901426cbfda3d1b71de8c96dd2cc73c06dd825107898
+EBUILD kdebase-startkde-4.1.71.ebuild 3936 RMD160 22c8e4bb034ffc56ab8d8c70bf2e173853f049c9 SHA1 fe1eb9739b7d9dea2010748fd9b7e9450ae9f7d6 SHA256 8409775064626736229ec266cd6263d9c0c2f42f583124a4a39af7c150f9f240
 MISC ChangeLog 2650 RMD160 0b9217dad89c3565e98b3cc5020f4f05610e6b9c SHA1 d76c0a1e88c477b11df3b7d0d1ca67406d7ae9ed SHA256 1d000b6a99a4fb574a8cd7f157a16a5b8b055231599c2873c05e8adf3c67980c
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.1.71.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.1.71.ebuild
index 42d4810717e..69910500aad 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.1.71.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.1.71.ebuild
@@ -4,12 +4,12 @@
 
 EAPI="2"
 
-KMNAME=kdebase-workspace
-KMNOMODULE=true
+KMNAME="kdebase-workspace"
+KMNOMODULE="true"
 inherit kde4-meta multilib
 
 DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE=""
 
 DEPEND=""
@@ -47,25 +47,29 @@ KMCOMPILEONLY="kdm/kfrontend/sessions/"
 PATCHES=("${FILESDIR}/gentoo-startkde4.patch")
 
 src_configure() {
-	# Patch the startkde script to setup the environment for KDE 4.0
-	# Add our KDEDIR
-	if use kdeprefix; then
-		sed -e "s#@REPLACE_LDFLAGS@#export LFFLAGS=${_libdirs}:\$LDFAGS#" \
-			-i "${S}/startkde.cmake" || die "Sed for LDPATH failed."
-	else
-		sed -e "s#@REPLACE_LDFLAGS@##" -i "${S}/startkde.cmake" || \
-			die "sed for LDPATH failed"
-	fi
+	# Patch the startkde script to setup the environment for KDE SVN
 	# List all the multilib libdirs
 	local _libdir _libdirs
 	for _libdir in $(get_all_libdirs); do
 		_libdirs="${_libdirs}:${PREFIX}/${_libdir}"
 	done
 	_libdirs=${_libdirs#:}
+	
+	# Sort the LDFLAGS out if necessary	
+	if use kdeprefix; then
+		sed -e "s#@REPLACE_LDFLAGS@#export LDFLAGS=${_libdirs}:\$LDFLAGS#" \
+			-i "${S}/startkde.cmake" || die "Sed for LDPATH failed."
+	else
+		sed -e "s#@REPLACE_LDFLAGS@##" -i "${S}/startkde.cmake" || \
+			die "sed for LDPATH failed"
+	fi
 
 	# Complete LDPATH
-	sed -e "s#@REPLACE_LIBS@#${_libdirs}#" \
-		-i "${S}/startkde.cmake" || die "Sed for LDPATH failed."
+	sed -e "s#@REPLACE_LIBDIR@#$(get_libdir)#" \
+		-i "${S}/startkde.cmake" || die "Sed for REPLACE_LIBDIR failed."
+	# Now fix the prefix
+	sed -e "s#@REPLACE_PREFIX@#${KDEDIR}#" \
+		-i "${S}/startkde.cmake" || die "Sed for REPLACE_PREFIX failed."
 
 	kde4-meta_src_configure
 }
diff --git a/kde-base/phonon-kde/Manifest b/kde-base/phonon-kde/Manifest
index 7989bb546e0..dff7947d559 100644
--- a/kde-base/phonon-kde/Manifest
+++ b/kde-base/phonon-kde/Manifest
@@ -1,4 +1,4 @@
 DIST kdebase-runtime-4.1.71.tar.bz2 60417866 RMD160 275659c1ccc5052232d20912a935fabf19966493 SHA1 3402f80615d4e702c0b7449cef22f71f03df52e9 SHA256 6a87f79bb87ae3ae75b0efc1741815becb248df0c6fd6ce1b9c9a790da3116f5
-EBUILD phonon-kde-4.1.71.ebuild 538 RMD160 80fb8660c0788fc9018c7b82c18e32f5d4fcd1df SHA1 ae08a9cb6fefb935d23cd0dc6eb9177e08758d82 SHA256 6ac6413220993dbd48b7fe45518cc8d9e75efc45e6f4014971706f7ae897b319
+EBUILD phonon-kde-4.1.71.ebuild 538 RMD160 5655d03ed366d79c8dbfe79fafad88732c61dff3 SHA1 416d85d47e0dcf047808dddf4f7b43417061b299 SHA256 5662f060ff11622d3b40e18ead7170ba868bbfa84348171c66e42c6c585ff48d
 MISC ChangeLog 1348 RMD160 de00575c67af54eb4f58f292f9e4b24d2b0e8788 SHA1 9fd27cfe49d1e54cd5d290697363dfa160dacdd0 SHA256 d1002976d7772d455efd9b9fa6445867f3dc966389456fdf635213b533ba9698
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/phonon-kde/phonon-kde-4.1.71.ebuild b/kde-base/phonon-kde/phonon-kde-4.1.71.ebuild
index fc7b1783a72..80e3e09ac66 100644
--- a/kde-base/phonon-kde/phonon-kde-4.1.71.ebuild
+++ b/kde-base/phonon-kde/phonon-kde-4.1.71.ebuild
@@ -6,7 +6,7 @@ EAPI="2"
 
 KMNAME=kdebase-runtime
 KMMODULE=phonon
-inherit kde4-base
+inherit kde4-meta
 
 DESCRIPTION="Phonon KDE integration"
 HOMEPAGE="http://phonon.kde.org"