version bump introducing UWSGI_PLUGINS USE_EXPAND with help of @dev-zero fix #497534 #497364 #488398 #484366 #469098 #469536, drop obsolete versions, cleanup

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

12 files changed, 410 insertions, 917 deletions

diff --git a/www-servers/uwsgi/ChangeLog b/www-servers/uwsgi/ChangeLog
index b8d68d94a266..8e91c0541898 100644
--- a/www-servers/uwsgi/ChangeLog
+++ b/www-servers/uwsgi/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for www-servers/uwsgi
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/ChangeLog,v 1.47 2013/12/26 10:40:43 ultrabug Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/ChangeLog,v 1.48 2014/01/16 13:40:41 ultrabug Exp $
+
+*uwsgi-2.0 (16 Jan 2014)
+
+  16 Jan 2014; Ultrabug <ultrabug@gentoo.org> -uwsgi-1.0.2.1.ebuild,
+  -uwsgi-1.2.6.ebuild, -uwsgi-1.9.6.ebuild, +uwsgi-2.0.ebuild,
+  -files/1.2.6-fixed-typecasting.patch, -files/uwsgi-1.0.2.1-no-werror.patch,
+  +files/gentoo.buildconf, -files/uwsgi.confd, -files/uwsgi.initd,
+  metadata.xml:
+  version bump introducing UWSGI_PLUGINS USE_EXPAND with help of @dev-zero fix
+  #497534 #497364 #488398 #484366 #469098 #469536, drop obsolete versions,
+  cleanup
 
   26 Dec 2013; Ultrabug <ultrabug@gentoo.org> uwsgi-1.4.10.ebuild:
   fix php5.5 support
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 41d09c654e27..f34be13b738c 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -3,28 +3,21 @@ Hash: SHA256
 
 AUX 1.1.2-threaded-php.patch 1098 SHA256 e5f03fcdf2ebf7d2867b21e640f2c44f23da169108b2ea964e96fea44152d49b SHA512 d213c827710b75c1e4e1a1ad657515a7d2cacf02fa1f2f309d5cf986b3650ea20529077e2d2df5a22ed6edf60e43e755378ec6ea556c43c844cf534552239d75 WHIRLPOOL 1b0e42b83aa45a3bb17edaf4f9d7b260bc9dae8d7e8f06a38c97045361e64ddd9e774a1df1244e521c7973b27d27d40cbca4d8d2b16d0f9765ca2daa00cc3be8
 AUX 1.2.3-pyerl.patch 1015 SHA256 1da74cb8d108f46c4faa39548f73de2f74849dde81d1012b71c7c91ab939596b SHA512 b298feccb2604b9459a15699d786c26be9d830f88a4a00beca69fba3ff0d5d78cc239e6dcce51da32121c8bb4d72af41a6e57e5594a3005cfceb4feebbffaed2 WHIRLPOOL 60ff1374e1f13c9ffaa65996a24d87d86d64d7f4edb9d1378d0b7287bfeb285d5123da4532c6e0fb022ff78d80a6b5eba9d6bb8c36536145d4a11cbdecee23f6
-AUX 1.2.6-fixed-typecasting.patch 740 SHA256 491e9b4e6c7af6bdc38224c5b54ed7ffe86e729f4e0ae4ce762e0b4fbe4a43fa SHA512 e49f905b75c8d859aaf193944f2d563143c4e8f17563c2e924d743f55a2a20d54e09f8f91fe1243aa25ac21748e5bd8180b5f2571b00827322d1bf5e49f78442 WHIRLPOOL 785e60e111efb63d02ef2ba574acf7a0cfb1d72667584292577247def67e5d3a1c8d047f4592f71301558f39f438a782a58c2629bf1c829e00b0471c5042641d
 AUX 42_mod_uwsgi-r1.conf 248 SHA256 40ef0a3916eba8f1a87828911571e9d8bf838f38f050d67df1662aca11ba6c91 SHA512 84babaa9aa5cc1a52235f1b4febe3d9dd1a90e7e28c54499d78219727a222e2c2f4db001d898e0fdc46718ea582ce3fc98d0fbbf94b1730f4a139555225b4538 WHIRLPOOL d96ef19fce89fbb36e1bc7701b2fb7424945f5da9d7eee071de74c9975463da9ba5be0a1a855e75c39705317ce0eef5116e7733d74091bfd984d3c1f189edea3
 AUX 42_mod_uwsgi.conf 159 SHA256 b759712baa7b8abab2ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861 SHA512 14eb8d58f814657da9d28215d4096373a26e5bdd9e3953bd37dc6008f42b04ca99ac5aa552bec36d1d8503e7ae54c78fcc00c1f6fe9d6daf983764bae07b802f WHIRLPOOL ec352b176c89441532378446cb909b3383054afbbee5d4f24c801eb5716d1143737c098bd25be46aa4399e54937c6b786fdca3e0343b0b4c91442456ba565f79
