Version bump, drop old

(Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key B658FA13)

2 files changed, 16 insertions, 5 deletions

diff --git a/www-servers/uwsgi/ChangeLog b/www-servers/uwsgi/ChangeLog
index 6460d2603c43..53aedcc52192 100644
--- a/www-servers/uwsgi/ChangeLog
+++ b/www-servers/uwsgi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/uwsgi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/ChangeLog,v 1.28 2012/09/10 09:47:52 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/ChangeLog,v 1.29 2012/10/29 18:58:05 ultrabug Exp $
+
+*uwsgi-1.3 (29 Oct 2012)
+
+  29 Oct 2012; Ultrabug <ultrabug@gentoo.org> -uwsgi-1.2.3-r4.ebuild,
+  +uwsgi-1.3.ebuild:
+  Version bump, drop old.
 
 *uwsgi-1.2.6 (10 Sep 2012)
 
diff --git a/www-servers/uwsgi/uwsgi-1.2.3-r4.ebuild b/www-servers/uwsgi/uwsgi-1.3.ebuild
index 0ac17c955b2f..6af6d530ac69 100644
--- a/www-servers/uwsgi/uwsgi-1.2.3-r4.ebuild
+++ b/www-servers/uwsgi/uwsgi-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-1.2.3-r4.ebuild,v 1.2 2012/07/11 09:57:46 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-1.3.ebuild,v 1.1 2012/10/29 18:58:05 ultrabug Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? *"
@@ -25,7 +25,7 @@ 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 perl +pcre php +python rrdtool rsyslog ruby spooler sqlite syslog +xml yaml zeromq"
+IUSE="apache2 +caps +carbon cgi debug erlang gevent graylog2 json ldap lua +nagios pam perl +pcre php +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
@@ -79,7 +79,7 @@ pkg_setup() {
 src_prepare() {
 	epatch \
 		"${FILESDIR}/1.1.2-threaded-php.patch" \
-		"${FILESDIR}/${PV}-pyerl.patch"
+		"${FILESDIR}/1.2.3-pyerl.patch"
 
 	sed -i \
 		-e "s|'-O2', ||" \
@@ -101,9 +101,11 @@ src_configure() {
 	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"
+	#TODO: mongodblog
 
 	cat > "buildconf/gentoo.ini" << EOF
 [uwsgi]
@@ -117,6 +119,7 @@ snmp = true
 sctp = false
 spooler = true
 embedded = true
+ssl = auto
 udp = true
 multicast = true
 threading = true
@@ -126,6 +129,8 @@ 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
@@ -136,7 +141,7 @@ 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, router_uwsgi, router_redirect, router_basicauth, zergpool, redislog ${plugins}
+embedded_plugins =  ping, cache, rpc, corerouter, fastrouter, http, ugreen, signal, logsocket, router_uwsgi, router_redirect, router_basicauth, zergpool, redislog, router_rewrite, router_http ${plugins}
 as_shared_library = false
 
 locking = auto