Version bump, drop old

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

3 files changed, 22 insertions, 11 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/Manifest b/www-servers/uwsgi/Manifest
index 5afccad3a0ac..433b58f2ca25 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -12,21 +12,21 @@ AUX uwsgi.confd-r1 1438 SHA256 baa1522d488523daf67d3d480f9aa5076ae3252ab2731f4c2
 AUX uwsgi.initd 2843 SHA256 93ac80033db1b9fcb9bc42ec22463cbc2b6c4135b458cd921ec699d86f976e8f SHA512 e3dcaa5d5bf18f38271f7cbdd315c77f42a951e45b9d311fca8c5e97e0213b890ccbc3cfc2be634d24e6d3a88fb633e17039bcaad166aa8b304adcb37169d726 WHIRLPOOL 44244eb504c13e1d9db2c34d3a94ee1049a0d1b31c3503853da92c3071df7ec44114d7f609f84151073d3d31b8b94b35ed0f391e17986e17b468ce3558470213
 AUX uwsgi.initd-r1 3352 SHA256 857940e7c6c97c0e23db85015a47d295a102607100f0662ae69dc9c3c5bef14c SHA512 8c32618696be688001597d685f2a91eb6bbf65464889dd1ec30e40fe3cea2290cfe2cf0ec41dc3a2e35461781400f1a6fe881d666ab0771dde37a65b8ab873a8 WHIRLPOOL 954357c5c6c529a3b763cd5a09b0c7af2c738f7cba0823ddb80405fb5d31a06edc1677a13043fe1396ef0e9aef6142365cca223342bd10d090cddff7f15d0dad
 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
 DIST uwsgi-1.2.6.tar.gz 515869 SHA256 49d2fbedbd42b3c95a684f7ddf43302f881297f3614c7edd0af4a4c44e2032a5 SHA512 79297cc3d348e6fbbd1d7da5fb4d03844cc14ce36411ce55d6951e8f0c50614d87c3038de6986589362e9e84543aec9754a871c52002065d5f17a27a7ad32f01 WHIRLPOOL cdd74205572f0fce1390f3335e4f3cd6413d3cd5be9fb91a259a38c7330fe6b53057985e3ed6b8a67f6fba5339609506be4fbf2ae10251518406d6b02c831f09
+DIST uwsgi-1.3.tar.gz 560035 SHA256 506d4e482e3a808ea0f83015ba9bfcebc5428fd4aee48aeb3ff193032f587eb2 SHA512 fdc05f1625ba0586736c74e9147c1396b832fa12a444a3589585aaa946f4f590155658db668ce448db41a95167caaf99993b9390955849f04c30e812cbcb2a53 WHIRLPOOL a36073c705157b7da995e88a42464f32f5c29c691981d5470dc13807ed8be2ff63def1ec1d2b60c2afed00f45c6d93dfd902844e4edaea168fb84e9cfd8893ac
 EBUILD uwsgi-1.0.2.1.ebuild 1891 SHA256 1078d427a2cd4abe8a7ed4a5ec4a477fea989c2b75e20d5a27128032359c61d5 SHA512 857cd70e9002e7f1ebb521ced5453cffd43f4ff5805363ebfecd10d929ec6a4ab0283f51ceb5563e531d371a190a16b7d8ab162a56715c8aac5a0ee1e62dd5ee WHIRLPOOL 6fcf9f03d8325ddc061ac95970568a02d2d86d883b3b936acda41368c6b9d7b806f37c9701a10a70375cd577608fe444fb6405785a8dd9605fbaf72b03196b3c
