Patch to make configure work with bash 3.1 (bug #118948).

Package-Manager: portage-2.1_pre3-r1

4 files changed, 40 insertions, 7 deletions

diff --git a/dev-python/mod_python/ChangeLog b/dev-python/mod_python/ChangeLog
index 3c932b15493f..3f176f8025a2 100644
--- a/dev-python/mod_python/ChangeLog
+++ b/dev-python/mod_python/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/mod_python
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.40 2005/12/28 16:21:07 blubb Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.41 2006/01/15 17:16:13 marienz Exp $
+
+  15 Jan 2006; Marien Zwart <marienz@gentoo.org>
+  +files/mod_python-3.1.4-configure-bash-3.1.patch,
+  mod_python-3.1.4-r1.ebuild:
+  Patch to make configure work with bash 3.1 (bug #118948)
 
   28 Dec 2005; Simon Stelling <blubb@gentoo.org> mod_python-3.1.4-r1.ebuild:
   stable on amd64
diff --git a/dev-python/mod_python/Manifest b/dev-python/mod_python/Manifest
index 98a340056ad5..3cea63baed21 100644
--- a/dev-python/mod_python/Manifest
+++ b/dev-python/mod_python/Manifest
@@ -1,4 +1,7 @@
-MD5 d3cff8db358dc8cfbfd39d292371f8df ChangeLog 5998
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 eda85cbd7ccbba47d894d259fba66ab7 ChangeLog 6191
 MD5 fc933df167083c6c8abc4d2e28c6274d files/16_mod_python-r1.conf 1101
 MD5 05bbbfafd26dcf70f83fcc2b015751dc files/16_mod_python.conf 1106
 MD5 eedde8a8dd90829d24fdb18cc86054f6 files/digest-mod_python-2.7.10 66
@@ -6,11 +9,19 @@ MD5 f9aea2b5454c22f2e134e3698099f890 files/digest-mod_python-2.7.11 66
 MD5 67e42121ddce856c5d7021b3eca7abdb files/digest-mod_python-3.1.3-r1 65
 MD5 c4619f17df8352dc648c0f89b61e17b6 files/digest-mod_python-3.1.4 65
 MD5 c4619f17df8352dc648c0f89b61e17b6 files/digest-mod_python-3.1.4-r1 65
+MD5 437d3b6af39626eb8dfb88127db3883c files/mod_python-3.1.4-configure-bash-3.1.patch 473
 MD5 01ce560a5062d990e685e78b756fa5ba files/mod_python.conf 70
 MD5 0779383c65d90a5161e7a11ab5bbbbec files/publisher-2.diff 1383
 MD5 4238f8266f49d6a9dbe435b27aa5cbb2 metadata.xml 1061
 MD5 67997ffb188bf18507f6a2ac093227a6 mod_python-2.7.10.ebuild 2466
 MD5 628388f842ff5c9d0959bce9e3c28075 mod_python-2.7.11.ebuild 1711
 MD5 c21328b1a8879707a158196fc9caa5c2 mod_python-3.1.3-r1.ebuild 1875
-MD5 cb3d10df5ca78ff30eafbdd9db8364f0 mod_python-3.1.4-r1.ebuild 1525
+MD5 8198bf15b607a55c31c2f2e3ad10dfa4 mod_python-3.1.4-r1.ebuild 1632
 MD5 7014ce279d11b10e01891e484d5e6486 mod_python-3.1.4.ebuild 1534
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDyoNuW78445TWHXcRAmPhAKCLwf1m2Hx4JLgFQNTNdymYlZvS5gCfe/0O
+qJ4FNI8it/ucmJYdwFan5f4=
+=8nji
+-----END PGP SIGNATURE-----
diff --git a/dev-python/mod_python/files/mod_python-3.1.4-configure-bash-3.1.patch b/dev-python/mod_python/files/mod_python-3.1.4-configure-bash-3.1.patch
new file mode 100644
index 000000000000..f3b5071963b0
--- /dev/null
+++ b/dev-python/mod_python/files/mod_python-3.1.4-configure-bash-3.1.patch
@@ -0,0 +1,13 @@
+=== modified file 'configure.in'
+--- configure.in	
++++ configure.in	
+@@ -275,7 +275,7 @@
+ # get the mod_python version
+ AC_SUBST(MP_VERSION)
+ MP_VERSION=`awk '/MPV_STRING/ {print $3}' src/include/mpversion.h`
+-MP_VERSION=`echo $MP_VERSION | sed s/\\"//g`                                      
++MP_VERSION=`echo $MP_VERSION | sed s/\"//g`                                      
+ 
+ AC_OUTPUT(Makefile src/Makefile Doc/Makefile test/testconf.py dist/setup.py dist/Makefile)
+ 
+
diff --git a/dev-python/mod_python/mod_python-3.1.4-r1.ebuild b/dev-python/mod_python/mod_python-3.1.4-r1.ebuild
index 6c8ba97e2006..4ddc195c0a08 100644
--- a/dev-python/mod_python/mod_python-3.1.4-r1.ebuild
+++ b/dev-python/mod_python/mod_python-3.1.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.1.4-r1.ebuild,v 1.6 2005/12/28 16:21:07 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.1.4-r1.ebuild,v 1.7 2006/01/15 17:16:13 marienz Exp $
 
-inherit python eutils apache-module
+inherit python eutils apache-module autotools
 
 DESCRIPTION="An Apache2 DSO providing an embedded Python interpreter"
 HOMEPAGE="http://www.modpython.org/"
@@ -32,6 +32,10 @@ src_unpack() {
 	if has_version ">=dev-lang/python-2.3"; then
 		sed -ie 's:LONG_LONG:PY_LONG_LONG:g' "${S}/src/requestobject.c"
 	fi
+
+	# fix configure with bash 3.1
+	epatch "${FILESDIR}/${P}-configure-bash-3.1.patch"
+	eautoconf
 }
 
 src_compile() {