[gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/

[Tiziano Müller]

commit:     d940aac04e7ed489deecbe75d764e53179b44041
Author:     Tiziano Mueller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  2 09:40:57 2011 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Tue Aug  2 09:40:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=d940aac0

fix automagic deps, added support for ruby, perl, lua, whatnotelse

---
 www-servers/uwsgi/Manifest                         |    3 +-
 .../uwsgi/files/uwsgi-0.9.8-fix-psgi-flags.patch   |   13 +++
 www-servers/uwsgi/uwsgi-0.9.8.3.ebuild             |   89 +++++++++++++++++++-
 3 files changed, 100 insertions(+), 5 deletions(-)

diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 413f93c..122f081 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -1,8 +1,9 @@
 MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 80e5cd4bd06fa22b86e439e7260064260df14d37 SHA256 418abb3d30490aae32336efcb4c27ee96af8a09f1f9bbfc629384efe8c2363a9
 AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db7 SHA1 24624a805c16778aaa4e24b74d2e8230ee381aec SHA256 b759712baa7b8abab2ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861
+AUX uwsgi-0.9.8-fix-psgi-flags.patch 640 RMD160 6556801682d2c35e30b394812bf3c695b3f234da SHA1 6e305e2d1d9c8b3f5f0d41b72bcd058a2a1d0cc1 SHA256 f27db595c0c9e9002163d978fc5f7075e1aa8fd453395ac6c43848b1a96bdb42
 AUX uwsgi-0.9.8-no-werror.patch 624 RMD160 ef3ebbfff1c6b4a49297e780b5eb5545786f8173 SHA1 a4e0923cb5ebaab19cee5b4495b1625f54c7510b SHA256 8650fe560d25d9b6facf8034bb5edfedc8aa74f22a716da702d2b97a1d298998
 AUX uwsgi.confd 1247 RMD160 f3cbb0ed1e83385e917949b7df1b8953792b9464 SHA1 2cba8d1990f0138f7bea113fec924b1656d53a8c SHA256 26c52f22137ffd44ef4c094ce9cf3b55f1c418f1602e0451462103a5117174a4
 AUX uwsgi.initd 2258 RMD160 567652a6d348494e8f74c002a4af48c361fe4202 SHA1 7119489ea985984735fc11e9f1414cc737d3c09e SHA256 38df43560b1a4de0bef8b3455bec46942917c97465da9ab167a4fc33ab1d53f8
 MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35
-EBUILD uwsgi-0.9.8.3.ebuild 1841 RMD160 efc9d251734d8c15a1108a654f49304def8e9009 SHA1 db42a0a23a42b4cbd1110ae3e2da9a6b72e86645 SHA256 d15343367daa297e17f81265afc19b73e793c26582d7b2cd10ff839b4c694d15
+EBUILD uwsgi-0.9.8.3.ebuild 3429 RMD160 c536eb7c5cab127332b279f2412a1475c348dabf SHA1 ac9a120e9a5224e48cf728c2e062111db35f1f30 SHA256 cf4bef79ec1dc3db05238526d22c0991f96cc7bcdebe43fa260f429ae32ec40f
 DIST uwsgi-0.9.8.3.tar.gz 351168 RMD160 8bfdaa9a503516378e834bca60dfa828b7bee9d2 SHA1 780a96a2c32a0f7bb7f5a63353acca2fbd23a8e6 SHA256 2b529a8408bb4938ebccd3c4264af5af4f17ee5bd6043376ef3909c2411f611f

diff --git a/www-servers/uwsgi/files/uwsgi-0.9.8-fix-psgi-flags.patch b/www-servers/uwsgi/files/uwsgi-0.9.8-fix-psgi-flags.patch
new file mode 100644
index 0000000..a65e6d2
--- /dev/null
+++ b/www-servers/uwsgi/files/uwsgi-0.9.8-fix-psgi-flags.patch
@@ -0,0 +1,13 @@
+diff --git a/plugins/psgi/uwsgiplugin.py b/plugins/psgi/uwsgiplugin.py
+index 9100824..8651fbb 100644
+--- a/plugins/psgi/uwsgiplugin.py
++++ b/plugins/psgi/uwsgiplugin.py
+@@ -2,6 +2,6 @@ import os,sys
+ 
+ NAME='psgi'
+ CFLAGS = [os.popen('perl -MExtUtils::Embed -e ccopts').read().rstrip()]
+-LDFLAGS = [os.popen('perl -MExtUtils::Embed -e ldopts').read().rstrip()]
+-LIBS = []
++LDFLAGS = [os.popen('perl -MExtUtils::Embed -e ldopts |  | grep -E "\-W\S+"').read().rstrip()]
++LIBS = [os.popen('perl -MExtUtils::Embed -e ldopts | grep -o -E "\-[L].*"').read().rstrip()]
+ GCC_LIST = ['uwsgi_plmodule', 'psgi_loader', 'psgi_response', 'psgi_plugin']

diff --git a/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild b/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild
index c5b45f5..137ff2a 100644
--- a/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild
+++ b/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild
@@ -15,20 +15,101 @@ SRC_URI="http://projects.unbit.it/downloads/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="expat json ldap lua pcre perl ruby sqlite +xml yaml zeromq"
 
-RDEPEND="dev-libs/libxml2"
-DEPEND="${RDEPEND}"
+RDEPEND="expat? ( dev-libs/expat )
+	json? ( dev-libs/jansson )
+	ldap? ( net-nds/openldap )
+	lua? ( dev-lang/lua )
+	pcre? ( dev-libs/libpcre )
+	perl? ( dev-lang/perl )
+	ruby? ( dev-lang/ruby )
+	sqlite? ( dev-db/sqlite:3 )
+	xml? ( !expat? ( dev-libs/libxml2 ) )
+	yaml? ( dev-libs/libyaml )
+	zeromq? ( net-libs/zeromq )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 APXS2_S="${S}/apache2"
 APACHE2_MOD_CONF="42_mod_${PN}"
 want_apache2_2
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.9.8-no-werror.patch
+	epatch \
+		"${FILESDIR}"/${PN}-0.9.8-no-werror.patch \
+		"${FILESDIR}"/${PN}-0.9.8-fix-psgi-flags.patch
 	python_copy_sources
 }
 
