diff options
Diffstat (limited to 'dev-python/mod_python')
| -rw-r--r-- | dev-python/mod_python/ChangeLog | 157 | ||||
| -rw-r--r-- | dev-python/mod_python/Manifest | 26 | ||||
| -rw-r--r-- | dev-python/mod_python/files/mod_python.conf | 2 | ||||
| -rw-r--r-- | dev-python/mod_python/metadata.xml | 14 | ||||
| -rw-r--r-- | dev-python/mod_python/mod_python-2.7.10.ebuild | 10 | ||||
| -rw-r--r-- | dev-python/mod_python/mod_python-2.7.11.ebuild | 12 | ||||
| -rw-r--r-- | dev-python/mod_python/mod_python-3.1.3-r1.ebuild | 4 | ||||
| -rw-r--r-- | dev-python/mod_python/mod_python-3.1.4-r1.ebuild | 4 | ||||
| -rw-r--r-- | dev-python/mod_python/mod_python-3.1.4.ebuild | 10 |
9 files changed, 21 insertions, 218 deletions
diff --git a/dev-python/mod_python/ChangeLog b/dev-python/mod_python/ChangeLog index cda0b2d98019..e3dc54f63c83 100644 --- a/dev-python/mod_python/ChangeLog +++ b/dev-python/mod_python/ChangeLog @@ -1,161 +1,10 @@ # 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.38 2005/11/19 10:42:22 chriswhite Exp $ - - 19 Nov 2005; Chris White <chriswhite@gentoo.org> metadata.xml: - Added japanese metadata.xml translation thanks to Yoshino-san. - - 14 Oct 2005; Aron Griffis <agriffis@gentoo.org> - mod_python-3.1.4-r1.ebuild: - Mark 3.1.4-r1 stable on alpha - - 07 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> - mod_python-3.1.4-r1.ebuild: - Stable on sparc - - 06 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> - mod_python-3.1.4-r1.ebuild: - Stable on ppc. - - 27 Sep 2005; Bryan Østergaard <kloeri@gentoo.org> - mod_python-3.1.4-r1.ebuild: - Stable for new apache layout. - -*mod_python-3.1.4-r1 (06 Jul 2005) - - 06 Jul 2005; Alastair Tse <liquidx@gentoo.org> - -mod_python-2.7.10-r1.ebuild, -mod_python-3.1.3.ebuild, - +mod_python-3.1.4-r1.ebuild: - replaced ./configure with econf to force search paths to /usr rather than - /usr/local (#97992) - - 05 May 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml: - Add apache herd as maintainers. - - 24 Apr 2005; Simon Stelling <blubb@gentoo.org> mod_python-3.1.3-r1.ebuild: - stable on amd64 - - 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) - - 26 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> - +mod_python-2.7.11.ebuild, +mod_python-3.1.4.ebuild: - Version bump + uses new apache-module eclass. All changes by Benedikt Boehm - <hollow@gentoo.org>. - - 11 Feb 2005; Rob Cakebread <pythonhead@gentoo.org> - +files/publisher-2.diff, mod_python-3.1.3.ebuild: - Bumped and patched security bug# 80109 CAN-2005-0088 - - 30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : - Change encoding to UTF-8 for GLEP 31 compliance - - 17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> mod_python-3.1.3.ebuild: - keywords ~amd64; closes #66176. - -*mod_python-2.7.10-r1 (04 Sep 2004) - - 04 Sep 2004; Lukasz Strzygowski <lucass@gentoo.org> metadata.xml, - +mod_python-2.7.10-r1.ebuild: - Fixed issue with detecting if python is compiled with threads. - Added description to metadata. - - 14 Jul 2004; Jason Wever <weeve@gentoo.org> mod_python-3.1.3.ebuild: - Added ~sparc keyword, resolves bug #57102. - - 12 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> - -mod_python-3.0.4-r1.ebuild, -mod_python-3.0.4-r2.ebuild, - mod_python-3.1.3.ebuild: - Remove old versions, stable on alpha. - - 24 May 2004; Bryan Østergaard <kloeri@gentoo.org> mod_python-3.1.3.ebuild: - Keyworded ~alpha, requested in bug #51550. - - 24 May 2004; Chuck Short <zul@gentoo.org> mod_python-3.1.3.ebuild: - Marked stable as requested by #51420. - - 04 May 2004; Bryan Østergaard <kloeri@gentoo.org> mod_python-2.7.10.ebuild, - mod_python-3.0.4-r1.ebuild, mod_python-3.0.4-r2.ebuild, - mod_python-3.1.3.ebuild: - Change SRC_URI to mirror://.. - - 25 Apr 2004; Aron Griffis <agriffis@gentoo.org> mod_python-2.7.10.ebuild: - Add die following econf for bug 48950 - - 01 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> mod_python-2.7.10.ebuild, - mod_python-3.0.4-r2.ebuild, mod_python-3.0.4.ebuild: - Stable on x86. - -*mod_python-3.1.3 (29 Feb 2004) - - 29 Feb 2004; <kloeri@gentoo.org> mod_python-3.1.3.ebuild: - Version bump. - -*mod_python-3.0.4-r2 (29 Jan 2004) - - 29 Jan 2004; Bryan Østergaard,,, <kloeri@gentoo.org> - mod_python-3.0.4-r2.ebuild: - Fix installation paths, closing bug #39757 and #39758. - -*mod_python-3.0.4-r1 (28 Jan 2004) - - 28 Jan 2004; Alastair Tse <liquidx@gentoo.org> mod_python-3.0.4-r1.ebuild: - fix missing mod_python.so, add python postinst pyc/pyo generation (#39627) - -*mod_python-2.7.10 (24 Jan 2004) - - 24 Jan 2004; Alastair Tse <liquidx@gentoo.org> mod_python-2.7.8.ebuild, - mod_python-2.7.9.ebuild, mod_python-3.0.3.ebuild, - files/mod_python-3.0.3-dest1.diff, files/mod_python-3.0.3-dest2.diff, - files/patch-2.7.8.diff: - cleanup vunerable versions, bump 2.7 series due to security update (#39154) - - 13 Dec 2003; Bryan Østergaard,,, <kloeri@gentoo.org> - mod_python-3.0.3.ebuild, mod_python-3.0.4.ebuild: - Install icons needed for html documentation, closing bug #29271 - -*mod_python-2.7.9 (12 Dec 2003) -*mod_python-3.0.4 (12 Dec 2003) - - 12 Dec 2003; Bryan Østergaard,,, <kloeri@gentoo.org> - mod_python-2.7.9.ebuild, mod_python-3.0.0_beta4.ebuild, - mod_python-3.0.1.ebuild, mod_python-3.0.4.ebuild, - files/mod_python-3.0.0_beta4-destdir.diff: - Bump versions and remove some old versions. - - 28 Oct 2003; Bryan Østergaard <kloeri@gentoo.org> - mod_python-3.0.3.ebuild: - Fix bug when using Python-2.3 closing bug #32018. - - 05 Oct 2003; Rob Cakebread <pythonhead@gentoo.org> - mod_python-3.0.0_beta4.ebuild, mod_python-3.0.1.ebuild: - Added pkg_postinst to tell users to add -D PYTHON to /etc/conf.d/apache2 - -*mod_python-3.0.3 (05 Oct 2003) - - 05 Oct 2003; Rob Cakebread <pythonhead@gentoo.org> mod_python-3.0.3.ebuild: - Version bump. Thanks Bryan Østergaard <kloeri@mailme.dk> - - 09 Jul 2003; Donny Davies <woodchip@gentoo.org> mod_python-2.7.8.ebuild: - Description clarify. - -*mod_python-3.0.1 (2 Feb 2003) - - 2 Feb 2003; Grant Goodyear <g2boojum@gentoo.org> : Beyond the beta! - -*mod_python-3.0.0_beta4 (29 Nov 2002) - - 29 Nov 2002; Donny Davies <woodchip@gentoo.org> : Updated for Apache2. +# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.1 2002/10/21 12:43:23 phoenix Exp $ *mod_python-2.7.8 (21 Oct 2002) - 27 Nov 2002; phoen][x <phoenix@gentoo.org> ChangeLog, files/mod_python.conf: - Fixed a typo in files/mod_python.conf. - 21 Oct 2002; phoen][x <phoenix@gentoo.org> ChangeLog, mod_python-2.7.8.ebuild, files/digest-mod_python-2.7.8, files/mod_python.conf, files/patch-2.7.8.diff : + Initial import. Use this ebuild to add python support to your apache webserver. diff --git a/dev-python/mod_python/Manifest b/dev-python/mod_python/Manifest index 5af644908900..e69de29bb2d1 100644 --- a/dev-python/mod_python/Manifest +++ b/dev-python/mod_python/Manifest @@ -1,26 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 bb750ae3f9c0891d05bda53f11c03d54 ChangeLog 5801 -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 -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 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 3cd9a71487590f5789bcb43c74698602 mod_python-2.7.11.ebuild 1712 -MD5 c21328b1a8879707a158196fc9caa5c2 mod_python-3.1.3-r1.ebuild 1875 -MD5 6a4a3a0a3dc093f503de9ca57611fb9a mod_python-3.1.4-r1.ebuild 1529 -MD5 7014ce279d11b10e01891e484d5e6486 mod_python-3.1.4.ebuild 1534 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDfwGnFdQwWVoAgN4RArzTAJ4zgW5xuewa5hGfzr2A1OCHR43dPACeJqnq -lNxNQI05JU4dbbKjVt/TuyA= -=GTrq ------END PGP SIGNATURE----- diff --git a/dev-python/mod_python/files/mod_python.conf b/dev-python/mod_python/files/mod_python.conf index 1300a59a90c6..82c6f81c5625 100644 --- a/dev-python/mod_python/files/mod_python.conf +++ b/dev-python/mod_python/files/mod_python.conf @@ -1,4 +1,4 @@ -<IfModule mod_python.c> +<IfModule mod_phyton.c> AddHandler python-program .py diff --git a/dev-python/mod_python/metadata.xml b/dev-python/mod_python/metadata.xml index 65fe83770a56..de483c53568f 100644 --- a/dev-python/mod_python/metadata.xml +++ b/dev-python/mod_python/metadata.xml @@ -2,18 +2,4 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>python</herd> -<herd>apache</herd> -<longdescription> -Mod_python is an Apache module that embeds the Python interpreter within -the server. With mod_python you can write web-based applications in Python -that will run many times faster than traditional CGI and will have access -to advanced features such as ability to retain database connections and -other data between hits and access to Apache internals. -</longdescription> -<longdescription lang="ja"> -Mod_PythonはウェブサーバーにPythonインタープリタを埋め込むApacheモジュールです。 -Mod_PythonはPython言語のウェブベース・アプリケーションを従来のCGIよりも何倍も高> -速に走らせることができ、データデータベースのコネクション保持に関するより高度なア -クセス機能やヒット間の他のデータやApache内部へのアクセス機能を持ちます。 -</longdescription> </pkgmetadata> diff --git a/dev-python/mod_python/mod_python-2.7.10.ebuild b/dev-python/mod_python/mod_python-2.7.10.ebuild index 658af8f89cc1..b23d01703cdd 100644 --- a/dev-python/mod_python/mod_python-2.7.10.ebuild +++ b/dev-python/mod_python/mod_python-2.7.10.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-2.7.10.ebuild,v 1.6 2005/02/11 19:45:40 pythonhead Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-2.7.10.ebuild,v 1.1 2004/01/24 21:06:45 liquidx Exp $ inherit python DESCRIPTION="Python module for Apache 1.x, not for Apache 2.x" -SRC_URI="mirror://apache/modpython/${P}.tgz" +SRC_URI="http://www.apache.org/dist/httpd/modpython/${P}.tgz" HOMEPAGE="http://www.modpython.org/" LICENSE="as-is" -KEYWORDS="x86" +KEYWORDS="~x86" SLOT="0" IUSE="" @@ -29,7 +29,7 @@ src_compile() { echo 'echo "configure done"' >> configure export OPTFLAGS="`/usr/sbin/apxs -q CFLAGS`" - econf --with-apxs=/usr/sbin/apxs || die "econf failed" + econf --with-apxs=/usr/sbin/apxs sed -e 's/LIBEXECDIR=\/usr\/lib\/apache/LIBEXECDIR=${D}\/usr\/lib\/apache-extramodules/' \ -e 's/PY_STD_LIB=/PY_STD_LIB=${D}/' \ 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 75b628d19212..4452b6868e18 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.2 2005/02/27 02:33:22 kloeri Exp $ +# $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 $ inherit python apache-module @@ -13,7 +13,7 @@ KEYWORDS="~x86" SLOT="0" IUSE="" -#APACHE1_MOD_CONF="16_${PN}-r1" +APACHE1_MOD_CONF="${PV}/16_${PN}" APACHE1_MOD_DEFINE="PYTHON" DOCFILES="COPYRIGHT CREDITS NEWS README" @@ -21,15 +21,11 @@ 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} + econf --with-apxs=${APXS1} || die "econf failed" sed -ie 's:LIBEXECDIR=:LIBEXECDIR=${D}:' Makefile sed -ie 's:PY_STD_LIB=:PY_STD_LIB=${D}:' Makefile @@ -55,6 +51,4 @@ 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.3-r1.ebuild b/dev-python/mod_python/mod_python-3.1.3-r1.ebuild index 2e0f0e94e55e..3ab58055735c 100644 --- a/dev-python/mod_python/mod_python-3.1.3-r1.ebuild +++ b/dev-python/mod_python/mod_python-3.1.3-r1.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.3-r1.ebuild,v 1.2 2005/04/24 09:35:04 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.1.3-r1.ebuild,v 1.1 2005/02/11 19:45:40 pythonhead Exp $ inherit python eutils @@ -9,7 +9,7 @@ HOMEPAGE="http://www.modpython.org/" SRC_URI="mirror://apache/modpython/${P}.tgz" LICENSE="Apache-1.1" SLOT="0" -KEYWORDS="x86 alpha ppc ~sparc amd64" +KEYWORDS="x86 alpha ppc ~sparc ~amd64" IUSE="" DEPEND="dev-lang/python >=net-www/apache-2.0" 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 ddeeff24f855..ba0c07bc0918 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,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-r1.ebuild,v 1.5 2005/10/14 01:58:32 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.1.4-r1.ebuild,v 1.1 2005/07/06 10:50:26 liquidx Exp $ inherit python eutils apache-module @@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/modpython/${P}.tgz" LICENSE="Apache-1.1" SLOT="0" -KEYWORDS="alpha ~amd64 ppc sparc x86" +KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64" IUSE="" DEPEND="dev-lang/python" 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 90b4494f940e..9b61a09b5f10 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.4 2005/02/27 11:18:51 kloeri Exp $ +# $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 $ inherit python eutils apache-module @@ -10,11 +10,11 @@ SRC_URI="mirror://apache/httpd/modpython/${P}.tgz" LICENSE="Apache-1.1" SLOT="0" -KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64" +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" @@ -40,6 +40,8 @@ src_compile() { } src_install() { + #dodir ${APACHE2_MODULESDIR} + #make install DESTDIR=${D} LIBEXECDIR=/usr/lib/apache2-extramodules || die emake DESTDIR=${D} install || die dohtml doc-html/* @@ -47,8 +49,6 @@ src_install() { doins doc-html/icons/* apache-module_src_install - insinto ${APACHE2_MODULES_CONFDIR} - newins ${FILESDIR}/16_${PN}-r1.conf 16_${PN}.conf } pkg_postinst() { |