summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Lohrke <carlo@gentoo.org>2007-05-11 17:35:59 +0000
committerCarsten Lohrke <carlo@gentoo.org>2007-05-11 17:35:59 +0000
commit7eae9a0bf96d6ca74e730fcd40fbf9f959232ebb (patch)
treeae0c287a0c0e2a1c1e738b4c1af8d0064c4382b2 /kde-base
parent Update post install message a bit. (diff)
downloadgentoo-2-7eae9a0bf96d6ca74e730fcd40fbf9f959232ebb.tar.gz
gentoo-2-7eae9a0bf96d6ca74e730fcd40fbf9f959232ebb.tar.bz2
gentoo-2-7eae9a0bf96d6ca74e730fcd40fbf9f959232ebb.zip
Change check not to use svn-config as it doesn't get installed by Subversion 1.4.x.
(Portage version: 2.1.2.7)
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdesdk-kioslaves/ChangeLog7
-rw-r--r--kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.6-r1.ebuild8
2 files changed, 10 insertions, 5 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/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"