Change check not to use svn-config as it doesn't get installed by Subversion 1.4.x.

Package-Manager: portage-2.1.2.7

3 files changed, 18 insertions, 13 deletions

diff --git a/kde-base/kdesdk-kioslaves/ChangeLog b/kde-base/kdesdk-kioslaves/ChangeLog
index 2dca667ac3d0..742ea08bce7b 100644
--- a/kde-base/kdesdk-kioslaves/ChangeLog
+++ b/kde-base/kdesdk-kioslaves/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdesdk-kioslaves
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/ChangeLog,v 1.56 2007/05/09 11:51:02 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/ChangeLog,v 1.57 2007/05/11 17:35:59 carlo Exp $
+
+  11 May 2007; Carsten Lohrke <carlo@gentoo.org>
+  kdesdk-kioslaves-3.5.6-r1.ebuild:
+  Change check not to use svn-config as it doesn't get installed by Subversion
+  1.4.x.
 
 *kdesdk-kioslaves-3.5.6-r1 (09 May 2007)
 
diff --git a/kde-base/kdesdk-kioslaves/Manifest b/kde-base/kdesdk-kioslaves/Manifest
index 3555776fff61..f950ed26b681 100644
--- a/kde-base/kdesdk-kioslaves/Manifest
+++ b/kde-base/kdesdk-kioslaves/Manifest
@@ -4,18 +4,18 @@ EBUILD kdesdk-kioslaves-3.5.5.ebuild 513 RMD160 9fe4a985ec9b632c87f124e0903e2f1f
 MD5 4993f7c6c8621c875b60ef869099e3d8 kdesdk-kioslaves-3.5.5.ebuild 513
 RMD160 9fe4a985ec9b632c87f124e0903e2f1f9e05e3c6 kdesdk-kioslaves-3.5.5.ebuild 513
 SHA256 a3a72095a204707441772355b9483e995c2d9aa5165efe7a1c92730540a87a51 kdesdk-kioslaves-3.5.5.ebuild 513
-EBUILD kdesdk-kioslaves-3.5.6-r1.ebuild 1290 RMD160 2645bd2024f8855a3f3bc2b415cb6da061233a90 SHA1 0dd6d2a39dfbedf952602c53ec33bde066dbf7c8 SHA256 d947b51cd358e25e9f11abadffe18e72aec9a1a67cd25f7cf7113ddad5df6cc7
-MD5 e823d385b1bf3acbac709551ed8b9fe6 kdesdk-kioslaves-3.5.6-r1.ebuild 1290
-RMD160 2645bd2024f8855a3f3bc2b415cb6da061233a90 kdesdk-kioslaves-3.5.6-r1.ebuild 1290
-SHA256 d947b51cd358e25e9f11abadffe18e72aec9a1a67cd25f7cf7113ddad5df6cc7 kdesdk-kioslaves-3.5.6-r1.ebuild 1290
+EBUILD kdesdk-kioslaves-3.5.6-r1.ebuild 1245 RMD160 e3b0bfac951eb315f8f20983a10b070062f6a31a SHA1 c51542771b76439efd79b6279224522eff47ee09 SHA256 30eb20cf00887ce5b1274407c300861bc878f9864bf2c7bdc0e6d258e959bf75
+MD5 0f0c9202f0554945262488e4b297c1f7 kdesdk-kioslaves-3.5.6-r1.ebuild 1245
+RMD160 e3b0bfac951eb315f8f20983a10b070062f6a31a kdesdk-kioslaves-3.5.6-r1.ebuild 1245
+SHA256 30eb20cf00887ce5b1274407c300861bc878f9864bf2c7bdc0e6d258e959bf75 kdesdk-kioslaves-3.5.6-r1.ebuild 1245
 EBUILD kdesdk-kioslaves-3.5.6.ebuild 523 RMD160 ae5c1c61e41c51707ba01492d54b897d6bb3e781 SHA1 c0b3ebb8adff6627b8953bfa3afa0696e13013a9 SHA256 8213f6e699abb78c34250c7d4e0658025f3ed326bf9ab76c612ea5e2b72388d3
 MD5 ba065f933b8c90acac8d42377434e216 kdesdk-kioslaves-3.5.6.ebuild 523
 RMD160 ae5c1c61e41c51707ba01492d54b897d6bb3e781 kdesdk-kioslaves-3.5.6.ebuild 523
 SHA256 8213f6e699abb78c34250c7d4e0658025f3ed326bf9ab76c612ea5e2b72388d3 kdesdk-kioslaves-3.5.6.ebuild 523
-MISC ChangeLog 7725 RMD160 7e48aeafb3969c1a92e491b570f8473103abb294 SHA1 6ec610f7e1a3d60fdac50a62b4b6deb866c86ba1 SHA256 d807a984f00ad3f5b69218dc8ea4f2503c0e4d7eeb51a1610594817fe716fbcc
-MD5 ec02af0158511b4b30bf7cc564cdd0b0 ChangeLog 7725
-RMD160 7e48aeafb3969c1a92e491b570f8473103abb294 ChangeLog 7725
-SHA256 d807a984f00ad3f5b69218dc8ea4f2503c0e4d7eeb51a1610594817fe716fbcc ChangeLog 7725
+MISC ChangeLog 7899 RMD160 3e77192ea8a670129f0ec57a64601b821a97d458 SHA1 698475fca90a51d65c115f33da6a7bf38ec1c95a SHA256 f3d04ecad63854c66f70466051d92b21f3090f7ab5b687365d10e86404922715
+MD5 1e2a226bc15f6601fa4036718b2d70d9 ChangeLog 7899
+RMD160 3e77192ea8a670129f0ec57a64601b821a97d458 ChangeLog 7899
+SHA256 f3d04ecad63854c66f70466051d92b21f3090f7ab5b687365d10e86404922715 ChangeLog 7899
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
diff --git a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.6-r1.ebuild b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.6-r1.ebuild
index b9c27378ba5d..ed294705aeda 100644
--- a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.6-r1.ebuild
+++ b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.6-r1.ebuild,v 1.1 2007/05/09 11:51:03 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.6-r1.ebuild,v 1.2 2007/05/11 17:35:59 carlo Exp $
 
 KMNAME=kdesdk
 KMMODULE=kioslave
@@ -14,13 +14,13 @@ IUSE="kdehiddenvisibility"
 DEPEND="dev-util/subversion"
 
 pkg_setup() {
-	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."
 		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."
@@ -29,7 +29,7 @@ pkg_setup() {
 }
 
 src_comile() {
-	if [[ -n "$(svn-config --includes | grep -o /usr/include/apr-0)" ]] ; then
+	if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-0)" ]] ; then
 		myconf="--with-apr-config=/usr/bin/apr-config"
 	else
 		myconf="--with-apr-config=/usr/bin/apr-1-config"