version bump, add reload functionnality to init script

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

5 files changed, 116 insertions, 6 deletions

diff --git a/www-servers/uwsgi/ChangeLog b/www-servers/uwsgi/ChangeLog
index 3ef793abac05..7a37c83ee32e 100644
--- a/www-servers/uwsgi/ChangeLog
+++ b/www-servers/uwsgi/ChangeLog
@@ -1,6 +1,12 @@
 # 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.8 2011/06/08 18:00:12 maksbotan Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/ChangeLog,v 1.9 2012/01/27 11:10:27 ultrabug Exp $
+
+*uwsgi-1.0.2.1 (27 Jan 2012)
+
+  27 Jan 2012; Ultrabug <ultrabug@gentoo.org> +uwsgi-1.0.2.1.ebuild,
+  +files/uwsgi-1.0.2.1-no-werror.patch, files/uwsgi.initd:
+  Version bump, add reload functionnality to init script
 
 *uwsgi-0.9.8 (08 Jun 2011)
 
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index db61d6c135ae..83600baf7fe7 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -1,14 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db7 SHA1 24624a805c16778aaa4e24b74d2e8230ee381aec SHA256 b759712baa7b8abab2ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861
 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
 AUX uwsgi-0.9.7.2-no-werror.patch 722 RMD160 0337d5ca8db56047fa2cd3a39aecd5761d7f31b4 SHA1 7546eee71f64202813471ced4cef040661064f0e SHA256 918d89bc7f15e8efc437ef713c985da10dde912cdf64bf13d342e71a47f65e70
 AUX uwsgi-0.9.8-no-werror.patch 624 RMD160 ef3ebbfff1c6b4a49297e780b5eb5545786f8173 SHA1 a4e0923cb5ebaab19cee5b4495b1625f54c7510b SHA256 8650fe560d25d9b6facf8034bb5edfedc8aa74f22a716da702d2b97a1d298998
+AUX uwsgi-1.0.2.1-no-werror.patch 567 RMD160 c246bd927f5dbe12552cfaa0aeafdd81f4b83e69 SHA1 d217ac9fb34ef7d5fd4151ea2b45e9aff42284c4 SHA256 64ee1684a12ea64b6b6892209c77863061a54cc752156131c6fc55f7f8785153
 AUX uwsgi.confd 1116 RMD160 e13ddecb06cf4efaf75216ec657db99a4abbbddf SHA1 9df38c84bc2d612803629a6a2e6bd9a3a5568d33 SHA256 3c238b934f8db9eae87f77dc3d131499e442526d5e45438b5461c0d7590b772f
-AUX uwsgi.initd 2705 RMD160 96ee8102823eddfcfc17da14882aed17c7ca5249 SHA1 35365c5ca755cd650424c826488ac85b067e4575 SHA256 328087fe8a36e91155c1173cfddc257f4479b1588bc56689b42a0fc74707bed4
+AUX uwsgi.initd 2861 RMD160 9b33ea58fd404f18a80b06721c59e9e1aa5bce1f SHA1 de7046a94d28c53c6fca11d46b03a2631863b218 SHA256 8891e4bebb324a1663aaf994715243346ea9ed2bf73a1296be5646542d77b10e
 DIST uwsgi-0.9.7.2.tar.gz 306218 RMD160 a6f0a548d6db46230946ec0a33395d5f5b119a58 SHA1 e279c2c597d349d9cf463bc4d226db7123c43342 SHA256 6eccf3c7ead324c6af9a6196f0d4faf4c8472ca3b728a01a0070b472b0784bba
 DIST uwsgi-0.9.8.tar.gz 335000 RMD160 424e9ec7c4bd24e2db256c92f84c0a3881ec3aaa SHA1 2ab2fd822fc966efe32c6be5a97efd7299d0cd01 SHA256 63a33006ea93f87aa24aaffda9e8b3bfc2d598b1d7bc4d9cd13c587f25500899
+DIST uwsgi-1.0.2.1.tar.gz 465250 RMD160 e882e19ea072af06cb477c9fe5d580f3a5127d27 SHA1 b383b2d3d9d2b8fa3fef9d5449d151dde89e5ead SHA256 78280b57a970db7842e4481f8b00f13d011f27b340c869dc1ad28d564d716439
 EBUILD uwsgi-0.9.7.2.ebuild 1865 RMD160 88f9865c13d11e93333d1007e105fcae0a4ded09 SHA1 7f4db1f0c8e9707fe136360c7c48f1430977162b SHA256 f3b10ff3e9c6a3ffc992b726a11c347b6c40b34b9d86e1d1c9542187b599dd1e
 EBUILD uwsgi-0.9.8.ebuild 1863 RMD160 aeb64831458b5e0f1c37741d8cb56e52b4bb13cc SHA1 65379ca69e731fd2b76974d46c2be1c23acfe375 SHA256 0e62c83a411db5c986395f924f9cbb93566201d4a7a69a7e03f3ce5140e08e3d
