Fix broken configuration.

Package-Manager: portage-2.0.51-r15

5 files changed, 68 insertions, 12 deletions

diff --git a/dev-python/mod_python/ChangeLog b/dev-python/mod_python/ChangeLog
index 02d39a527c0d..28f129210f5f 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.29 2005/02/26 12:27:02 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.30 2005/02/27 02:33:22 kloeri Exp $
+
+  27 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +files/16_mod_python-r1.conf, mod_python-2.7.11.ebuild,
+  mod_python-3.1.4.ebuild:
+  Fix broken configuration.
 
 *mod_python-2.7.11 (26 Feb 2005)
 
diff --git a/dev-python/mod_python/Manifest b/dev-python/mod_python/Manifest
index 649a1e5f0d98..42db825907e0 100644
--- a/dev-python/mod_python/Manifest
+++ b/dev-python/mod_python/Manifest
@@ -2,12 +2,12 @@
 Hash: SHA1
 
 MD5 19c5d014ef01ffef8f4e55360e14b8ad metadata.xml 546
-MD5 e342308b34955a66cc6530d4367f877b mod_python-2.7.11.ebuild 1493
+MD5 3cd9a71487590f5789bcb43c74698602 mod_python-2.7.11.ebuild 1712
 MD5 67997ffb188bf18507f6a2ac093227a6 mod_python-2.7.10.ebuild 2466
 MD5 56e0e23014de3fcd64cd488154dc0c14 mod_python-2.7.10-r1.ebuild 2670
 MD5 7a9f8809160500edcc3f6adfee451a0a mod_python-3.1.3-r1.ebuild 1881
-MD5 3d5deac78b5bc3ea0bc0bd4c94c3557b ChangeLog 4594
-MD5 447e33446bf4411594dda17d6e934d58 mod_python-3.1.4.ebuild 1549
+MD5 309bd5e3c99651af8951a2cc1bb463ba ChangeLog 4761
+MD5 e1f9909b6a1be646d18d2e8a3154c016 mod_python-3.1.4.ebuild 1707
 MD5 eeb4d18110c623dfed18a9c097b39a97 mod_python-3.1.3.ebuild 1879
 MD5 01ce560a5062d990e685e78b756fa5ba files/mod_python.conf 70
 MD5 eedde8a8dd90829d24fdb18cc86054f6 files/digest-mod_python-2.7.10-r1 66
@@ -15,13 +15,14 @@ MD5 c4619f17df8352dc648c0f89b61e17b6 files/digest-mod_python-3.1.4 65
 MD5 67e42121ddce856c5d7021b3eca7abdb files/digest-mod_python-3.1.3 65
 MD5 0779383c65d90a5161e7a11ab5bbbbec files/publisher-2.diff 1383
 MD5 05bbbfafd26dcf70f83fcc2b015751dc files/16_mod_python.conf 1106
+MD5 fc933df167083c6c8abc4d2e28c6274d files/16_mod_python-r1.conf 1101
 MD5 eedde8a8dd90829d24fdb18cc86054f6 files/digest-mod_python-2.7.10 66
 MD5 67e42121ddce856c5d7021b3eca7abdb files/digest-mod_python-3.1.3-r1 65
 MD5 f9aea2b5454c22f2e134e3698099f890 files/digest-mod_python-2.7.11 66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCIGyhugEuf3OQ0akRApj+AJ42kqLGJfb5h2XPln9wtcv2BJvoLwCfbjth
