Version bump, add pam to IUSE. Drop old.

(Portage version: 2.1.11.9/cvs/Linux x86_64)

3 files changed, 12 insertions, 4 deletions

diff --git a/www-servers/uwsgi/ChangeLog b/www-servers/uwsgi/ChangeLog
index b33ada52c1aa..a956d491c194 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.25 2012/07/11 09:57:46 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/ChangeLog,v 1.26 2012/08/14 08:33:01 ultrabug Exp $
+
+*uwsgi-1.2.5 (14 Aug 2012)
+
+  14 Aug 2012; Ultrabug <ultrabug@gentoo.org> -uwsgi-1.2.3-r3.ebuild,
+  +uwsgi-1.2.5.ebuild, metadata.xml:
+  Version bump, add pam to IUSE. Drop old.
 
   11 Jul 2012; Ultrabug <ultrabug@gentoo.org>
   -files/uwsgi-0.9.5-fix_uwsgiconfig.py_indentation.patch,
diff --git a/www-servers/uwsgi/metadata.xml b/www-servers/uwsgi/metadata.xml
index abfd9350e154..830027db1d77 100644
--- a/www-servers/uwsgi/metadata.xml
+++ b/www-servers/uwsgi/metadata.xml
@@ -12,6 +12,7 @@
 		<flag name='graylog2'>Enable logging to graylog2 (see http://graylog2.org/).</flag>
 		<flag name='json'>Support json as a configuration file format.</flag>
 		<flag name='nagios'>Add nagios-friendly logging output (see http://projects.unbit.it/uwsgi/wiki/Nagios).</flag>
+		<flag name='pam'>Add the pam plugin.</flag>
 		<flag name='rrdtool'>Enable support for writing requests data in RRD files.</flag>
 		<flag name='rsyslog'>Support direct logging to a <pkg>app-admin/rsyslog</pkg> socket (without going through the syslog interface).</flag>
 		<flag name='spooler'>Build a plugin which gives a network spooler (see http://projects.unbit.it/uwsgi/wiki/Spooler).</flag>
diff --git a/www-servers/uwsgi/uwsgi-1.2.3-r3.ebuild b/www-servers/uwsgi/uwsgi-1.2.5.ebuild
index 9123359416f4..8870a54e7668 100644
--- a/www-servers/uwsgi/uwsgi-1.2.3-r3.ebuild
+++ b/www-servers/uwsgi/uwsgi-1.2.5.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-r3.ebuild,v 1.3 2012/07/11 09:57:46 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-1.2.5.ebuild,v 1.1 2012/08/14 08:33:01 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,6 +101,7 @@ 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"