[patch] Updated patch to 3.5.6-r1 and 3.5.7

kdesdk.patch (text/plain), 5.43 KB, created by Arfrever Frehtes Taifersar Arahesis (RETIRED) on 2007-06-23 16:58:06 UTC

--- kde-base/kdesdk/kdesdk-3.5.6-r1.ebuild
+++ kde-base/kdesdk/kdesdk-3.5.6-r1.ebuild
@@ -24,16 +24,16 @@
 
 pkg_setup() {
 	if use subversion ; then
-		if [[ -n "$(svn-config --includes | grep -o /usr/include/apr-0)" ]] \
+		if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-0)" ]] \
 			&& ! has_version =dev-libs/apr-0* ;
 		then
-			eerror "Subversion has been built against =dev-libs/apr-0*, but no matching version is installed."
+			eerror "Subversion has been built against dev-libs/apr:0, but no matching version is installed."
 			die "Please rebuild dev-util/subversion."
 		fi
-		if [[ -n "$(svn-config --includes | grep -o /usr/include/apr-1)" ]] \
+		if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-1)" ]] \
 			&& ! has_version =dev-libs/apr-1* ;
 		then
-			eerror "Subversion has been built against =dev-libs/apr-1*, but no matching version is installed."
+			eerror "Subversion has been built against dev-libs/apr:1, but no matching version is installed."
 			die "Please rebuild dev-util/subversion."
 		fi
 	fi
@@ -50,10 +50,10 @@
 	fi
 
 	if use subversion ; then
-		if [[ -n "$(svn-config --includes | grep -o /usr/include/apr-0)" ]] ; then
-			myconf="--with-apr-config=/usr/bin/apr-config"
+		if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-0)" ]] ; then
+			myconf="--with-apr-config=/usr/bin/apr-config --with-apu-config=/usr/bin/apu-config"
 		else
-			myconf="--with-apr-config=/usr/bin/apr-1-config"
+			myconf="--with-apr-config=/usr/bin/apr-1-config --with-apu-config=/usr/bin/apu-1-config"
 		fi
 	fi
 
--- kde-base/kdesdk/kdesdk-3.5.7.ebuild
+++ kde-base/kdesdk/kdesdk-3.5.7.ebuild
@@ -24,16 +24,16 @@
 
 pkg_setup() {
 	if use subversion ; then
-		if [[ -n "$(svn-config --includes | grep -o /usr/include/apr-0)" ]] \
+		if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-0)" ]] \
 			&& ! has_version =dev-libs/apr-0* ;
 		then
-			eerror "Subversion has been built against =dev-libs/apr-0*, but no matching version is installed."
+			eerror "Subversion has been built against dev-libs/apr:0, but no matching version is installed."
 			die "Please rebuild dev-util/subversion."
 		fi
-		if [[ -n "$(svn-config --includes | grep -o /usr/include/apr-1)" ]] \
+		if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-1)" ]] \
 			&& ! has_version =dev-libs/apr-1* ;
 		then
-			eerror "Subversion has been built against =dev-libs/apr-1*, but no matching version is installed."
+			eerror "Subversion has been built against dev-libs/apr:1, but no matching version is installed."
 			die "Please rebuild dev-util/subversion."
 		fi
 	fi
@@ -50,10 +50,10 @@
 	fi
 
 	if use subversion ; then
-		if [[ -n "$(svn-config --includes | grep -o /usr/include/apr-0)" ]] ; then
-			myconf="--with-apr-config=/usr/bin/apr-config"
+		if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-0)" ]] ; then
+			myconf="--with-apr-config=/usr/bin/apr-config --with-apu-config=/usr/bin/apu-config"
 		else
-			myconf="--with-apr-config=/usr/bin/apr-1-config"
+			myconf="--with-apr-config=/usr/bin/apr-1-config --with-apu-config=/usr/bin/apu-1-config"
 		fi
 	fi
 
--- kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.6-r1.ebuild
+++ kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.6-r1.ebuild
@@ -17,22 +17,22 @@
 	if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-0)" ]] \
 		&& ! has_version =dev-libs/apr-0* ;
 	then
-		eerror "Subversion has been built against =dev-libs/apr-0*, but no matching version is installed."
+		eerror "Subversion has been built against dev-libs/apr:0, but no matching version is installed."
 		die "Please rebuild dev-util/subversion."
 	fi
 	if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-1)" ]] \
 		&& ! has_version =dev-libs/apr-1* ;
 	then
-		eerror "Subversion has been built against =dev-libs/apr-1*, but no matching version is installed."
+		eerror "Subversion has been built against dev-libs/apr:1, but no matching version is installed."
 		die "Please rebuild dev-util/subversion."
 	fi
 }
 
 src_compile() {
 	if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-0)" ]] ; then
-		myconf="--with-apr-config=/usr/bin/apr-config"
+		myconf="--with-apr-config=/usr/bin/apr-config --with-apu-config=/usr/bin/apu-config"
 	else
-		myconf="--with-apr-config=/usr/bin/apr-1-config"
+		myconf="--with-apr-config=/usr/bin/apr-1-config --with-apu-config=/usr/bin/apu-1-config"
 	fi
 	kde-meta_src_compile
 }
--- kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.7.ebuild
+++ kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.7.ebuild
@@ -17,22 +17,22 @@
 	if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-0)" ]] \
 		&& ! has_version =dev-libs/apr-0* ;
 	then
-		eerror "Subversion has been built against =dev-libs/apr-0*, but no matching version is installed."
+		eerror "Subversion has been built against dev-libs/apr:0, but no matching version is installed."
 		die "Please rebuild dev-util/subversion."
 	fi
 	if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-1)" ]] \
 		&& ! has_version =dev-libs/apr-1* ;
 	then
-		eerror "Subversion has been built against =dev-libs/apr-1*, but no matching version is installed."
+		eerror "Subversion has been built against dev-libs/apr:1, but no matching version is installed."
 		die "Please rebuild dev-util/subversion."
 	fi
 }
 
 src_compile() {
 	if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-0)" ]] ; then
-		myconf="--with-apr-config=/usr/bin/apr-config"
+		myconf="--with-apr-config=/usr/bin/apr-config --with-apu-config=/usr/bin/apu-config"
 	else
-		myconf="--with-apr-config=/usr/bin/apr-1-config"
+		myconf="--with-apr-config=/usr/bin/apr-1-config --with-apu-config=/usr/bin/apu-1-config"
 	fi
 	kde-meta_src_compile
 }