From c4417f1a7c5eaeab404f2455480d9eeb80b15882 Mon Sep 17 00:00:00 2001
From: Ultrabug <ultrabug@gentoo.org>
Date: Mon, 19 Mar 2012 09:56:25 +0100
Subject: uwsgi bump

---
 www-servers/uwsgi/Manifest             |   4 +-
 www-servers/uwsgi/uwsgi-1.1.ebuild     | 232 +++++++++++++++++++++++++++++++++
 www-servers/uwsgi/uwsgi-1.1_rc2.ebuild | 232 ---------------------------------
 3 files changed, 234 insertions(+), 234 deletions(-)
 create mode 100644 www-servers/uwsgi/uwsgi-1.1.ebuild
 delete mode 100644 www-servers/uwsgi/uwsgi-1.1_rc2.ebuild

diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 7c9a044..087c3a8 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -1,6 +1,6 @@
 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-rc2.tar.gz 494167 RMD160 8de3adf339ec374ad811bd17b65979a87bf5531b SHA1 a3dab84ae1c9873a00a049838ff1d970c54db6ca SHA256 c5545f7aafcb41a85f105bff2b951fdc81e3b2f0fa5e255467317df2aa223656
-EBUILD uwsgi-1.1_rc2.ebuild 5850 RMD160 bb5326e782c472af8e2f9947e2459a0aa2aed390 SHA1 04ff14c0ba066521134bd7af6c88a959dc5ef548 SHA256 77444c6ca0ee343bce8cd2d1224aa1d58c0c2c4fc0040e0910e503e0b36880b1
+DIST uwsgi-1.1.tar.gz 494774 RMD160 8b1fcf09d228e4392f96d5449927c285e080d52d SHA1 0b03d03f2316e1455550e6f9152bc1f76e23cabb SHA256 5a3a471684540729aede1f49595b29e28080b74f39695f6e86e17eedf68cd7dc
+EBUILD uwsgi-1.1.ebuild 5850 RMD160 bb5326e782c472af8e2f9947e2459a0aa2aed390 SHA1 04ff14c0ba066521134bd7af6c88a959dc5ef548 SHA256 77444c6ca0ee343bce8cd2d1224aa1d58c0c2c4fc0040e0910e503e0b36880b1
 MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35
