From 65518f7d94d883e223c54b9da996d59977f2a1f4 Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <djc@gentoo.org>
Date: Tue, 15 Oct 2013 09:52:12 +0000
Subject: Fix bug 450022 (python-single-r1 for mod_wsgi).

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 30380381)
---
 www-apache/mod_wsgi/ChangeLog              | 11 ++++++--
 www-apache/mod_wsgi/mod_wsgi-3.3.ebuild    | 40 ------------------------------
 www-apache/mod_wsgi/mod_wsgi-3.4-r1.ebuild | 37 +++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 42 deletions(-)
 delete mode 100644 www-apache/mod_wsgi/mod_wsgi-3.3.ebuild
 create mode 100644 www-apache/mod_wsgi/mod_wsgi-3.4-r1.ebuild

(limited to 'www-apache/mod_wsgi')

diff --git a/www-apache/mod_wsgi/ChangeLog b/www-apache/mod_wsgi/ChangeLog
index ee8855505f26..207503e771ba 100644
--- a/www-apache/mod_wsgi/ChangeLog
+++ b/www-apache/mod_wsgi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apache/mod_wsgi
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_wsgi/ChangeLog,v 1.36 2012/11/27 19:37:31 pacho Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_wsgi/ChangeLog,v 1.37 2013/10/15 09:52:12 djc Exp $
+
+*mod_wsgi-3.4-r1 (15 Oct 2013)
+
+  15 Oct 2013; Dirkjan Ochtman <djc@gentoo.org> -mod_wsgi-3.3.ebuild,
+  +mod_wsgi-3.4-r1.ebuild:
+  Remove old version, support python-single-r1 (bug 450022, thanks to Joachim
+  Breur <gentoo@jmbreuer.net> for the patch).
 
   27 Nov 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop apache herd as discussed in http://www.gossamer-
diff --git a/www-apache/mod_wsgi/mod_wsgi-3.3.ebuild b/www-apache/mod_wsgi/mod_wsgi-3.3.ebuild
deleted file mode 100644
index e30522e0fffa..000000000000
--- a/www-apache/mod_wsgi/mod_wsgi-3.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_wsgi/mod_wsgi-3.3.ebuild,v 1.5 2011/04/22 21:58:23 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*"
-PYTHON_USE_WITH="threads"
-
-inherit apache-module eutils python
-
-DESCRIPTION="An Apache2 module for running Python WSGI applications."
-HOMEPAGE="http://code.google.com/p/modwsgi/"
-SRC_URI="http://modwsgi.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-APACHE2_MOD_CONF="70_${PN}"
-APACHE2_MOD_DEFINE="WSGI"
-
-DOCFILES="README"
-
-need_apache2
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-python-3.2.patch"
-}
-
-src_configure() {
-	econf --with-apxs=${APXS}
-}
-
-src_compile() {
-	default
-}
diff --git a/www-apache/mod_wsgi/mod_wsgi-3.4-r1.ebuild b/www-apache/mod_wsgi/mod_wsgi-3.4-r1.ebuild
new file mode 100644
index 000000000000..f034d3237459
--- /dev/null
+++ b/www-apache/mod_wsgi/mod_wsgi-3.4-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_wsgi/mod_wsgi-3.4-r1.ebuild,v 1.1 2013/10/15 09:52:12 djc Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_6 python2_7 python3_1 python3_2 python3_3 )
+PYTHON_REQ_USE="threads"
+
+inherit apache-module eutils python-single-r1
+
+DESCRIPTION="An Apache2 module for running Python WSGI applications."
+HOMEPAGE="http://code.google.com/p/modwsgi/"
+SRC_URI="http://modwsgi.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+APACHE2_MOD_CONF="70_${PN}"
+APACHE2_MOD_DEFINE="WSGI"
+
+DOCFILES="README"
+
+need_apache2
+
+src_configure() {
+	econf --with-apxs=${APXS} --with-python=${PYTHON}
+}
+
+src_compile() {
+	default
+}
-- 
cgit v1.2.3-65-gdbad