-AUX uwsgi-1.0.2.1-no-werror.patch 567 SHA256 64ee1684a12ea64b6b6892209c77863061a54cc752156131c6fc55f7f8785153 SHA512 8ebd116d1fd75385f13cf072ac44dfb0055f789dd7fc1f37433b6dd98c62cb439b2fbf99fe891d919139f93404f5017e3600093d8dc21c8463f0f50e3bb72460 WHIRLPOOL 0de33344956bd2723f364da07ad6a48adca3ffc43e53cad9ee70c92707ea6f9b47004f1fdd8b14318ba39d0995085986a3d606e26d07fd293d71ebdab17eaf17
-AUX uwsgi.confd 1116 SHA256 3c238b934f8db9eae87f77dc3d131499e442526d5e45438b5461c0d7590b772f SHA512 888d174ed0c83e93724b473712288e42ce97e0b367b7aca3c707795e8bf4753a242982d8fa35274662851a6638eef3a55860982aae1d94fb234cd29ca4382bfd WHIRLPOOL a3708ed41de4e21562eca5ea89afed6e6cb234c0c37583b58ee346478de64569e68b8eed45ca0349222cb07ee8b85683ecebeea404c2f0ded1c91dff90cbfdbc
+AUX gentoo.buildconf 490 SHA256 a82aeada480a7571181c6767ba2df40f14117e4a3070920961510eee05035a19 SHA512 d5bdc136374aed58ce206ea72cc45c72750f60117eef98960356b5cd64e2152c454af6b5aebb28f03ad46b42ea95a16fbf1e4a6f976ae78744550803ac775fe2 WHIRLPOOL f5f13dc512e470bc32a1d487176cbc82dddb280b7f0b284580f5b0106a9f03aae123b9ac2298f4e61068212cc0afde7b970ff9a4c9f18e11bffb58a4c8d993e4
 AUX uwsgi.confd-r1 1438 SHA256 baa1522d488523daf67d3d480f9aa5076ae3252ab2731f4c25ef564caba8cfd2 SHA512 51e7154ced90a6a531944db8df7bdc2d502550501845ff153e05f94623d0d547180b78fe80203a272af60306b9d3d8575dc101e4069b655091a821929a6e4436 WHIRLPOOL cb12c57c5eb636941e429900ae8f932129ace89620d46d537108ba3aa15e694eb4038bca5739eefba544dc02c8ecefdb53419509ed542c40ec5803f4f0516ff5
 AUX uwsgi.confd-r3 1816 SHA256 4cb047e311aecd0f498da1d6a4c0947dd6dc7cc98575d54cb2ef150cacf8425c SHA512 9f00afb2aa574bbc59040f945475712b8c40da0c06eeb5699de5510aa116148e35ab0429fa891084cf0cd7868876d5a80e1601b7c85d0e2e9ea2a1f54cdde619 WHIRLPOOL 5b20118c3b5950d2457d909bf7cca15f21edd13358da1a9284ff4412fda3ab13958df5dd0714e12d0c38e9e516c46c779a71cd872164165074045adb008a639c
-AUX uwsgi.initd 2843 SHA256 93ac80033db1b9fcb9bc42ec22463cbc2b6c4135b458cd921ec699d86f976e8f SHA512 e3dcaa5d5bf18f38271f7cbdd315c77f42a951e45b9d311fca8c5e97e0213b890ccbc3cfc2be634d24e6d3a88fb633e17039bcaad166aa8b304adcb37169d726 WHIRLPOOL 44244eb504c13e1d9db2c34d3a94ee1049a0d1b31c3503853da92c3071df7ec44114d7f609f84151073d3d31b8b94b35ed0f391e17986e17b468ce3558470213
 AUX uwsgi.initd-r1 3352 SHA256 857940e7c6c97c0e23db85015a47d295a102607100f0662ae69dc9c3c5bef14c SHA512 8c32618696be688001597d685f2a91eb6bbf65464889dd1ec30e40fe3cea2290cfe2cf0ec41dc3a2e35461781400f1a6fe881d666ab0771dde37a65b8ab873a8 WHIRLPOOL 954357c5c6c529a3b763cd5a09b0c7af2c738f7cba0823ddb80405fb5d31a06edc1677a13043fe1396ef0e9aef6142365cca223342bd10d090cddff7f15d0dad
 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.0.2.1.tar.gz 465250 SHA256 78280b57a970db7842e4481f8b00f13d011f27b340c869dc1ad28d564d716439 SHA512 de7761b24ae92aea62b4b5d4523d1b812dd5c25c09551baf7007a0e1a97461c62033762cb02e90a9bd85f2aef78477c5151c5a359c8b878150a0c926e3a759ee WHIRLPOOL 47ca0115d55a09b99006fff9c6fb6b5daa71b0b4ea64bbc65390ff64c05f62a661a17b1ec172e05f78f75dd9a36efad3d9dacb57c980639038be6f718480d7b6
-DIST uwsgi-1.2.6.tar.gz 515869 SHA256 49d2fbedbd42b3c95a684f7ddf43302f881297f3614c7edd0af4a4c44e2032a5 SHA512 79297cc3d348e6fbbd1d7da5fb4d03844cc14ce36411ce55d6951e8f0c50614d87c3038de6986589362e9e84543aec9754a871c52002065d5f17a27a7ad32f01 WHIRLPOOL cdd74205572f0fce1390f3335e4f3cd6413d3cd5be9fb91a259a38c7330fe6b53057985e3ed6b8a67f6fba5339609506be4fbf2ae10251518406d6b02c831f09
 DIST uwsgi-1.4.10.tar.gz 590892 SHA256 d4c30a6496d7d7be59f0264393649b9bd5ec58f72c4c3b79b8160b25c193c512 SHA512 26eb3e34595f0e85ae8f217ace8d326f966c605e00974621aa8b94fd83ef9fd711bdfa262c609a62a7f8d82a04431876769b546a1d1a0929de50ccd877a13e22 WHIRLPOOL 77d1a556c8af59a95eea75e8ae0af524c9aa768c1ecb7a396d43ca9cd6d215a96b83626882f8ab47cdc181ad1c5e62f18e508f43e97e8feb39bb5659fc6b2f37
 DIST uwsgi-1.4.4.tar.gz 589158 SHA256 419f45aea5469b6bec5b20e0edfe481c91a5efcd150cfaa49ca977bc14beddb9 SHA512 0736edadcda323ee4923c3163996e27eb3b7cb6c6603055c63ba527cc7408c3e39448cdc35e70ceec0dd4551e1a451ed04e2cf7bc6a3ca39726f144a0b818813 WHIRLPOOL 0d5be288a5e8b685ddbec922fee3ee0068143aabf6c7a3b38f68f20b9ca63775d8212ac0584b85e57352adb460a1c851e3605e9018d9ec65d59d8c4c03fbd4c1
 DIST uwsgi-1.4.5.tar.gz 589985 SHA256 5c17f09d0f8d5a4f3385c791e91ca71975b8ccb0c0b94620f9f924c21ef30f3a SHA512 f9b4da6eff9c20f0dcf1e46a4fb7b8dd348bc38ef307ceafc4de40e0d8ab06f33a967977db7194cb07ecb7690e3c8bb599cbd9586bec7336c34113deda82a64b WHIRLPOOL c806e42ae72ba0490189c70a12aae8fe3037d98d461ccc773e847c7e16394b98a89e1ef3262496a9abda4f3985547dbd098af535bf20e127325629a0adefaf3a
 DIST uwsgi-1.4.6.tar.gz 591470 SHA256 731b57574dc8c6bc270233b689157433ababd0b611dbaeb16a11b6608d1deb80 SHA512 ea022ceae4e43f4ae0bde390f2a78f688d01c0beea91593820ab5602d418564a289a44c7a8bef4449ab0b7e5b7511a9c1f2e4b2609bdb063f526eebd8a1dd9a7 WHIRLPOOL 25f2f773d88d8c83796eda75a1f824b303fd9c5a55a512d2dc97824bef3bbbf4512641aa99eefa60a5044e577dd9a2f43e91b560db706bb6a96dde668907cef0
 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-1.9.6.tar.gz 599581 SHA256 841824a35bfb2ed40c12f887992ccdb9537505d61a15cdc70327d9003819e9f9 SHA512 c61c84f1189e991d6309d89c9c0199df5d051693592ed52b4e49f3cc7e2dbacd741dea1d7e5fbc9b5c50ce1331f63759f5e3abfd4eab428273c95e4fe426328a WHIRLPOOL 210c43682547c289d40558800a91d634a20a2844bb87ec1dac5079d137cb0b35d97353e77a2f485bcecdc8343a8894dfbf7bec66a6e3658a9018eab8a122db88