+use_true_false() {
+	if use $1 ; then
+		echo "true"
+	else
+		echo "false"
+	fi
+}
+
+src_configure() {
+	configure() {
+		local plugins
+		use lua && plugins+=", lua"
+		use perl && plugins+=", psgi"
+		use ruby && plugins+=", rack"
+
+		local xmlimpl="libxml2"
+		use expat && xmlimpl="expat"
+
+		cat > "buildconf/default.ini" << EOF
+[uwsgi]
+xml = $(use_true_false xml)
+ini = true
+yaml = true
+json = $(use_true_false json)
+sqlite3 = $(use_true_false sqlite)
+zeromq = $(use_true_false zeromq)
+snmp = true
+sctp = false
+spooler = true
+embedded = true
+udp = true
+multicast = true
+threading = true
+sendfile = true
+minterpreters = true
+async = true
+evdis = false
+ldap = $(use_true_false ldap)
+pcre = $(use_true_false pcre)
+debug = $(use_true_false debug)
+unbit = false
+xml_implementation = ${xmlimpl}
+yaml_implementation = libyaml
+malloc_implementation = libc
+plugins =
+bin_name = uwsgi
+append_version =
+plugin_dir = .
+embedded_plugins =  python, ping, cache, nagios, rpc, fastrouter, http, ugreen${plugins}
+
+locking = auto
+event = auto
+timer = auto
+filemonitor = auto
+
+embed_files =
+
+embed_config =
+
+[python]
+paste = true
+web3 = true
+
+EOF
+	}
+	python_execute_function -s configure
+}
+
 src_compile() {
 	python_src_compile CC="$(tc-getCC)"