diff options
| author |   Tiziano Müller <dev-zero@gentoo.org> | 2011-01-10 10:54:39 +0000 |
|---|---|---|
| committer | Tiziano Müller <dev-zero@gentoo.org> | 2011-01-10 10:54:39 +0000 |
| commit | 842eee61f8696bad5b61d79a1dca97dfd49ed213 (patch) | |
| tree | 52efe6e920ba8ce10b7b03da83770fcf2d3424fa /www-servers | |
| parent | Fix build with Berkeley DB 5.0 (bug #319955). (diff) | |
| download | historical-842eee61f8696bad5b61d79a1dca97dfd49ed213.tar.gz historical-842eee61f8696bad5b61d79a1dca97dfd49ed213.tar.bz2 historical-842eee61f8696bad5b61d79a1dca97dfd49ed213.zip | |
mod_Ruwsgi and mod_uwsgi are mutually exclusive.
Package-Manager: portage-2.1.9.26/cvs/Linux x86_64
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/uwsgi/ChangeLog | 6 | ||||
| -rw-r--r-- | www-servers/uwsgi/Manifest | 6 | ||||
| -rw-r--r-- | www-servers/uwsgi/files/42_mod_uwsgi.conf | 2 | ||||
| -rw-r--r-- | www-servers/uwsgi/uwsgi-0.9.6.6.ebuild | 15 |
4 files changed, 23 insertions, 6 deletions
diff --git a/www-servers/uwsgi/ChangeLog b/www-servers/uwsgi/ChangeLog index 26de4c5cb821..023b2877c6b4 100644 --- a/www-servers/uwsgi/ChangeLog +++ b/www-servers/uwsgi/ChangeLog @@ -1,6 +1,10 @@ # 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.2 2011/01/07 14:22:20 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/ChangeLog,v 1.3 2011/01/10 10:54:39 dev-zero Exp $ + + 10 Jan 2011; Tiziano Müller <dev-zero@gentoo.org> files/42_mod_uwsgi.conf, + uwsgi-0.9.6.6.ebuild: + mod_Ruwsgi and mod_uwsgi are mutually exclusive. *uwsgi-0.9.6.6 (07 Jan 2011) diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest index 9bf7523bf6a1..5d2eac527ac0 100644 --- a/www-servers/uwsgi/Manifest +++ b/www-servers/uwsgi/Manifest @@ -1,10 +1,10 @@ -AUX 42_mod_uwsgi.conf 160 RMD160 c3b0b430f21b6ce2924803842b3f89eae5ce01f6 SHA1 516694983d95464e15f40d1deedef650713b4916 SHA256 9afc91eb82efe216ba741204be1f8fd02625a99692765052d900f8d0b5af940b +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 408 RMD160 d437d759d571724da35e0010c7e18282469e9bff SHA1 dd32829dc95ca77bb00aaa542b979ec7df917487 SHA256 a4b91449527946744c30974bd2dad75c34030da71ecdf15d3486a89eb2617f51 DIST uwsgi-0.9.5.tar.gz 118203 RMD160 c6ffd2661dd623e848002604798e4a18402f7d76 SHA1 264572059254e2cca771908050d7534aaafff1a8 SHA256 49e88485b9f91693409c255738bc6a6f2a6f856a8a0f04b07dccf5ab7e3de0bd 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 -EBUILD uwsgi-0.9.6.6.ebuild 1236 RMD160 06e7cfb7ba844ea0f8d63cc992120bc82d93009e SHA1 22815b1ef73e6fa3601f660c059d8927fa45396e SHA256 f277d9e09556080a33fddde9393a2f428e0ace13f7972418480c60df481fa25d -MISC ChangeLog 739 RMD160 60c6e6bd6a6ac35787cb78b4d595c66dbe8e45a5 SHA1 9f810e80cc0c7d7f2171ccdfa1e4d3ca5179b6ae SHA256 3e41ea1f829e98f660d8b58a9b2a3ed35cea3d89f1bdecc203be61d44f6100ff +EBUILD uwsgi-0.9.6.6.ebuild 1773 RMD160 fc833c5320001d8fc6f712559cdaa49fe10c0868 SHA1 dbbe822cb2006688ccb80422a204c8d726446661 SHA256 7099df92909a8b3fc9a74dfb3882d97da668e6afb7c9b0b3277b8a8c60e98621 +MISC ChangeLog 893 RMD160 4f6ca131568c0d159853ec25d8707619eca50e72 SHA1 290d2747236155bc0e999b0505ac8ce2f2b6c528 SHA256 fa991abce8e6a80e78a188e522594f1917911840f9f5960a3f40b6ddb3aea326 MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35 diff --git a/www-servers/uwsgi/files/42_mod_uwsgi.conf b/www-servers/uwsgi/files/42_mod_uwsgi.conf index 236bf564cdd4..a619baeafeeb 100644 --- a/www-servers/uwsgi/files/42_mod_uwsgi.conf +++ b/www-servers/uwsgi/files/42_mod_uwsgi.conf @@ -2,6 +2,6 @@ LoadModule uwsgi_module modules/mod_uwsgi.so </IfDefine> <IfDefine RUWSGI> - LoadModule Ruwsgi_module modules/mod_Ruwsgi.so + LoadModule uwsgi_module modules/mod_Ruwsgi.so </IfDefine> diff --git a/www-servers/uwsgi/uwsgi-0.9.6.6.ebuild b/www-servers/uwsgi/uwsgi-0.9.6.6.ebuild index 8887b03a4899..fc3da5e8165a 100644 --- a/www-servers/uwsgi/uwsgi-0.9.6.6.ebuild +++ b/www-servers/uwsgi/uwsgi-0.9.6.6.ebuild @@ -1,6 +1,6 @@ # 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.6.6.ebuild,v 1.1 2011/01/07 14:22:20 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-0.9.6.6.ebuild,v 1.2 2011/01/10 10:54:39 dev-zero Exp $ EAPI="3" PYTHON_DEPEND="*" @@ -55,3 +55,16 @@ src_install() { done fi } + +pkg_postinst() { + python_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 +} |