-EBUILD uwsgi-1.0.2.1.ebuild 1891 SHA256 1078d427a2cd4abe8a7ed4a5ec4a477fea989c2b75e20d5a27128032359c61d5 SHA512 857cd70e9002e7f1ebb521ced5453cffd43f4ff5805363ebfecd10d929ec6a4ab0283f51ceb5563e531d371a190a16b7d8ab162a56715c8aac5a0ee1e62dd5ee WHIRLPOOL 6fcf9f03d8325ddc061ac95970568a02d2d86d883b3b936acda41368c6b9d7b806f37c9701a10a70375cd577608fe444fb6405785a8dd9605fbaf72b03196b3c
-EBUILD uwsgi-1.2.6.ebuild 8658 SHA256 98585a8e43e7af3f9bf516994fc7778e817a1857bca75658eacde9d1389c6033 SHA512 9b53d4ade90665886881c02869b8619e4128fcdeaa3340efec02b8dc645de3f99cba69a827cc4b0273dc8c94af72c2bc9ec0021f7f76616c14f21e6f41275b24 WHIRLPOOL b18455b534307639fe9b37fd54d3047c5ebbbceaa8438688bb6d89f9b4b63ccf4c0b03590e23ba1c6d2fa70224ce5bb5b135c87d74df0389dfb07407784569aa
+DIST uwsgi-2.0.tar.gz 744221 SHA256 297073c85dc7a6b104f6367778cf7604bedd685a977b320b36dd46b0b11a8af0 SHA512 ee4b3602749b5b0352717001a6ea3d252c80f2d0d0b8ac0c21b3fbb49df7ff911f4211a1cb6f23afe1716f1b3a6f856236b6cd48a0f82d618a6d52dbf13f13b3 WHIRLPOOL 8236c3c7063a319f71e879a0ff08c9a06f90a3b16cce8d20ab9e1895bb5b2b6affa970f55c2aaca90249900960d4390aed6f573a6f6b82043906262a40e3fb17
 EBUILD uwsgi-1.4.10.ebuild 9617 SHA256 75b85cb390d973c0cbdee78796621cf9a34aacaa13277b6f20d499bea0eb497a SHA512 d28f770b9940c24fbd4d02d00d21880d734a98484fe7268ffea5668fd755a358ba5ed439be2509677cb44fa9df99c7b46da89e07e7c47d8b4270d65167ef505f WHIRLPOOL 229d65b6dd944854fe6aabb1ef35e929f9f7780431fc83ff838592a7c3c6392ad34f7b2bb9a1feaa278174c3b8b161139cc4718b58a46a27beccea4eda856950
 EBUILD uwsgi-1.4.4.ebuild 9559 SHA256 58c6c34168966b915caa3c25dbcef3cfc60b9ae25056c1ddaa739e35963195d6 SHA512 43338613228a61db00e7c97c0217d0e65269a6612eb6a21fccc04d4dec6f577cda4b3889f3ea0afdb02a3e997b44580e85e70d56732faf17f1b4ea7242c33802 WHIRLPOOL 795667e01e8a4ddf0f01558b6bbe2bcc85472d5f5015bc6e87cf990b3e71f7dfb789a80107efe3511b56c0c3c7ad92f64cff1e7091b6d0a0081e12b20ba4e04a
 EBUILD uwsgi-1.4.5-r1.ebuild 9562 SHA256 ffeda3dce0dba8c1aa29b05a5f057bbe30f86325473ef3e6427bc37a6789c0c8 SHA512 149ca6773547dc5b2eb122fb2cb8a3ccc066ce1e8e339a39df2d1bbd037407919bc9ae8b1cb42aadc0999d425511cf5b73c6bf9fc8696cc6d12ef70e459af1e0 WHIRLPOOL 2f0cb2606080afd7acee1e6359d34ed4fded90839eb88252777f09c1c537fd5fe57e0176f9a1f900767f008f82ef76c1565078eaa9f296711a4c4c7589253cf9
@@ -32,13 +25,13 @@ EBUILD uwsgi-1.4.6-r1.ebuild 9562 SHA256 64e5834cc5768cf2b8cc96f9e075e155bbbe192
 EBUILD uwsgi-1.4.6.ebuild 9559 SHA256 d606c46c5d9c3d422faa13113138eaa84812e08dad807741261314887e75ac5a SHA512 2006048503b70e59d3a0515c889ad88fdab59af1a2ccbfa8eaddf5f926b164b9932c223d52f376cd57c1c068415daef1a2815f0dc2e736cab4224ad9209dc601 WHIRLPOOL 31ee2ae6954d97388c2681376e67431f00ef497c11892eb7b6938ca235811a42d1ee309619633836594c6729f2bbc6fdfb860d40047e618aed1983aac74e45d4
 EBUILD uwsgi-1.4.8.ebuild 9559 SHA256 cc21690212eb37156b5c2449f8223de09807315719a0b03586385048db49d1b6 SHA512 c8e02803c97e39a63ee0383ad5a4a12211e8f8871a81d25993cebda38a30f6cdcc8bbed190033c409342148b2f8bd57997d6a007584ebcaf7cc9d81326b00b11 WHIRLPOOL 2405726642ddf2d7d98cc6d6eb5ddc5a7ade8671b0025e9b533a70692be6cdeaf9f6d53df04b995f73e5be87521f012139e3e5c03c3b7bd368a133d08b2ad489
 EBUILD uwsgi-1.4.9.ebuild 9559 SHA256 d78fe36b66cfd7df05842bead1f516cd010f68f4ed1aa797ae0a20c1292ead83 SHA512 a93dac97f722c56ea8847d08932b98012a494eeccc9993f7cd07fcec4e53c2357d294e3da21633430ac629cfab0640a3f226e2ba7aeb989de904a375d17dd49d WHIRLPOOL f2f2fb3bb93f775db59751e6b7a580bf2ce0589f02c51b6cfe44db59f57febde7dc8749383990dde8a76f26cbd35b09e65f0e4533b71eb736bb3e84521555639