-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
 EBUILD uwsgi-1.2.5.ebuild 8610 SHA256 8bddca1e7fafbd7201c22d0527a1f34c0a9ced7f0e6909cfeb196832217f4d50 SHA512 746b61eece930d74ed174a7ee74fa1e90632a9ced239e62409784a63a178c290053514339b68c11003ea627e9e541c6476c1e3916526d21bbd37236cc52395d3 WHIRLPOOL a5f8bcf17cb634946019f051267798e12919e1a40001fb476b5d531d18ad40d0db80b210444fdd8847eacb0eb504de68f50bb632c75421bfd4d8d7bb9c43166d
 EBUILD uwsgi-1.2.6.ebuild 8658 SHA256 98585a8e43e7af3f9bf516994fc7778e817a1857bca75658eacde9d1389c6033 SHA512 9b53d4ade90665886881c02869b8619e4128fcdeaa3340efec02b8dc645de3f99cba69a827cc4b0273dc8c94af72c2bc9ec0021f7f76616c14f21e6f41275b24 WHIRLPOOL b18455b534307639fe9b37fd54d3047c5ebbbceaa8438688bb6d89f9b4b63ccf4c0b03590e23ba1c6d2fa70224ce5bb5b135c87d74df0389dfb07407784569aa
-MISC ChangeLog 5449 SHA256 e4784d7665a1908a2f668dac4c81f249ca6e43e970f3dd091501af98c29826c9 SHA512 2df1a84aa08ac5acfb9e1f46d79105b4128edb74bdd438a953f85cd442a122d27bbb3ab036a108ea6a4fa399b30653ebf4c2a4c590def898e68bc5ac347dbc7f WHIRLPOOL 45eed7f094eb64fd7b4f7de4642744642fc9e0c7dd80413e7178aac27032b19e6a3d33c1a7d5b2a2f1056da3f5a2d68907987d67b3869fd9c0c4aa7ecac7729b
+EBUILD uwsgi-1.3.ebuild 8707 SHA256 d7208ec553cea7f9036b2a779eb552740f49a577f71fa180329fb8cc8c59965c SHA512 bd4eec4c2dd106d93b31bbb9d2e2b39ae287fd9d78be8ab00773c488557f4be3ce8db4ea59eff00a4734df0bf56dd287f78407387d5d84959207c264e8b552a2 WHIRLPOOL 5ba934ec62d85156413edf02b11a10580e85d3823f277723b64fdf52b05f6b03d1ea8863bb69eb5b6ca4318a91b21b0a75fe377423877b3b951d2db53c6a0ebd
+MISC ChangeLog 5593 SHA256 eeb5a41f5d2418e0062c9867ad44c2597159d87bec9b688f50f938a1a7ec1fe3 SHA512 5033ae73c8bf4d69db52f7e309bd0868d685a84af77d4e71ca4071dbb2d3951ac992b7d5a7916aecfe10b692185565a1fa569eff78b8ca039bd22a2f280e6eaa WHIRLPOOL 82fbd50720492f86a57d4585804474b8219a771eb2e178bcc5ceb22799c2fbdf989c11ba868d7c0be39403378eb760d4d4d018b24be35e9d599a1b5a0247033b
 MISC metadata.xml 1741 SHA256 9aeaf0a71eec68f74f9aeb0f5526aa9b504527c4a79486ed184e2ec9fa45fc10 SHA512 615d7b29f89c7441baa0022c7fae48d4b88f9da77b5fcb897d22a21bc92f09ed3492f7111978b97eecb4404b96c0bc5cf3addb9226b678bcfc0788770522249f WHIRLPOOL 478fbc2926280d69388bb2f59f179f89519499bb59fbb8b0f82836707878a5d2428f108cdeb407541f5677f2366fc8059fc567fa46cd56939143caee2fa2d3ec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBNt04ACgkQGwVqY66cHjCq0ACfe0cc136mut5cSROJ3tsMKUl+
-duIAnj+tIiZruFdf6jTcykUEFZhMXAME
-=tNOr
+iF4EAREIAAYFAlCO0cIACgkQKiQSS7ZY+hOyxgD/T4aMVlWmSD2+wFzRLa5ldehl
+xE1y8xzA0kST9f1DEYIBALOewy4iTOiz+8YN45r7LQFc+OSiHsuYKIywFSLYZV5Q
+=Hv+r
 -----END PGP SIGNATURE-----
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