Fix compilation with USE=apache2 (bug #499482), add support for mono (bug #473382), build rbthreads plugin with USE=ruby and build fiber with all supported ruby versions (1.9,2.0,2.1).

Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0x1E0CA85F!

3 files changed, 29 insertions, 17 deletions

diff --git a/www-servers/uwsgi/ChangeLog b/www-servers/uwsgi/ChangeLog
index 8b3fa1984baf..c73dcbe2b390 100644
--- a/www-servers/uwsgi/ChangeLog
+++ b/www-servers/uwsgi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-servers/uwsgi
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/ChangeLog,v 1.50 2014/01/22 17:07:11 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/ChangeLog,v 1.51 2014/01/30 08:50:18 dev-zero Exp $
+
+*uwsgi-2.0-r2 (30 Jan 2014)
+
+  30 Jan 2014; Tiziano Müller <dev-zero@gentoo.org> +uwsgi-2.0-r2.ebuild,
+  -uwsgi-2.0-r1.ebuild:
+  Fix compilation with USE=apache2 (bug #499482), add support for mono (bug
+  #473382), build rbthreads plugin with USE=ruby and build fiber with all
+  supported ruby versions (1.9,2.0,2.1).
 
 *uwsgi-2.0-r1 (22 Jan 2014)
 
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 8435307b2b6d..f98238411c20 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -22,6 +22,6 @@ EBUILD uwsgi-1.4.6-r1.ebuild 9562 SHA256 64e5834cc5768cf2b8cc96f9e075e155bbbe192
 EBUILD uwsgi-1.4.6.ebuild 9559 SHA256 d606c46c5d9c3d422faa13113138eaa84812e08dad807741261314887e75ac5a SHA512 2006048503b70e59d3a0515c889ad88fdab59af1a2ccbfa8eaddf5f926b164b9932c223d52f376cd57c1c068415daef1a2815f0dc2e736cab4224ad9209dc601 WHIRLPOOL 31ee2ae6954d97388c2681376e67431f00ef497c11892eb7b6938ca235811a42d1ee309619633836594c6729f2bbc6fdfb860d40047e618aed1983aac74e45d4
 EBUILD uwsgi-1.4.8.ebuild 9559 SHA256 cc21690212eb37156b5c2449f8223de09807315719a0b03586385048db49d1b6 SHA512 c8e02803c97e39a63ee0383ad5a4a12211e8f8871a81d25993cebda38a30f6cdcc8bbed190033c409342148b2f8bd57997d6a007584ebcaf7cc9d81326b00b11 WHIRLPOOL 2405726642ddf2d7d98cc6d6eb5ddc5a7ade8671b0025e9b533a70692be6cdeaf9f6d53df04b995f73e5be87521f012139e3e5c03c3b7bd368a133d08b2ad489
 EBUILD uwsgi-1.4.9.ebuild 9559 SHA256 d78fe36b66cfd7df05842bead1f516cd010f68f4ed1aa797ae0a20c1292ead83 SHA512 a93dac97f722c56ea8847d08932b98012a494eeccc9993f7cd07fcec4e53c2357d294e3da21633430ac629cfab0640a3f226e2ba7aeb989de904a375d17dd49d WHIRLPOOL f2f2fb3bb93f775db59751e6b7a580bf2ce0589f02c51b6cfe44db59f57febde7dc8749383990dde8a76f26cbd35b09e65f0e4533b71eb736bb3e84521555639
-EBUILD uwsgi-2.0-r1.ebuild 10941 SHA256 553e50c2401f88e1f94c04ff5e3cff8f6ac9cedd4b73f29e892fe2947bb63af2 SHA512 7d6631f8127353872424ee672bfb096e4bfe33956a2d41a6178d847071ccfcf798e932b60ca3734328159e1d4c646aa44c6e4f2ef98c83db8460214ebdf5f903 WHIRLPOOL 1882a30b6f63d22a636c298d9bad3d7ddd562692d666b9393a602d695c4425bce86f5ce23cdb45ce1435c56bff5ef2f49c23903755467df558394d4416a59484
-MISC ChangeLog 8979 SHA256 c460794bcf6c98cbfab9189792a68df96e1e6824d0bfb3ffff5a014bb4e52a48 SHA512 9da05191256683c50ebee0f62d30eb967f29cc75a871bcdb1184259f474cd90c17a9be156a17fdcbaf887adc0f6d7e6ce87b857c22c5726195b0839cc9751701 WHIRLPOOL 6ad5435eb089c8fe3e1055c63754f3fa247463c6c0f5ad23e536d44513ac31829dc76a4d2ba531fd5c08f7838e9d95c2a4371279e073b49d625350809439111c
+EBUILD uwsgi-2.0-r2.ebuild 11257 SHA256 52527df791a6ac823d1d7e1ade66371b892dd11f061cfd7480c5eda1a59a5a9c SHA512 fe95e10055224aaadd8b52e74382773aaae66f229b01fb4b31e4b37c843947d09e67881ff4d2c28415a227e07e4ced0f5f11592ac3b7432823fb97e548220857 WHIRLPOOL cb78ddcd9c15cd7d4433195c9d57fe2ae36fdb64255875fa81f2028e822d75ad5fcdb57a116dd198b57914d83f98b9a1280f01ad1a431354dc435be84a3bfc32
+MISC ChangeLog 9299 SHA256 09df048789ded5cdb1089a87c0d630ec39bc83c4f6517b6dc7274b6f07e62d53 SHA512 d629895e831c9859f97d04215b86763e74524879fb315e300b6cdf7258469a86cc3ce4a81660554dd4c4a4b17a739866ead3aed87aebe156fb6f93f956f7aa9f WHIRLPOOL 2aa277dee7f6191ca6656f5c9da4cbf7ea2f7fa021024e73162e8f1d44aebbda102f3bf959a07b56cfe1c3637f59c4a1fdb62ef60a18d0fb31b32f0e6f4f0325
 MISC metadata.xml 2398 SHA256 fcc2a39d1a01b6d2ff727aa61ef47a46270bfe563a5d56145077306f51acf956 SHA512 40eddbe1a633a5c018dd536ff03cc47df345c7f504b0371724bea99e9ae7dcd66dedfdcda3387ecb217c9f004668b435f878bb067354793b19ee74a44ce6d8a6 WHIRLPOOL e0e6583c809deb2ef33dc9c7d02a92dc33b0d1c0c6ac50d2d8d9a368e0bba96ce3a294bc397f596314135256b0121b12871437522485aa2bae9e5ac79dfc91ed
diff --git a/www-servers/uwsgi/uwsgi-2.0-r1.ebuild b/www-servers/uwsgi/uwsgi-2.0-r2.ebuild
index 1b183b573a42..0e67ba5777ee 100644
--- a/www-servers/uwsgi/uwsgi-2.0-r1.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-2.0-r1.ebuild,v 1.1 2014/01/22 17:07:11 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-2.0-r2.ebuild,v 1.1 2014/01/30 08:50:18 dev-zero Exp $
 
 EAPI="5"
 
@@ -41,7 +41,7 @@ UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron
 	sqlite ssi stats_pusher_statsd
 	systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix )
 
-LANG_SUPPORT_SIMPLE=( cgi perl ) # plugins which can be built in the main build process
+LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process
 LANG_SUPPORT_EXTENDED=( lua php python python_gevent ruby )
 
 # plugins to be ignored (for now):
@@ -53,7 +53,6 @@ LANG_SUPPORT_EXTENDED=( lua php python python_gevent ruby )
 # exception_log: example plugin
 # *go*: TODO
 # *java*: TODO
-# *mono*: TODO
 # v8: TODO
 # matheval: TODO
 IUSE="apache2 +caps debug +embedded expat jemalloc json +pcre +routing +ssl +xml yajl yaml zeromq"
@@ -80,7 +79,6 @@ REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
 # 3. Plugins
 # 4. Language/app support
 CDEPEND="sys-libs/zlib
-	apache2? ( www-servers/apache )
 	caps? ( sys-libs/libcap )
 	json? ( !yajl? ( dev-libs/jansson )
 		yajl? ( dev-libs/yajl ) )
@@ -105,6 +103,7 @@ CDEPEND="sys-libs/zlib
 	uwsgi_plugins_webdav? ( dev-libs/libxml2 )
 	uwsgi_plugins_xslt? ( dev-libs/libxslt )
 	lua? ( dev-lang/lua )
+	mono? ( =dev-lang/mono-2* )
 	perl? ( dev-lang/perl:= )
 	php? (
 		php_targets_php5-3? ( dev-lang/php:5.3[embed] )
@@ -119,6 +118,8 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool )"
 
+want_apache2
+
 S="${WORKDIR}/${MY_P}"
 APXS2_S="${S}/apache2"
 APACHE2_MOD_CONF="42_mod_uwsgi-r1 42_mod_uwsgi"
@@ -129,6 +130,8 @@ src_unpack() {
 
 pkg_setup() {
 	python_setup
+	use ruby && ruby-ng_pkg_setup
+	depend.apache_pkg_setup
 }
 
 src_prepare() {
@@ -218,10 +221,8 @@ each_ruby_compile() {
 	cd "${WORKDIR}/${MY_P}"
 
 	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo rack_${RUBY##*/} || die "building plugin for ${RUBY} failed"
-
-	if [[ "${RUBY}" == *ruby19 ]] ; then
-		UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/fiber gentoo || die "building fiber plugin for ${RUBY} failed"
-	fi
+	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/fiber gentoo fiber_${RUBY##*/}|| die "building fiber plugin for ${RUBY} failed"
+	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rbthreads gentoo rbthreads_${RUBY##*/}|| die "building rbthreads plugin for ${RUBY} failed"
 }
 
 python_compile_plugins() {
@@ -247,9 +248,9 @@ src_compile() {
 	python uwsgiconfig.py --build gentoo || die "building uwsgi failed"
 
 	if use lua ; then
-		# setting LUALIB explicitly since lua is not slotted on Gentoo
-		# and uwsgi otherwise looks for lua5.1
-		UWSGICONFIG_LUALIB="lua" python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed"
+		# setting the name for the pkg-config file to lua, since we don't have
+		# slotted lua
+		UWSGICONFIG_LUAPC="lua" python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed"
 	fi
 
 	if use php ; then
@@ -283,6 +284,7 @@ src_install() {
 
 	use cgi && dosym uwsgi /usr/bin/uwsgi_cgi
 	use lua && dosym uwsgi /usr/bin/uwsgi_lua
+	use mono && dosym uwsgi /usr/bin/uwsgi_mono
 	use perl && dosym uwsgi /usr/bin/uwsgi_psgi
 
 	if use php ; then
@@ -323,6 +325,7 @@ pkg_postinst() {
 	elog "Append the following options to the uwsgi call to load the respective language plugin:"
 	use cgi    && elog "  '--plugins cgi' for cgi"
 	use lua    && elog "  '--plugins lua' for lua"
+	use mono   && elog "  '--plugins mono' for mono"
 	use perl   && elog "  '--plugins psgi' for perl"
 
 	if use php ; then
@@ -346,9 +349,10 @@ pkg_postinst() {
 
 	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"
+			if use ruby_targets_${ruby} ; then
+				elog "  '--plugins rack_${ruby/.}' for ${ruby}"
+				elog "  '--plugins fiber_${ruby/.}' for ${ruby} fibers"
+				elog "  '--plugins rbthreads_${ruby/.}' for ${ruby} rbthreads"
 			fi
 		done
 	fi