public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/
@ 2011-08-02 13:13 Tiziano Müller
  0 siblings, 0 replies; 11+ messages in thread
From: Tiziano Müller @ 2011-08-02 13:13 UTC (permalink / raw
  To: gentoo-commits

commit:     a2559f54efc6e0073414ecbf02bce3e48e789a3d
Author:     Tiziano Mueller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  2 13:11:59 2011 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Tue Aug  2 13:11:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=a2559f54

added live ebuild

---
 www-servers/uwsgi/Manifest          |    1 +
 www-servers/uwsgi/uwsgi-9999.ebuild |  152 +++++++++++++++++++++++++++++++++++
 2 files changed, 153 insertions(+), 0 deletions(-)

diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 122f081..00fdff6 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -6,4 +6,5 @@ AUX uwsgi.confd 1247 RMD160 f3cbb0ed1e83385e917949b7df1b8953792b9464 SHA1 2cba8d
 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 3429 RMD160 c536eb7c5cab127332b279f2412a1475c348dabf SHA1 ac9a120e9a5224e48cf728c2e062111db35f1f30 SHA256 cf4bef79ec1dc3db05238526d22c0991f96cc7bcdebe43fa260f429ae32ec40f
+EBUILD uwsgi-9999.ebuild 3420 RMD160 e15fb278953cae542ebf0776665c6d56be315190 SHA1 ca73243f9693ad022559d8b003c87343c39c249e SHA256 4d986d99fcf952c1918b62ebea6a1eedf1748a725b8afd2e96dee6fea0fd061b
 DIST uwsgi-0.9.8.3.tar.gz 351168 RMD160 8bfdaa9a503516378e834bca60dfa828b7bee9d2 SHA1 780a96a2c32a0f7bb7f5a63353acca2fbd23a8e6 SHA256 2b529a8408bb4938ebccd3c4264af5af4f17ee5bd6043376ef3909c2411f611f

diff --git a/www-servers/uwsgi/uwsgi-9999.ebuild b/www-servers/uwsgi/uwsgi-9999.ebuild
new file mode 100644
index 0000000..de44907
--- /dev/null
+++ b/www-servers/uwsgi/uwsgi-9999.ebuild
@@ -0,0 +1,152 @@
+# 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.8.ebuild,v 1.1 2011/06/08 18:00:13 maksbotan Exp $
+
+EAPI="3"
+PYTHON_DEPEND="*"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils python toolchain-funcs apache-module mercurial
+
+DESCRIPTION="uWSGI server for Python web applications"
+HOMEPAGE="http://projects.unbit.it/uwsgi/"
+EHG_REPO_URI="http://projects.unbit.it/hg/uwsgi"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="expat json ldap lua pcre perl ruby sqlite +xml yaml zeromq"
+
+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 \
+		"${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)"
+
+	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
+}
+
+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
+}



^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/
@ 2011-08-04 13:57 Tiziano Müller
  0 siblings, 0 replies; 11+ messages in thread