-uZBqtHGQaMrEXQuyKIT6Td8=
-=svI+
+iD8DBQFCITGEugEuf3OQ0akRAskqAJ40+nxmC/97ORDrhSUD8wZHxu3uuwCdFMqW
+me6iAFzt9vMbWtYgGfWx4u0=
+=lGRZ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/mod_python/files/16_mod_python-r1.conf b/dev-python/mod_python/files/16_mod_python-r1.conf
new file mode 100644
index 000000000000..c2df73cf8ff2
--- /dev/null
+++ b/dev-python/mod_python/files/16_mod_python-r1.conf
@@ -0,0 +1,40 @@
+<IfDefine PYTHON>
+  <IfModule !mod_python.c>
+    LoadModule python_module    modules/mod_python.so
+  </IfModule>
+</IfDefine>
+
+<IfModule mod_python.c>
+#
+# Mod_python is a module that embeds the Python language interpreter
+# within the server, allowing Apache handlers to be written in Python.
+#
+
+# This will cause files beneath /home/httpd/htdocs with the extension .spam
+# to be handled by the Python script /home/httpd/htdocs/eggs.py
+#
+#<Directory /home/httpd/htdocs>
+#    <IfModule mod_mime.c>
+#    AddHandler python-program .spam
+#    </IfModule>
+#    PythonHandler eggs
+#</Directory>
+
+# This will cause all requests to the /python heirachy of your
+# webserver to be handled by the python script /path/to/myhandler.py
+#
+#<Location /python>
+#    SetHandler python-program
+#    PythonPath "sys.path + ['/path/to']"
+#    PythonHandler myhandler
+#</Location>
+
+# This will cause all requests to the /python heirachy of your
+# webserver to be handled by mod_python's Publisher handler
+#
+#<Location /python>
+#    SetHandler python-program
+#    PythonHandler mod_python.publisher
+#</Location>
+
+</IfModule>
diff --git a/dev-python/mod_python/mod_python-2.7.11.ebuild b/dev-python/mod_python/mod_python-2.7.11.ebuild
index 4452b6868e18..75b628d19212 100644
--- a/dev-python/mod_python/mod_python-2.7.11.ebuild
+++ b/dev-python/mod_python/mod_python-2.7.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-2.7.11.ebuild,v 1.1 2005/02/26 12:27:02 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-2.7.11.ebuild,v 1.2 2005/02/27 02:33:22 kloeri Exp $
 
 inherit python apache-module
 
@@ -13,7 +13,7 @@ KEYWORDS="~x86"
 SLOT="0"
 IUSE=""
 
-APACHE1_MOD_CONF="${PV}/16_${PN}"
+#APACHE1_MOD_CONF="16_${PN}-r1"
 APACHE1_MOD_DEFINE="PYTHON"
 
 DOCFILES="COPYRIGHT CREDITS NEWS README"
@@ -21,11 +21,15 @@ DOCFILES="COPYRIGHT CREDITS NEWS README"
 need_apache1
 
 src_compile() {
+	# If we dont add that, ./configure breaks this ebuild
+	# because the last task (make depend) is somehow borked
+	echo 'echo "configure done"' >> configure
+
 	sed -ie 's:OPT=:OPT=$(OPTFLAGS):' ${S}/src/Makefile.in
 	sed -ie 's/\(\\"thread\\" in sys.builtin_module_names\)/int(\1)/' ${S}/configure
 
 	export OPTFLAGS="`/usr/sbin/apxs -q CFLAGS`"
-	econf --with-apxs=${APXS1} || die "econf failed"
+	econf --with-apxs=${APXS1}
 
 	sed -ie 's:LIBEXECDIR=:LIBEXECDIR=${D}:' Makefile
 	sed -ie 's:PY_STD_LIB=:PY_STD_LIB=${D}:' Makefile
@@ -51,4 +55,6 @@ src_install() {
 	doins doc-html/icons/*
 
 	apache-module_src_install
+	insinto ${APACHE1_MODULES_CONFDIR}
+	newins ${FILESDIR}/16_${PN}-r1.conf 16_${PN}.conf
 }
diff --git a/dev-python/mod_python/mod_python-3.1.4.ebuild b/dev-python/mod_python/mod_python-3.1.4.ebuild
index 9b61a09b5f10..cbcc7fbac488 100644
--- a/dev-python/mod_python/mod_python-3.1.4.ebuild
+++ b/dev-python/mod_python/mod_python-3.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.ebuild,v 1.1 2005/02/26 12:27:02 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.1.4.ebuild,v 1.2 2005/02/27 02:33:22 kloeri Exp $
 
 inherit python eutils apache-module
 
@@ -14,7 +14,7 @@ KEYWORDS="x86 alpha ppc ~sparc ~amd64"
 IUSE=""
 DEPEND="dev-lang/python"
 
-APACHE2_MOD_CONF="2.7.11/16_${PN}"
+#APACHE2_MOD_CONF="2.7.11/16_${PN}"
 APACHE2_MOD_DEFINE="PYTHON"
 
 DOCFILES="README NEWS CREDITS COPYRIGHT"
@@ -49,6 +49,10 @@ src_install() {
 	doins doc-html/icons/*
 
 	apache-module_src_install
+	einfo ${APACHE2_MODULES_CONFDIR}
+	einfo ${FILESDIR}/16_${PN}-r1.conf
+	insinto ${APACHE2_MODULES_CONFDIR}
+	newins ${FILESDIR}/16_${PN}-r1.conf 16_${PN}.conf
 }
 
 pkg_postinst() {