Check the dev-libs/apr version Subversion is built against and use the correct config binary.

Package-Manager: portage-2.1.2.7

4 files changed, 60 insertions, 15 deletions

diff --git a/kde-base/kdesdk-kioslaves/ChangeLog b/kde-base/kdesdk-kioslaves/ChangeLog
index 3f71e947fa89..2dca667ac3d0 100644
--- a/kde-base/kdesdk-kioslaves/ChangeLog
+++ b/kde-base/kdesdk-kioslaves/ChangeLog
@@ -1,6 +1,13 @@
 # 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.55 2007/02/04 02:15:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/ChangeLog,v 1.56 2007/05/09 11:51:02 carlo Exp $
+
+*kdesdk-kioslaves-3.5.6-r1 (09 May 2007)
+
+  09 May 2007; Carsten Lohrke <carlo@gentoo.org>
+  +kdesdk-kioslaves-3.5.6-r1.ebuild:
+  Check the dev-libs/apr version Subversion is built against and use the
+  correct config binary.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -kdesdk-kioslaves-3.5.2.ebuild:
diff --git a/kde-base/kdesdk-kioslaves/Manifest b/kde-base/kdesdk-kioslaves/Manifest
index d7dc8b4cc221..3555776fff61 100644
--- a/kde-base/kdesdk-kioslaves/Manifest
+++ b/kde-base/kdesdk-kioslaves/Manifest
@@ -1,20 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST kdesdk-3.5.5.tar.bz2 5043560 RMD160 6151d938607bdd31f69ab1ca78ec7aec7bb14187 SHA1 0994e8eef41ab4e0237a78f1c761d7133998a712 SHA256 fedd1631c2e139d27450dc51ab5aa3e9e46f5d5c0c030992818b9c37058678cd
 DIST kdesdk-3.5.6.tar.bz2 5046602 RMD160 96e96a0ca87aadf8940ceb1dfead385503096a4f SHA1 5c1f3478b72fde8b117d9458072d471eb8be5cbe SHA256 63cdea02149b38998a4d41899f8da863fd9f9333dd17a8d1d3fea9fc6607d7e4
 EBUILD kdesdk-kioslaves-3.5.5.ebuild 513 RMD160 9fe4a985ec9b632c87f124e0903e2f1f9e05e3c6 SHA1 a62564f02c77e5a0781bc3af1768ee72f244041b SHA256 a3a72095a204707441772355b9483e995c2d9aa5165efe7a1c92730540a87a51
 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.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 7502 RMD160 9a92a778f31697ac310765b933cc75421b06f521 SHA1 ff5bcdb675309ed3d65e78aad0d78f1c10a4a911 SHA256 d7bf631c3f37d2b54c65b4f3dffacc95162a7ec6cc57390c1b83c5d5f533ec6b
-MD5 d36f84ee18dbccac5d1ea822136f5053 ChangeLog 7502
-RMD160 9a92a778f31697ac310765b933cc75421b06f521 ChangeLog 7502
-SHA256 d7bf631c3f37d2b54c65b4f3dffacc95162a7ec6cc57390c1b83c5d5f533ec6b ChangeLog 7502
+MISC ChangeLog 7725 RMD160 7e48aeafb3969c1a92e491b570f8473103abb294 SHA1 6ec610f7e1a3d60fdac50a62b4b6deb866c86ba1 SHA256 d807a984f00ad3f5b69218dc8ea4f2503c0e4d7eeb51a1610594817fe716fbcc
+MD5 ec02af0158511b4b30bf7cc564cdd0b0 ChangeLog 7725
+RMD160 7e48aeafb3969c1a92e491b570f8473103abb294 ChangeLog 7725
+SHA256 d807a984f00ad3f5b69218dc8ea4f2503c0e4d7eeb51a1610594817fe716fbcc ChangeLog 7725
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -25,10 +26,6 @@ SHA256 c3589de6f3695aa67f01c94883d3e032fa317a84e263e44ac72754fce964cffb files/di
 MD5 03dee6283bcdfcb198808ac3bca4e6ac files/digest-kdesdk-kioslaves-3.5.6 244
 RMD160 205bed8e8f34fea07c7af6ae4026b2c252109d56 files/digest-kdesdk-kioslaves-3.5.6 244
 SHA256 9130a817dd6d3b5c8d5ae8f926b4e65d8a35cfe930a1b613c06ce36aaeb17854 files/digest-kdesdk-kioslaves-3.5.6 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFxUGyAiZjviIA2XgRAt9PAKDOd5/1+J3i18txzwZeOIKsA8xBAQCfahL1
-a8HLL7ZAuXfZ7eLwrzvv7vA=
-=y63L
------END PGP SIGNATURE-----
+MD5 03dee6283bcdfcb198808ac3bca4e6ac files/digest-kdesdk-kioslaves-3.5.6-r1 244
+RMD160 205bed8e8f34fea07c7af6ae4026b2c252109d56 files/digest-kdesdk-kioslaves-3.5.6-r1 244
+SHA256 9130a817dd6d3b5c8d5ae8f926b4e65d8a35cfe930a1b613c06ce36aaeb17854 files/digest-kdesdk-kioslaves-3.5.6-r1 244
diff --git a/kde-base/kdesdk-kioslaves/files/digest-kdesdk-kioslaves-3.5.6-r1 b/kde-base/kdesdk-kioslaves/files/digest-kdesdk-kioslaves-3.5.6-r1
new file mode 100644
index 000000000000..e3795607e98a
--- /dev/null
+++ b/kde-base/kdesdk-kioslaves/files/digest-kdesdk-kioslaves-3.5.6-r1
@@ -0,0 +1,3 @@
+MD5 1462e1a884fdaa070ed493c10a336728 kdesdk-3.5.6.tar.bz2 5046602
+RMD160 96e96a0ca87aadf8940ceb1dfead385503096a4f kdesdk-3.5.6.tar.bz2 5046602
+SHA256 63cdea02149b38998a4d41899f8da863fd9f9333dd17a8d1d3fea9fc6607d7e4 kdesdk-3.5.6.tar.bz2 5046602
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
new file mode 100644
index 000000000000..b9c27378ba5d
--- /dev/null
+++ b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.6-r1.ebuild
@@ -0,0 +1,38 @@
+# 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 $
+
+KMNAME=kdesdk
+KMMODULE=kioslave
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="kioslaves from kdesdk package: the subversion kioslave"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="kdehiddenvisibility"
+DEPEND="dev-util/subversion"
+
+pkg_setup() {
+	if [[ -n "$(svn-config --includes | grep -o /usr/include/apr-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)" ]] \
+		&& ! has_version =dev-libs/apr-1* ;
+	then
+		eerror "Subversion has been built against =dev-libs/apr-1*, but no matching version is installed."
+		die "Please rebuild dev-util/subversion."
+	fi
+}
+
+src_comile() {
+	if [[ -n "$(svn-config --includes | grep -o /usr/include/apr-0)" ]] ; then
+		myconf="--with-apr-config=/usr/bin/apr-config"
+	else
+		myconf="--with-apr-config=/usr/bin/apr-1-config"
+	fi
+	kde-meta_src_compile
+}
\ No newline at end of file