version bump, drop old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

5 files changed, 15 insertions, 671 deletions

diff --git a/www-servers/uwsgi/ChangeLog b/www-servers/uwsgi/ChangeLog
index add176300c88..fc067f9bb215 100644
--- a/www-servers/uwsgi/ChangeLog
+++ b/www-servers/uwsgi/ChangeLog
@@ -1,6 +1,12 @@
 # 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.57 2014/06/02 13:52:35 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/ChangeLog,v 1.58 2014/07/01 10:34:50 ultrabug Exp $
+
+*uwsgi-2.0.6 (01 Jul 2014)
+
+  01 Jul 2014; Ultrabug <ultrabug@gentoo.org> -uwsgi-1.4.8.ebuild,
+  -uwsgi-1.4.9.ebuild, -uwsgi-2.0.4.ebuild, +uwsgi-2.0.6.ebuild:
+  version bump, drop old
 
 *uwsgi-2.0.5.1 (02 Jun 2014)
 
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index c88f604772db..db94ac222778 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -12,21 +12,17 @@ AUX uwsgi.initd-r1 3352 SHA256 857940e7c6c97c0e23db85015a47d295a102607100f0662ae
 AUX uwsgi.initd-r2 3436 SHA256 1983e7346e50996ea9a34ac8f399b965596232bf7b9b38a98226562f11143463 SHA512 0eb9f844bacc3133615f4cd521adccb8830f58bd5b8c6d602e86191a7005157cc52fc5259654de79735f7ac4a41d0d2fd093f0dd08f62d3732efe482450b7590 WHIRLPOOL bbbf4cdb82710468caa6365536423e79ac13d0b81e393f50fed0be95bea5f73cc31ca19f99bdc0c6b54f7fdfea8175f6af6e8975b5c6b28828790dd2bf022921
 AUX uwsgi.initd-r3 3614 SHA256 58b998b025e4a9df20ca917bc93e287f9a8cf02d278d513fa461f70e1d08f799 SHA512 ab9dc6277bd05821287f6f8beb3ac2504f0e41db38e11b4d2884ac026f14ac7bfaaca138f045afa712d4f2843f94de105bf0d43fad35d18679ac33b507cd187e WHIRLPOOL 7bf4b1d5263ddb3ea0e3c81fe4906debaa3a3ee0a59a177b4f12a24d883bcb2049dffa4b11d9564c1ce4324a23a67cd4e8110f1955c05287f53cbd4b4e75e7cc
 DIST uwsgi-1.4.10.tar.gz 590892 SHA256 d4c30a6496d7d7be59f0264393649b9bd5ec58f72c4c3b79b8160b25c193c512 SHA512 26eb3e34595f0e85ae8f217ace8d326f966c605e00974621aa8b94fd83ef9fd711bdfa262c609a62a7f8d82a04431876769b546a1d1a0929de50ccd877a13e22 WHIRLPOOL 77d1a556c8af59a95eea75e8ae0af524c9aa768c1ecb7a396d43ca9cd6d215a96b83626882f8ab47cdc181ad1c5e62f18e508f43e97e8feb39bb5659fc6b2f37
