Version bump, add pam to IUSE. Drop old.

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

4 files changed, 19 insertions, 10 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/Manifest b/www-servers/uwsgi/Manifest
index e17f81dad497..b308c74c014b 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -13,16 +13,17 @@ AUX uwsgi.initd-r1 3370 SHA256 8b429f67fe885a2a6314168cc8eef3acc065a3fccf02140e0
 DIST uwsgi-1.0.2.1.tar.gz 465250 SHA256 78280b57a970db7842e4481f8b00f13d011f27b340c869dc1ad28d564d716439 SHA512 de7761b24ae92aea62b4b5d4523d1b812dd5c25c09551baf7007a0e1a97461c62033762cb02e90a9bd85f2aef78477c5151c5a359c8b878150a0c926e3a759ee WHIRLPOOL 47ca0115d55a09b99006fff9c6fb6b5daa71b0b4ea64bbc65390ff64c05f62a661a17b1ec172e05f78f75dd9a36efad3d9dacb57c980639038be6f718480d7b6
 DIST uwsgi-1.2.3.tar.gz 512385 SHA256 1f9f6047468272708241780597014ed00d93919a384e81b30e65167fb2c2e129 SHA512 d6f673877cc5e6ae48effe2c3579ca59ef2579c57ed2d647513451b4411304a366ae81e5aae772014ca6b48da652a056ef7cb48576ad144f2e11bc6ca5fbef50 WHIRLPOOL 06dc820b60f837977d2c9a3689fa948cc14302f4c5cf78297c75bd358e888a98403c2d44ca4d3e4460853fa5496fe66295cb91d548b57dd29273b6843c5c965e
 DIST uwsgi-1.2.4.tar.gz 514048 SHA256 294306d249300b531bfc7abaa706926d0ed87ccc2e7248afec50b425aef39ebb SHA512 cf75b4da66fe44435d0f2bd8c7d959d30a9409c5dbf5136ec4b1805d368ff254dc22f8777affb88d1f0a63a98a34480ae0cdf25fbe0dd2419834cfc7c55692ae WHIRLPOOL cb9e70441323de5519643b91e2415fb72ab53cd8a0064792eca0ba9de05f55b9a7752244287ba5460adb18b20501aa38a0163a1320162d0a68d8b2ce42aa315f
+DIST uwsgi-1.2.5.tar.gz 515481 SHA256 e208a90f335725589361ac7f7e548ddf7a906dbe6bd50e83b1c5fc9884976ee4 SHA512 85bc94a80c235f2a35f0d8c7118eac8d98ea142f6ad584addbe4ffca011e61e158454202d69b9accda3319e3237d9c38b45c647c248b0ef2f2e75dc76256848a WHIRLPOOL e05edf639b22586be4dc6d7320b4fb75e448cbd57a0fd846ab0e2a1b6d19f400c72c0b40f64753b32cfe8fd35cb008ef38e8dff4423f004c047d5af08e143806
 EBUILD uwsgi-1.0.2.1.ebuild 1891 SHA256 1078d427a2cd4abe8a7ed4a5ec4a477fea989c2b75e20d5a27128032359c61d5 SHA512 857cd70e9002e7f1ebb521ced5453cffd43f4ff5805363ebfecd10d929ec6a4ab0283f51ceb5563e531d371a190a16b7d8ab162a56715c8aac5a0ee1e62dd5ee WHIRLPOOL 6fcf9f03d8325ddc061ac95970568a02d2d86d883b3b936acda41368c6b9d7b806f37c9701a10a70375cd577608fe444fb6405785a8dd9605fbaf72b03196b3c
-EBUILD uwsgi-1.2.3-r3.ebuild 8580 SHA256 0c7876499d197a9292dfa05420f27a2d418bf1b1e19e310ef0d2933b99330e9e SHA512 f6e60800fac1d372632db72e8aa969148cecd05055d220a02b655360fab1395b5cb6bc21c1cb4402cbb3832de4d35cff493716a7cf28c8e40015c74bde69e071 WHIRLPOOL 8b6cf524f3c540ca5abdb944e89049294247b1e9019fb285eefb00cce1f49a85190ff419b7124bfc56dedd1276f673187504e0969df8a4b26dfc2bd9c8244e76
 EBUILD uwsgi-1.2.3-r4.ebuild 8580 SHA256 b639a675168ac9dae4179914ef46106f0c39a15884811ed1f0451c29e7ba1208 SHA512 0e5e7735e15d3168dfe79d3ec1538f7714885c7c13e5361724f94a7d4a5e8fa76eb3bb55c37d3fc9a62606d7724e5defd4df1a3edc5b7db4f049b93de1ecc1fe WHIRLPOOL 353344467d34eb7f7c3cb02e4ad5f98c3a3d543025615d7d894146401c47e8e3052aaa62ae16708591c157e008914932bc49b451e7494b659b99e341b556cadd
 EBUILD uwsgi-1.2.4.ebuild 8577 SHA256 88bcfb8ecf1c866a6b3ca4e88019a8cdb348fa8a5311f92563ffb0f8232ba227 SHA512 fc464cdc3f0d1bd64af6401aeb893c6e248ac02b9ad88dd4c28d64b89c660e25417a7c6b30cd3f782c0e4083d52e8c3aa89ee50e8cf786d6c0a86e2abcfc4353 WHIRLPOOL f230d2502f301a9e285effd02c374941163441b9028b618f4fdbc83e105d241e7d035da916dbe5549082b122252189256c7668488b7be25b215b4c2cd402fb85
