Bump www-servers/uwsgi to 0.9.7.2, #340058

Package-Manager: portage-2.1.9.46/cvs/Linux i686

7 files changed, 242 insertions, 51 deletions

diff --git a/www-servers/uwsgi/ChangeLog b/www-servers/uwsgi/ChangeLog
index a836c083a4c4..c3e4fb6ad772 100644
--- a/www-servers/uwsgi/ChangeLog
+++ b/www-servers/uwsgi/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for www-servers/uwsgi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/ChangeLog,v 1.5 2011/04/19 07:34:42 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/ChangeLog,v 1.6 2011/05/31 19:49:07 maksbotan Exp $
+
+*uwsgi-0.9.7.2 (31 May 2011)
+
+  31 May 2011; Maxim Koltsov (maksbotan) <maksbotan@gentoo.org>
+  -uwsgi-0.9.5.ebuild, +uwsgi-0.9.7.2.ebuild, +files/uwsgi.confd,
+  +files/uwsgi.initd, metadata.xml:
+  Bumping to 0.9.7.2 (bug #340058). Added init scripts from that bug.
+  Removed
+  uwsgi-0.9.5 as obsolete. Drop usage of gcc patch in 0.9.7.2 as issue is
+  fixed
+  upstream.
 
   19 Apr 2011; Benedikt Böhm <hollow@gentoo.org> metadata.xml:
   remove myself from metadata
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 12575635b947..f2f4e9380a6c 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -2,9 +2,11 @@ AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db7 SHA1 2
 AUX uwsgi-0.9.5-fix_uwsgiconfig.py_indentation.patch 1202 RMD160 9c32ba693bd7bbdd6fae90c5b43118b8e0f882bc SHA1 cab74b61086c39e9f77e217b88361197c0069b98 SHA256 3903cf208ba14578aaf5cb95306191b97ed0b973047cad02321d4416d03a47f5
 AUX uwsgi-0.9.5-respect_flags.patch 3985 RMD160 1787075a4decad7376e1772231a65e0ef5737537 SHA1 456031bc53a80ca5423a149b7c8013c3bb9338fe SHA256 5af3f880b7104b5fb4c8612d92fab9074b1d5ecc556aeea0775a82a82c4be80e
 AUX uwsgi-0.9.6.6-gentoo-gcc.patch 631 RMD160 2c9b6c7c8256fc61116a1c784a6b948345d5570d SHA1 37cb5960758265e4ef9502c7767c71c82828540e SHA256 2ded8ebdbdfa73e7498ab8704541c9207db30d67b7a1970bc87d7e7d5ce9fcc5
-DIST uwsgi-0.9.5.tar.gz 118203 RMD160 c6ffd2661dd623e848002604798e4a18402f7d76 SHA1 264572059254e2cca771908050d7534aaafff1a8 SHA256 49e88485b9f91693409c255738bc6a6f2a6f856a8a0f04b07dccf5ab7e3de0bd
+AUX uwsgi.confd 1116 RMD160 e13ddecb06cf4efaf75216ec657db99a4abbbddf SHA1 9df38c84bc2d612803629a6a2e6bd9a3a5568d33 SHA256 3c238b934f8db9eae87f77dc3d131499e442526d5e45438b5461c0d7590b772f
+AUX uwsgi.initd 2705 RMD160 96ee8102823eddfcfc17da14882aed17c7ca5249 SHA1 35365c5ca755cd650424c826488ac85b067e4575 SHA256 328087fe8a36e91155c1173cfddc257f4479b1588bc56689b42a0fc74707bed4
 DIST uwsgi-0.9.6.6.tar.gz 185172 RMD160 f8799e96cf342bd0b6566a273e36f24ca8f2c4b9 SHA1 6e43f45c79ad1ea874d98f9c72d11b33ac66f6bd SHA256 6388c21104f87310377d814b6e4fe3cbc5ddf222458e17f62825e04b9a6cd9c2
-EBUILD uwsgi-0.9.5.ebuild 1042 RMD160 bf01c6661a01766604693af418d1b30e61cb5f54 SHA1 e1ed54cb4c9fbcdca388d0cf2ba7304e4dc0658d SHA256 8a6444418fffc1787f1a0105b5443e4a2ec5ac5668ea22f1237d5dfb2d693157
+DIST uwsgi-0.9.7.2.tar.gz 306218 RMD160 a6f0a548d6db46230946ec0a33395d5f5b119a58 SHA1 e279c2c597d349d9cf463bc4d226db7123c43342 SHA256 6eccf3c7ead324c6af9a6196f0d4faf4c8472ca3b728a01a0070b472b0784bba
 EBUILD uwsgi-0.9.6.6.ebuild 1751 RMD160 eca1e93b508c0654182a9ce6f3cf4a0bc03d4976 SHA1 9747ae415bdf71b1494d85db22cbd799df27ea2c SHA256 4d8b54aae0ccc3511bc8d7cf5314b939c1430441a60c5289fdd26c4b1de70a72
-MISC ChangeLog 1165 RMD160 2835b4a1fd0bbceadf41ad5469cd5e022f2e34e0 SHA1 55503326c5341fb25c938b6ff5dc3f7545205354 SHA256 da3f4c94fdd9eebf1ac62b4156c0e3faafdc097031231313379b5448558bc091
-MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
+EBUILD uwsgi-0.9.7.2.ebuild 1822 RMD160 1e0706cfc0a389f9596e8ba1abb7ec4ac1a661e3 SHA1 a0cee7bfe687abec69a303e42216592d4eb35f16 SHA256 02f4025dffbefaa40a6284693ba2efe817b439a18f7e686f9ba4e0dbb37433d3
+MISC ChangeLog 1539 RMD160 531e09b6ec9c3d72aea1187350668f344268bd9e SHA1 8eeafce4f11b280ecb4cc21df57714e43160c4a6 SHA256 e670da20591cfcbf999f630af264741d5a34c5f82e7d8524261b11a940167db6
+MISC metadata.xml 290 RMD160 a9e04892214d9e8cb88985adb7506a150d312f05 SHA1 daa73f3541b07308076a75af935f87888a806770 SHA256 b368eecfcb4b38a7f0b6e4cee3ebf76ad4d53f30c0b344bfeaf6584b17ad488a
diff --git a/www-servers/uwsgi/files/uwsgi.confd b/www-servers/uwsgi/files/uwsgi.confd
new file mode 100644
index 000000000000..11152da5dbf7
--- /dev/null
+++ b/www-servers/uwsgi/files/uwsgi.confd
@@ -0,0 +1,47 @@
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/files/uwsgi.confd,v 1.1 2011/05/31 19:49:07 maksbotan Exp $
+
+# DO NOT MODIFY THIS FILE DIRECTLY! CREATE A COPY AND MODIFY THAT INSTEAD!
+
+# Path (or name) of UNIX/TCP socket to bind to
+#
+UWSGI_SOCKET=127.0.0.1:1234
+
+# Enable threads?
+#
+UWSGI_THREADS=1
+
+# The path to your uWSGI application.
+#
+UWSGI_PROGRAM=
+
+# The path to your uWSGI xml config file.
+#
+UWSGI_XML_CONFIG=
+
+# The number of child processes to spawn. The default is 1.
+#
+UWSGI_CHILDREN=1
+
+# The log file path. If empty logging is disabled
+#
+UWSGI_LOG_FILE=
+
+# If you want to run your application inside a chroot then specify the
+# directory here. Leave this blank otherwise.
+#
+UWSGI_CHROOT=
+
+# If you want to run your application from a specific directiory specify
+# it here. Leave this blank otherwise.
+#
+# UWSGI_DIR=
+
+# The user and group to run your application as. If you do not specify these,
+# the application will be run as root:root.
+#
+UWSGI_USER=
+
+# Additional options you might want to pass to uWSGI
+#
+#UWSGI_EXTRA_OPTIONS=
diff --git a/www-servers/uwsgi/files/uwsgi.initd b/www-servers/uwsgi/files/uwsgi.initd
new file mode 100644
index 000000000000..3fedecc64f63
--- /dev/null
+++ b/www-servers/uwsgi/files/uwsgi.initd
@@ -0,0 +1,101 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/files/uwsgi.initd,v 1.1 2011/05/31 19:49:07 maksbotan Exp $
+
+PROGNAME=${SVCNAME#*.}
+
+UWSGI_EXEC=/usr/bin/uwsgi
+PIDPATH=/var/run/uwsgi
+PIDFILE="${PIDPATH}/${PROGNAME}.pid"
+
+depend() {
+	need net
+}
+
+start() {
+	local OPTIONS
+
+	if [ "${SVCNAME}" = "uwsgi" ]; then
+		eerror "You are not supposed to run this script directly. Create a symlink"
+		eerror "for the FastCGI application you want to run as well as a copy of the"
+		eerror "configuration file and modify it appropriately like so..."
+		eerror
+		eerror "  ln -s uwsgi /etc/init.d/uwsgi.trac"
+		eerror "  cp /etc/conf.d/uwsgi /etc/conf.d/uwsgi.trac"
+		eerror "  `basename "${EDITOR}"` /etc/conf.d/uwsgi.trac"
+		eerror
+		return 1
+	fi
+
+	if [ -z "${UWSGI_SOCKET}" ]; then
+		eerror "You need to specify path (or name) of UNIX/TCP socket to bind to"
+		eerror "in UWSGI_SOCKET"
+		return 1
+	fi
+
+	if [ -z "${UWSGI_PROGRAM}" ] && [ -z "${UWSGI_XML_CONFIG}" ]; then
+		eerror "You need to specify which \$UWSGI_PROGRAM or \$UWSGI_XML_CONFIG"
+		eerror "you want to start."
+		eerror "Please adjust /etc/conf.d/uwsgi.${PROGNAME}"
+		return 1
+	fi
+
+	if [ -n "${UWSGI_PROGRAM}" ] && [ -n "${UWSGI_XML_CONFIG}" ]; then
+		eerror "Only one of the two may be defined:"
+		eerror "  UWSGI_PROGRAM=${UWSGI_PROGRAM}"
+		eerror "  UWSGI_XML_CONFIG=${UWSGI_XML_CONFIG}"
+		return 1
+	fi
+
+
+	OPTIONS="--master --daemonize"
+
+	if [ -n "$UWSGI_LOG_FILE" ]; then
+		OPTIONS="${OPTIONS} $UWSGI_LOG_FILE"
+	else
+		OPTIONS="${OPTIONS} /dev/null --disable-logging"
+	fi
+
+	if [ "${UWSGI_THREADS}" = "1" ]; then
+		OPTIONS="${OPTIONS} --enable-threads"
+	fi
+
+	if [ -n "${UWSGI_SOCKET}" ]; then
+		OPTIONS="${OPTIONS} --socket ${UWSGI_SOCKET}"
+	fi
+
+	if [ -n "${UWSGI_CHILDREN}" ]; then
+		OPTIONS="${OPTIONS} --processes ${UWSGI_CHILDREN}"
+	fi
+
+	if [ -n "${UWSGI_CHROOT}" ]; then
+		OPTIONS="${OPTIONS} --chroot ${UWSGI_CHROOT}"
+	fi
+
+	[ -z "${UWSGI_DIR}" ] && UWSGI_DIR="/"
+	[ -z "${UWSGI_USER}" ] && UWSGI_USER="root"
+
+	if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then
+		OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}"
+	fi
+
+	if [ -n "${UWSGI_PROGRAM}" ]; then
+		OPTIONS="${OPTIONS} --wsgi-file ${UWSGI_PROGRAM}"
+	fi
+
+	if [ -n "${UWSGI_XML_CONFIG}" ]; then
+		OPTIONS="${OPTIONS} --xmlconfig ${UWSGI_XML_CONFIG}"
+	fi
+
+	ebegin "Starting uWSGI application ${PROGNAME}"
+	cd "${UWSGI_DIR}" && \
+	start-stop-daemon --start --user "${UWSGI_USER}" --exec "${UWSGI_EXEC}" -- ${OPTIONS} --pidfile "${PIDFILE}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping uWSGI application ${PROGNAME}"
+	start-stop-daemon --stop --pidfile "${PIDFILE}" --signal 3
+	eend $?
+}
diff --git a/www-servers/uwsgi/metadata.xml b/www-servers/uwsgi/metadata.xml
index 9f3fdee2246b..30792c895c17 100644
--- a/www-servers/uwsgi/metadata.xml
+++ b/www-servers/uwsgi/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
+	<herd>python</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>maksbotan@gentoo.org</email>
+	</maintainer>
+	<maintainer>
+		<email>sterkrig@home.se</email>
 	</maintainer>
 </pkgmetadata>
diff --git a/www-servers/uwsgi/uwsgi-0.9.5.ebuild b/www-servers/uwsgi/uwsgi-0.9.5.ebuild
deleted file mode 100644
index ca24328e1fdc..000000000000
--- a/www-servers/uwsgi/uwsgi-0.9.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-0.9.5.ebuild,v 1.1 2010/05/03 19:24:28 hollow Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils python toolchain-funcs
-
-DESCRIPTION="uWSGI server for Python web applications"
-HOMEPAGE="http://projects.unbit.it/uwsgi/"
-SRC_URI="http://projects.unbit.it/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/libxml2"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Python 3 requires constant indentation.
-	epatch "${FILESDIR}/${PN}-0.9.5-fix_uwsgiconfig.py_indentation.patch"
-
-	# Respect CC, CFLAGS and LDFLAGS.
-	epatch "${FILESDIR}/${PN}-0.9.5-respect_flags.patch"
-
-	python_copy_sources
-}
-
-src_compile() {
-	python_src_compile CC="$(tc-getCC)"
-}
-
-src_install() {
-	installation() {
-		newbin uwsgi uwsgi-${PYTHON_ABI}
-	}
-	python_execute_function -s installation
-
-	python_generate_wrapper_scripts "${ED}usr/bin/uwsgi"
-}
diff --git a/www-servers/uwsgi/uwsgi-0.9.7.2.ebuild b/www-servers/uwsgi/uwsgi-0.9.7.2.ebuild
new file mode 100644
index 000000000000..9f299d8f4728
--- /dev/null
+++ b/www-servers/uwsgi/uwsgi-0.9.7.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-0.9.7.2.ebuild,v 1.1 2011/05/31 19:49:07 maksbotan Exp $
+
+EAPI="3"
+PYTHON_DEPEND="*"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils python toolchain-funcs apache-module
+
+DESCRIPTION="uWSGI server for Python web applications"
+HOMEPAGE="http://projects.unbit.it/uwsgi/"
+SRC_URI="http://projects.unbit.it/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/libxml2"
+DEPEND="${RDEPEND}"
+
+APXS2_S="${S}/apache2"
+APACHE2_MOD_CONF="42_mod_${PN}"
+want_apache2_2
+
+src_prepare() {
+	python_copy_sources
+}
+
+src_compile() {
+	python_src_compile CC="$(tc-getCC)"
+
+	if use apache2 ; then
+		for m in Ruwsgi uwsgi ; do
+			APXS2_ARGS="-c mod_${m}.c"
+			apache-module_src_compile
+		done
+	fi
+}
+
+src_install() {
+	installation() {
+		newbin uwsgi uwsgi-${PYTHON_ABI}
+	}
+	python_execute_function -s installation
+
+	python_generate_wrapper_scripts "${ED}usr/bin/uwsgi"
+
+	if use apache2; then
+		for m in Ruwsgi uwsgi ; do
+			APACHE2_MOD_FILE="${APXS2_S}/.libs/mod_${m}.so"
+			apache-module_src_install
+		done
+	fi
+
+	newinitd "${FILESDIR}"/uwsgi.initd uwsgi
+	newconfd "${FILESDIR}"/uwsgi.confd uwsgi
+	mkdir "${ED}"/var/run/uwsgi
+}
+
+pkg_postinst() {
+	if use apache2 ; then
+		elog "Two Apache modules have been installed: mod_uwsgi and mod_Ruwsgi."
+		elog "You can enable them with -DUWSGI or -DRUWSGI in /etc/conf.d/apache2."
+		elog "Both have the same configuration interface and define the same symbols."
+		elog "Therefore you can enable only one of them at a time."
+		elog "mod_uwsgi is commercially supported by Unbit and stable but a bit hacky."
+		elog "mod_Ruwsgi is newer and more Apache-API friendly but not commercially supported."
+	fi
+}