Patch to work with newer apr and apr-utils, closes bug 169289, thanks for suggestions given on that bug.

Package-Manager: portage-2.1.3_rc8

3 files changed, 29 insertions, 12 deletions

diff --git a/kde-base/kdesdk-kioslaves/ChangeLog b/kde-base/kdesdk-kioslaves/ChangeLog
index 4c986b99006c..de3e4ee11065 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.59 2007/05/22 23:18:08 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/ChangeLog,v 1.60 2007/07/15 23:00:09 cryos Exp $
+
+  15 Jul 2007; Marcus D. Hanwell <cryos@gentoo.org>
+  kdesdk-kioslaves-3.5.7.ebuild:
+  Patch to work with newer apr and apr-utils, closes bug 169289, thanks for
+  suggestions given on that bug.
 
 *kdesdk-kioslaves-3.5.7 (22 May 2007)
 
diff --git a/kde-base/kdesdk-kioslaves/Manifest b/kde-base/kdesdk-kioslaves/Manifest
index 47b9ab116edf..17715b37d6bd 100644
--- a/kde-base/kdesdk-kioslaves/Manifest
+++ b/kde-base/kdesdk-kioslaves/Manifest
@@ -1,3 +1,6 @@
+-----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
 DIST kdesdk-3.5.7.tar.bz2 5200751 RMD160 055d0ec884b289376fa5da6367811abbcf8787db SHA1 e9cd8a8416ff340e7dc46289efafd1b1b99c31ff SHA256 701c3ca8ecd699a513760fe4c492e102f6daa3a9db16e458435f1ac5af3dd021
@@ -13,14 +16,14 @@ EBUILD kdesdk-kioslaves-3.5.6.ebuild 521 RMD160 60e02721bf875ea00f63df5b973df507
 MD5 243d51e7550227481bc5f3719f8317b6 kdesdk-kioslaves-3.5.6.ebuild 521
 RMD160 60e02721bf875ea00f63df5b973df5078fb6d131 kdesdk-kioslaves-3.5.6.ebuild 521
 SHA256 ea7624ecbc0f83461445c75d237ab90adb70fb6045945b5a65560df82f85e934 kdesdk-kioslaves-3.5.6.ebuild 521
-EBUILD kdesdk-kioslaves-3.5.7.ebuild 1248 RMD160 985939dc5830ccace73d0d91d5a2b377e07d587b SHA1 d2c4acc89c4a419efe15bedd654d41f0fcd0f49a SHA256 0ab6f594465abb68ecf61606eb31a2798e03e79e1e46049a418e24112ff17e20
-MD5 806b70b5e2b9828df8b5ac5cf7559343 kdesdk-kioslaves-3.5.7.ebuild 1248
-RMD160 985939dc5830ccace73d0d91d5a2b377e07d587b kdesdk-kioslaves-3.5.7.ebuild 1248
-SHA256 0ab6f594465abb68ecf61606eb31a2798e03e79e1e46049a418e24112ff17e20 kdesdk-kioslaves-3.5.7.ebuild 1248
-MISC ChangeLog 8141 RMD160 fab2a608759650a830f96c773c7d66db03a7d5d3 SHA1 04c2e5d569cedec06ca923bc24dd72cfff304955 SHA256 b4e17b7f777e6b9ee8ab11f7296e6c31303161e8662012248f360e1d86ebc91a
-MD5 bd03ce5920632b2ae19cbcb281396404 ChangeLog 8141
-RMD160 fab2a608759650a830f96c773c7d66db03a7d5d3 ChangeLog 8141
-SHA256 b4e17b7f777e6b9ee8ab11f7296e6c31303161e8662012248f360e1d86ebc91a ChangeLog 8141
+EBUILD kdesdk-kioslaves-3.5.7.ebuild 1326 RMD160 37d68281d5dd51cc345e08c7be9cee7adb4f9bc2 SHA1 8c3884c4e313257573ac2bf61efc738c9f3082f6 SHA256 8d7962fd794b32e504d5ad7c474544d1f93d8bb90ad88d24fc40375dd72eb34b
+MD5 fc377100d957e5f909cec3e661d05be4 kdesdk-kioslaves-3.5.7.ebuild 1326
+RMD160 37d68281d5dd51cc345e08c7be9cee7adb4f9bc2 kdesdk-kioslaves-3.5.7.ebuild 1326
+SHA256 8d7962fd794b32e504d5ad7c474544d1f93d8bb90ad88d24fc40375dd72eb34b kdesdk-kioslaves-3.5.7.ebuild 1326
+MISC ChangeLog 8336 RMD160 c89e5bf661a1428843cdf1e9479f042af7c32639 SHA1 cd6901c561864f797211e0306e8afb4135eeba5f SHA256 0b800f9dbfdbfd1b745f062fa4473caf71c91fc27aed6360860c0776995a3373
+MD5 125f78025233ab320483218fb4f015cd ChangeLog 8336
+RMD160 c89e5bf661a1428843cdf1e9479f042af7c32639 ChangeLog 8336
+SHA256 0b800f9dbfdbfd1b745f062fa4473caf71c91fc27aed6360860c0776995a3373 ChangeLog 8336
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -37,3 +40,10 @@ SHA256 9130a817dd6d3b5c8d5ae8f926b4e65d8a35cfe930a1b613c06ce36aaeb17854 files/di
 MD5 3b54c9dbb4055174b2f9afa78f3487b8 files/digest-kdesdk-kioslaves-3.5.7 244
 RMD160 73528337642609126c831aca0720b3f874fffdc8 files/digest-kdesdk-kioslaves-3.5.7 244
 SHA256 5b0c42c3810c369ebeba1f641664bcc632a83fdf3f50ea665a66383799c31dc2 files/digest-kdesdk-kioslaves-3.5.7 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGmqb9ntT9W3vfTuoRAolZAJ9ksv80wcBfKo2IMyDf2lj9U76Q7QCgkOhs
+GYW6mWYrYT2MFYsFLEQlSRY=
+=BLAz
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.7.ebuild b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.7.ebuild
index cd1776f3f3c7..5bab5e1f0466 100644
--- a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.7.ebuild
+++ b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.7.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.7.ebuild,v 1.2 2007/05/30 20:37:17 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.7.ebuild,v 1.3 2007/07/15 23:00:09 cryos Exp $
 
 KMNAME=kdesdk
 KMMODULE=kioslave
@@ -30,9 +30,11 @@ pkg_setup() {
 
 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
 }