-DIST uwsgi-1.4.8.tar.gz 592776 SHA256 3c35893927a065ed89775cf5a8f66f66d71b060618f4611efbcca76e520aac37 SHA512 7ead90c0740db0ebc28256b312a98e8de610b62cc82504c738cc2f3d2b0819ae673eb1875ea31abc3e511dc76db9af9fb15f4d1ae2a62f6b67b2a5966cfe2bab WHIRLPOOL da750b61916a99a9cea314dc57ca8e02920fbc3431977f6ad55368dc65a42fe6f297aae509fe7df23607a5b3f6097466e939b3a22650c90fcc7ed00bc78d9f0c
-DIST uwsgi-1.4.9.tar.gz 590671 SHA256 f4d345e3f08bf7859cf92340f79e10d7093e297e54c8448d9c1c821848e7fe2d SHA512 89936de83cbecfcb3d8f93ab50a3d77e496d4b4c085e52f8a1a691eb99fbfc17dd2e2802846a139f4ea42aac996729ad483fe9f6fbeef303d74e03b46ae6142b WHIRLPOOL ab3b8c0edfb63501fdac41ef92cc48bd135984f49e02d57618255543c07819d93faf1673b8fa397b66c58710416565c18578f57bf64ab96534d6b09d3bb542f2
-DIST uwsgi-2.0.4.tar.gz 765555 SHA256 22ed4607b90878c0bd3eb41e6117512c44f5d6891bd3534378627ffa6f6865f0 SHA512 18011e9e07e303380b768d3024d868211a6d568c714466c4dacbbd576b801e6ec26b39ca16e1d1848feffcce65aeeaad21953d9c41ad0cdb18a2a4e66a8beb92 WHIRLPOOL 11c619936cc5709b14e43a73ba780c0a62e586cab623f32b2f9e62e43467c0cf1823f21e7556f8459fa05f476d288cec48ee1424bf3f00633e0bba75f6961036
 DIST uwsgi-2.0.5.1.tar.gz 770256 SHA256 4d486a6ddc9389245790f210673f524e1eb0631fc867a3c514bb2c22b090dbb1 SHA512 67dbe3607964763d12b0bcc9e2f9440748c07f5afc3289d0b5fb30e5a3160ed1963c7c5d58ea55c6ab3ad226a55f7b5adac7d9c94db89adf5489e03eb3771d7f WHIRLPOOL 367d5de037aa3f3dafd59b2d9aecdfaf142c1381676921f0dfea20a851173e6734f0e6464fbb38bf4f62d8ae82515ecfcad52f6cc70d316d0368e7987bb0a3d3
+DIST uwsgi-2.0.6.tar.gz 773418 SHA256 a5cd4cf8c7dc694fd433d8492019f30d19e7c3bf233b5f28823795026864166e SHA512 21540ac40e46866d0e1f420c64da2ed1328bf3442105f9dad28cc3635ee4987bb769828e51b1e0840fd3db9e7cd36fce5ef528c70ad89feb83228b0fdbeef07f WHIRLPOOL a8e76c784ac7bd7de46eff9257537082ccc02c8d834e867d733eeb2b3b36fd7db4767262293639fe0e07490b01843e46f6296d188eff3fe5cfc4ea15fa18d44f
 EBUILD uwsgi-1.4.10.ebuild 9601 SHA256 55291be8816fbc9996ceb27e2126c4811bc2c14155d36dd88f159fb827e06eca SHA512 3660696d2d145d1845a79b591c89351110ef78c569b019987e09f4136b92a7ddaa6b8f931befae8768f08b8772c6e9a10297fada687e0089ec16cf4748b020a9 WHIRLPOOL 71876fc46f89b64e764d88a7e89fd617542bea2003a0c4b5b4c07ab4041fc76827862cf64c6d43d7c6d8737601c2e02b1205e51dc860092eb2c29d1559deedc1
-EBUILD uwsgi-1.4.8.ebuild 9543 SHA256 36556bbb376c96aed18c548ce2c351f67a09780109ec94ff281e5176e9c0f4d3 SHA512 241bf69432e1cce8a988cb90b23747129c5498114b98d945305ca06905435b7bdcd68d99423e7efc47f46b36f4c97a8fd16ea163c2ea6fc7c5273f5eb0394959 WHIRLPOOL feb1d7661e9a559d1e06519d9559baee3466bca8b044c5b81b429a33b57c4687470fe164c33e95bf20d274af132707c8ad5e3fe332f00a7dce4a60b5c1ab3086
-EBUILD uwsgi-1.4.9.ebuild 9543 SHA256 38922a5346372d6dbe94bdd2e1b8ba3c76f309ab9c2484af90cfe203f5687a30 SHA512 9a7fe1d7da5cf4eb02ea3dbdc13ee1a01921a199f8b9eeb1bd94043820f279e936eb50966764873278357a9848bad6cdaab6d986ab1e922889c1c7dbb0b0738b WHIRLPOOL f4e30b561984e64594cd96047a0bfc0f9cabfbf2ddda1c606e62ce1633ddab9e36f8228de65490a81a5b8a94c35810fa8de39643770b5ff1bf8f3d678af82f5a
-EBUILD uwsgi-2.0.4.ebuild 11835 SHA256 8470ab9ddcd7c1b59493340eba6d5cbe3655f15b1ef9ffe1bf33bee7189c6c9f SHA512 d7afee25813b6b9b069616356b6a4a9479bc00c10eac2adb4d138aab68cf778f9fe7c00e6f54d39a5f531a1d911bc365306302f0795603cf3617eaa04d685509 WHIRLPOOL 1f96ff7a2869230065e8b5f1002ddaa4d59cf73f4f3586738a92568a9b7f85bd3344ad53f94ef90b86a08d6e4d7d25276fe326ee527c637fda0f2862add3cdc8
 EBUILD uwsgi-2.0.5.1.ebuild 11837 SHA256 d30f092b3d01fd7ac61fb49145eb2b25b6cc24461be0e8f20dddb66339bb0dbb SHA512 cb7cae355f8fc1f44dd27f2ae9ebcfc043bc1f911d0665923823f8abc80620fbba373a343e56f567ab60c704b35d5ec15ed97424ea9dabfb3ce4499b285e287d WHIRLPOOL 6d9706678eb11413988019330c8bf7e3d7f224268885967512f70f7ecbacf0b19c6847a30abbd37921aa0e655de252b4f0789662d96b31b9796a03eb51f6e572