-MISC ChangeLog 4974 SHA256 5d083a8b520cef5d6e5659a412280f8f0196afa13e50d63da4b809868ef4308c SHA512 a85f2053a5fa00d608b28164b3ff943ad7ef15606e26dd65c26b6b4c39be6f71ebef1d160ad401445c4114f62c65528f3fa95b60231f94376f70182d7af1e0a9 WHIRLPOOL f43abae4bd1e6372bdb86cdd7b7003a4b179dc584612c10981363673766f5b1b56e8af159032f964eed3b0098cfe9a8b7321f184447049c99fbe2efb5a96d64b
-MISC metadata.xml 1695 SHA256 2c176c7490bc3b284157056a10608475377c1528bfedb7488c5caf65e9112fd8 SHA512 5f14196d9997554978b3fde33519c1930268ecc8e63505b4d382086c01040369afc1403ffb9966e177651d64a415780768b06e9afa696647c421cd953f8c323c WHIRLPOOL 2e0a3ccceb5a94b1f0fe67a881b8d11bd22aebcd2ab0d60441708b7f48b9d35cfd0485824720c43a16d297fe69353064a8c097292530657d0e4c6f27c0a77e87
+EBUILD uwsgi-1.2.5.ebuild 8610 SHA256 8bddca1e7fafbd7201c22d0527a1f34c0a9ced7f0e6909cfeb196832217f4d50 SHA512 746b61eece930d74ed174a7ee74fa1e90632a9ced239e62409784a63a178c290053514339b68c11003ea627e9e541c6476c1e3916526d21bbd37236cc52395d3 WHIRLPOOL a5f8bcf17cb634946019f051267798e12919e1a40001fb476b5d531d18ad40d0db80b210444fdd8847eacb0eb504de68f50bb632c75421bfd4d8d7bb9c43166d
+MISC ChangeLog 5153 SHA256 3e7f66c3df3c3946f600125325be7f4c019df901a693a91cbb42edebcceeb288 SHA512 f081dbf2cc37492e157ddb10828d6d33afaaf09222e835a80eb6bbf48c21642899438afccaa734c8adbc696aa8a5f3c2eb9757c32cf3435d46b8df62436827f4 WHIRLPOOL d019e0666c16bb6e9fc39d3ec09df452d5c3d900257c96a3db375701922d7a7034cb9644dcb00b5d46f016a6f2273b9c8eca8096bae810f72a1d5e42d9588364
+MISC metadata.xml 1741 SHA256 9aeaf0a71eec68f74f9aeb0f5526aa9b504527c4a79486ed184e2ec9fa45fc10 SHA512 615d7b29f89c7441baa0022c7fae48d4b88f9da77b5fcb897d22a21bc92f09ed3492f7111978b97eecb4404b96c0bc5cf3addb9226b678bcfc0788770522249f WHIRLPOOL 478fbc2926280d69388bb2f59f179f89519499bb59fbb8b0f82836707878a5d2428f108cdeb407541f5677f2366fc8059fc567fa46cd56939143caee2fa2d3ec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/9TiUACgkQKiQSS7ZY+hN1vwEAyiRj4/CoabNxfNDDvZL1PH5H
-7Bbo/Udi+msVRl3egu8BAMV6V9cq8WlU+n0AtMXXkpUOBAKBDzO54GJ5irKnQ3qx
-=zWhF
+iF4EAREIAAYFAlAqDUgACgkQKiQSS7ZY+hPltwD+Ja00BdI/QRuhvJqYvijG9uZs
+R7ouVDQ7p3Uf+MKFQrAA+wac8CuVp8RI+1G38G282OW5kVr7e0p4CEpfQPXaPcBm
+=WXBE
 -----END PGP SIGNATURE-----
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"