-MISC ChangeLog 1949 RMD160 2164d9c15700d0940f8d5f00bd8f7cc476c3cbdb SHA1 6dc21b0dfe13b833279c89590cf8e7fa1b43a7a6 SHA256 74afd9a28bf1726fafd8d184c5a19737da00f53eb696cd555f82a7e42955e8d6
+EBUILD uwsgi-1.0.2.1.ebuild 1867 RMD160 33e3dda53bbbf1eb141011d1d6dd333bc2f92fba SHA1 8ce2987c5db0011b8f7cf365e8e85f322b5ae135 SHA256 9d14ea1e493d44e3d00d39d6ec9ce3239ab69c5d6a9982a3b73eeed6d4ffe704
+MISC ChangeLog 2164 RMD160 9afc5e9e42d6f8a0bbbf892640328b7606130566 SHA1 be6a354db24ed12121632b2f28ae6b20023ffbd3 SHA256 a345832deb998970b31a220278e33e27111591aee363bbe4e1d157816bab273f
 MISC metadata.xml 290 RMD160 a9e04892214d9e8cb88985adb7506a150d312f05 SHA1 daa73f3541b07308076a75af935f87888a806770 SHA256 b368eecfcb4b38a7f0b6e4cee3ebf76ad4d53f30c0b344bfeaf6584b17ad488a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk8ihiwACgkQKiQSS7ZY+hN54QD/T6cLlGweQfHfYzqxnBRijGSV
+b3FmJ5uTXI0eOAkj4PQBAMux1P8sT4BD6VwKzLw5EvX21vbjNtWixgjcX80JsRlp
+=MxTD
+-----END PGP SIGNATURE-----
diff --git a/www-servers/uwsgi/files/uwsgi-1.0.2.1-no-werror.patch b/www-servers/uwsgi/files/uwsgi-1.0.2.1-no-werror.patch
new file mode 100644
index 000000000000..9786186fe5e3
--- /dev/null
+++ b/www-servers/uwsgi/files/uwsgi-1.0.2.1-no-werror.patch
@@ -0,0 +1,11 @@
+--- a/uwsgiconfig.py	2012-01-11 19:38:58.000000000 +0100
++++ b/uwsgiconfig.py	2012-01-27 11:43:47.969407343 +0100
+@@ -252,7 +252,7 @@
+         self.gcc_list.append('proto/fastcgi')
+         self.include_path = []
+ 
+-        self.cflags = ['-O2', '-Wall', '-Werror', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64'] + os.environ.get("CFLAGS", "").split()
++        self.cflags = ['-O2', '-Wall', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64'] + os.environ.get("CFLAGS", "").split()
+ 
+         if uwsgi_os == 'Linux':
+             self.gcc_list.append('lib/linux_ns')
diff --git a/www-servers/uwsgi/files/uwsgi.initd b/www-servers/uwsgi/files/uwsgi.initd
index 3fedecc64f63..3e6542e9f67c 100644
--- a/www-servers/uwsgi/files/uwsgi.initd
+++ b/www-servers/uwsgi/files/uwsgi.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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 $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/files/uwsgi.initd,v 1.2 2012/01/27 11:10:27 ultrabug Exp $
 
 PROGNAME=${SVCNAME#*.}
 
@@ -9,6 +9,8 @@ UWSGI_EXEC=/usr/bin/uwsgi
 PIDPATH=/var/run/uwsgi
 PIDFILE="${PIDPATH}/${PROGNAME}.pid"
 
+extra_started_commands="reload"
+
 depend() {
 	need net
 }
@@ -94,6 +96,12 @@ start() {
 	eend $?
 }
 
+reload() {
+	ebegin "Reloading ${SVCNAME}"
+	kill -HUP `cat ${PIDFILE}` &>/dev/null
+	eend $? "Failed to reload ${SVCNAME}"
+}
+
 stop() {
 	ebegin "Stopping uWSGI application ${PROGNAME}"
 	start-stop-daemon --stop --pidfile "${PIDFILE}" --signal 3
diff --git a/www-servers/uwsgi/uwsgi-1.0.2.1.ebuild b/www-servers/uwsgi/uwsgi-1.0.2.1.ebuild
new file mode 100644
index 000000000000..635ae1ca52a6
--- /dev/null
+++ b/www-servers/uwsgi/uwsgi-1.0.2.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-1.0.2.1.ebuild,v 1.1 2012/01/27 11:10:27 ultrabug 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() {
+	epatch "${FILESDIR}"/${P}-no-werror.patch
+	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 -p "${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
+}