-EBUILD uwsgi-1.9.6.ebuild 9509 SHA256 65ecb4484955ae46218a7a8354c102d144d6260da3530ee278631df8072f80ca SHA512 fa87242495ce93beea5951806838fc2cdfe45ebe7776a94877c2af8fc4e61f1170fee8c588788eb1766ce3d857c5b6aac2208127eca78de1fb84153d858050c0 WHIRLPOOL 51e22a23d0737db4ef9abe1edd5c57222d809392bd093dc685b0aefdc179ddcf30b8f3713af13705dedfc659ef71ae9cab8c4afb4638e52875cb8bdbe85a0bd0
-MISC ChangeLog 8223 SHA256 4d2ab687d10dd03ba5cf85d18c4af04c4727d5b80c476534963ca0cc7e2be516 SHA512 9ff2e5dbddc8489c4b544e6007f39a4073f5873e48012e69514e909887719ff80b5a9a00674c46e0b852b4d8a8a076810e813ad845963be59f4b46f2c0c7bf4c WHIRLPOOL 91afa0170927ab61034093c9d2e06bb5bb7e5e5556e1f36900c70da366d43c0648272bbf649c8cc4d025fb06ed86eed8f771f8587255be11c8c2d891cd53f277
-MISC metadata.xml 1858 SHA256 1f5f523b1f818eba2c101f5ba8dd86e519bb35e94858238a004279ec1b036058 SHA512 c3fe4b3b5846be99307971ee8e3b557c7715353da237324cb29731fecaefc2daf5da944d364ec45e1282d3bbfd586ae849b0efc86e6b8cdc56ea657c37a11d2f WHIRLPOOL 288c3c14c307a65fc62977d2b1285f4d34049f783b74480f64fdb1ffbfab3dc238b47639ee1372b23201471287a2b5f7b78b2fba10bba1e526d1432d1530b121
+EBUILD uwsgi-2.0.ebuild 10918 SHA256 c4013663cccbcd192932321a5e28e47a32af4bfe11a65a11be51d00869199fa6 SHA512 7914551dc22ceb0b92d54e42cf9a205ff9739d2244b2ad622103b47722f4f9ed7ffdffa905fa57e94df9343686401cdf4113b1a4882e90c054abfd571d0012b4 WHIRLPOOL 311513ff9abeae38ceca0173ae3b40ac880abe39dfd1a97f2f9da7f7fe41961b4b93b93f51436450ba1837eba814ed48d076c2ea0a1e77386a72e3a92e182437
+MISC ChangeLog 8707 SHA256 4fba6f555c8ab14ccb11c17d3170fa25ad4b957277ce689e29af9c1a8268f292 SHA512 a380a1ef8fd40a2e20744c8771c342bea4de40da949ad10327c213fa25a0230d0cf26a60dfad9d985f05c131f80c500bf9082b8133e4c8a98c59965119847c3c WHIRLPOOL 1ae711f92b17e71f2ab111c95d5f773520e912b909ae61edb85b38b11ab2de3959f9d2a8401a68f28cedbcdb4e01cf6cd3f9b1fe8bd27b002fed02551aa5358e
+MISC metadata.xml 2397 SHA256 0200f0638392c99a13a78580b5684cf229ca03d7b086b95da7965f42585dfa24 SHA512 e9cba6aa83b4b4427d9acd006db5658b01bc94ca8226b96f7b36e484f7922949bccd568f21070f7239bb55e99acdc10fcd865f309f633d72e04ac3013bb7f52d WHIRLPOOL 7a95ada5f7c89d00880c1e929a7f4ab7a31935cf7fde1a4729d01cbfa01c4c2df63b3814c80a38feb928602cd8f02e9b438d87a33823c04063f4e687524bd7b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlK8B7MACgkQKiQSS7ZY+hPjXwD9FtSS98W5qzCQ31RFBEy6dXv3
-ZNvIERXszi2n+m2BjwwA/0ZivTNpxkQuIRvYNxSinQz16/eSIYg9k85mMM+sDSan
-=gvgK
+iF4EAREIAAYFAlLX4V8ACgkQKiQSS7ZY+hPgQgEAl0KEUEmk19BhF6nHz20KA3Mh
+nQJXv5S98qu8abzuv6QBAOvZAEflWnU3js0AuZTkQo6ps7CygROwmiRJFj+iISs8
+=i6tm
 -----END PGP SIGNATURE-----