diff --git a/www-servers/uwsgi/uwsgi-1.1.ebuild b/www-servers/uwsgi/uwsgi-1.1.ebuild
new file mode 100644
index 0000000..d4fa225
--- /dev/null
+++ b/www-servers/uwsgi/uwsgi-1.1.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2:2.4:2.7 3:3.1:3.2"
+PYTHON_MODNAME="uwsgidecorators"
+SUPPORT_PYTHON_ABIS="1"
+USE_RUBY="ruby18 ree18 ruby19"
+RUBY_OPTIONAL="yes"
+
+MY_P="${P/_/-}"
+
+inherit apache-module python multilib ruby-ng
+
+DESCRIPTION="uWSGI server for Python web applications"
+HOMEPAGE="http://projects.unbit.it/uwsgi/"
+SRC_URI="http://projects.unbit.it/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apache2 +caps +carbon debug json ldap lua +nagios perl +pcre python rrdtool rsyslog ruby spooler sqlite syslog +uuid +xml yaml zeromq"
+REQUIRED_USE="|| ( lua perl python ruby )"
+
+CDEPEND="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? ( $(ruby_implementations_depend) )
+	sqlite? ( dev-db/sqlite:3 )
+	rsyslog? ( app-admin/rsyslog )
+	uuid? ( sys-apps/util-linux )
+	xml? ( dev-libs/libxml2 )
+	yaml? ( dev-libs/libyaml )
+	zeromq? ( net-libs/zeromq )"
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+RDEPEND="${CDEPEND}
+	rrdtool? ( net-analyzer/rrdtool )"
+
+S="${WORKDIR}/${MY_P}"
+APXS2_S="${S}/apache2"
+APACHE2_MOD_CONF="42_mod_${PN}"
+
+want_apache2_2
+
+use_true_false() {
+	if use $1 ; then
+		echo "true"
+	else
+		echo "false"
+	fi
+}
+
+src_unpack() {
+	default
+}
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	python_pkg_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e "s|'-O2', ||" \
+		-e "s|'-Werror', ||" \
+		-e "s|uc.get('plugin_dir')|uc.get('plugin_build_dir')|" \
+		uwsgiconfig.py || die "sed failed"
+
+	sed -i \
+		-e 's|python\([0-9].[0-9]\)-config|python-config-\1|' \
+		plugins/python/uwsgiplugin.py || die "sed failed"
+}
+
+src_configure() {
+	local plugins=""
+	use carbon && plugins+=", carbon"
+	use nagios && plugins+=", nagios"
+	use rrdtool && plugins+=", rrdtool"
+	use rsyslog && plugins+=", rsyslog"
+	use syslog && plugins+=", syslog"
+
+	cat > "buildconf/gentoo.ini" << EOF
+[uwsgi]
+xml = $(use_true_false xml)
+ini = true
+yaml = $(use_true_false yaml)
+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 = libxml2
+yaml_implementation = libyaml
+malloc_implementation = libc
+plugins =
+bin_name = uwsgi
+append_version =
+plugin_dir = /usr/$(get_libdir)/uwsgi
+plugin_build_dir = ${T}/plugins
+embedded_plugins =  ping, cache, rpc, fastrouter, http, ugreen, signal, logsocket, ${plugins:1}
+as_shared_library = false
+
+locking = auto
+event = auto
+timer = auto
+filemonitor = auto
+
+embed_files = 
+
+embed_config =
+[python]
+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
+}
+
+install_python_lib() {
+	insinto $(python_get_sitedir)
+	doins uwsgidecorators.py
+}
+
+src_compile() {
+	python uwsgiconfig.py --build gentoo || die "building uwsgi failed"
+
+	mkdir -p "${T}/plugins"
+
+	if use lua ; then
+		python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed"
+	fi
+
+	if use perl ; then
+		python uwsgiconfig.py --plugin plugins/psgi gentoo || die "building plugin for perl failed"
+	fi
+
+	if use python ; then
+		for a in ${PYTHON_ABIS} ; do
+			python${a} uwsgiconfig.py --plugin plugins/python gentoo python${a/.} || die "building plugin for python-${a} failed"
+		done
+	fi
+
+	if use ruby ; then
+		ruby-ng_src_compile
+	fi
+
+	if use spooler ; then
+		python uwsgiconfig.py --plugin plugins/spooler gentoo || die "building plugin for spooler failed"
+	fi
+
+	if use apache2 ; then
+		for m in Ruwsgi uwsgi ; do
+			APXS2_ARGS="-c mod_${m}.c"
+			apache-module_src_compile
+		done
+	fi
+}
+
+src_install() {
+	dobin uwsgi
+
+	insinto /usr/$(get_libdir)/uwsgi
+	doins "${T}/plugins"/*.so
+
+	use lua && dosym uwsgi /usr/bin/uwsgi_lua
+
+	use perl && dosym uwsgi /usr/bin/uwsgi_perl
+
+	if use python ; then
+		python_execute_function install_python_lib
+		for a in ${PYTHON_ABIS} ; do
+			dosym uwsgi /usr/bin/uwsgi_python${a/.}
+		done
+	fi
+
+	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
+	keepdir /etc/"${PN}".d
+	use spooler && keepdir /var/spool/"${PN}"
+}
+
+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
+
+	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."
+	fi
+}
diff --git a/www-servers/uwsgi/uwsgi-1.1_rc2.ebuild b/www-servers/uwsgi/uwsgi-1.1_rc2.ebuild
deleted file mode 100644
index d4fa225..0000000
--- a/www-servers/uwsgi/uwsgi-1.1_rc2.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2:2.4:2.7 3:3.1:3.2"
-PYTHON_MODNAME="uwsgidecorators"
-SUPPORT_PYTHON_ABIS="1"
-USE_RUBY="ruby18 ree18 ruby19"
-RUBY_OPTIONAL="yes"
-
-MY_P="${P/_/-}"
-
-inherit apache-module python multilib ruby-ng
-
-DESCRIPTION="uWSGI server for Python web applications"
-HOMEPAGE="http://projects.unbit.it/uwsgi/"
-SRC_URI="http://projects.unbit.it/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="apache2 +caps +carbon debug json ldap lua +nagios perl +pcre python rrdtool rsyslog ruby spooler sqlite syslog +uuid +xml yaml zeromq"
-REQUIRED_USE="|| ( lua perl python ruby )"
-
-CDEPEND="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? ( $(ruby_implementations_depend) )
-	sqlite? ( dev-db/sqlite:3 )
-	rsyslog? ( app-admin/rsyslog )
-	uuid? ( sys-apps/util-linux )
-	xml? ( dev-libs/libxml2 )
-	yaml? ( dev-libs/libyaml )
-	zeromq? ( net-libs/zeromq )"
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig"
-RDEPEND="${CDEPEND}
-	rrdtool? ( net-analyzer/rrdtool )"
-
-S="${WORKDIR}/${MY_P}"
-APXS2_S="${S}/apache2"
-APACHE2_MOD_CONF="42_mod_${PN}"
-
-want_apache2_2
-
-use_true_false() {
-	if use $1 ; then
-		echo "true"
-	else
-		echo "false"
-	fi
-}
-
-src_unpack() {
-	default
-}
-
-pkg_setup() {
-	depend.apache_pkg_setup
-	python_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e "s|'-O2', ||" \
-		-e "s|'-Werror', ||" \
-		-e "s|uc.get('plugin_dir')|uc.get('plugin_build_dir')|" \
-		uwsgiconfig.py || die "sed failed"
-
-	sed -i \
-		-e 's|python\([0-9].[0-9]\)-config|python-config-\1|' \
-		plugins/python/uwsgiplugin.py || die "sed failed"
-}
-
-src_configure() {
-	local plugins=""
-	use carbon && plugins+=", carbon"
-	use nagios && plugins+=", nagios"
-	use rrdtool && plugins+=", rrdtool"
-	use rsyslog && plugins+=", rsyslog"
-	use syslog && plugins+=", syslog"
-
-	cat > "buildconf/gentoo.ini" << EOF
-[uwsgi]
-xml = $(use_true_false xml)
-ini = true
-yaml = $(use_true_false yaml)
-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 = libxml2
-yaml_implementation = libyaml
-malloc_implementation = libc
-plugins =
-bin_name = uwsgi
-append_version =
-plugin_dir = /usr/$(get_libdir)/uwsgi
-plugin_build_dir = ${T}/plugins
-embedded_plugins =  ping, cache, rpc, fastrouter, http, ugreen, signal, logsocket, ${plugins:1}
-as_shared_library = false
-
-locking = auto
-event = auto
-timer = auto
-filemonitor = auto
-
-embed_files = 
-
-embed_config =
-[python]
-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
-}
-
-install_python_lib() {
-	insinto $(python_get_sitedir)
-	doins uwsgidecorators.py
-}
-
-src_compile() {
-	python uwsgiconfig.py --build gentoo || die "building uwsgi failed"
-
-	mkdir -p "${T}/plugins"
-
-	if use lua ; then
-		python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed"
-	fi
-
-	if use perl ; then
-		python uwsgiconfig.py --plugin plugins/psgi gentoo || die "building plugin for perl failed"
-	fi
-
-	if use python ; then
-		for a in ${PYTHON_ABIS} ; do
-			python${a} uwsgiconfig.py --plugin plugins/python gentoo python${a/.} || die "building plugin for python-${a} failed"
-		done
-	fi
-
-	if use ruby ; then
-		ruby-ng_src_compile
-	fi
-
-	if use spooler ; then
-		python uwsgiconfig.py --plugin plugins/spooler gentoo || die "building plugin for spooler failed"
-	fi
-
-	if use apache2 ; then
-		for m in Ruwsgi uwsgi ; do
-			APXS2_ARGS="-c mod_${m}.c"
-			apache-module_src_compile
-		done
-	fi
-}
-
-src_install() {
-	dobin uwsgi
-
-	insinto /usr/$(get_libdir)/uwsgi
-	doins "${T}/plugins"/*.so
-
-	use lua && dosym uwsgi /usr/bin/uwsgi_lua
-
-	use perl && dosym uwsgi /usr/bin/uwsgi_perl
-
-	if use python ; then
-		python_execute_function install_python_lib
-		for a in ${PYTHON_ABIS} ; do
-			dosym uwsgi /usr/bin/uwsgi_python${a/.}
-		done
-	fi
-
-	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
-	keepdir /etc/"${PN}".d
-	use spooler && keepdir /var/spool/"${PN}"
-}
-
-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
-
-	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."
-	fi
-}
-- 
cgit v1.2.3