-MISC ChangeLog 10279 SHA256 7eda078697ac252287dde2a1577e1102a7b33e9cb21bdeb1719d3735a09d3394 SHA512 8fe57954ff7875e8687f506d786ffcc8a32cc5ac906e028f6cdeb55c4e93147d4fd28e5b94305ecb0f887de904b51e30aac1aef2e9cb3ffe1d787ed25448e319 WHIRLPOOL 6eaedebee35810cc9296e1a0e11e443c07e98ccddba5f72bbcbef9c8033d532c245ca8ad0cc121657b7a6002d1f43224b39d031498587bd74b1f05f8637ef0cc
+EBUILD uwsgi-2.0.6.ebuild 11835 SHA256 e53e3cbd2cf2c59c78be95340b88d17596af93a1ab0f3ade9c4a01873fa10492 SHA512 4096a624efd38b06827b9d6c40553dcfccfba1d669218050312b864d10744015966aa72fc911c51c637f9caaf9ba348e9870dab09bdbe308fe6709b5dbe0976a WHIRLPOOL 77b63570927b8c3d99e6a5d7d1e2bc119148489fcc22c160b169e85380b4cfd8b2ceaafd90d2258dfcc93af3d023caef0ea435f96f80732c761bf12d3aa64fdc
+MISC ChangeLog 10465 SHA256 2ab24b2a6afe1e0262de3849f97a0a528c17a2c9dc5947719c6651db97d1b5b2 SHA512 555b3f85bcdd6bdbd7cc87fcbeaf1cd585201fc92ca6e33d07f08ee16d7689d6b673d7a9388e1a9c34dffc9de609705659b1682a5314ae08fd916318baaf86c4 WHIRLPOOL 03e54a9bfd3a99503a674ec0f200df8e1763fcdac0ad70dece9d3debddbf45e124b6a33182b6a7d426f5301c8b8762c1ca2a9eb05eb0ff80270f1bcb7c2bb643
 MISC metadata.xml 2594 SHA256 6e77fb15045b2feda8587315d54f7791c9c9af4b0e0f13d72a371646e32216e3 SHA512 89ac61cbfc089ff5452bc909f429431377c67aedc828098ffb33463a90f4a66524729a41fb83460df772218354d564529b7c3c206d3262c1025da1a6b1dd038a WHIRLPOOL 53c09c69fdc10762171891aeff5b731471cdd135ddb90896bfb2a2b1a0e1b841d6db97f9c217c44aed5c4e56d50f6eaff540646a2d05a7e8ce5f20bef9b326dd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iF4EAREIAAYFAlOMgakACgkQKiQSS7ZY+hPtygD/YWN3CnLuigb6ERhqsGkIGOXs