diff --git a/www-servers/uwsgi/files/1.2.6-fixed-typecasting.patch b/www-servers/uwsgi/files/1.2.6-fixed-typecasting.patch
deleted file mode 100644
index b9dfec7e2260..000000000000
--- a/www-servers/uwsgi/files/1.2.6-fixed-typecasting.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-# HG changeset patch
-# User roberto@quantal64
-# Date 1347021464 -7200
-# Node ID 4d4686fdb3ba44fd5083f61ceb27f820d7a79937
-# Parent  88dc416d99e40ddacfb7ccb4d620fe50b9d9319c
-fixed typecasting
-
-diff -r 88dc416d99e4 -r 4d4686fdb3ba plugins/router_uwsgi/router_uwsgi.c
---- a/plugins/router_uwsgi/router_uwsgi.c	gio set 06 16:32:49 2012 +0200
-+++ b/plugins/router_uwsgi/router_uwsgi.c	ven set 07 14:37:44 2012 +0200
-@@ -54,7 +54,7 @@
- 
- 	int post_fd = wsgi_req->poll.fd;
- 	if (wsgi_req->async_post) {
--		post_fd = fileno(wsgi_req->async_post);
-+		post_fd = fileno((FILE *)wsgi_req->async_post);
- 	}
- 
- 	if (uwsgi_send_message(uwsgi_fd, uh->modifier1, uh->modifier2, wsgi_req->buffer, wsgi_req->uh.pktsize, post_fd, wsgi_req->post_cl, 0) < 0) {
-
diff --git a/www-servers/uwsgi/files/gentoo.buildconf b/www-servers/uwsgi/files/gentoo.buildconf
new file mode 100644
index 000000000000..e0c60bc6a5b8
--- /dev/null
+++ b/www-servers/uwsgi/files/gentoo.buildconf
@@ -0,0 +1,30 @@
+[uwsgi]
+xml = VAR_XML
+yaml = VAR_YAML
+json = VAR_JSON
+ssl = VAR_SSL
+pcre = VAR_PCRE
+zeromq = VAR_ZMQ
+routing = VAR_ROUTING
+debug = VAR_DEBUG
+unbit = false
+malloc_implementation = VAR_MALLOC
+extras =
+plugins = VAR_PLUGINS
+bin_name = uwsgi
+append_version =
+plugin_dir = VAR_PLUGIN_DIR
+plugin_build_dir = VAR_BUILD_DIR
+embedded_plugins = VAR_EMBEDDED
+as_shared_library = false
+
+locking = auto
+event = auto
+timer = auto
+filemonitor = auto
+
+blacklist =
+whitelist =
+
+embed_files =
+embed_config =
diff --git a/www-servers/uwsgi/files/uwsgi-1.0.2.1-no-werror.patch b/www-servers/uwsgi/files/uwsgi-1.0.2.1-no-werror.patch
deleted file mode 100644
index 9786186fe5e3..000000000000
--- a/www-servers/uwsgi/files/uwsgi-1.0.2.1-no-werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/uwsgiconfig.py	2012-01-11 19:38:58.000000000 +0100
-+++ b/uwsgiconfig.py	2012-01-27 11:43:47.969407343 +0100
-@@ -252,7 +252,7 @@
-         self.gcc_list.append('proto/fastcgi')
-         self.include_path = []
- 
--        self.cflags = ['-O2', '-Wall', '-Werror', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64'] + os.environ.get("CFLAGS", "").split()
-+        self.cflags = ['-O2', '-Wall', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64'] + os.environ.get("CFLAGS", "").split()
- 
-         if uwsgi_os == 'Linux':
-             self.gcc_list.append('lib/linux_ns')
diff --git a/www-servers/uwsgi/files/uwsgi.confd b/www-servers/uwsgi/files/uwsgi.confd
deleted file mode 100644
index 11152da5dbf7..000000000000
--- a/www-servers/uwsgi/files/uwsgi.confd
+++ /dev/null
@@ -1,47 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/files/uwsgi.confd,v 1.1 2011/05/31 19:49:07 maksbotan Exp $
-
-# DO NOT MODIFY THIS FILE DIRECTLY! CREATE A COPY AND MODIFY THAT INSTEAD!
-
-# Path (or name) of UNIX/TCP socket to bind to
-#
-UWSGI_SOCKET=127.0.0.1:1234
-
-# Enable threads?
-#
-UWSGI_THREADS=1
-
-# The path to your uWSGI application.
-#
-UWSGI_PROGRAM=
-
-# The path to your uWSGI xml config file.
-#
-UWSGI_XML_CONFIG=
-
-# The number of child processes to spawn. The default is 1.
-#
-UWSGI_CHILDREN=1
-
-# The log file path. If empty logging is disabled
-#
-UWSGI_LOG_FILE=
-
-# If you want to run your application inside a chroot then specify the
-# directory here. Leave this blank otherwise.
-#
-UWSGI_CHROOT=
-
-# If you want to run your application from a specific directiory specify
-# it here. Leave this blank otherwise.
-#
-# UWSGI_DIR=
-
-# The user and group to run your application as. If you do not specify these,
-# the application will be run as root:root.
-#
-UWSGI_USER=
-
-# Additional options you might want to pass to uWSGI
-#
-#UWSGI_EXTRA_OPTIONS=
diff --git a/www-servers/uwsgi/files/uwsgi.initd b/www-servers/uwsgi/files/uwsgi.initd
deleted file mode 100644
index ce0ba5724ab5..000000000000
--- a/www-servers/uwsgi/files/uwsgi.initd
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/files/uwsgi.initd,v 1.3 2012/08/27 08:34:07 ultrabug Exp $
-
-PROGNAME=${SVCNAME#*.}
-
-UWSGI_EXEC=/usr/bin/uwsgi
-PIDPATH=/var/run/uwsgi
-PIDFILE="${PIDPATH}/${PROGNAME}.pid"
-
-extra_started_commands="reload"
-
-depend() {
-	need net
-}
-
-start() {
-	local OPTIONS
-
-	if [ "${SVCNAME}" = "uwsgi" ]; then
-		eerror "You are not supposed to run this script directly. Create a symlink"
-		eerror "for the FastCGI application you want to run as well as a copy of the"
-		eerror "configuration file and modify it appropriately like so..."
-		eerror
-		eerror "  ln -s uwsgi /etc/init.d/uwsgi.trac"
-		eerror "  cp /etc/conf.d/uwsgi /etc/conf.d/uwsgi.trac"
-		eerror "  nano /etc/conf.d/uwsgi.trac"
-		eerror
-		return 1
-	fi
-
-	if [ -z "${UWSGI_SOCKET}" ]; then
-		eerror "You need to specify path (or name) of UNIX/TCP socket to bind to"
-		eerror "in UWSGI_SOCKET"
-		return 1
-	fi
-
-	if [ -z "${UWSGI_PROGRAM}" ] && [ -z "${UWSGI_XML_CONFIG}" ]; then
-		eerror "You need to specify which \$UWSGI_PROGRAM or \$UWSGI_XML_CONFIG"
-		eerror "you want to start."
-		eerror "Please adjust /etc/conf.d/uwsgi.${PROGNAME}"
-		return 1
-	fi
-
-	if [ -n "${UWSGI_PROGRAM}" ] && [ -n "${UWSGI_XML_CONFIG}" ]; then
-		eerror "Only one of the two may be defined:"
-		eerror "  UWSGI_PROGRAM=${UWSGI_PROGRAM}"
-		eerror "  UWSGI_XML_CONFIG=${UWSGI_XML_CONFIG}"
-		return 1
-	fi
-
-
-	OPTIONS="--master --daemonize"
-
-	if [ -n "$UWSGI_LOG_FILE" ]; then
-		OPTIONS="${OPTIONS} $UWSGI_LOG_FILE"
-	else
-		OPTIONS="${OPTIONS} /dev/null --disable-logging"
-	fi
-
-	if [ "${UWSGI_THREADS}" = "1" ]; then
-		OPTIONS="${OPTIONS} --enable-threads"
-	fi
-
-	if [ -n "${UWSGI_SOCKET}" ]; then
-		OPTIONS="${OPTIONS} --socket ${UWSGI_SOCKET}"
-	fi
-
-	if [ -n "${UWSGI_CHILDREN}" ]; then
-		OPTIONS="${OPTIONS} --processes ${UWSGI_CHILDREN}"
-	fi
-
-	if [ -n "${UWSGI_CHROOT}" ]; then
-		OPTIONS="${OPTIONS} --chroot ${UWSGI_CHROOT}"
-	fi
-
-	[ -z "${UWSGI_DIR}" ] && UWSGI_DIR="/"
-	[ -z "${UWSGI_USER}" ] && UWSGI_USER="root"
-
-	if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then
-		OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}"
-	fi
-
-	if [ -n "${UWSGI_PROGRAM}" ]; then
-		OPTIONS="${OPTIONS} --wsgi-file ${UWSGI_PROGRAM}"
-	fi
-
-	if [ -n "${UWSGI_XML_CONFIG}" ]; then
-		OPTIONS="${OPTIONS} --xmlconfig ${UWSGI_XML_CONFIG}"
-	fi
-
-	ebegin "Starting uWSGI application ${PROGNAME}"
-	cd "${UWSGI_DIR}" && \
-	start-stop-daemon --start --user "${UWSGI_USER}" --exec "${UWSGI_EXEC}" -- ${OPTIONS} --pidfile "${PIDFILE}"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading ${SVCNAME}"
-	kill -HUP `cat ${PIDFILE}` &>/dev/null
-	eend $? "Failed to reload ${SVCNAME}"
-}
-
-stop() {
-	ebegin "Stopping uWSGI application ${PROGNAME}"
-	start-stop-daemon --stop --pidfile "${PIDFILE}" --signal 3
-	eend $?
-}
diff --git a/www-servers/uwsgi/metadata.xml b/www-servers/uwsgi/metadata.xml
index 30b2aebb453f..e0dbe55ad9e2 100644
--- a/www-servers/uwsgi/metadata.xml
+++ b/www-servers/uwsgi/metadata.xml
@@ -7,17 +7,21 @@
 	</maintainer>
 	<use>
 		<flag name='carbon'>Enable support for sending statistics to a carbon server (see http://projects.unbit.it/uwsgi/wiki/Carbon).</flag>
-		<flag name='erlang'>Let the uWSGI server act as an Erlang C-Node and exchange messages and rpc with Erlang nodes. Together with the USE=python this enables erlang support in python (see the mappings table in http://projects.unbit.it/uwsgi/wiki/ErlangIntegration).</flag>
+		<flag name='erlang'>Let the uWSGI server as as an Erlang C-Node and exchange messages and rpc with Erlang nodes. Together with the USE=python this enables erlang support in python (see the mappings table in http://projects.unbit.it/uwsgi/wiki/ErlangIntegration).</flag>
+		<flag name='embedded'>Embed plugins instead of building them as real plugins. When disabling this USE flag make sure you specify all used plugins in your uWSGI configuration. Note: Language plugins will always be built as real plugins.</flag>
 		<flag name='gevent'>Use <pkg>dev-python/gevent</pkg> for async request dispatching and as LoopEngine (see http://projects.unbit.it/uwsgi/wiki/Gevent).</flag>
+		<flag name='jemalloc'>Use <pkg>dev-libs/jemalloc</pkg> instead of libc's malloc</flag>
 		<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='probepg'>Add the PostgreSQL probe plugin (see http://projects.unbit.it/uwsgi/wiki/DjangoDBHA).</flag>
+		<flag name='python_gevent'>Use <pkg>dev-python/gevent</pkg> for async request dispatching and as LoopEngine (see http://projects.unbit.it/uwsgi/wiki/Gevent).</flag>
+		<flag name='routing'>Enable routing support</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>
 		<flag name='yaml'>Support yaml as a configuration file format.</flag>
-		<flag name='zeromq'>Enable logging and deployment via ZeroMQ. Together with json-support this turns uwsgi into a Mongrel2 handler (see http://projects.unbit.it/uwsgi/wiki/Mongrel2).</flag>
+		<flag name='yajl'>Use <pkg>dev-libs/yajl</pkg> instead of <pkg>dev-libs/jansson</pkg> for parsing JSON configuration files (if USe=json is set)</flag>
+		<flag name='zeromq'>Enable logging and deployment via ZeroMQ.</flag>
 	</use>
-</pkgmetadata>
+</pkgmetadata>
\ No newline at end of file
diff --git a/www-servers/uwsgi/uwsgi-1.0.2.1.ebuild b/www-servers/uwsgi/uwsgi-1.0.2.1.ebuild
deleted file mode 100644
index 7a37777628f9..000000000000
--- a/www-servers/uwsgi/uwsgi-1.0.2.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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.0.2.1.ebuild,v 1.2 2012/02/25 04:26:07 patrick Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
-
-inherit eutils python toolchain-funcs apache-module
-
-DESCRIPTION="uWSGI server for Python web applications"
-HOMEPAGE="http://projects.unbit.it/uwsgi/"
-SRC_URI="http://projects.unbit.it/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/libxml2"
-DEPEND="${RDEPEND}"
-
-APXS2_S="${S}/apache2"
-APACHE2_MOD_CONF="42_mod_${PN}"
-want_apache2_2
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-werror.patch
-	python_copy_sources
-}
-
-src_compile() {
-	python_src_compile CC="$(tc-getCC)"
-
-	if use apache2 ; then
-		for m in Ruwsgi uwsgi ; do
-			APXS2_ARGS="-c mod_${m}.c"
-			apache-module_src_compile
-		done
-	fi
-}
-
-src_install() {
-	installation() {
-		newbin uwsgi uwsgi-${PYTHON_ABI}
-	}
-	python_execute_function -s installation
-
-	python_generate_wrapper_scripts "${ED}usr/bin/uwsgi"
-
-	if use apache2; then
-		for m in Ruwsgi uwsgi ; do
-			APACHE2_MOD_FILE="${APXS2_S}/.libs/mod_${m}.so"
-			apache-module_src_install
-		done
-	fi
-
-	newinitd "${FILESDIR}"/uwsgi.initd uwsgi
-	newconfd "${FILESDIR}"/uwsgi.confd uwsgi
-	mkdir -p "${ED}"/var/run/uwsgi
-}
-
-pkg_postinst() {
-	if use apache2 ; then
-		elog "Two Apache modules have been installed: mod_uwsgi and mod_Ruwsgi."
-		elog "You can enable them with -DUWSGI or -DRUWSGI in /etc/conf.d/apache2."
-		elog "Both 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."
-	fi
-}
diff --git a/www-servers/uwsgi/uwsgi-1.2.6.ebuild b/www-servers/uwsgi/uwsgi-1.2.6.ebuild
deleted file mode 100644
index 2771d1662a6f..000000000000
--- a/www-servers/uwsgi/uwsgi-1.2.6.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# 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.6.ebuild,v 1.1 2012/09/10 09:47:52 dev-zero Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? *"
-PYTHON_MODNAME="uwsgidecorators"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
-USE_RUBY="ruby18 ree18 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
-
-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 +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] )
-	)
-	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" \
-		"${FILESDIR}/${PV}-fixed-typecasting.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"
-
-	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
-udp = true
-multicast = true
-threading = true
-sendfile = true
-minterpreters = true
-async = true
-evdis = false
-ldap = $(use_true_false ldap)
-pcre = $(use_true_false pcre)
-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, fastrouter, http, ugreen, signal, logsocket, router_uwsgi, router_redirect, router_basicauth, zergpool, redislog ${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"
-}
-
-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
-		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 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-r1 uwsgi
-	newconfd "${FILESDIR}"/uwsgi.confd-r1 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.9.6.ebuild b/www-servers/uwsgi/uwsgi-1.9.6.ebuild
deleted file mode 100644
index c8ff0f058263..000000000000
--- a/www-servers/uwsgi/uwsgi-1.9.6.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-1.9.6.ebuild,v 1.1 2013/04/20 00:31:37 zx2c4 Exp $
-
-EAPI="5"
-PYTHON_DEPEND="python? *"
-PYTHON_MODNAME="uwsgidecorators"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
-USE_RUBY="ruby18 ree18 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=""
-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"
-
-	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.ebuild b/www-servers/uwsgi/uwsgi-2.0.ebuild
new file mode 100644
index 000000000000..e2bd273e25f4
--- /dev/null
+++ b/www-servers/uwsgi/uwsgi-2.0.ebuild
@@ -0,0 +1,351 @@
+# 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.ebuild,v 1.1 2014/01/16 13:40:41 ultrabug Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_{6,7} python3_{2,3} )
+
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby19 ruby20 ruby21"
+
+PHP_EXT_INI="no"
+PHP_EXT_NAME="dummy"
+PHP_EXT_OPTIONAL_USE="php"
+USE_PHP="php5-3 php5-4 php5-5" # deps must be registered separately below
+
+MY_P="${P/_/-}"
+
+inherit apache-module distutils-r1 eutils multilib pax-utils php-ext-source-r2 python-r1 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"
+
+UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool
+	http ugreen signal syslog rsyslog
+	router_{uwsgi,redirect,basicauth,rewrite,http,cache,static,memcached,redis,hash,expires,metrics}
+	{core,fast,raw,ssl}router
+	redislog mongodblog log{file,socket}
+	spooler cheaper_busyness symcall
+	transformation_{chunked,gzip,offload,tofile}
+	zergpool )
+UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron
+	dumbloop echo emperor_{amqp,pg,zeromq} forkptyrouter
+	geoip graylog2 legion_cache_fetch ldap log{crypto,pipe} notfound pam
+	router_{access,radius,spnego,xmldir}
+	sqlite ssi stats_pusher_statsd
+	systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix )
+
+LANG_SUPPORT_SIMPLE=( cgi perl ) # plugins which can be built in the main build process
+LANG_SUPPORT_EXTENDED=( lua php python python_gevent ruby )
+
+# plugins to be ignored (for now):
+# cheaper_backlog2: example plugin
+# coroae: TODO
+# cplusplus: partially example code, needs explicit class
+# dummy: no idea
+# example: example plugin
+# exception_log: example plugin
+# *go*: TODO
+# *java*: TODO
+# *mono*: TODO
+# v8: TODO
+# matheval: TODO
+IUSE="apache2 +caps debug +embedded expat jemalloc json +pcre +routing +ssl +xml yajl yaml zeromq"
+
+for plugin in ${UWSGI_PLUGINS_STD[@]}  ; do IUSE="${IUSE} +uwsgi_plugins_${plugin}" ; done
+for plugin in ${UWSGI_PLUGINS_OPT[@]}  ; do IUSE="${IUSE} uwsgi_plugins_${plugin}" ; done
+IUSE="${IUSE} ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]}"
+
+REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
+	uwsgi_plugins_logcrypto? ( ssl )
+	uwsgi_plugins_sslrouter? ( ssl )
+	routing? ( pcre )
+	uwsgi_plugins_emperor_zeromq? ( zeromq )
+	uwsgi_plugins_router_xmldir? ( xml )
+	uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	python_gevent? ( python )
+	expat? ( xml )"
+
+# util-linux is required for libuuid when requesting zeromq support
+# Order:
+# 1. Unconditional
+# 2. General features
+# 3. Plugins
+# 4. Language/app support
+CDEPEND="sys-libs/zlib
+	apache2? ( www-servers/apache )
+	caps? ( sys-libs/libcap )
+	json? ( !yajl? ( dev-libs/jansson )
+		yajl? ( dev-libs/yajl ) )
+	pcre? ( dev-libs/libpcre:3 )
+	ssl? ( dev-libs/openssl )
+	xml? ( !expat? ( dev-libs/libxml2 )
+		expat? ( dev-libs/expat ) )
+	yaml? ( dev-libs/libyaml )
+	zeromq? ( net-libs/zeromq sys-apps/util-linux )
+	uwsgi_plugins_alarm_curl? ( net-misc/curl )
+	uwsgi_plugins_alarm_xmpp? ( net-libs/gloox )
+	uwsgi_plugins_curl_cron? ( net-misc/curl )
+	uwsgi_plugins_emperor_pg? ( dev-db/postgresql-base:= )
+	uwsgi_plugins_geoip? ( dev-libs/geoip )
+	uwsgi_plugins_ldap? ( net-nds/openldap )
+	uwsgi_plugins_pam? ( virtual/pam )
+	uwsgi_plugins_sqlite? ( dev-db/sqlite:3 )
+	uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers )
+	uwsgi_plugins_router_spnego? ( virtual/krb5 )
+	uwsgi_plugins_rsyslog? ( app-admin/rsyslog )
+	uwsgi_plugins_systemd_logger? ( sys-apps/systemd )
+	uwsgi_plugins_webdav? ( dev-libs/libxml2 )
+	uwsgi_plugins_xslt? ( dev-libs/libxslt )
+	lua? ( dev-lang/lua )
+	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] )
+		php_targets_php5-5? ( dev-lang/php:5.5[embed] )
+	)
+	python? ( ${PYTHON_DEPS} )
+	python_gevent? ( >=dev-python/gevent-1.0_beta2[$(python_gen_usedep 'python2*')] )
+	ruby? ( $(ruby_implementations_depend) )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool )"
+
+S="${WORKDIR}/${MY_P}"
+APXS2_S="${S}/apache2"
+APACHE2_MOD_CONF="42_mod_uwsgi-r1 42_mod_uwsgi"
+
+src_unpack() {
+	default
+}
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/1.1.2-threaded-php.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|/lib|/$(get_libdir)|" \
+		plugins/php/uwsgiplugin.py || die "sed failed"
+}
+
+src_configure() {
+	local embedded_plugins=()
+	local plugins=()
+	local malloc_impl="libc"
+	local json="false"
+	local xml="false"
+
+	for p in ${UWSGI_PLUGINS_STD[@]} ${UWSGI_PLUGINS_OPT[@]} ; do
+		use uwsgi_plugins_${p} && embedded_plugins+=("${p}")
+	done
+	for p in ${LANG_SUPPORT_SIMPLE[@]} ; do
+		use ${p} && plugins+=("${p}")
+	done
+
+	# do not embedded any plugins
+	if ! use embedded ; then
+		plugins=( ${plugins[@]} ${embedded_plugins[@]} )
+		embedded_plugins=()
+	fi
+
+	# flatten the arrays
+	plugins=${plugins[@]}
+	embedded_plugins=${embedded_plugins[@]}
+
+	# rename some of the use flags, language plugins are always real plugins
+	plugins="${plugins/perl/psgi}"
+	plugins="${plugins/sqlite/sqlite3}"
+	embedded_plugins="${embedded_plugins/sqlite/sqlite3}"
+
+	# override defaults as requested by the user
+	use xml && (use expat && xml="expat" || xml="libxml2" )
+	use json && (use yajl && xml="yajl" || xml="jansson" )
+	use jemalloc && malloc_impl="jemalloc"
+
+	# prepare the buildconf for gentoo
+	cp "${FILESDIR}"/gentoo.buildconf buildconf/gentoo.ini
+	sed -i \
+		-e "s|VAR_XML|${xml}|" \
+		-e "s|VAR_YAML|$(usex yaml true false)|" \
+		-e "s|VAR_JSON|${json}|" \
+		-e "s|VAR_SSL|$(usex ssl true false)|" \
+		-e "s|VAR_PCRE|$(usex pcre true false)|" \
+		-e "s|VAR_ZMQ|$(usex zeromq true false)|" \
+		-e "s|VAR_ROUTING|$(usex routing true false)|" \
+		-e "s|VAR_DEBUG|$(usex debug true false)|" \
+		-e "s|VAR_MALLOC|${malloc_impl}|" \
+		-e "s|VAR_PLUGINS|${plugins// /, }|" \
+		-e "s|VAR_PLUGIN_DIR|/usr/$(get_libdir)/uwsgi|" \
+		-e "s|VAR_BUILD_DIR|${T}/plugins|" \
+		-e "s|VAR_EMBEDDED|${embedded_plugins// /, }|" \
+		buildconf/gentoo.ini
+
+	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 uwsgi_plugins_emperor_pg ; 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/emperor_pg/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
+}
+
+python_compile_plugins() {
+	local EPYV
+	local PYV
+	EPYV=${EPYTHON/.}
+	PYV=${EPYV/python}
+
+	${PYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed"
+
+	if use python_gevent ; then
+		${PYTHON} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${PYV} || die "building plugin for gevent-support in ${EPYTHON} failed"
+	fi
+}
+
+python_install_symlinks() {
+	dosym uwsgi /usr/bin/uwsgi_${EPYTHON/.}
+}
+
+src_compile() {
+	mkdir -p "${T}/plugins"
+
+	python uwsgiconfig.py --build gentoo || die "building uwsgi failed"
+
+	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 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
+		python_foreach_impl python_compile_plugins
+	fi
+
+	if use ruby ; then
+		ruby-ng_src_compile
+	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 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_foreach_impl python_install_symlinks
+		python_foreach_impl python_domodule uwsgidecorators.py
+	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 uwsgi_plugins_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 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
+
+	python_pkg_postinst() {
+		elog "  '--plugins ${EPYTHON}' for ${EPYTHON}"
+		if use python_gevent ; then
+			if [[ ${EPYTHON} == python2* ]] ; then
+				elog "  '--plugins ${EPYTHON},gevent-${EPYTHON}' for gevent support in ${EPYTHON}"
+			else
+				elog "  (gevent is currently not support in ${EPYTHON})"
+			fi
+		fi
+	}
+
+	use python && python_foreach_impl python_pkg_postinst
+
+	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
+}