net-im/ejabberd: Bump version

Commit on behalf of Vadim Efimov <evadim@evadim.ru>.  Clean up a bit the
ebuild attached to the bug report. Rebase ejabberdctl patch from
previous version over the new version.

Gentoo-Bug: 549724

Package-Manager: portage-2.2.27

4 files changed, 430 insertions, 1 deletions

diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index b3e9e0895883..d0c30fc0b3a9 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,3 +1,32 @@
+DIST cache_tab-1.0.1.zip 16719 SHA256 149eff4dfb01f633cab643f368e5f96825c26c85ae9e6c22de3f5792e5d3dc28 SHA512 ada72a578359909201d62ad775ca85969aed5cab9be31d38bd505f726434d08bb311f06654f3f26a3b639b9ae2742dd1950ba527489aef84f2ac0dfdb7fba0c8 WHIRLPOOL d026a7452274cb8cfd536da4c5dbabaf0414ddaa5fe835aa80d825d1afae9f952a71e61eaa825d89ee65f6a1d4db9714c3710e7ed36c8fac1be73730e732f362
+DIST eiconv-0.9.0.zip 101407 SHA256 fdaa09bcc79b556f2250c4693bc57c89ce474a5ea6ea12429cbb6c2d4ed3619b SHA512 44d0af378b9873dede92657c53557a565050cd4259598a1fe92e1c9bddc8219922ff093bfc20e380f3e39fc0d5648d6d6f72766a5847781cf2101dbd4b922fb6 WHIRLPOOL 97d97f527aaf4d0fb0176723bde464ab003b49b12acca1f657efe83f8c03186e6b4819f4aadedebb8e703e16cc4af23d317b6ebebe96a9a794e6aa78c8e6fc80
 DIST ejabberd-15.03.tar.xz 6274856 SHA256 3a6fd6e94d6f24575dcaff1aa7ca319944eb76970a9d3b6bf5f30819824143fc SHA512 b292b596094aeab576d9d4aadea47042eeda130881de5dd523985dc60cd0644726dae8d525364ec72992c0c45ba9e0673b7a6ffc2bc20613ba0092e2b285e16f WHIRLPOOL 630feba542f5d4bac1e4c17f453b2298a500c0d18159e8f09a4f11e9d372f7ffbf6e2e600c0ee849c689868872644404c03ebfb375d4852f3bbbd966417d951e
+DIST ejabberd-16.01.tgz 1651587 SHA256 e2cc479d5870539b2e6756690b227969c88a541d464d1fc6e1cbf7270ad7d681 SHA512 f0614db0d0eaf6d4f25b75b8eefbcf93260549876535fd5d82498c75779d182b19ec249ffb9b1b168cb5a887e8e6933eb868892b4aa5cd2933b739d263adca8a WHIRLPOOL 65bc13ba5e380a999ed2ae9c816856f90e24393343d16ae52349350687dfdb15857a3358d856de5694c30718cefc5513b9d3c75871bb368cac54547becc1607a
 DIST ejabberd-2.1.13.tgz 1999853 SHA256 a80d1c72e435da31758261cb0c04fe750ac71fc3e33a3b606123efd3b3abc86d SHA512 9348271f0cf1d9a7e6c53204121568e77820afc50fff1271e7b7ef66c5c5d7d067034c46472250423c4e9052046b18c1c8178f09eda0b0bfe25a1eac465fd07b WHIRLPOOL 2c366d2f7c4371db56f47f5492ef27028a589186eeddb7a6b4e8aac0537b1b80ee31a9760f0551063ce2c2a658b9b5eafb7ed25294e00eb69480231a599a7b10
 DIST ejabberd-mod_statsdx-1118.patch.gz 13989 SHA256 5e5d975e44248cf2b0d6dd0ecf4c477e8479b2b4d0bd531e80f4623fd787320e SHA512 99399323150990cda15e707385f0f26fa790d4ba188a97ac46daaaab9c25e72a7ec72a875573136f17a18648017074d76e4e267b544dc4c95a5101ed9ad6815d WHIRLPOOL 05997f03bb70136ee5e829ea9c55e3aeb0704150f1ed54f11c6cce382a82106129fc1a6ef35a62780837cd2b59fbb384fa10f3bb49813acaee8c5edc22ae3702