-9jzVkzCPklqQJ9Nz3JIBAKlUW9qgsaoW1zqPF8rhRWWyxMNjle+6IQVPvwWkUeR0
-=CN1S
+iF4EAREIAAYFAlOyjtAACgkQKiQSS7ZY+hPkzgEA5fYpPVlze/L4P5Hvz4kPz1cy
+Wo668sCuzAFDhWJZQTQA/1R0gOrWENENCjbeV+G7Wtt0/Lk6rYVL31/fbPVp39KL
+=jXEl
 -----END PGP SIGNATURE-----
diff --git a/www-servers/uwsgi/uwsgi-1.4.8.ebuild b/www-servers/uwsgi/uwsgi-1.4.8.ebuild
deleted file mode 100644
index 2cf688b0378a..000000000000
--- a/www-servers/uwsgi/uwsgi-1.4.8.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# 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-1.4.8.ebuild,v 1.2 2014/05/07 19:03:10 mrueg Exp $
-
-EAPI="5"
-PYTHON_DEPEND="python? *"
-PYTHON_MODNAME="uwsgidecorators"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
-USE_RUBY="ruby19"
-RUBY_OPTIONAL="yes"
-PHP_EXT_NAME="dummy"
-PHP_EXT_INI="no"
-USE_PHP="php5-3 php5-4" # deps must be registered separately below
-PHP_EXT_OPTIONAL_USE="php"
-
-MY_P="${P/_/-}"
-
-inherit apache-module eutils python multilib pax-utils php-ext-source-r2 ruby-ng versionator
-
-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 cgi debug erlang gevent graylog2 json ldap lua +nagios pam perl +pcre php probepg +python rrdtool rsyslog ruby spooler sqlite syslog +xml yaml zeromq"
-REQUIRED_USE="|| ( cgi erlang lua perl php python ruby )"
-
-# util-linux is required for libuuid when requesting zeromq support
-CDEPEND="caps? ( sys-libs/libcap )
-	json? ( dev-libs/jansson )
-	erlang? ( dev-lang/erlang )
-	gevent? ( >=dev-python/gevent-1.0_beta2 )
-	graylog2? ( sys-libs/zlib )
-	ldap? ( net-nds/openldap )
-	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] )
-	)
-	probepg? ( dev-db/postgresql-base:= )
-	ruby? ( $(ruby_implementations_depend) )
-	sqlite? ( dev-db/sqlite:3 )
-	rsyslog? ( app-admin/rsyslog )
-	xml? ( dev-libs/libxml2 )
-	yaml? ( dev-libs/libyaml )
-	zeromq? ( net-libs/zeromq sys-apps/util-linux )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	rrdtool? ( net-analyzer/rrdtool )"
-
-S="${WORKDIR}/${MY_P}"
-APXS2_S="${S}/apache2"
-APACHE2_MOD_CONF="42_mod_uwsgi-r1 42_mod_uwsgi"
-
-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() {
-	epatch \
-		"${FILESDIR}/1.1.2-threaded-php.patch" \
-		"${FILESDIR}/1.2.3-pyerl.patch"
-
-	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"
-
-	sed -i \
-		-e "s|/lib|/$(get_libdir)|" \
-		plugins/php/uwsgiplugin.py || die "sed failed"
-}
-
-src_configure() {
-	local plugins=""
-	use carbon && plugins+=", carbon"
-	use graylog2 && plugins+=", graylog2"
-	use nagios && plugins+=", nagios"
-	use pam && plugins+=", pam"
-	use rrdtool && plugins+=", rrdtool"
-	use rsyslog && plugins+=", rsyslog"
-	use syslog && plugins+=", syslog"
-
-	# Notes:
-	# * the embedded_plugins mostly follows the list of embedded_plugins
-	#   in buildconf/base.ini, make sure you compare the list when bumping uWSGI
-	# * thus: keep the order in embedded_plugins the same as in the base.ini
-	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
-ssl = auto
-udp = true
-multicast = true
-threading = true
-sendfile = true
-minterpreters = true
-async = true
-evdis = false
-ldap = $(use_true_false ldap)
-pcre = $(use_true_false pcre)
-routing = auto
-alarm = auto
-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, corerouter, fastrouter, http, ugreen, signal, logsocket, router_uwsgi, router_redirect, router_basicauth, zergpool, redislog, mongodblog, router_rewrite, router_http, logfile, router_cache, rawrouter ${plugins}
-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 zeromq || sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed"
-
-	if use probepg ; then
-		PGPV="$(best_version dev-db/postgresql-base)"
-		PGSLOT="$(get_version_component_range 1-2 ${PGPV##dev-db/postgresql-base-})"
-		sed -i \
-			-e "s|pg_config|pg_config${PGSLOT/.}|" \
-			plugins/probepg/uwsgiplugin.py || die "sed failed"
-	fi
-}
-
-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
-}
-
-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 erlang ; then
-		python uwsgiconfig.py --plugin plugins/erlang gentoo || die "building plugin for erlang failed"
-	fi
-
-	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"
-	fi
-
-	if use perl ; then
-		python uwsgiconfig.py --plugin plugins/psgi gentoo || die "building plugin for perl failed"
-	fi
-
-	if use php ; then
-		for s in $(php_get_slots); do
-			UWSGICONFIG_PHPDIR="/usr/$(get_libdir)/${s}" python uwsgiconfig.py --plugin plugins/php gentoo ${s/.} || die "building plugin for ${s} failed"
-		done
-	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"
-
-			if use gevent ; then
-				python${a} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${a/.} || die "building plugin for gevent-support in python-${a} failed"
-			fi
-			if use erlang ; then
-				python${a} uwsgiconfig.py --plugin plugins/pyerl gentoo pyerl${a/.} || die "building plugin for erlang-support in python failed"
-			fi
-		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 cgi ; then
-		python uwsgiconfig.py --plugin plugins/cgi gentoo || die "building plugin for cgi failed"
-	fi
-
-	if use probepg ; then
-		python uwsgiconfig.py --plugin plugins/probepg gentoo || die "building plugin for postgresql probe failed"
-	fi
-
-	if use apache2 ; then
-		for m in proxy_uwsgi Ruwsgi uwsgi ; do
-			APXS2_ARGS="-c mod_${m}.c"
-			apache-module_src_compile
-		done
-	fi
-}
-
-src_install() {
-	dobin uwsgi
-	pax-mark m "${D}"/usr/bin/uwsgi
-
-	insinto /usr/$(get_libdir)/uwsgi
-	doins "${T}/plugins"/*.so
-
-	use cgi && dosym uwsgi /usr/bin/uwsgi_cgi
-	use erlang && dosym uwsgi /usr/bin/uwsgi_erlang
-	use lua && dosym uwsgi /usr/bin/uwsgi_lua
-	use perl && dosym uwsgi /usr/bin/uwsgi_psgi
-
-	if use php ; then
-		for s in $(php_get_slots); do
-			dosym uwsgi /usr/bin/uwsgi_${s/.}
-		done
-	fi
-
-	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 proxy_uwsgi Ruwsgi uwsgi ; do
-			APACHE2_MOD_FILE="${APXS2_S}/.libs/mod_${m}.so"
-			apache-module_src_install
-		done
-	fi
-
-	newinitd "${FILESDIR}"/uwsgi.initd-r3 uwsgi
-	newconfd "${FILESDIR}"/uwsgi.confd-r3 uwsgi
-	keepdir /etc/"${PN}".d
-	use spooler && keepdir /var/spool/"${PN}"
-}
-
-pkg_postinst() {
-	if use apache2 ; then
-		elog "Three Apache modules have been installed: mod_proxy_uwsgi, mod_uwsgi and mod_Ruwsgi."
-		elog "You can enable them with -D PROXY_UWSGI, -DUWSGI or -DRUWSGI in /etc/conf.d/apache2."
-		elog "mod_uwsgi and mod_Ruwsgi 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."
-		elog "mod_proxy_uwsgi is the newest and not considered ready for production yet."
-	fi
-
-	elog "Append the following options to the uwsgi call to load the respective language plugin:"
-	use cgi    && elog "  '--plugins cgi' for cgi"
-	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}"
-			use gevent && elog "  '--plugins python${a/.},gevent${a/.}' for gevent support in python-${a}"
-			use erlang && elog "  '--plugins python${a/.},erlang,pyerl${a/.}' for erlang support in 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
-}
diff --git a/www-servers/uwsgi/uwsgi-1.4.9.ebuild b/www-servers/uwsgi/uwsgi-1.4.9.ebuild
deleted file mode 100644
index 48bb1f494f6b..000000000000
--- a/www-servers/uwsgi/uwsgi-1.4.9.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# 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-1.4.9.ebuild,v 1.2 2014/05/07 19:03:10 mrueg Exp $
-
-EAPI="5"
-PYTHON_DEPEND="python? *"
-PYTHON_MODNAME="uwsgidecorators"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
-USE_RUBY="ruby19"
-RUBY_OPTIONAL="yes"
-PHP_EXT_NAME="dummy"
-PHP_EXT_INI="no"
-USE_PHP="php5-3 php5-4" # deps must be registered separately below
-PHP_EXT_OPTIONAL_USE="php"
-
-MY_P="${P/_/-}"
-
-inherit apache-module eutils python multilib pax-utils php-ext-source-r2 ruby-ng versionator
-
-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 cgi debug erlang gevent graylog2 json ldap lua +nagios pam perl +pcre php probepg +python rrdtool rsyslog ruby spooler sqlite syslog +xml yaml zeromq"
-REQUIRED_USE="|| ( cgi erlang lua perl php python ruby )"
-
-# util-linux is required for libuuid when requesting zeromq support
-CDEPEND="caps? ( sys-libs/libcap )
-	json? ( dev-libs/jansson )
-	erlang? ( dev-lang/erlang )
-	gevent? ( >=dev-python/gevent-1.0_beta2 )
-	graylog2? ( sys-libs/zlib )
-	ldap? ( net-nds/openldap )
-	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] )
-	)
-	probepg? ( dev-db/postgresql-base:= )
-	ruby? ( $(ruby_implementations_depend) )
-	sqlite? ( dev-db/sqlite:3 )
-	rsyslog? ( app-admin/rsyslog )
-	xml? ( dev-libs/libxml2 )
-	yaml? ( dev-libs/libyaml )
-	zeromq? ( net-libs/zeromq sys-apps/util-linux )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	rrdtool? ( net-analyzer/rrdtool )"
-
-S="${WORKDIR}/${MY_P}"
-APXS2_S="${S}/apache2"
-APACHE2_MOD_CONF="42_mod_uwsgi-r1 42_mod_uwsgi"
-
-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() {
-	epatch \
-		"${FILESDIR}/1.1.2-threaded-php.patch" \
-		"${FILESDIR}/1.2.3-pyerl.patch"
-
-	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"
-
-	sed -i \
-		-e "s|/lib|/$(get_libdir)|" \
-		plugins/php/uwsgiplugin.py || die "sed failed"
-}
-
-src_configure() {
-	local plugins=""
-	use carbon && plugins+=", carbon"
-	use graylog2 && plugins+=", graylog2"
-	use nagios && plugins+=", nagios"
-	use pam && plugins+=", pam"
-	use rrdtool && plugins+=", rrdtool"
-	use rsyslog && plugins+=", rsyslog"
-	use syslog && plugins+=", syslog"
-
-	# Notes:
-	# * the embedded_plugins mostly follows the list of embedded_plugins
-	#   in buildconf/base.ini, make sure you compare the list when bumping uWSGI
-	# * thus: keep the order in embedded_plugins the same as in the base.ini
-	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
-ssl = auto
-udp = true
-multicast = true
-threading = true
-sendfile = true
-minterpreters = true
-async = true
-evdis = false
-ldap = $(use_true_false ldap)
-pcre = $(use_true_false pcre)
-routing = auto
-alarm = auto
-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, corerouter, fastrouter, http, ugreen, signal, logsocket, router_uwsgi, router_redirect, router_basicauth, zergpool, redislog, mongodblog, router_rewrite, router_http, logfile, router_cache, rawrouter ${plugins}
-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 zeromq || sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed"
-
-	if use probepg ; then
-		PGPV="$(best_version dev-db/postgresql-base)"
-		PGSLOT="$(get_version_component_range 1-2 ${PGPV##dev-db/postgresql-base-})"
-		sed -i \
-			-e "s|pg_config|pg_config${PGSLOT/.}|" \
-			plugins/probepg/uwsgiplugin.py || die "sed failed"
-	fi
-}
-
-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
-}
-
-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 erlang ; then
-		python uwsgiconfig.py --plugin plugins/erlang gentoo || die "building plugin for erlang failed"
-	fi
-
-	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"
-	fi
-
-	if use perl ; then
-		python uwsgiconfig.py --plugin plugins/psgi gentoo || die "building plugin for perl failed"
-	fi
-
-	if use php ; then
-		for s in $(php_get_slots); do
-			UWSGICONFIG_PHPDIR="/usr/$(get_libdir)/${s}" python uwsgiconfig.py --plugin plugins/php gentoo ${s/.} || die "building plugin for ${s} failed"
-		done
-	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"
-
-			if use gevent ; then
-				python${a} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${a/.} || die "building plugin for gevent-support in python-${a} failed"
-			fi
-			if use erlang ; then
-				python${a} uwsgiconfig.py --plugin plugins/pyerl gentoo pyerl${a/.} || die "building plugin for erlang-support in python failed"
-			fi
-		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 cgi ; then
-		python uwsgiconfig.py --plugin plugins/cgi gentoo || die "building plugin for cgi failed"
-	fi
-
-	if use probepg ; then
-		python uwsgiconfig.py --plugin plugins/probepg gentoo || die "building plugin for postgresql probe failed"
-	fi
-
-	if use apache2 ; then
-		for m in proxy_uwsgi Ruwsgi uwsgi ; do
-			APXS2_ARGS="-c mod_${m}.c"
-			apache-module_src_compile
-		done
-	fi
-}
-
-src_install() {
-	dobin uwsgi
-	pax-mark m "${D}"/usr/bin/uwsgi
-
-	insinto /usr/$(get_libdir)/uwsgi
-	doins "${T}/plugins"/*.so
-
-	use cgi && dosym uwsgi /usr/bin/uwsgi_cgi
-	use erlang && dosym uwsgi /usr/bin/uwsgi_erlang
-	use lua && dosym uwsgi /usr/bin/uwsgi_lua
-	use perl && dosym uwsgi /usr/bin/uwsgi_psgi
-
-	if use php ; then
-		for s in $(php_get_slots); do
-			dosym uwsgi /usr/bin/uwsgi_${s/.}
-		done
-	fi
-
-	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 proxy_uwsgi Ruwsgi uwsgi ; do
-			APACHE2_MOD_FILE="${APXS2_S}/.libs/mod_${m}.so"
-			apache-module_src_install
-		done
-	fi
-
-	newinitd "${FILESDIR}"/uwsgi.initd-r3 uwsgi
-	newconfd "${FILESDIR}"/uwsgi.confd-r3 uwsgi
-	keepdir /etc/"${PN}".d
-	use spooler && keepdir /var/spool/"${PN}"
-}
-
-pkg_postinst() {
-	if use apache2 ; then
-		elog "Three Apache modules have been installed: mod_proxy_uwsgi, mod_uwsgi and mod_Ruwsgi."
-		elog "You can enable them with -D PROXY_UWSGI, -DUWSGI or -DRUWSGI in /etc/conf.d/apache2."
-		elog "mod_uwsgi and mod_Ruwsgi 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."
-		elog "mod_proxy_uwsgi is the newest and not considered ready for production yet."
-	fi
-
-	elog "Append the following options to the uwsgi call to load the respective language plugin:"
-	use cgi    && elog "  '--plugins cgi' for cgi"
-	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}"
-			use gevent && elog "  '--plugins python${a/.},gevent${a/.}' for gevent support in python-${a}"
-			use erlang && elog "  '--plugins python${a/.},erlang,pyerl${a/.}' for erlang support in 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
-}
diff --git a/www-servers/uwsgi/uwsgi-2.0.4.ebuild b/www-servers/uwsgi/uwsgi-2.0.6.ebuild
index 96441af40c31..28dbe0737907 100644
--- a/www-servers/uwsgi/uwsgi-2.0.4.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.6.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.4.ebuild,v 1.1 2014/05/05 16:47:50 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-2.0.6.ebuild,v 1.1 2014/07/01 10:34:50 ultrabug Exp $
 
 EAPI="5"