Fix compilation for newer apr

Package-Manager: portage-2.1_pre7-r5

4 files changed, 28 insertions, 8 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index fe434d31cdbe..9ed620368586 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.210 2006/04/05 12:21:02 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.211 2006/04/17 19:19:34 pauldv Exp $
+
+  17 Apr 2006; Paul de Vrieze <pauldv@gentoo.org>
+  +files/subversion-apr_cppflags.patch, subversion-1.3.1.ebuild:
+  Fix the compilation of the perl bindings with newer apr. Thanks to R.May 
+  <tinitus1@onlinehome.de> in bug #123222 for the patch.
 
 *subversion-1.3.1 (05 Apr 2006)
 
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index fb1fb242c2db..5de414ab7629 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -1,6 +1,6 @@
-MD5 74768ddf7a588fc5d33c0da910cc5f2c ChangeLog 36149
-RMD160 d56733fe560c582803263858c3a0601d1bb4fc17 ChangeLog 36149
-SHA256 7f29c943b4ad5bd472b05c6ba58c05ddaa0cd237175607d05367f9bf82263512 ChangeLog 36149
+MD5 0739193a2932659a0daf802230fde6f9 ChangeLog 36398
+RMD160 3e04c4de0bbb32182ac9f81e54150d43f8167dba ChangeLog 36398
+SHA256 e0b802b694908b666e8d6a884a84225ba944ee2484f2ea0f50eede80bca699fe ChangeLog 36398
 MD5 4fd39b311d09602c93a9ff0aceaf8596 files/70svn-gentoo.el 136
 RMD160 d130792953a0b14b78b9a54a982f0812428f0d5e files/70svn-gentoo.el 136
 SHA256 85dc5461709d3cd28be3fbdaf0f02778f98bc9c970b50bcb00ca7658e88f3274 files/70svn-gentoo.el 136
@@ -28,6 +28,9 @@ SHA256 d7c5994fa66d77ec956b2e1ca1020fadcf1200bdd2acce974033e9839bb8f7c3 files/su
 MD5 c357b009b610db967d0df27d61cd3704 files/subversion-1.3.1-neon-config.patch 1237
 RMD160 ccf7449e030afe6ef6388c12157831d5f2d59d6b files/subversion-1.3.1-neon-config.patch 1237
 SHA256 6e0f152a8254b7e7c0b498ce011f1798d475b2acf18d779b4dfe0758de1f3049 files/subversion-1.3.1-neon-config.patch 1237
+MD5 e7538c50c65c0ae5c7b0cfc7057f8620 files/subversion-apr_cppflags.patch 426
+RMD160 245d52ce05da6652e5f5984f0e33aa51e534082a files/subversion-apr_cppflags.patch 426
+SHA256 0d7e52ce90cc806270ccb5e3c2b700fdb6d251a17001b91f08de5beab66295e6 files/subversion-apr_cppflags.patch 426
 MD5 ce6f3698724b55cf49e647727207cca5 files/subversion-db4.patch 563
 RMD160 36a0ae5ed2bdf2d9511865e3b4d1aeb228c55d6d files/subversion-db4.patch 563
 SHA256 7d84d8ec5beb7b30e6ee6e27afdbaa2bed9e4b9e5df45c572c543547b4317f5b files/subversion-db4.patch 563
@@ -70,6 +73,6 @@ SHA256 2a23c97f9b38bb55863b6eb753cf1c677759ca28d022de431339034080856340 subversi
 MD5 9d6f84d540f50aced2ea571c46975970 subversion-1.3.0.ebuild 11515
 RMD160 2eca0cc08a29594f7dac281ffdecc9306a8b5f60 subversion-1.3.0.ebuild 11515
 SHA256 5540cd1b4516b44bd093e68f6f4884e103fd9c893f0c49cb59128eadab6041ab subversion-1.3.0.ebuild 11515
-MD5 41dd890992e201040064a5f74917b9a3 subversion-1.3.1.ebuild 11518
-RMD160 3c84aaf4b4ef3ea2b6f5ca1fc6d6f247a0de1842 subversion-1.3.1.ebuild 11518
-SHA256 088b8875e74229676dcb4600470536005f48fce217e1f6321be0568581e3a764 subversion-1.3.1.ebuild 11518
+MD5 0356ed755035f783cac31d72da2a0ac8 subversion-1.3.1.ebuild 11568
+RMD160 e4a8bbb29d221f5a0782a5d8479273be6e860edc subversion-1.3.1.ebuild 11568
+SHA256 12f7151e0bcbe9d332f71cc7a5b68fc217e47df8734d927a5111d5c296ee0b31 subversion-1.3.1.ebuild 11568
diff --git a/dev-util/subversion/files/subversion-apr_cppflags.patch b/dev-util/subversion/files/subversion-apr_cppflags.patch
new file mode 100644
index 000000000000..1c24d8ea9664
--- /dev/null
+++ b/dev-util/subversion/files/subversion-apr_cppflags.patch
@@ -0,0 +1,11 @@
+--- subversion-1.3.1/build/ac-macros/apr.m4	2004-11-24 00:18:18.000000000 +0100
++++ subversion-1.3.1/build/ac-macros/apr.m4.new	2006-04-16 17:57:36.214707250 +0200
+@@ -59,7 +59,7 @@
+     AC_MSG_ERROR([apr-config --ldflags failed])
+   fi
+ 
+-  SVN_APR_INCLUDES="`$apr_config --includes`"
++  SVN_APR_INCLUDES="`$apr_config --includes --cppflags`"
+   if test $? -ne 0; then
+     AC_MSG_ERROR([apr-config --includes failed])
+   fi
diff --git a/dev-util/subversion/subversion-1.3.1.ebuild b/dev-util/subversion/subversion-1.3.1.ebuild
index 0f0bfe46021d..657ac9118945 100644
--- a/dev-util/subversion/subversion-1.3.1.ebuild
+++ b/dev-util/subversion/subversion-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.3.1.ebuild,v 1.1 2006/04/05 12:21:03 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.3.1.ebuild,v 1.2 2006/04/17 19:19:34 pauldv Exp $
 
 inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module
 
@@ -66,6 +66,7 @@ src_unpack() {
 	epatch ${FILESDIR}/subversion-1.1.1-perl-vendor.patch
 	epatch ${FILESDIR}/subversion-hotbackup-config.patch
 	epatch ${FILESDIR}/subversion-1.3.1-neon-config.patch
+	epatch ${FILESDIR}/subversion-apr_cppflags.patch
 
 	export WANT_AUTOCONF=2.5
 	autoconf