+DIST elixir-f2a9c7016633ca63541a8160c63a53eb7edbccdb.zip 1335681 SHA256 4ef8cd93e68a314bb4702547629f9be7a6bb840f6b7956aead6f51700e73c41a SHA512 a6e5170f8d3efc1d31aa82477f4ff377ea7205d106bbf633075df5bef0b22a276cc6897c2a8b7fcbbff269c9fe8378f4802876e0e2aecb90012c0c2165c2b8e8 WHIRLPOOL 716e45804df24b7a4a55e0ad81f72c9961e4066dd3e24b1e3cd1ba041c6c1dc8426d0feaf97580eaf9b369d0fee33cb9e3c26b71eaf6c91d318590e9e6b5ab0c
+DIST epam-1.0.0.zip 47889 SHA256 6704010b14034881d8c60f52d1a82d8125f20cdf1e52a7113c838f1db6be7e81 SHA512 710919ff2883a5e1a99703f3b72ad8a0d61c612b2af66b57b88a6bd9faddc64c61b8b44998feb37d3d3338d24d4c1d8d6a73d6836e254b8f8452249b41427c78 WHIRLPOOL 48a9fedc2fa52a7d5dc1cdcf11a48096798cd87d37987b709ffd0c6cf49881f9afec7fd85b3f8d84020e41920e129534d5f8d6adce92916370ab3a413d4919c9
+DIST eredis-cbc013f516e464706493c01662e5e9dd82d1db01.zip 133223 SHA256 707c54c568b6d07a4a1ac82a528cabef73469136cc14b4f69457e28de9827227 SHA512 fbaa323da0d668fc7147bc406dd4f00bd132d592d4fd3d61c2bee59f4b1c9390784a4c03737d6efd3b004855a92911878bfb11a966dc1853a785c9b10714f34f WHIRLPOOL d6713eef9328f70d6f003c4a27b560715d7a4c433d522dde3a99731e7b868353082b2ba62060fcefc6241977713627b57353ba47919553fe6eb47a554d3b7264
+DIST erlang-sqlite3-cbc3505f7a131254265d3ef56191b2581b8cc172.zip 1843206 SHA256 10db9c7f1a8b8fe16e5e5695a3085584c63dc6d074e56d5e8595e2cc82d0679d SHA512 37f0530e83d69efa02ad1bbc98a4da760d93a8fe764086832bc838a0905843e635d342917c6c6784d1cb3f87f8af8a27189d87a25096bfccf36a561bd66e9696 WHIRLPOOL f25270e56bfd0a168c4a20ce0eb016ec3ee8313d5a78de221134e34ccc7cfa6c4a59d78374c9ae08daf1cdc8f76f26028a796b4b8065664b1a47df7450d0883e
+DIST erlang_protobuffs-6e7fc924506e2dc166a6170e580ce1d95ebbd5bd.zip 255081 SHA256 a8d329ca06631951e8dd723ee07a28d84056efdfcf107ffc4390773de2c2652d SHA512 58d01ef598ca4b1894353a57cc561889b4b80f032df3bee1a0661edcb1f02775177a3655e85526ac855af128700a528987ad64854e3a4e6bf885778d0c76cc85 WHIRLPOOL 5f221d1bfe61f23290bbd5067a1c60a15e302cfb484df592bd92a27788803e7b66ca560a0ef575c592ab33a684f8fa0a5eeed31d6a2281fa388fd6d1eebc3871
+DIST goldrush-212299233c7e7eb63a97be2777e1c05ebaa58dbe.zip 36124 SHA256 529fd62c47a995e6efa4e96a015402177bc54d6f6c68e035799025679223f359 SHA512 af9999a8e687e3f06b2cbbdac2cc2933e4a136698661da350e16b1ecac34bbccdae9175d5a4e1ce2a4e237d0d8e846fcfb00d3a7143a5ac0c230a73dfef6c660 WHIRLPOOL 5cff5953b8c4096d8ec402f3be6ee94e839e50d3c087468d48c63ce914a50f35c80f93f2920564cdd74faeaa5047eb8a7176045c834347ffcc2566333540f4b8
+DIST hamcrest-erlang-908a24fda4a46776a5135db60ca071e3d783f9f6.zip 174732 SHA256 74c28779da72861132cc4c641dcafd1185e0579280b092fd2eeee6089e02cfcf SHA512 0110f69640cdd762a0d939fcda9d3a3da5942335f31b580dd7712c2c50ba53ec97b43f6d5f059db075597d7978e3b089f83dce1d86eb586cad80832ef8612406 WHIRLPOOL 1fff0a6d979309c657a139d37b26e8ccf3e3f0b779c55d1db0bd5e27a557733a9d95e4f63714a495e5926176aa37410df2eb68adf268b9e27fde7eb7fa8c5475
+DIST jiffy-0.14.5.zip 1899711 SHA256 80e7bc14aab3e9dbfb6b930eb99807843bce9902c37cba145f601e1d47e3633b SHA512 f8a021111501db2646b1b806a9260f2eda40d7aa4d58454fb445e75dbaeb9efcda74403b0c2a1d00a7d102ee9133abb813980692842fd4c899c42a2588f07e5f WHIRLPOOL 7f55d12e016058ad0c126a6721f8e05215518c49e088d4c6ca861073174c0de1f9ef599fc1278584ce4f120581072525ed9b6b312a882c7260a77137fe9be0e6
+DIST lager-3.0.2.zip 254249 SHA256 ccb4811774b847fa31b35dbd85edde0560406b1a0dc9c3f2dc71d69ccf687e61 SHA512 69143704067a5a757713d9fb127bac0ef799bb4d6a06e47d9426f1893a0156ad31289b42f55b8ff5a5b15ec8b3b82548485989eae75ef84641e5b4728a89811e WHIRLPOOL d91d106c8fea377e9a30df4d55c74f9b4768c0f3f265f19a69c50465b6479fcd836b9a4b203b2feeb69d00da83ce83b63b7e1e8649a4c29e63c3f779a7301799
+DIST meck-0.8.2.zip 222637 SHA256 c6ba50da30d30e904067f9ea661028dbea3b33c4c5f7631c1fb893ac264f91ec SHA512 58b98b665f56c1b0416e47e7f7e7b94cfbcaca2dc26571802ebb6cdb6fb79ab6207e27a0ee981efa25ed034b602f0abcac33ee4ac23ffef19ba2c02aa845d4e3 WHIRLPOOL d104084426cda735758a8ad4e46819a926431826bb1f32dfbaede39ce5acda920992ea744f852b39cf608bb69c350e7b42b143c7d248adb09f7b45fd0c5dbf39
+DIST mysql-1.0.0.zip 21330 SHA256 3d240192062ee8e78be218b7f365ff5ade5beeef16bd8315077338f4cb2c20b9 SHA512 554573b8d570bb001998196e44d71ae7fc0c87f35badaa3dc2a39695fb847d49ef95e140bf0668843e5593a78e35cc8ababb8cd9f181718c4434bc965f7eea0e WHIRLPOOL 7f3b6ac53e504cd311251fce1eeb3854f333c073b13b65e333139d4071cfac2df3cd9afb943f57a0f5de6468bc7d06e8da63134643ae09c7106fcdc7b7073b40
+DIST oauth2-8d129fbf8866930b4ffa6dd84e65bd2b32b9acb8.zip 225059 SHA256 8e043e96eabd4ced74f7f5b6c4ff6606c3027bc9ca9d807f6a348f4e0e4c66b3 SHA512 c9257054f579badfa78653b9deaabdd4fa71f84b742bdfb2dab1fb0fffa52d40b6236f01523c67ecc61068d9dbfd4a2ab2c19b9b90fa926dc359f76cfa18085b WHIRLPOOL 2e35022969739844a9b08cbd3149c204cd6798d6f8f009134a3c0d2cc14e46d6c3ef06f9d87a8f65a2cbb6915087be643a7040498ee4c1698d1a14978381ecb4
+DIST p1_logger-1.0.0.zip 21168 SHA256 416026a99ee3ae739d1cb7cccfe0546635e441b16433cd8e5ff0a76e8f72a9c0 SHA512 11dafee5ba7d726a5f526583533d8ce1a5cf247c16b1ed4c2617a8cc46fcb3dc9358c70e6924c4b7b5b6911d99fa8a57adfc8b3b40ade6cc798f0f5c2b040810 WHIRLPOOL c4cb246c0d9121f2d9097b5cf63372f14a32f3b147202763a605e519f80fa60e1331a1ad5a03ca32445df2555aeaaa5f6fd79d44b2cf4ebdce0ebc514a9b1713
+DIST p1_sip-1.0.0.zip 268267 SHA256 d21b4468f32483817ddd81aef1896e112939118c6c93768a241ab37a10649171 SHA512 987051968696a04969e00e5a43e5787cfdd52c453829b822b2ed065fa31e265ddef4e367ec5bb0d1ed260e3b46a5085efbc845195c29b6d8c14e2a85a31204b3 WHIRLPOOL e5254cbb8fb57324da3fab5708f390d6ef52e29f47da72707b4f6f27d87c55d7963dd6669c96dfe58be44578b0cec38f95efc3dcff3dc60d44c405a601a4c0bb
+DIST p1_utils-1.0.2.zip 41661 SHA256 9fd24f82aecbe6681a4cff9d3e515847afc77d1562ace5b704f2b566de0ffc8d SHA512 836db43bec11405bc229c4b6e7aff4d17869d32b9d51b523447b3fe53523d527db9aeb5b69d3c1fc010ebed1f597814d1b403331aadae5bfca97845082aa3d0b WHIRLPOOL cf0e8b1b5a8b4b70ebb3a6041bab1c90ac953c678cd7e6c9cf0519c2c9a5e416ad0fbb3be53d79170073f71603f7607261ce6e35c50890297a0ae9cd26fcdc38
+DIST p1_yaml-1.0.0.zip 196536 SHA256 02d60f14b5510469bdff8a9ce091035cde6b87ee44e896ec11c18c3479f09ebe SHA512 105cc9c29db5bf6635c24b1be44a06e4c982b8d03de56655a6a7ed7c24343d47652279243f3fc28417dde023cc570c519d5f2bbf9ba57f343459a61225e7476e WHIRLPOOL 8893fd98a00170fc8f1f7f51212f48027fefa068d61b75ef15d4785d6735d81e35c74bf98f30e7f6f693dcb6b4016a399ac692d8249fef0d2c2006712f35fccf
+DIST pgsql-1.0.0.zip 19384 SHA256 470bfee28dc0ce4d93fb7bf4d59e782e49dc03a040db5471d9f1e09c37f8a0c2 SHA512 9b637a337a14cd0175c3f64d34056e28957d8c38b2f151b0f4be489667ebc7231b7295523f7bf6328a0cd565a2b00b1ec81b8e885e33b2a79c3298fce908b517 WHIRLPOOL 281c13ac3151b70b56a07f172451c7af746e2a26c349126fc720a0588b35f86f66c1649b9122449468614d3158654991b3c257ce0a06a53194a893ddbdc1033c
+DIST rebar_elixir_plugin-0.1.0.zip 6553 SHA256 b9760890b74827805a35899c9c2e237c1b3e0f651446871b5095bb49e98bd09d SHA512 e4733c76fdb1f09222cbbbf61dbf274c39b3ec9ca286502782cbf6f967afcb6047e0d0f5464f4821f8ae8df7e7f156c21014c719147da029dbff29197047b7bf WHIRLPOOL cf003c2f232f70d5879561c8de13b6b5d8c238085b17d6dfcb7a71ea3728d687b8f4c5f1f114ec0d2934c0b52fe3de472aae7efb6ec42f5ef446f932c7decbbb
+DIST riak-erlang-client-527722d12d0433b837cdb92a60900c2cb5df8942.zip 242131 SHA256 ef3539206f774b1680a36c4ae50dc764b9b87a60efa2225d0b69c7064b24140e SHA512 e228be58754867a2f2084683c326ebc973b4e520d3ef33171b49833c33be8dda7749c09f8368a7cc92b67b866185efada1062a172515cf69340a75d50e97f35d WHIRLPOOL 651b3e3eedbcae36c21bdfe551623945be709a2890da28b352ba74f5a96c6d23eefe756fe9f6652c7dbfbb3e40330dd3fdf319eafa7372fe26e6bfc3590ab4a6
+DIST riak_pb-1a43334c03cfe81712c71c6f166b68fe9270f008.zip 235172 SHA256 485295f8123c163d43767ead3c66e58c4bc7e4f13a2dd55be6de263b51c42a4a SHA512 5c56bfbccd6c6bfa82f1772cbbf7228ed46ee23078c7eda2d2251ec0c97dae46786df8f17aa65fe672f89f425e86cfe07a37bf50a3a8f0c0747a9604c43d1d1a WHIRLPOOL d28aff0cc311dd9345a705b8e8d4066b26e8b25d6896c98e96098b5649bafced51b2b6437f282017a61c653efc54777d794834318da468ec2e10bb02c1d9a187
+DIST stringprep-1.0.0.zip 101552 SHA256 e2a71b59084f9556133a9c99ba4a6621f4853abfb902fa1301224d2fd6791aef SHA512 7b724c8eb888e3683b421220c823553ba695fb4d94225fcc968f2f8f1386a5090a0e2fd85113ebb7d67c50f687011ad461802cb89a52b4a26c02b03c9e72f123 WHIRLPOOL 46a1ceb7db35d7c231c12e47c0ea9599c9809bc763b90aa241b6b0dfca71d0d04f0b933c99c002805dc9f70f776585ed2e7b62ba47bf0cf61f05ae086d5dc97a
+DIST stun-0.9.0.zip 38634 SHA256 c99f2965f8832488abc8ad753afd538f6f492dd5bea1889cb4a787ed4bc2b7c6 SHA512 d4210ad5563aae291a6239256090c1dab4e98b62ece7474f25107a4bf6ba2e65d1c9858b26967a9546f81b64386979e4c020142a089be04d1b12f2f09353a38e WHIRLPOOL 564a14fbbf09ad6f9709d0b57004628105c63f35d9533c84bbb831c93eb392b914fa9cab419569a433d63f48ddd72d3f2b612d3260b22bcc1f08f02feaffca68
+DIST tls-1.0.0.zip 66622 SHA256 1434a7f580839f427b455b4f49ac504d26d97e9836f3bbdf59a130611a37c0f4 SHA512 84533d13e3aa631359e962597d3ea63d899a4bc4c776f05fcc78e46e3de9319ecbc653363c809f0a98c0a27e685f332cde64587b86bc9bb5a968058352beab06 WHIRLPOOL 89862f08f68e6bf478c1e25b168ae57c7fb7d253e953a3609f768f8aee8d42fb83ef09d317f05d4e6b7984a2da7a35ca735dfa4b5a3940ac10f4818caa238f04
+DIST xml-1.1.1.zip 94306 SHA256 2a9013ca2756dcd4c8b3387fcfa21ecc36b3e8cf50dd27afc8b80776f4c0892d SHA512 ccfd6929498b2f9ed17c4b7a1d0be13172b9a8304b00c3cbdfb49cc7df054c76cdf06844fa29fef7d17d45e5e2717c8fea22cd1eac61cf8293545310fe9098e7 WHIRLPOOL 1fb22cb2845c699a5fc8a8291d1ec804fa22e2c169b65f00ade151484a4c4d0d38a4cb9f1e90f3adad8eefb38c425823579d0b3ff90987b343b246607c19bae8
+DIST xmlrpc-1.15.zip 139769 SHA256 841488a5405f4a32182cae863c7305464daba7ed150dca55ec5b04f198df503a SHA512 a96fa31422e95b75afcdecd844fe020bb1be9144fc31d957a238658498d8ae4b8ed069d27e06ed105230b42a4fd4c37d95b4a09c96dbffd60e6a49faae94eead WHIRLPOOL cba32ff8c0024de1fff30620bbb0d93c1a49beb74ec1f58eeffc4de683ce1ad3743e2e30217834b285016a9cc4a7de596dfc8f6597a22fb5eb74478d12e2c7e0
+DIST zlib-1.0.0.zip 48754 SHA256 82f934a5ea146195a3046e56b38ef7bbdb3f04dbc6c5c05bec4245384f010a15 SHA512 f4598dd2e4dd5b27b9599d3aecdba690368d684a81309838655bf8dfc338573cf227f49aa0976940b7fd9ea97f7e881fdf88fea128fdc7bc99f2d78ffe42264a WHIRLPOOL def5ec392f3ba133a3b7462cc10edee41585c2f1d8580ccfbd4bb74f2fb327aa1d7a10b4a3fbe3b21c56aeab224861ea91e632758fd2e36f7f89ed0d8f2790be
diff --git a/net-im/ejabberd/ejabberd-16.01.ebuild b/net-im/ejabberd/ejabberd-16.01.ebuild
new file mode 100644
index 000000000000..3415ae6da4b1
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-16.01.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+declare -A PLUGINS{_REPO_NAME,_COMMIT,_URL,_PV}
+declare -A mods
+
+# regenerate url list
+#for i in *; do pushd $i > /dev/null; name="$i"; rev=`git show-ref -s HEAD`; url=`git config remote.origin.url`; repo_base=`dirname "$url"`; repo_name=`basename "$url"`; echo "PLUGINS_REPO_NAME[$name]=$repo_name"; echo "PLUGINS_COMMIT[$name]=$rev"; echo "PLUGINS_PV[$name]=\"\${PLUGINS_REPO_NAME[$name]}-\${PLUGINS_COMMIT[$name]}\""; echo "PLUGINS_URL[$name]=\"$repo_base/\${PLUGINS_REPO_NAME[$name]}/archive/\${PLUGINS_COMMIT[$name]}.zip\""; echo; popd > /dev/null; done
+
+PLUGINS_REPO_NAME[cache_tab]=cache_tab
+PLUGINS_COMMIT[cache_tab]=1.0.1
+PLUGINS_PV[cache_tab]="${PLUGINS_REPO_NAME[cache_tab]}-${PLUGINS_COMMIT[cache_tab]}"
+PLUGINS_URL[cache_tab]="https://github.com/processone/${PLUGINS_REPO_NAME[cache_tab]}/archive/${PLUGINS_COMMIT[cache_tab]}.zip"
+
+PLUGINS_REPO_NAME[elixir]=elixir
+PLUGINS_COMMIT[elixir]=f2a9c7016633ca63541a8160c63a53eb7edbccdb
+PLUGINS_PV[elixir]="${PLUGINS_REPO_NAME[elixir]}-${PLUGINS_COMMIT[elixir]}"
+PLUGINS_URL[elixir]="https://github.com/elixir-lang/${PLUGINS_REPO_NAME[elixir]}/archive/${PLUGINS_COMMIT[elixir]}.zip"
+
+PLUGINS_REPO_NAME[eredis]=eredis
+PLUGINS_COMMIT[eredis]=cbc013f516e464706493c01662e5e9dd82d1db01
+PLUGINS_PV[eredis]="${PLUGINS_REPO_NAME[eredis]}-${PLUGINS_COMMIT[eredis]}"
+PLUGINS_URL[eredis]="https://github.com/wooga/${PLUGINS_REPO_NAME[eredis]}/archive/${PLUGINS_COMMIT[eredis]}.zip"
+
+PLUGINS_REPO_NAME[esip]=p1_sip
+PLUGINS_COMMIT[esip]=1.0.0
+PLUGINS_PV[esip]="${PLUGINS_REPO_NAME[esip]}-${PLUGINS_COMMIT[esip]}"
+PLUGINS_URL[esip]="https://github.com/processone/${PLUGINS_REPO_NAME[esip]}/archive/${PLUGINS_COMMIT[esip]}.zip"
+
+PLUGINS_REPO_NAME[goldrush]=goldrush
+PLUGINS_COMMIT[goldrush]=212299233c7e7eb63a97be2777e1c05ebaa58dbe
+PLUGINS_PV[goldrush]="${PLUGINS_REPO_NAME[goldrush]}-${PLUGINS_COMMIT[goldrush]}"
+PLUGINS_URL[goldrush]="https://github.com/DeadZen/${PLUGINS_REPO_NAME[goldrush]}/archive/${PLUGINS_COMMIT[goldrush]}.zip"
+
+PLUGINS_REPO_NAME[hamcrest]=hamcrest-erlang
+PLUGINS_COMMIT[hamcrest]=908a24fda4a46776a5135db60ca071e3d783f9f6
+PLUGINS_PV[hamcrest]="${PLUGINS_REPO_NAME[hamcrest]}-${PLUGINS_COMMIT[hamcrest]}"
+PLUGINS_URL[hamcrest]="https://github.com/hyperthunk/${PLUGINS_REPO_NAME[hamcrest]}/archive/${PLUGINS_COMMIT[hamcrest]}.zip"
+
+PLUGINS_REPO_NAME[jiffy]=jiffy
+PLUGINS_COMMIT[jiffy]=0.14.5
+PLUGINS_PV[jiffy]="${PLUGINS_REPO_NAME[jiffy]}-${PLUGINS_COMMIT[jiffy]}"
+PLUGINS_URL[jiffy]="https://github.com/davisp/${PLUGINS_REPO_NAME[jiffy]}/archive/${PLUGINS_COMMIT[jiffy]}.zip"
+
+PLUGINS_REPO_NAME[lager]=lager
+PLUGINS_COMMIT[lager]=3.0.2
+PLUGINS_PV[lager]="${PLUGINS_REPO_NAME[lager]}-${PLUGINS_COMMIT[lager]}"
+PLUGINS_URL[lager]="https://github.com/basho/${PLUGINS_REPO_NAME[lager]}/archive/${PLUGINS_COMMIT[lager]}.zip"
+
+PLUGINS_REPO_NAME[meck]=meck
+PLUGINS_COMMIT[meck]=0.8.2
+PLUGINS_PV[meck]="${PLUGINS_REPO_NAME[meck]}-${PLUGINS_COMMIT[meck]}"
+PLUGINS_URL[meck]="https://github.com/eproxus/${PLUGINS_REPO_NAME[meck]}/archive/${PLUGINS_COMMIT[meck]}.zip"
+
+PLUGINS_REPO_NAME[oauth2]=oauth2
+PLUGINS_COMMIT[oauth2]=8d129fbf8866930b4ffa6dd84e65bd2b32b9acb8
+PLUGINS_PV[oauth2]="${PLUGINS_REPO_NAME[oauth2]}-${PLUGINS_COMMIT[oauth2]}"
+PLUGINS_URL[oauth2]="https://github.com/kivra/${PLUGINS_REPO_NAME[oauth2]}/archive/${PLUGINS_COMMIT[oauth2]}.zip"
+
+PLUGINS_REPO_NAME[p1_iconv]=eiconv
+PLUGINS_COMMIT[p1_iconv]=0.9.0
+PLUGINS_PV[p1_iconv]="${PLUGINS_REPO_NAME[p1_iconv]}-${PLUGINS_COMMIT[p1_iconv]}"
+PLUGINS_URL[p1_iconv]="https://github.com/processone/${PLUGINS_REPO_NAME[p1_iconv]}/archive/${PLUGINS_COMMIT[p1_iconv]}.zip"
+
+PLUGINS_REPO_NAME[p1_logger]=p1_logger
+PLUGINS_COMMIT[p1_logger]=1.0.0
+PLUGINS_PV[p1_logger]="${PLUGINS_REPO_NAME[p1_logger]}-${PLUGINS_COMMIT[p1_logger]}"
+PLUGINS_URL[p1_logger]="https://github.com/processone/${PLUGINS_REPO_NAME[p1_logger]}/archive/${PLUGINS_COMMIT[p1_logger]}.zip"
+
+PLUGINS_REPO_NAME[p1_mysql]=mysql
+PLUGINS_COMMIT[p1_mysql]=1.0.0
+PLUGINS_PV[p1_mysql]="${PLUGINS_REPO_NAME[p1_mysql]}-${PLUGINS_COMMIT[p1_mysql]}"
+PLUGINS_URL[p1_mysql]="https://github.com/processone/${PLUGINS_REPO_NAME[p1_mysql]}/archive/${PLUGINS_COMMIT[p1_mysql]}.zip"
+
+PLUGINS_REPO_NAME[p1_pam]=epam
+PLUGINS_COMMIT[p1_pam]=1.0.0
+PLUGINS_PV[p1_pam]="${PLUGINS_REPO_NAME[p1_pam]}-${PLUGINS_COMMIT[p1_pam]}"
+PLUGINS_URL[p1_pam]="https://github.com/processone/${PLUGINS_REPO_NAME[p1_pam]}/archive/${PLUGINS_COMMIT[p1_pam]}.zip"
+
+PLUGINS_REPO_NAME[p1_pgsql]=pgsql
+PLUGINS_COMMIT[p1_pgsql]=1.0.0
+PLUGINS_PV[p1_pgsql]="${PLUGINS_REPO_NAME[p1_pgsql]}-${PLUGINS_COMMIT[p1_pgsql]}"
+PLUGINS_URL[p1_pgsql]="https://github.com/processone/${PLUGINS_REPO_NAME[p1_pgsql]}/archive/${PLUGINS_COMMIT[p1_pgsql]}.zip"
+
+PLUGINS_REPO_NAME[p1_stringprep]=stringprep
+PLUGINS_COMMIT[p1_stringprep]=1.0.0
+PLUGINS_PV[p1_stringprep]="${PLUGINS_REPO_NAME[p1_stringprep]}-${PLUGINS_COMMIT[p1_stringprep]}"
+PLUGINS_URL[p1_stringprep]="https://github.com/processone/${PLUGINS_REPO_NAME[p1_stringprep]}/archive/${PLUGINS_COMMIT[p1_stringprep]}.zip"
+
+PLUGINS_REPO_NAME[p1_stun]=stun
+PLUGINS_COMMIT[p1_stun]=0.9.0
+PLUGINS_PV[p1_stun]="${PLUGINS_REPO_NAME[p1_stun]}-${PLUGINS_COMMIT[p1_stun]}"
+PLUGINS_URL[p1_stun]="https://github.com/processone/${PLUGINS_REPO_NAME[p1_stun]}/archive/${PLUGINS_COMMIT[p1_stun]}.zip"
+
+PLUGINS_REPO_NAME[p1_tls]=tls
+PLUGINS_COMMIT[p1_tls]=1.0.0
+PLUGINS_PV[p1_tls]="${PLUGINS_REPO_NAME[p1_tls]}-${PLUGINS_COMMIT[p1_tls]}"
+PLUGINS_URL[p1_tls]="https://github.com/processone/${PLUGINS_REPO_NAME[p1_tls]}/archive/${PLUGINS_COMMIT[p1_tls]}.zip"
+
+PLUGINS_REPO_NAME[p1_utils]=p1_utils
+PLUGINS_COMMIT[p1_utils]=1.0.2
+PLUGINS_PV[p1_utils]="${PLUGINS_REPO_NAME[p1_utils]}-${PLUGINS_COMMIT[p1_utils]}"
+PLUGINS_URL[p1_utils]="https://github.com/processone/${PLUGINS_REPO_NAME[p1_utils]}/archive/${PLUGINS_COMMIT[p1_utils]}.zip"
+
+PLUGINS_REPO_NAME[p1_xml]=xml
+PLUGINS_COMMIT[p1_xml]=1.1.1
+PLUGINS_PV[p1_xml]="${PLUGINS_REPO_NAME[p1_xml]}-${PLUGINS_COMMIT[p1_xml]}"
+PLUGINS_URL[p1_xml]="https://github.com/processone/${PLUGINS_REPO_NAME[p1_xml]}/archive/${PLUGINS_COMMIT[p1_xml]}.zip"
+
+PLUGINS_REPO_NAME[p1_yaml]=p1_yaml
+PLUGINS_COMMIT[p1_yaml]=1.0.0
+PLUGINS_PV[p1_yaml]="${PLUGINS_REPO_NAME[p1_yaml]}-${PLUGINS_COMMIT[p1_yaml]}"
+PLUGINS_URL[p1_yaml]="https://github.com/processone/${PLUGINS_REPO_NAME[p1_yaml]}/archive/${PLUGINS_COMMIT[p1_yaml]}.zip"
+
+PLUGINS_REPO_NAME[p1_zlib]=zlib
+PLUGINS_COMMIT[p1_zlib]=1.0.0
+PLUGINS_PV[p1_zlib]="${PLUGINS_REPO_NAME[p1_zlib]}-${PLUGINS_COMMIT[p1_zlib]}"
+PLUGINS_URL[p1_zlib]="https://github.com/processone/${PLUGINS_REPO_NAME[p1_zlib]}/archive/${PLUGINS_COMMIT[p1_zlib]}.zip"
+
+PLUGINS_REPO_NAME[protobuffs]=erlang_protobuffs
+PLUGINS_COMMIT[protobuffs]=6e7fc924506e2dc166a6170e580ce1d95ebbd5bd
+PLUGINS_PV[protobuffs]="${PLUGINS_REPO_NAME[protobuffs]}-${PLUGINS_COMMIT[protobuffs]}"
+PLUGINS_URL[protobuffs]="https://github.com/basho/${PLUGINS_REPO_NAME[protobuffs]}/archive/${PLUGINS_COMMIT[protobuffs]}.zip"
+
+PLUGINS_REPO_NAME[rebar_elixir_plugin]=rebar_elixir_plugin
+PLUGINS_COMMIT[rebar_elixir_plugin]=0.1.0
+PLUGINS_PV[rebar_elixir_plugin]="${PLUGINS_REPO_NAME[rebar_elixir_plugin]}-${PLUGINS_COMMIT[rebar_elixir_plugin]}"
+PLUGINS_URL[rebar_elixir_plugin]="https://github.com/processone/${PLUGINS_REPO_NAME[rebar_elixir_plugin]}/archive/${PLUGINS_COMMIT[rebar_elixir_plugin]}.zip"
+
+PLUGINS_REPO_NAME[riakc]=riak-erlang-client
+PLUGINS_COMMIT[riakc]=527722d12d0433b837cdb92a60900c2cb5df8942
+PLUGINS_PV[riakc]="${PLUGINS_REPO_NAME[riakc]}-${PLUGINS_COMMIT[riakc]}"
+PLUGINS_URL[riakc]="https://github.com/basho/${PLUGINS_REPO_NAME[riakc]}/archive/${PLUGINS_COMMIT[riakc]}.zip"
+
+PLUGINS_REPO_NAME[riak_pb]=riak_pb
+PLUGINS_COMMIT[riak_pb]=1a43334c03cfe81712c71c6f166b68fe9270f008
+PLUGINS_PV[riak_pb]="${PLUGINS_REPO_NAME[riak_pb]}-${PLUGINS_COMMIT[riak_pb]}"
+PLUGINS_URL[riak_pb]="https://github.com/basho/${PLUGINS_REPO_NAME[riak_pb]}/archive/${PLUGINS_COMMIT[riak_pb]}.zip"
+
+PLUGINS_REPO_NAME[sqlite3]=erlang-sqlite3
+PLUGINS_COMMIT[sqlite3]=cbc3505f7a131254265d3ef56191b2581b8cc172
+PLUGINS_PV[sqlite3]="${PLUGINS_REPO_NAME[sqlite3]}-${PLUGINS_COMMIT[sqlite3]}"
+PLUGINS_URL[sqlite3]="https://github.com/alexeyr/${PLUGINS_REPO_NAME[sqlite3]}/archive/${PLUGINS_COMMIT[sqlite3]}.zip"
+
+PLUGINS_REPO_NAME[xmlrpc]=xmlrpc
+PLUGINS_COMMIT[xmlrpc]=1.15
+PLUGINS_PV[xmlrpc]="${PLUGINS_REPO_NAME[xmlrpc]}-${PLUGINS_COMMIT[xmlrpc]}"
+PLUGINS_URL[xmlrpc]="https://github.com/rds13/${PLUGINS_REPO_NAME[xmlrpc]}/archive/${PLUGINS_COMMIT[xmlrpc]}.zip"
+
+inherit eutils multilib pam ssl-cert systemd
+
+DESCRIPTION="The Erlang Jabber Daemon"
+HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/"
+SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
+	mysql?	( "${PLUGINS_URL[p1_mysql]}" -> "${PLUGINS_PV[p1_mysql]}.zip" )
+	postgres? ( "${PLUGINS_URL[p1_pgsql]}" -> "${PLUGINS_PV[p1_pgsql]}.zip" )
+	sqlite?	( "${PLUGINS_URL[sqlite3]}" -> "${PLUGINS_PV[sqlite3]}.zip" )
+	pam?	( "${PLUGINS_URL[p1_pam]}" -> "${PLUGINS_PV[p1_pam]}.zip" )
+	zlib?	( "${PLUGINS_URL[p1_zlib]}" -> "${PLUGINS_PV[p1_zlib]}.zip" )
+	riak?	( "${PLUGINS_URL[riakc]}" -> "${PLUGINS_PV[riakc]}.zip"
+		  "${PLUGINS_URL[riak_pb]}" -> "${PLUGINS_PV[riak_pb]}.zip"
+		  "${PLUGINS_URL[hamcrest]}" -> "${PLUGINS_PV[hamcrest]}.zip"
+		  "${PLUGINS_URL[protobuffs]}" -> "${PLUGINS_PV[protobuffs]}.zip" )
+	elixir?	( "${PLUGINS_URL[rebar_elixir_plugin]}" -> "${PLUGINS_PV[rebar_elixir_plugin]}.zip"
+		  "${PLUGINS_URL[elixir]}" -> "${PLUGINS_PV[elixir]}.zip" )
+	iconv?	( "${PLUGINS_URL[p1_iconv]}" -> "${PLUGINS_PV[p1_iconv]}.zip" )
+	lager?	( "${PLUGINS_URL[lager]}" -> "${PLUGINS_PV[lager]}.zip"
+		  "${PLUGINS_URL[goldrush]}" -> "${PLUGINS_PV[goldrush]}.zip" )
+	!lager?	( "${PLUGINS_URL[p1_logger]}" -> "${PLUGINS_PV[p1_logger]}.zip" )
+	tools?	( "${PLUGINS_URL[meck]}" -> "${PLUGINS_PV[meck]}.zip" )
+	redis?	( "${PLUGINS_URL[eredis]}" -> "${PLUGINS_PV[eredis]}.zip" )
+"
+
+mods[core]="p1_tls p1_stringprep p1_xml esip p1_stun p1_yaml p1_utils cache_tab jiffy oauth2 xmlrpc"
+
+for plugin in ${mods[core]} ; do
+	SRC_URI+=" ${PLUGINS_URL[$plugin]} -> ${PLUGINS_PV[$plugin]}.zip" ; done
+
+RESTRICT="mirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+EJABBERD_MODULES="mod_bosh mod_irc mod_muc mod_proxy65 mod_pubsub"
+IUSE="captcha debug elixir +iconv +lager ldap mssql mysql odbc pam postgres redis riak sqlite ssl tools +zlib ${EJABBERD_MODULES}"
+
+DEPEND=">=net-im/jabber-base-0.01
+	>=dev-libs/expat-1.95
+	>=dev-libs/libyaml-0.1.4
+	>=dev-lang/erlang-17.1[ssl]
+	odbc? ( dev-db/unixODBC[-minimal] )
+	ldap? ( =net-nds/openldap-2* )
+	dev-libs/openssl:0
+	captcha? ( media-gfx/imagemagick[truetype,png] )
+	zlib? ( >=sys-libs/zlib-1.2.3 )"
+RDEPEND="${DEPEND}
+	>=sys-apps/shadow-4.1.4.2-r3
+	elixir? ( !dev-lang/elixir )
+	pam? ( virtual/pam )"
+
+REQUIRED_USE="mssql? ( odbc )"
+
+# paths in net-im/jabber-base
+JABBER_ETC="${EPREFIX}/etc/jabber"
+#JABBER_RUN="/var/run/jabber"
+JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
+JABBER_LOG="${EPREFIX}/var/log/jabber"
+JABBER_DOC="${EPREFIX}/usr/share/doc/${PF}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ejabberdctl.patch
+
+	#emulate rebar unpack
+	mkdir "${S}/deps"
+	for plugin in ${!PLUGINS_COMMIT[@]}; do
+	    mv "$WORKDIR/${PLUGINS_PV[$plugin]}" "$S/deps/${plugin}" 2>/dev/null
+	done
+	touch "${S}"/deps/.got
+
+	#patch rebar dependency checks
+	sed -e "s/vsn, git/vsn, \"0.14.4\"/" \
+		-i deps/jiffy/src/jiffy.app.src || die
+
+	if use riak; then
+	sed -e "s/vsn, git/vsn, \"2.1.1\"/" \
+		-i deps/riakc/src/riakc.app.src || die
+	sed -e "s/vsn, git/vsn, \"2.1.0.7\"/" \
+		-i deps/riak_pb/src/riak_pb.app.src || die
+	sed -e "s/vsn, git/vsn, \"0.8.2\"/" \
+		-i deps/protobuffs/src/protobuffs.app.src || die
+	fi
+
+#	if use elixir; then
+#	sed -e "s/vsn, git/vsn, \"0.1.0\"/" \
+#		-i deps/rebar_elixir_plugin/src/rebar_elixir_plugin.app.src || die
+#	fi
+
+	# don't install release notes (we'll do this manually)
+	sed '/install .* [.][.]\/doc\/[*][.]txt $(DOCDIR)/d' -i Makefile.in || die
+	# Set correct paths from jabber-base package
+	sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${PF}:}" \
+		-e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \
+		-e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \
+		-e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \
+			-i Makefile.in || die
+	sed -e "/EJABBERDDIR=/{s:ejabberd:${PF}:}" \
+		-e "s|\(ETC_DIR=\){{sysconfdir}}.*|\1${JABBER_ETC}|" \
+		-e "s|\(LOGS_DIR=\){{localstatedir}}.*|\1${JABBER_LOG}|" \
+		-e "s|\(SPOOL_DIR=\){{localstatedir}}.*|\1${JABBER_SPOOL}|" \
+			-i ejabberdctl.template || die
+
+	# fix up the ssl cert paths in ejabberd.yml to use our cert and
+	# also use the correct pam service name
+	sed -e "s:/path/to/ssl.pem:/etc/ssl/ejabberd/server.pem:g" \
+		-e "s:pamservicename:xmpp:" \
+		-i ejabberd.yml.example || die
+
+	# correct path to captcha script in default ejabberd.yml
+	sed -e 's|\(captcha_cmd:[[:space:]]*"\).\+"|\1/usr/'$(get_libdir)'/erlang/lib/'${PN}'/'${P}'/priv/bin/captcha.sh"}|' \
+		-i ejabberd.yml.example || die
+
+	# disable mod_irc in ejabberd.yml
+	if ! use mod_irc; then
+		sed -e "s/{mod_irc,/%{mod_irc,/" \
+			-i ejabberd.yml.example || die
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)/erlang/lib/${PN}/" \
+		$(use_enable tools) \
+		$(use_enable odbc) \
+		$(use_enable mysql) \
+		$(use_enable mssql) \
+		$(use_enable pam) \
+		$(use_enable postgres pgsql) \
+		$(use_enable zlib) \
+		$(use_enable sqlite) \
+		$(use_enable riak) \
+		$(use_enable redis) \
+		$(use_enable iconv) \
+		$(use_enable elixir) \
+		$(use_enable debug) \
+		$(use_enable lager) \
+		--enable-user=jabber
+}
+
+src_compile() {
+	emake $(use debug && echo debug=true ejabberd_debug=true)
+}
+
+src_install() {
+	default
+
+	# Pam helper module permissions
+	# http://docs.ejabberd.im/admin/guide/configuration/#pam-authentication
+	if use pam; then
+		pamd_mimic_system xmpp auth account || die "Cannot create pam.d file"
+		local epamdir="p1_pam-${PLUGINS_COMMIT[p1_pam]}"
+		fowners root:jabber "/usr/$(get_libdir)/erlang/lib/${PN}/${epamdir}/priv/bin/epam"
+		fperms 4750 "/usr/$(get_libdir)/erlang/lib/${PN}/${epamdir}/priv/bin/epam"
+	fi
+
+	newinitd "${FILESDIR}"/${PN}-3.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}-3.confd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_dotmpfilesd "${FILESDIR}"/${PN}.tmpfiles.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "For configuration instructions, please see"
+		elog "/usr/share/doc/${PF}/html/guide.html, or the online version at"
+		elog "http://docs.ejabberd.im/admin/guide/"
+	else
+		elog "Ejabberd now defaults to using a YAML format for its config file."
+		elog "The old ejabberd.cfg file can be converted using the following instructions:"
+		echo
+		elog "1. Make sure all processes related to the previous version of ejabberd aren't running."
+		elog "   Usually this just means the ejabberd daemon and possibly the pam-related processes"
+		elog "   (epmd and epam) if pam support is enabled."
+		elog "2. Run \`ejabberdctl start\` with sufficient permissions. Note that this can fail to"
+		elog "   start ejabberd properly for various reasons. Check ejabberd's main log file"
+		elog "   at /var/log/jabber/ejabberd.log to confirm it started successfully."
+		elog "3. Run \`ejabberdctl convert_to_yaml /etc/jabber/ejabberd.cfg /etc/jabber/ejabberd.yml.new\`"
+		elog "   with sufficient permissions, edit and rename /etc/jabber/ejabberd.yml.new to"
+		elog "   /etc/jabber/ejabberd.yml, and finally restart ejabberd with the new config file."
+		echo
+	fi
+
+	SSL_ORGANIZATION="${SSL_ORGANIZATION:-Ejabberd XMPP Server}"
+	install_cert /etc/ssl/ejabberd/server
+	# Fix ssl cert permissions bug #369809
+	chown root:jabber "${EROOT}/etc/ssl/ejabberd/server.pem"
+	chmod 0440 "${EROOT}/etc/ssl/ejabberd/server.pem"
+}
diff --git a/net-im/ejabberd/files/ejabberd-16.01-ejabberdctl.patch b/net-im/ejabberd/files/ejabberd-16.01-ejabberdctl.patch
new file mode 100644
index 000000000000..7a1c9e650fa5
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-16.01-ejabberdctl.patch
@@ -0,0 +1,49 @@
+Set SHELL since the generic jabber user used on Gentoo for jabber servers
+doesn't have a valid shell set by default and fix EXEC_CMD otherwise it fails
+with "This account is currently not available" again due to jabber not having
+a valid shell.
+
+Also, workaround the assumption that jabber's $HOME is a directory when instead
+it defaults to /dev/null on Gentoo.
+
+--- ejabberdctl.template	2016-01-12 11:07:58.000000000 +0000
++++ ejabberdctl.template.new	2016-02-15 21:36:27.508297627 +0000
+@@ -16,6 +16,7 @@
+ EPMD={{bindir}}/epmd
+ INSTALLUSER={{installuser}}
+ ERL_LIBS={{libdir}}
++SHELL=/bin/sh
+ 
+ # check the proper system user is used if defined
+ if [ "$INSTALLUSER" != "" ] ; then
+@@ -23,11 +24,11 @@
+     for GID in `id -G`; do
+         if [ $GID -eq 0 ] ; then
+             INSTALLUSER_HOME=$(getent passwd "$INSTALLUSER" | cut -d: -f6)
+-            if [ -n "$INSTALLUSER_HOME" ] && [ ! -d "$INSTALLUSER_HOME" ] ; then
++            if [ -n "$INSTALLUSER_HOME" ] && [ ! -e "$INSTALLUSER_HOME" ] ; then
+                 mkdir -p "$INSTALLUSER_HOME"
+                 chown "$INSTALLUSER" "$INSTALLUSER_HOME"
+             fi
+-            EXEC_CMD="su $INSTALLUSER -c"
++            EXEC_CMD="su $INSTALLUSER -p -c"
+         fi
+     done
+     if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
+@@ -100,6 +101,7 @@
+ DATETIME=`date "+%Y%m%d-%H%M%S"`
+ ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump
+ ERL_INETRC=$ETC_DIR/inetrc
++HOME=$SPOOL_DIR
+ 
+ # define mnesia options
+ MNESIA_OPTS="-mnesia dir \"\\\"$SPOOL_DIR\\\"\" $MNESIA_OPTIONS"
+@@ -159,6 +161,8 @@
+ export CONTRIB_MODULES_PATH
+ export CONTRIB_MODULES_CONF_DIR
+ export ERL_LIBS
++export HOME
++export SHELL
+ 
+ shell_escape()
+ {
diff --git a/net-im/ejabberd/metadata.xml b/net-im/ejabberd/metadata.xml
index 8f5537ed6960..45ac1e31a8bd 100644
--- a/net-im/ejabberd/metadata.xml
+++ b/net-im/ejabberd/metadata.xml
@@ -17,11 +17,16 @@
 		<flag name="captcha">Support for CAPTCHA Forms (XEP-158)</flag>
 		<flag name="mod_proxy65">Support for SOCKS5 Bytestreams (XEP-0065)</flag>
 		<flag name="mod_statsdx">Measures several statistics, and provides a new section in ejabberd Web Admin to view them.</flag>
-		<flag name="elixir">Enable Elixir language support (http://elixir-lang.org/)</flag>
+		<flag name="elixir">Enable Elixir language support (http://elixir-lang.org/). Use bundled plugin instead of dev-lang/elixir.</flag>
+		<flag name="lager">Use lager Erlang logging tool instead of standard error logger</flag>
 		<flag name="mod_bosh">Enable support for XMPP over BOSH (XEP-0206)</flag>
 		<flag name="mod_irc">Build irc gateway</flag>
 		<flag name="mod_muc">Build Multi User Chat module</flag>
 		<flag name="mod_pubsub">Build Pubsub module</flag>
+		<flag name="mssql">Build Microsoft SQL Server support</flag>
+		<flag name="mysql">Build Native MySQL support</flag>
+		<flag name="odbc">Build ODBC data storage support</flag>
+		<flag name="postgres">Build Native PostgreSQL support</flag>
 		<flag name="redis">Enable Redis support</flag>
 		<flag name="riak">Enable Riak support</flag>
 		<flag name="tools">Build development tools</flag>