From: Tiziano Müller @ 2011-08-04 13:57 UTC (permalink / raw
  To: gentoo-commits

commit:     1751e941df3f97809f84c20e128d90992678a10c
Author:     Tiziano Mueller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  4 13:55:52 2011 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Thu Aug  4 13:55:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=1751e941

build is broken with expat and unsupported according to upstream. Try building the live ebuild with shared plugins.

---
 www-servers/uwsgi/Manifest             |    4 ++--
 www-servers/uwsgi/uwsgi-0.9.8.3.ebuild |   12 ++++--------
 www-servers/uwsgi/uwsgi-9999.ebuild    |   18 +++++++-----------
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 00fdff6..b04b601 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -5,6 +5,6 @@ AUX uwsgi-0.9.8-no-werror.patch 624 RMD160 ef3ebbfff1c6b4a49297e780b5eb5545786f8
 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 3429 RMD160 c536eb7c5cab127332b279f2412a1475c348dabf SHA1 ac9a120e9a5224e48cf728c2e062111db35f1f30 SHA256 cf4bef79ec1dc3db05238526d22c0991f96cc7bcdebe43fa260f429ae32ec40f
-EBUILD uwsgi-9999.ebuild 3420 RMD160 e15fb278953cae542ebf0776665c6d56be315190 SHA1 ca73243f9693ad022559d8b003c87343c39c249e SHA256 4d986d99fcf952c1918b62ebea6a1eedf1748a725b8afd2e96dee6fea0fd061b
+EBUILD uwsgi-0.9.8.3.ebuild 3329 RMD160 21e4b09e5fb03a56bfdd2256367992244de8396c SHA1 8aab4fe9a179c896615d66a3b1b487338e640744 SHA256 fc595c2be57e1e2a8ff92fdd1e79470be7abc104f2167e7326af560bfe6bc65f
+EBUILD uwsgi-9999.ebuild 3396 RMD160 8d77416b104053e16e133a4e75c59f2a7bbb66b1 SHA1 35c54016e8ea95302f304a3b516586d9750f5a5f SHA256 3896af58a9a0b915a9d84910595db9e015f13e952bc89fdb2ea006d0d97c941c
 DIST uwsgi-0.9.8.3.tar.gz 351168 RMD160 8bfdaa9a503516378e834bca60dfa828b7bee9d2 SHA1 780a96a2c32a0f7bb7f5a63353acca2fbd23a8e6 SHA256 2b529a8408bb4938ebccd3c4264af5af4f17ee5bd6043376ef3909c2411f611f

diff --git a/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild b/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild
index 137ff2a..ca42434 100644
--- a/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild
+++ b/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild
@@ -15,17 +15,16 @@ SRC_URI="http://projects.unbit.it/downloads/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="expat json ldap lua pcre perl ruby sqlite +xml yaml zeromq"
+IUSE="debug json ldap lua pcre perl ruby sqlite +xml yaml zeromq"
 
-RDEPEND="expat? ( dev-libs/expat )
-	json? ( dev-libs/jansson )
+RDEPEND="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 ) )
+	xml? ( dev-libs/libxml2 )
 	yaml? ( dev-libs/libyaml )
 	zeromq? ( net-libs/zeromq )"
 DEPEND="${RDEPEND}
@@ -57,9 +56,6 @@ src_configure() {
 		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)
@@ -83,7 +79,7 @@ ldap = $(use_true_false ldap)
 pcre = $(use_true_false pcre)
 debug = $(use_true_false debug)
 unbit = false
-xml_implementation = ${xmlimpl}
+xml_implementation = libxml2
 yaml_implementation = libyaml
 malloc_implementation = libc
 plugins =

diff --git a/www-servers/uwsgi/uwsgi-9999.ebuild b/www-servers/uwsgi/uwsgi-9999.ebuild
index de44907..f2d9356 100644
--- a/www-servers/uwsgi/uwsgi-9999.ebuild
+++ b/www-servers/uwsgi/uwsgi-9999.ebuild
@@ -15,17 +15,16 @@ EHG_REPO_URI="http://projects.unbit.it/hg/uwsgi"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="expat json ldap lua pcre perl ruby sqlite +xml yaml zeromq"
+IUSE="debug json ldap lua pcre perl ruby sqlite +xml yaml zeromq"
 
-RDEPEND="expat? ( dev-libs/expat )
-	json? ( dev-libs/jansson )
+RDEPEND="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 ) )
+	xml? ( dev-libs/libxml2 )
 	yaml? ( dev-libs/libyaml )
 	zeromq? ( net-libs/zeromq )"
 DEPEND="${RDEPEND}
@@ -57,9 +56,6 @@ src_configure() {
 		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)
@@ -83,14 +79,14 @@ ldap = $(use_true_false ldap)
 pcre = $(use_true_false pcre)
 debug = $(use_true_false debug)
 unbit = false
-xml_implementation = ${xmlimpl}
+xml_implementation = libxml2
 yaml_implementation = libyaml
 malloc_implementation = libc
-plugins =
+plugins = python, ping, cache, nagios, rpc, fastrouter, http, ugreen${plugins}
 bin_name = uwsgi
 append_version =
-plugin_dir = .
-embedded_plugins =  python, ping, cache, nagios, rpc, fastrouter, http, ugreen${plugins}
+plugin_dir = plugins
+#embedded_plugins =  python, ping, cache, nagios, rpc, fastrouter, http, ugreen${plugins}
 
 locking = auto
 event = auto



^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/
@ 2011-08-09 10:02 Tiziano Müller
  0 siblings, 0 replies; 11+ messages in thread
From: Tiziano Müller @ 2011-08-09 10:02 UTC (permalink / raw
  To: gentoo-commits

commit:     54df987bd20cd04068ec3c996576f7d44db89bf7
Author:     Tiziano Mueller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  9 10:01:05 2011 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Tue Aug  9 10:01:05 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=54df987b

building lua,perl,ruby as plugins

---
 www-servers/uwsgi/Manifest             |    5 +++--
 www-servers/uwsgi/uwsgi-0.9.8.3.ebuild |   21 ++++++++++++++++-----
 www-servers/uwsgi/uwsgi-9999.ebuild    |    4 ++--
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 13ba6bf..bc78864 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -2,10 +2,11 @@ MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 80e5cd4b
 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-0.9.8.3-fix-destdir.patch 385 RMD160 86e055c560079c61035107943d63c48d3689c35c SHA1 44b54276acf2ea61da824bf8aab054e662cdc8aa SHA256 b9fcaf3b7a76ab7a5150b85df4a39ecf578a7f181d9880c36d1e6e876bcb0ed7
 AUX uwsgi-9999-fix-destdir.patch 385 RMD160 86e055c560079c61035107943d63c48d3689c35c SHA1 44b54276acf2ea61da824bf8aab054e662cdc8aa SHA256 b9fcaf3b7a76ab7a5150b85df4a39ecf578a7f181d9880c36d1e6e876bcb0ed7
 AUX uwsgi.confd 1247 RMD160 f3cbb0ed1e83385e917949b7df1b8953792b9464 SHA1 2cba8d1990f0138f7bea113fec924b1656d53a8c SHA256 26c52f22137ffd44ef4c094ce9cf3b55f1c418f1602e0451462103a5117174a4
 AUX uwsgi.initd 2392 RMD160 d90a00358cfafc341889882989593ee567c3b153 SHA1 af23d4a1646560acd7a9d82dc2ac98196392075a SHA256 98859da43ac2def62b9b7d8527207481cdb4fbfbb17e9de6a1f2853d3271654d
 MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35
-EBUILD uwsgi-0.9.8.3.ebuild 3329 RMD160 21e4b09e5fb03a56bfdd2256367992244de8396c SHA1 8aab4fe9a179c896615d66a3b1b487338e640744 SHA256 fc595c2be57e1e2a8ff92fdd1e79470be7abc104f2167e7326af560bfe6bc65f
-EBUILD uwsgi-9999.ebuild 3701 RMD160 12064bd8202d62b224b6bb20739461a7c68bd003 SHA1 619c859ebb2e70ea545ee31ec9725bd9da966d65 SHA256 58bd6e5bc09b03ce9bc82c21e61c55536de61c985dde11befad0bb6c72d83245
+EBUILD uwsgi-0.9.8.3.ebuild 3711 RMD160 14fd09a139622efb649d074278012a767f03f109 SHA1 c147fc37bd3736856459b0679451b32431fb075b SHA256 6aeec7ee47c38c937193926cc8b809e26b6aa2b05c3c29602b44e93c26ad1022
+EBUILD uwsgi-9999.ebuild 3714 RMD160 eb0a5686a9620fc309649c47b1c912dcb7a2948b SHA1 c45150e52d072f8b63ebb40fa3cf5c4d8cb67b6f SHA256 74251b3da8ff0d99aa12ee0905b4b20fe3ab581afd7054a6c8fb09a2d6622c64
 DIST uwsgi-0.9.8.3.tar.gz 351168 RMD160 8bfdaa9a503516378e834bca60dfa828b7bee9d2 SHA1 780a96a2c32a0f7bb7f5a63353acca2fbd23a8e6 SHA256 2b529a8408bb4938ebccd3c4264af5af4f17ee5bd6043376ef3909c2411f611f

diff --git a/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild b/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild
index ca42434..1ec1078 100644
--- a/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild
+++ b/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild
@@ -37,7 +37,7 @@ want_apache2_2
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-0.9.8-no-werror.patch \
-		"${FILESDIR}"/${PN}-0.9.8-fix-psgi-flags.patch
+		"${FILESDIR}"/${P}-fix-destdir.patch
 	python_copy_sources
 }
 
@@ -55,12 +55,13 @@ src_configure() {
 		use lua && plugins+=", lua"
 		use perl && plugins+=", psgi"
 		use ruby && plugins+=", rack"
+		plugins="${plugins:1}"
 
 		cat > "buildconf/default.ini" << EOF
 [uwsgi]
 xml = $(use_true_false xml)
 ini = true
-yaml = true
+yaml = $(use_true_false yaml)
 json = $(use_true_false json)
 sqlite3 = $(use_true_false sqlite)
 zeromq = $(use_true_false zeromq)
@@ -82,11 +83,12 @@ unbit = false
 xml_implementation = libxml2
 yaml_implementation = libyaml
 malloc_implementation = libc
-plugins =
+plugins = ${plugins}
 bin_name = uwsgi
 append_version =
-plugin_dir = .
-embedded_plugins =  python, ping, cache, nagios, rpc, fastrouter, http, ugreen${plugins}
+plugin_build_dir = plugins
+plugin_dir = /usr/$(get_libdir)/uwsgi
+embedded_plugins =  python, ping, cache, nagios, rpc, fastrouter, http, ugreen
 
 locking = auto
 event = auto
@@ -120,6 +122,10 @@ src_compile() {
 src_install() {
 	installation() {
 		newbin uwsgi uwsgi-${PYTHON_ABI}
+		if use lua || use perl || use ruby ; then
+			insinto /usr/$(get_libdir)/uwsgi
+			doins plugins/*.so
+		fi
 	}
 	python_execute_function -s installation
 
@@ -145,4 +151,9 @@ pkg_postinst() {
 		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
+
+	if use lua || use perl || use ruby ; then
+		elog "The lua, perl and ruby modules are built as plugins."
+		elog "Use '--plugins lua', '--plugins psgi' or '--plugins rack' to load them."
+	fi
 }

diff --git a/www-servers/uwsgi/uwsgi-9999.ebuild b/www-servers/uwsgi/uwsgi-9999.ebuild
index 80ed927..9a8d231 100644
--- a/www-servers/uwsgi/uwsgi-9999.ebuild
+++ b/www-servers/uwsgi/uwsgi-9999.ebuild
@@ -62,7 +62,7 @@ src_configure() {
 [uwsgi]
 xml = $(use_true_false xml)
 ini = true
-yaml = true
+yaml = $(use_true_false yaml)
 json = $(use_true_false json)
 sqlite3 = $(use_true_false sqlite)
 zeromq = $(use_true_false zeromq)
@@ -156,7 +156,7 @@ pkg_postinst() {
 	fi
 
 	if use lua || use perl || use ruby ; then
-		elog "The lua, perl and ruby modules are built as real plugins."
+		elog "The lua, perl and ruby modules are built as plugins."
 		elog "Use '--plugins lua', '--plugins psgi' or '--plugins rack' to load them."
 	fi
 }



^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/
@ 2011-10-12 13:25 Tiziano Müller
  0 siblings, 0 replies; 11+ messages in thread
From: Tiziano Müller @ 2011-10-12 13:25 UTC (permalink / raw
  To: gentoo-commits

commit:     bcbf046fb807693a0a2acc29b3f64e8968159864
Author:     Tiziano Müller <tm <AT> dev-zero <DOT> ch>
AuthorDate: Sat Sep 24 06:58:08 2011 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 06:58:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=bcbf046f

Version bump.

---
 www-servers/uwsgi/Manifest                         |    4 ++--
 .../{uwsgi-0.9.8.3.ebuild => uwsgi-0.9.8.6.ebuild} |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index c56eff0..768001c 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -7,6 +7,6 @@ AUX uwsgi-9999-fix-destdir.patch 385 RMD160 86e055c560079c61035107943d63c48d3689
 AUX uwsgi.confd 1247 RMD160 f3cbb0ed1e83385e917949b7df1b8953792b9464 SHA1 2cba8d1990f0138f7bea113fec924b1656d53a8c SHA256 26c52f22137ffd44ef4c094ce9cf3b55f1c418f1602e0451462103a5117174a4
 AUX uwsgi.initd 2388 RMD160 32dcbde8f29c55f3aba996396880d543fc51f97d SHA1 24276db0dd82a5b5cdd756772ed81ae5c86e6e45 SHA256 6497afcc6208d54f01ef853bff0ee33eb4f5f63e0eb3e024bc206ee78966986b
 MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35
-EBUILD uwsgi-0.9.8.3.ebuild 3711 RMD160 14fd09a139622efb649d074278012a767f03f109 SHA1 c147fc37bd3736856459b0679451b32431fb075b SHA256 6aeec7ee47c38c937193926cc8b809e26b6aa2b05c3c29602b44e93c26ad1022
+EBUILD uwsgi-0.9.8.6.ebuild 3720 RMD160 50df26197402d355939a599d2229a86e9c14bbfb SHA1 a5902c32a7a2ef598fbd1bb35bed2bceabdd0336 SHA256 198eaa5873b5a7815e8e9831d5756f7636f12ed066bf1b99adc273cc7e8e1583
 EBUILD uwsgi-9999.ebuild 3714 RMD160 eb0a5686a9620fc309649c47b1c912dcb7a2948b SHA1 c45150e52d072f8b63ebb40fa3cf5c4d8cb67b6f SHA256 74251b3da8ff0d99aa12ee0905b4b20fe3ab581afd7054a6c8fb09a2d6622c64
-DIST uwsgi-0.9.8.3.tar.gz 351168 RMD160 8bfdaa9a503516378e834bca60dfa828b7bee9d2 SHA1 780a96a2c32a0f7bb7f5a63353acca2fbd23a8e6 SHA256 2b529a8408bb4938ebccd3c4264af5af4f17ee5bd6043376ef3909c2411f611f
+DIST uwsgi-0.9.8.6.tar.gz 359620 RMD160 78b92fe3a9b272ca5a2704b0db7d1956b9149a0b SHA1 bb835c3c14310640b24ebdbcf0aa91e8ce8bd5a6 SHA256 14379c0055063dbfbc4ce9ba10dfd6eec827286a462300d98947174d9694d981

diff --git a/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild b/www-servers/uwsgi/uwsgi-0.9.8.6.ebuild
similarity index 98%
rename from www-servers/uwsgi/uwsgi-0.9.8.3.ebuild
rename to www-servers/uwsgi/uwsgi-0.9.8.6.ebuild
index 1ec1078..7bc3bf3 100644
--- a/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild
+++ b/www-servers/uwsgi/uwsgi-0.9.8.6.ebuild
@@ -37,7 +37,7 @@ want_apache2_2
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-0.9.8-no-werror.patch \
-		"${FILESDIR}"/${P}-fix-destdir.patch
+		"${FILESDIR}"/${PN}-0.9.8.3-fix-destdir.patch
 	python_copy_sources
 }
 



^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/
@ 2011-11-29 18:54 Tiziano Müller
  0 siblings, 0 replies; 11+ messages in thread
From: Tiziano Müller @ 2011-11-29 18:54 UTC (permalink / raw
  To: gentoo-commits

commit:     8f52dfa432d2618eb2176b9c3dc4bcc342c856c6
Author:     Tiziano Müller <tm <AT> dev-zero <DOT> ch>
AuthorDate: Tue Nov 29 18:54:22 2011 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 18:54:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=8f52dfa4

version bump

---
 www-servers/uwsgi/Manifest                         |    4 ++--
 .../{uwsgi-1.0_rc6.ebuild => uwsgi-1.0_rc7.ebuild} |    0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 579f9cc..129edd2 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -2,9 +2,9 @@ AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db7 SHA1 2
 AUX uwsgi.confd 1247 RMD160 f3cbb0ed1e83385e917949b7df1b8953792b9464 SHA1 2cba8d1990f0138f7bea113fec924b1656d53a8c SHA256 26c52f22137ffd44ef4c094ce9cf3b55f1c418f1602e0451462103a5117174a4
 AUX uwsgi.initd 2386 RMD160 a799175f2b94eb96dc19ff9b8b4d5c18a52cbd38 SHA1 ffa1870c2e14871764447bc97e6d7b9f24364a28 SHA256 d523238595e83b7f82001dea41ffa3298836fd0027859ed3e1bf4f84d75e1370
 DIST uwsgi-0.9.8.6.tar.gz 359620 RMD160 78b92fe3a9b272ca5a2704b0db7d1956b9149a0b SHA1 bb835c3c14310640b24ebdbcf0aa91e8ce8bd5a6 SHA256 14379c0055063dbfbc4ce9ba10dfd6eec827286a462300d98947174d9694d981
-DIST uwsgi-1.0-rc6.tar.gz 441757 RMD160 67ba49700adc523a73ce9cc49ce86d742352c32e SHA1 bc2da6d7572222bf13cb6f3423e7dd4d38b7e3ce SHA256 e3878ac5fef7a9c4e5ebffe4c79a424c2aff34ebc5f6a6b2f88f16cb515552e2
+DIST uwsgi-1.0-rc7.tar.gz 447066 RMD160 4e2ff2bbfbafd3e0402c3a551c43af88d7d370dc SHA1 9ab26a73ba6204ae509adc129ed2acc22413ab05 SHA256 7439578f62a3bf1adcfeb58b192405a77032b6b792bef3cd54dd3ae7ec4b1df2
 EBUILD uwsgi-0.9.8.6.ebuild 4304 RMD160 ce533908cedae761db93ae26b811ae09e12847fc SHA1 29710c3c36fe5cffb34c180f9c6a48d7ace001e5 SHA256 5bf9203180bfa41622cad1f8c414b0a00af7b901e70017784f7648be43316b28
-EBUILD uwsgi-1.0_rc6.ebuild 4494 RMD160 7bdd37f424fe0d24595fcae20219cbdb98222006 SHA1 a0580b78bcd9a682d93ef8443f3d23f08d4dfbb1 SHA256 3022965197bf679019c3be27acbb274df31da095afeea2b06658c136bb7e86aa
+EBUILD uwsgi-1.0_rc7.ebuild 4494 RMD160 7bdd37f424fe0d24595fcae20219cbdb98222006 SHA1 a0580b78bcd9a682d93ef8443f3d23f08d4dfbb1 SHA256 3022965197bf679019c3be27acbb274df31da095afeea2b06658c136bb7e86aa
 EBUILD uwsgi-9999.ebuild 4443 RMD160 114d797de425d0d5b3bfe23cfbc426aa9567fc99 SHA1 e26121b379a91b18edb6fcd2d94a5ef6377f0282 SHA256 37dc74d9d4d4224d419bca0f3805e7a936a303867cc94f6d26c8103a7dc3d45c
 MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 80e5cd4bd06fa22b86e439e7260064260df14d37 SHA256 418abb3d30490aae32336efcb4c27ee96af8a09f1f9bbfc629384efe8c2363a9
 MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35

diff --git a/www-servers/uwsgi/uwsgi-1.0_rc6.ebuild b/www-servers/uwsgi/uwsgi-1.0_rc7.ebuild
similarity index 100%
rename from www-servers/uwsgi/uwsgi-1.0_rc6.ebuild
rename to www-servers/uwsgi/uwsgi-1.0_rc7.ebuild



^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/
@ 2011-11-29 22:55 Tiziano Müller
  0 siblings, 0 replies; 11+ messages in thread
From: Tiziano Müller @ 2011-11-29 22:55 UTC (permalink / raw
  To: gentoo-commits

commit:     340102ed2869c45f1867da615988d79d95c1eba4
Author:     Tiziano Müller <tm <AT> dev-zero <DOT> ch>
AuthorDate: Tue Nov 29 22:55:48 2011 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 22:55:48 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=340102ed

build ruby plugins, fix building perl plugin, make capability and uuid support configurable

---
 www-servers/uwsgi/Manifest             |    2 +-
 www-servers/uwsgi/uwsgi-1.0_rc7.ebuild |   32 ++++++++++++++++++++++++++------
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 129edd2..c00b589 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -4,7 +4,7 @@ AUX uwsgi.initd 2386 RMD160 a799175f2b94eb96dc19ff9b8b4d5c18a52cbd38 SHA1 ffa187
 DIST uwsgi-0.9.8.6.tar.gz 359620 RMD160 78b92fe3a9b272ca5a2704b0db7d1956b9149a0b SHA1 bb835c3c14310640b24ebdbcf0aa91e8ce8bd5a6 SHA256 14379c0055063dbfbc4ce9ba10dfd6eec827286a462300d98947174d9694d981
 DIST uwsgi-1.0-rc7.tar.gz 447066 RMD160 4e2ff2bbfbafd3e0402c3a551c43af88d7d370dc SHA1 9ab26a73ba6204ae509adc129ed2acc22413ab05 SHA256 7439578f62a3bf1adcfeb58b192405a77032b6b792bef3cd54dd3ae7ec4b1df2
 EBUILD uwsgi-0.9.8.6.ebuild 4304 RMD160 ce533908cedae761db93ae26b811ae09e12847fc SHA1 29710c3c36fe5cffb34c180f9c6a48d7ace001e5 SHA256 5bf9203180bfa41622cad1f8c414b0a00af7b901e70017784f7648be43316b28
-EBUILD uwsgi-1.0_rc7.ebuild 4494 RMD160 7bdd37f424fe0d24595fcae20219cbdb98222006 SHA1 a0580b78bcd9a682d93ef8443f3d23f08d4dfbb1 SHA256 3022965197bf679019c3be27acbb274df31da095afeea2b06658c136bb7e86aa
+EBUILD uwsgi-1.0_rc7.ebuild 5266 RMD160 dd1dd5587cf7073ef117eafc6d55dbbb96666196 SHA1 af20ef6642e1eac12671a2b1082b8a69c158d05f SHA256 05c9b91e01014eb999eda4b8a962f15c359dffce5a7170fabe4015930930c341
 EBUILD uwsgi-9999.ebuild 4443 RMD160 114d797de425d0d5b3bfe23cfbc426aa9567fc99 SHA1 e26121b379a91b18edb6fcd2d94a5ef6377f0282 SHA256 37dc74d9d4d4224d419bca0f3805e7a936a303867cc94f6d26c8103a7dc3d45c
 MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 80e5cd4bd06fa22b86e439e7260064260df14d37 SHA256 418abb3d30490aae32336efcb4c27ee96af8a09f1f9bbfc629384efe8c2363a9
 MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35

diff --git a/www-servers/uwsgi/uwsgi-1.0_rc7.ebuild b/www-servers/uwsgi/uwsgi-1.0_rc7.ebuild
index 0641b06..bc63942 100644
--- a/www-servers/uwsgi/uwsgi-1.0_rc7.ebuild
+++ b/www-servers/uwsgi/uwsgi-1.0_rc7.ebuild
@@ -5,10 +5,11 @@
 EAPI="4"
 PYTHON_DEPEND="python? 2:2.4:2.7 3:3.1:3.2"
 SUPPORT_PYTHON_ABIS="1"
+USE_RUBY="ruby18 ree18 ruby19"
 
 MY_P="${P/_/-}"
 
-inherit apache-module python multilib
+inherit apache-module python multilib ruby-ng
 
 DESCRIPTION="uWSGI server for Python web applications"
 HOMEPAGE="http://projects.unbit.it/uwsgi/"
@@ -17,9 +18,11 @@ SRC_URI="http://projects.unbit.it/downloads/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="apache2 +carbon debug json ldap lua +nagios +pcre perl python ruby rrdtool sqlite +xml yaml zeromq"
+IUSE="apache2 +caps +carbon debug json ldap lua +nagios +pcre perl python ruby rrdtool sqlite +uuid +xml yaml zeromq"
 
-CDEPEND="json? ( dev-libs/jansson )
+CDEPEND="uuid? ( sys-apps/util-linux )
+	caps? ( sys-libs/libcap )
+	json? ( dev-libs/jansson )
 	ldap? ( net-nds/openldap )
 	lua? ( dev-lang/lua )
 	pcre? ( dev-libs/libpcre )
@@ -48,6 +51,10 @@ use_true_false() {
 	fi
 }
 
+src_unpack() {
+	default
+}
+
 pkg_setup() {
 	depend.apache_pkg_setup
 	python_pkg_setup
@@ -117,6 +124,19 @@ embed_config =
 paste = true
 web3 = true
 EOF
+	use caps || sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed"
+	use uuid || sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed"
+}
+
+each_ruby_compile() {
+	cd "${WORKDIR}/${MY_P}"
+
+	sed -i -e "s|^NAME=.*|NAME='rack_${RUBY##*/}'|" plugins/rack/uwsgiplugin.py || die "sed failed"
+	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo || die "building plugin for ${RUBY} failed"
+
+	if [[ "${RUBY}" == *ruby19 ]] ; then
+		UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/ruby19 gentoo || die "building plugin for ${RUBY} failed"
+	fi
 }
 
 src_compile() {
@@ -129,7 +149,7 @@ src_compile() {
 	fi
 
 	if use perl ; then
-		python uwsgiconfig.py --plugin plugins/perl gentoo || die "building plugin for perl failed"
+		python uwsgiconfig.py --plugin plugins/psgi gentoo || die "building plugin for perl failed"
 	fi
 
 	if use python ; then
@@ -139,7 +159,7 @@ src_compile() {
 	fi
 
 	if use ruby ; then
-		echo "TODO"
+		ruby-ng_src_compile
 	fi
 
 	if use apache2 ; then
@@ -189,6 +209,6 @@ pkg_postinst() {
 
 	if use lua || use perl || use ruby || use python; then
 		elog "The lua, perl and ruby modules are built as plugins."
-		elog "Use '--plugins lua', '--plugins psgi', '--plugins rack' or '--plugins python27' to load them."
+		elog "Use '--plugins lua', '--plugins psgi', '--plugins rack_ruby18' or '--plugins python27' to load them."
 	fi
 }



^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/
@ 2011-12-02  7:22 Tiziano Müller
  0 siblings, 0 replies; 11+ messages in thread
From: Tiziano Müller @ 2011-12-02  7:22 UTC (permalink / raw
  To: gentoo-commits

commit:     63a1481c964d7559e76ab58e3de878b38770fbbe
Author:     Tiziano Müller <tm <AT> dev-zero <DOT> ch>
AuthorDate: Fri Dec  2 07:22:08 2011 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 07:22:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=63a1481c

make ruby dep optional

---
 www-servers/uwsgi/Manifest             |    4 +-
 www-servers/uwsgi/uwsgi-1.0_rc7.ebuild |    3 +-
 www-servers/uwsgi/uwsgi-9999.ebuild    |   35 +++++++++++++++++++++++++------
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index c00b589..76d1387 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -4,7 +4,7 @@ AUX uwsgi.initd 2386 RMD160 a799175f2b94eb96dc19ff9b8b4d5c18a52cbd38 SHA1 ffa187
 DIST uwsgi-0.9.8.6.tar.gz 359620 RMD160 78b92fe3a9b272ca5a2704b0db7d1956b9149a0b SHA1 bb835c3c14310640b24ebdbcf0aa91e8ce8bd5a6 SHA256 14379c0055063dbfbc4ce9ba10dfd6eec827286a462300d98947174d9694d981
 DIST uwsgi-1.0-rc7.tar.gz 447066 RMD160 4e2ff2bbfbafd3e0402c3a551c43af88d7d370dc SHA1 9ab26a73ba6204ae509adc129ed2acc22413ab05 SHA256 7439578f62a3bf1adcfeb58b192405a77032b6b792bef3cd54dd3ae7ec4b1df2
 EBUILD uwsgi-0.9.8.6.ebuild 4304 RMD160 ce533908cedae761db93ae26b811ae09e12847fc SHA1 29710c3c36fe5cffb34c180f9c6a48d7ace001e5 SHA256 5bf9203180bfa41622cad1f8c414b0a00af7b901e70017784f7648be43316b28
-EBUILD uwsgi-1.0_rc7.ebuild 5266 RMD160 dd1dd5587cf7073ef117eafc6d55dbbb96666196 SHA1 af20ef6642e1eac12671a2b1082b8a69c158d05f SHA256 05c9b91e01014eb999eda4b8a962f15c359dffce5a7170fabe4015930930c341
-EBUILD uwsgi-9999.ebuild 4443 RMD160 114d797de425d0d5b3bfe23cfbc426aa9567fc99 SHA1 e26121b379a91b18edb6fcd2d94a5ef6377f0282 SHA256 37dc74d9d4d4224d419bca0f3805e7a936a303867cc94f6d26c8103a7dc3d45c
+EBUILD uwsgi-1.0_rc7.ebuild 5303 RMD160 657947aa39bb28ce8f2e4d8229617474c8431f50 SHA1 3a54351ee06a32fbc3b79f272a9b24bfea2313d4 SHA256 6968941db8836ddfb4bbcb1ba54c4f0f580bcc9f8ba0f52e149133c802465b5f
+EBUILD uwsgi-9999.ebuild 5255 RMD160 61721207ea4564268c1f2ca7239c4142e27b570c SHA1 f2c2b029e306026558b5109f92a6d2209361db27 SHA256 bb20de3da3ad5e54ae5089cb3a87e7b19c086326af8367e86b68f7acf6feae8c
 MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 80e5cd4bd06fa22b86e439e7260064260df14d37 SHA256 418abb3d30490aae32336efcb4c27ee96af8a09f1f9bbfc629384efe8c2363a9
 MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35

diff --git a/www-servers/uwsgi/uwsgi-1.0_rc7.ebuild b/www-servers/uwsgi/uwsgi-1.0_rc7.ebuild
index bc63942..ad2a719 100644
--- a/www-servers/uwsgi/uwsgi-1.0_rc7.ebuild
+++ b/www-servers/uwsgi/uwsgi-1.0_rc7.ebuild
@@ -6,6 +6,7 @@ EAPI="4"
 PYTHON_DEPEND="python? 2:2.4:2.7 3:3.1:3.2"
 SUPPORT_PYTHON_ABIS="1"
 USE_RUBY="ruby18 ree18 ruby19"
+RUBY_OPTIONAL="yes"
 
 MY_P="${P/_/-}"
 
@@ -27,7 +28,7 @@ CDEPEND="uuid? ( sys-apps/util-linux )
 	lua? ( dev-lang/lua )
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl )
-	ruby? ( dev-lang/ruby )
+	ruby? ( $(ruby_implementations_depend) )
 	sqlite? ( dev-db/sqlite:3 )
 	xml? ( dev-libs/libxml2 )
 	yaml? ( dev-libs/libyaml )

diff --git a/www-servers/uwsgi/uwsgi-9999.ebuild b/www-servers/uwsgi/uwsgi-9999.ebuild
index 917af91..6926a5c 100644
--- a/www-servers/uwsgi/uwsgi-9999.ebuild
+++ b/www-servers/uwsgi/uwsgi-9999.ebuild
@@ -5,6 +5,8 @@
 EAPI="4"
 PYTHON_DEPEND="python? 2:2.4:2.7 3:3.1:3.2"
 SUPPORT_PYTHON_ABIS="1"
+USE_RUBY="ruby18 ree18 ruby19"
+RUBY_OPTIONAL="yes"
 
 inherit apache-module python multilib mercurial
 
@@ -14,15 +16,17 @@ EHG_REPO_URI="http://projects.unbit.it/hg/uwsgi"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="apache2 +carbon debug json ldap lua +nagios +pcre perl python ruby rrdtool sqlite +xml yaml zeromq"
+KEYWORDS="~amd64 ~x86"
+IUSE="apache2 +caps +carbon debug json ldap lua +nagios +pcre perl python ruby rrdtool sqlite +uuid +xml yaml zeromq"
 
-CDEPEND="json? ( dev-libs/jansson )
+CDEPEND="uuid? ( sys-apps/util-linux )
+	caps? ( sys-libs/libcap )
+	json? ( dev-libs/jansson )
 	ldap? ( net-nds/openldap )
 	lua? ( dev-lang/lua )
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl )
-	ruby? ( dev-lang/ruby )
+	ruby? ( $(ruby_implementations_depend) )
 	sqlite? ( dev-db/sqlite:3 )
 	xml? ( dev-libs/libxml2 )
 	yaml? ( dev-libs/libyaml )
@@ -44,6 +48,10 @@ use_true_false() {
 	fi
 }
 
+src_unpack() {
+	default
+}
+
 pkg_setup() {
 	depend.apache_pkg_setup
 	python_pkg_setup
@@ -114,6 +122,19 @@ paste = true
 web3 = true
 
 EOF
+	use caps || sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed"
+	use uuid || sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed"
+}
+
+each_ruby_compile() {
+	cd "${WORKDIR}/${MY_P}"
+
+	sed -i -e "s|^NAME=.*|NAME='rack_${RUBY##*/}'|" plugins/rack/uwsgiplugin.py || die "sed failed"
+	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo || die "building plugin for ${RUBY} failed"
+
+	if [[ "${RUBY}" == *ruby19 ]] ; then
+		UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/ruby19 gentoo || die "building plugin for ${RUBY} failed"
+	fi
 }
 
 src_compile() {
@@ -126,7 +147,7 @@ src_compile() {
 	fi
 
 	if use perl ; then
-		python uwsgiconfig.py --plugin plugins/perl gentoo || die "building plugin for perl failed"
+		python uwsgiconfig.py --plugin plugins/psgi gentoo || die "building plugin for perl failed"
 	fi
 
 	if use python ; then
@@ -136,7 +157,7 @@ src_compile() {
 	fi
 
 	if use ruby ; then
-		echo "TODO"
+		ruby-ng_src_compile
 	fi
 
 	if use apache2 ; then
@@ -187,6 +208,6 @@ pkg_postinst() {
 
 	if use lua || use perl || use ruby || use python; then
 		elog "The lua, perl and ruby modules are built as plugins."
-		elog "Use '--plugins lua', '--plugins psgi', '--plugins rack' or '--plugins python27' to load them."
+		elog "Use '--plugins lua', '--plugins psgi', '--plugins rack_ruby18' or '--plugins python27' to load them."
 	fi
 }



^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/
@ 2012-02-20 14:02 Tiziano Müller
  0 siblings, 0 replies; 11+ messages in thread
From: Tiziano Müller @ 2012-02-20 14:02 UTC (permalink / raw
  To: gentoo-commits

commit:     e3b6fc78b2313b9a7e14f24869d1bec702be17b9
Author:     Tiziano Müller <tm <AT> dev-zero <DOT> ch>
AuthorDate: Mon Feb 20 14:01:26 2012 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Mon Feb 20 14:01:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=e3b6fc78

Version bump. Remove keywords for live ebuild.

---
 www-servers/uwsgi/Manifest                         |    6 +++---
 .../{uwsgi-1.0_rc7.ebuild => uwsgi-1.0.4.ebuild}   |    0
 www-servers/uwsgi/uwsgi-9999.ebuild                |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 76d1387..afa2c38 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -2,9 +2,9 @@ AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db7 SHA1 2
 AUX uwsgi.confd 1247 RMD160 f3cbb0ed1e83385e917949b7df1b8953792b9464 SHA1 2cba8d1990f0138f7bea113fec924b1656d53a8c SHA256 26c52f22137ffd44ef4c094ce9cf3b55f1c418f1602e0451462103a5117174a4
 AUX uwsgi.initd 2386 RMD160 a799175f2b94eb96dc19ff9b8b4d5c18a52cbd38 SHA1 ffa1870c2e14871764447bc97e6d7b9f24364a28 SHA256 d523238595e83b7f82001dea41ffa3298836fd0027859ed3e1bf4f84d75e1370
 DIST uwsgi-0.9.8.6.tar.gz 359620 RMD160 78b92fe3a9b272ca5a2704b0db7d1956b9149a0b SHA1 bb835c3c14310640b24ebdbcf0aa91e8ce8bd5a6 SHA256 14379c0055063dbfbc4ce9ba10dfd6eec827286a462300d98947174d9694d981
-DIST uwsgi-1.0-rc7.tar.gz 447066 RMD160 4e2ff2bbfbafd3e0402c3a551c43af88d7d370dc SHA1 9ab26a73ba6204ae509adc129ed2acc22413ab05 SHA256 7439578f62a3bf1adcfeb58b192405a77032b6b792bef3cd54dd3ae7ec4b1df2
+DIST uwsgi-1.0.4.tar.gz 465762 RMD160 afc67a752fb0055cb87769219a60b9e8f09acfcc SHA1 ba2e249e962acbdc9a3e7c3c86b2ceb9019503f6 SHA256 3267c48fdfce41766a237eb696eaaa6ee8d90672b483dbfc746663ddc8383b8d
 EBUILD uwsgi-0.9.8.6.ebuild 4304 RMD160 ce533908cedae761db93ae26b811ae09e12847fc SHA1 29710c3c36fe5cffb34c180f9c6a48d7ace001e5 SHA256 5bf9203180bfa41622cad1f8c414b0a00af7b901e70017784f7648be43316b28
-EBUILD uwsgi-1.0_rc7.ebuild 5303 RMD160 657947aa39bb28ce8f2e4d8229617474c8431f50 SHA1 3a54351ee06a32fbc3b79f272a9b24bfea2313d4 SHA256 6968941db8836ddfb4bbcb1ba54c4f0f580bcc9f8ba0f52e149133c802465b5f
-EBUILD uwsgi-9999.ebuild 5255 RMD160 61721207ea4564268c1f2ca7239c4142e27b570c SHA1 f2c2b029e306026558b5109f92a6d2209361db27 SHA256 bb20de3da3ad5e54ae5089cb3a87e7b19c086326af8367e86b68f7acf6feae8c
+EBUILD uwsgi-1.0.4.ebuild 5303 RMD160 657947aa39bb28ce8f2e4d8229617474c8431f50 SHA1 3a54351ee06a32fbc3b79f272a9b24bfea2313d4 SHA256 6968941db8836ddfb4bbcb1ba54c4f0f580bcc9f8ba0f52e149133c802465b5f
+EBUILD uwsgi-9999.ebuild 5244 RMD160 d4e039a853ae5e78b7a969c6cd3c14b2047a0caa SHA1 5463d445d460fa649cb1f90a2d16c170a0f7ddae SHA256 d0a9ddac405f57588009d4e6c87f08033cc405b60433aeb44b4f41bc153e99f4
 MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 80e5cd4bd06fa22b86e439e7260064260df14d37 SHA256 418abb3d30490aae32336efcb4c27ee96af8a09f1f9bbfc629384efe8c2363a9
 MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35

diff --git a/www-servers/uwsgi/uwsgi-1.0_rc7.ebuild b/www-servers/uwsgi/uwsgi-1.0.4.ebuild
similarity index 100%
rename from www-servers/uwsgi/uwsgi-1.0_rc7.ebuild
rename to www-servers/uwsgi/uwsgi-1.0.4.ebuild

diff --git a/www-servers/uwsgi/uwsgi-9999.ebuild b/www-servers/uwsgi/uwsgi-9999.ebuild
index 6926a5c..b2e3930 100644
--- a/www-servers/uwsgi/uwsgi-9999.ebuild
+++ b/www-servers/uwsgi/uwsgi-9999.ebuild
@@ -16,7 +16,7 @@ EHG_REPO_URI="http://projects.unbit.it/hg/uwsgi"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="apache2 +caps +carbon debug json ldap lua +nagios +pcre perl python ruby rrdtool sqlite +uuid +xml yaml zeromq"
 
 CDEPEND="uuid? ( sys-apps/util-linux )



^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/
@ 2012-04-23  7:49 Tiziano Müller
  0 siblings, 0 replies; 11+ messages in thread
From: Tiziano Müller @ 2012-04-23  7:49 UTC (permalink / raw
  To: gentoo-commits

commit:     c8061e7ea87acb461735b19594736fb8761b1aaa
Author:     Tiziano Müller <tm <AT> dev-zero <DOT> ch>
AuthorDate: Mon Apr 23 07:49:04 2012 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Mon Apr 23 07:49:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=c8061e7e

Add support for erlang. Cleanup pkg_postinst messages for the language plugins.

---
 www-servers/uwsgi/Manifest           |    2 +-
 www-servers/uwsgi/uwsgi-1.1.2.ebuild |   39 +++++++++++++++++++++++++++++----
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 40b070f..60b09d9 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -3,7 +3,7 @@ AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db7 SHA1 2
 AUX uwsgi.confd 1436 RMD160 27556a66bcd8f55e50bbce61110fdcc0a7b78b22 SHA1 a054d3d71fe333edc3a13c441051592a0db552e0 SHA256 2d87d90f643948e6d7f2a491196874d930122c37ff65949b089fdcba26916399
 AUX uwsgi.initd 3191 RMD160 dc665d3dc1325266c2fcee095503ae4e6b297980 SHA1 56396e9f7870a61e4084b524432972f349c09240 SHA256 4e2913b96e6fc88287879126727ae627e32fd5b51076aa8155af73359f1c97ca
 DIST uwsgi-1.1.2.tar.gz 497365 RMD160 4bb5f23db5b2ca0ae585dfde01dfc5bc1ea823c2 SHA1 b48ec35fcdd19c1786257958e34089c021655ba9 SHA256 0fc96217f83fed8cfaa340db2d09adb938b43edb1a963df8ede87f8d87b06e76
-EBUILD uwsgi-1.1.2.ebuild 6524 RMD160 afb8c1a773f22e2c957148b82ddb47b14fc2034a SHA1 5137ee230f82190623b3f10dec6e31f7f4b1d402 SHA256 09dc9f03b3e058063765b9fbb6f93df29da596d91f8d2a86d9a40e1d977c89bb
+EBUILD uwsgi-1.1.2.ebuild 7206 RMD160 43f934fd6e0d45cc15547aab6b4d52b15e424d9d SHA1 d1e430656b1def529365292da6ea412478c2a268 SHA256 c7d77834040016aae950c7ab722446d5ced763f524f27242a7afa75deda3fa07
 EBUILD uwsgi-9999.ebuild 5244 RMD160 d4e039a853ae5e78b7a969c6cd3c14b2047a0caa SHA1 5463d445d460fa649cb1f90a2d16c170a0f7ddae SHA256 d0a9ddac405f57588009d4e6c87f08033cc405b60433aeb44b4f41bc153e99f4
 MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 80e5cd4bd06fa22b86e439e7260064260df14d37 SHA256 418abb3d30490aae32336efcb4c27ee96af8a09f1f9bbfc629384efe8c2363a9
 MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35

diff --git a/www-servers/uwsgi/uwsgi-1.1.2.ebuild b/www-servers/uwsgi/uwsgi-1.1.2.ebuild
index 982c9ac..ed7c2cd 100644
--- a/www-servers/uwsgi/uwsgi-1.1.2.ebuild
+++ b/www-servers/uwsgi/uwsgi-1.1.2.ebuild
@@ -13,6 +13,9 @@ PHP_EXT_INI="no"
 USE_PHP="php5-3 php5-4"
 PHP_EXT_OPTIONAL_USE="php"
 
+# TODO:
+# - need to depend on php[embed]
+
 MY_P="${P/_/-}"
 
 inherit apache-module eutils python multilib pax-utils php-ext-source-r2 ruby-ng
@@ -24,11 +27,12 @@ SRC_URI="http://projects.unbit.it/downloads/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="apache2 +caps +carbon debug graylog2 json ldap lua +nagios perl +pcre php python rrdtool rsyslog ruby spooler sqlite syslog +uuid +xml yaml zeromq"
-REQUIRED_USE="|| ( lua perl php python ruby )"
+IUSE="apache2 +caps +carbon debug erlang graylog2 json ldap lua +nagios perl +pcre php python rrdtool rsyslog ruby spooler sqlite syslog +uuid +xml yaml zeromq"
+REQUIRED_USE="|| ( erlang lua perl php python ruby )"
 
 CDEPEND="caps? ( sys-libs/libcap )
 	json? ( dev-libs/jansson )
+	erlang? ( dev-lang/erlang )
 	graylog2? ( sys-libs/zlib )
 	ldap? ( net-nds/openldap )
 	lua? ( dev-lang/lua )
@@ -166,6 +170,10 @@ src_compile() {
 
 	mkdir -p "${T}/plugins"
 
+	if use erlang ; then
+		python uwsgiconfig.py --plugin plugins/erlang gentoo || die "building plugin for erlang failed"
+	fi
+
 	if use lua ; then
 		python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed"
 	fi
@@ -249,8 +257,29 @@ pkg_postinst() {
 		elog "mod_Ruwsgi is newer and more Apache-API friendly but not commercially supported."
 	fi
 
-	if use lua || use perl || use ruby || use python; then
-		elog "The lua, perl and ruby modules are built as plugins."
-		elog "Use '--plugins lua', '--plugins psgi', '--plugins rack_ruby18' or '--plugins python27' to load them."
+	elog "Append the following options to the uwsgi call to load the respective language plugin:"
+	use erlang && elog "  '--plugins erlang' for erlang"
+	use lua    && elog "  '--plugins lua' for lua"
+	use perl   && elog "  '--plugins psgi' for perl"
+
+	if use php ; then
+		for s in $(php_get_slots); do
+			elog "  '--plugins ${s/.}' for ${s}"
+		done
+	fi
+
+	if use python ; then
+		for a in ${PYTHON_ABIS} ; do
+			elog "  '--plugins python${a/.}' for python-${a}"
+		done
+	fi
+
+	if use ruby ; then
+		for ruby in $USE_RUBY; do
+			use ruby_targets_${ruby} && elog "  '--plugins rack_${ruby/.}' for ${ruby}"
+			if [[ "${ruby}" == *ruby19 ]] ; then
+				elog "  '--plugins fibre' for ruby-1.9 fibres"
+			fi
+		done
 	fi
 }



^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/
@ 2012-05-08 18:51 Tiziano Müller
  0 siblings, 0 replies; 11+ messages in thread
From: Tiziano Müller @ 2012-05-08 18:51 UTC (permalink / raw
  To: gentoo-commits

commit:     0ea1a708eaf560ac2bc18d1aaa9e1abeb93e778d
Author:     Tiziano Müller <tm <AT> dev-zero <DOT> ch>
AuthorDate: Tue May  8 18:51:31 2012 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Tue May  8 18:51:31 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=0ea1a708

version bump

---
 www-servers/uwsgi/Manifest                         |    4 ++--
 .../uwsgi/{uwsgi-1.1.2.ebuild => uwsgi-1.2.ebuild} |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 60b09d9..62b8f13 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -2,8 +2,8 @@ AUX 1.1.2-threaded-php.patch 1098 RMD160 df45f3951fe9b75e2fbde10e5bcf8fa42f42c7e
 AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db7 SHA1 24624a805c16778aaa4e24b74d2e8230ee381aec SHA256 b759712baa7b8abab2ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861
 AUX uwsgi.confd 1436 RMD160 27556a66bcd8f55e50bbce61110fdcc0a7b78b22 SHA1 a054d3d71fe333edc3a13c441051592a0db552e0 SHA256 2d87d90f643948e6d7f2a491196874d930122c37ff65949b089fdcba26916399
 AUX uwsgi.initd 3191 RMD160 dc665d3dc1325266c2fcee095503ae4e6b297980 SHA1 56396e9f7870a61e4084b524432972f349c09240 SHA256 4e2913b96e6fc88287879126727ae627e32fd5b51076aa8155af73359f1c97ca
-DIST uwsgi-1.1.2.tar.gz 497365 RMD160 4bb5f23db5b2ca0ae585dfde01dfc5bc1ea823c2 SHA1 b48ec35fcdd19c1786257958e34089c021655ba9 SHA256 0fc96217f83fed8cfaa340db2d09adb938b43edb1a963df8ede87f8d87b06e76
-EBUILD uwsgi-1.1.2.ebuild 7206 RMD160 43f934fd6e0d45cc15547aab6b4d52b15e424d9d SHA1 d1e430656b1def529365292da6ea412478c2a268 SHA256 c7d77834040016aae950c7ab722446d5ced763f524f27242a7afa75deda3fa07
+DIST uwsgi-1.2.tar.gz 506666 RMD160 1f938223a62c9b44996e623a8e41a1383ff57376 SHA1 9a3ec0ebaf0e71d3ecec4b79a90bf9b97b49b713 SHA256 55b43b3dc5d08db87cceff1a6aa93fb62cfa3ed3a897f2b2a087ed9597fd4e4a
+EBUILD uwsgi-1.2.ebuild 7206 RMD160 6351fb326d9e0e64a435f571e09b54459bb7857a SHA1 f30b6d1a9f47b8c1d05686414c41c561a89f524b SHA256 269a1c4af2278e953ff39fd2f554646b3aa2d7fd19ffb8f139b560be5793f766
 EBUILD uwsgi-9999.ebuild 5244 RMD160 d4e039a853ae5e78b7a969c6cd3c14b2047a0caa SHA1 5463d445d460fa649cb1f90a2d16c170a0f7ddae SHA256 d0a9ddac405f57588009d4e6c87f08033cc405b60433aeb44b4f41bc153e99f4
 MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 80e5cd4bd06fa22b86e439e7260064260df14d37 SHA256 418abb3d30490aae32336efcb4c27ee96af8a09f1f9bbfc629384efe8c2363a9
 MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35

diff --git a/www-servers/uwsgi/uwsgi-1.1.2.ebuild b/www-servers/uwsgi/uwsgi-1.2.ebuild
similarity index 99%
rename from www-servers/uwsgi/uwsgi-1.1.2.ebuild
rename to www-servers/uwsgi/uwsgi-1.2.ebuild
index ed7c2cd..07271df 100644
--- a/www-servers/uwsgi/uwsgi-1.1.2.ebuild
+++ b/www-servers/uwsgi/uwsgi-1.2.ebuild
@@ -74,7 +74,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PV}-threaded-php.patch"
+	epatch "${FILESDIR}/1.1.2-threaded-php.patch"
 
 	sed -i \
 		-e "s|'-O2', ||" \



^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/
@ 2012-05-09  6:11 Tiziano Müller
  0 siblings, 0 replies; 11+ messages in thread
From: Tiziano Müller @ 2012-05-09  6:11 UTC (permalink / raw
  To: gentoo-commits

commit:     ad5f35e944e83c16b1e5ed6ad4627ebf7e76ed95
Author:     Tiziano Müller <tm <AT> dev-zero <DOT> ch>
AuthorDate: Wed May  9 05:57:36 2012 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Wed May  9 05:57:36 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=ad5f35e9

fixed php dependency

---
 www-servers/uwsgi/Manifest         |    2 +-
 www-servers/uwsgi/uwsgi-1.2.ebuild |    9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 62b8f13..b5a8581 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -3,7 +3,7 @@ AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db7 SHA1 2
 AUX uwsgi.confd 1436 RMD160 27556a66bcd8f55e50bbce61110fdcc0a7b78b22 SHA1 a054d3d71fe333edc3a13c441051592a0db552e0 SHA256 2d87d90f643948e6d7f2a491196874d930122c37ff65949b089fdcba26916399
 AUX uwsgi.initd 3191 RMD160 dc665d3dc1325266c2fcee095503ae4e6b297980 SHA1 56396e9f7870a61e4084b524432972f349c09240 SHA256 4e2913b96e6fc88287879126727ae627e32fd5b51076aa8155af73359f1c97ca
 DIST uwsgi-1.2.tar.gz 506666 RMD160 1f938223a62c9b44996e623a8e41a1383ff57376 SHA1 9a3ec0ebaf0e71d3ecec4b79a90bf9b97b49b713 SHA256 55b43b3dc5d08db87cceff1a6aa93fb62cfa3ed3a897f2b2a087ed9597fd4e4a
-EBUILD uwsgi-1.2.ebuild 7206 RMD160 6351fb326d9e0e64a435f571e09b54459bb7857a SHA1 f30b6d1a9f47b8c1d05686414c41c561a89f524b SHA256 269a1c4af2278e953ff39fd2f554646b3aa2d7fd19ffb8f139b560be5793f766
+EBUILD uwsgi-1.2.ebuild 7318 RMD160 23d2500c7a9324aa183eb55dea11632b96db6493 SHA1 f0e64c4f999d9b2e9cc271990f431c1f64169d8d SHA256 8544a7b4234b07b90712e09c8b37f6d4e75f44a7cd98cac67c2ae4906387f754
 EBUILD uwsgi-9999.ebuild 5244 RMD160 d4e039a853ae5e78b7a969c6cd3c14b2047a0caa SHA1 5463d445d460fa649cb1f90a2d16c170a0f7ddae SHA256 d0a9ddac405f57588009d4e6c87f08033cc405b60433aeb44b4f41bc153e99f4
 MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 80e5cd4bd06fa22b86e439e7260064260df14d37 SHA256 418abb3d30490aae32336efcb4c27ee96af8a09f1f9bbfc629384efe8c2363a9
 MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35

diff --git a/www-servers/uwsgi/uwsgi-1.2.ebuild b/www-servers/uwsgi/uwsgi-1.2.ebuild
index 07271df..733c8df 100644
--- a/www-servers/uwsgi/uwsgi-1.2.ebuild
+++ b/www-servers/uwsgi/uwsgi-1.2.ebuild
@@ -10,12 +10,9 @@ USE_RUBY="ruby18 ree18 ruby19"
 RUBY_OPTIONAL="yes"
 PHP_EXT_NAME="dummy"
 PHP_EXT_INI="no"
-USE_PHP="php5-3 php5-4"
+USE_PHP="php5-3 php5-4" # deps must be registered separately below
 PHP_EXT_OPTIONAL_USE="php"
 
-# TODO:
-# - need to depend on php[embed]
-
 MY_P="${P/_/-}"
 
 inherit apache-module eutils python multilib pax-utils php-ext-source-r2 ruby-ng
@@ -38,6 +35,10 @@ CDEPEND="caps? ( sys-libs/libcap )
 	lua? ( dev-lang/lua )
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl )
+	php? (
+		php_targets_php5-3? ( dev-lang/php:5.3[embed] )
+		php_targets_php5-4? ( dev-lang/php:5.4[embed] )
+	)
 	ruby? ( $(ruby_implementations_depend) )
 	sqlite? ( dev-db/sqlite:3 )
 	rsyslog? ( app-admin/rsyslog )



^ permalink raw reply related	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2012-05-09  6:11 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-23  7:49 [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/ Tiziano Müller
  -- strict thread matches above, loose matches on Subject: below --
2012-05-09  6:11 Tiziano Müller
2012-05-08 18:51 Tiziano Müller
2012-02-20 14:02 Tiziano Müller
2011-12-02  7:22 Tiziano Müller
2011-11-29 22:55 Tiziano Müller
2011-11-29 18:54 Tiziano Müller
2011-10-12 13:25 Tiziano Müller
2011-08-09 10:02 Tiziano Müller
2011-08-04 13:57 Tiziano Müller
2011-08-02 13:13 Tiziano Müller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox