summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmadeusz Żołnowski <aidecoe@gentoo.org>2016-09-10 22:27:47 +0100
committerAmadeusz Żołnowski <aidecoe@gentoo.org>2016-09-10 22:27:47 +0100
commitdaa1e3ead45175465ebec110171cca484ae9a7c8 (patch)
tree0d83879bf2c83248c66a204445404595a46d6ed0
parentprofiles/package.mask: mask dev-libs/vrb for removal. (diff)
parentnet-im/ejabberd: Bump version to 16.08 (diff)
downloadgentoo-daa1e3ead45175465ebec110171cca484ae9a7c8.tar.gz
gentoo-daa1e3ead45175465ebec110171cca484ae9a7c8.tar.bz2
gentoo-daa1e3ead45175465ebec110171cca484ae9a7c8.zip
Merge branch 'ejabberd-16.08'
-rw-r--r--dev-erlang/cache_tab/Manifest1
-rw-r--r--dev-erlang/cache_tab/cache_tab-1.0.3.ebuild22
-rw-r--r--dev-erlang/esip/Manifest1
-rw-r--r--dev-erlang/esip/esip-1.0.4.ebuild2
-rw-r--r--dev-erlang/esip/esip-1.0.7.ebuild32
-rw-r--r--dev-erlang/fast_tls/Manifest1
-rw-r--r--dev-erlang/fast_tls/fast_tls-1.0.6.ebuild25
-rw-r--r--dev-erlang/fast_xml/Manifest1
-rw-r--r--dev-erlang/fast_xml/fast_xml-1.1.14.ebuild25
-rw-r--r--dev-erlang/fast_yaml/Manifest1
-rw-r--r--dev-erlang/fast_yaml/fast_yaml-1.0.5.ebuild23
-rw-r--r--dev-erlang/goldrush/goldrush-0.1.8.1.ebuild2
-rw-r--r--dev-erlang/hamcrest/Manifest1
-rw-r--r--dev-erlang/hamcrest/hamcrest-0.1.0_p20160709.ebuild34
-rw-r--r--dev-erlang/iconv/Manifest1
-rw-r--r--dev-erlang/iconv/iconv-1.0.1.ebuild22
-rw-r--r--dev-erlang/lager/Manifest1
-rw-r--r--dev-erlang/lager/lager-3.2.0.ebuild2
-rw-r--r--dev-erlang/lager/lager-3.2.1.ebuild28
-rw-r--r--dev-erlang/p1_utils/Manifest1
-rw-r--r--dev-erlang/p1_utils/p1_utils-1.0.5.ebuild21
-rw-r--r--dev-erlang/proper/Manifest1
-rw-r--r--dev-erlang/proper/proper-1.2.ebuild25
-rw-r--r--dev-erlang/protobuffs/Manifest1
-rw-r--r--dev-erlang/protobuffs/protobuffs-0.9.0.ebuild40
-rw-r--r--dev-erlang/riak_pb/Manifest1
-rw-r--r--dev-erlang/riak_pb/riak_pb-2.1.4.2.ebuild23
-rw-r--r--dev-erlang/riakc/Manifest1
-rw-r--r--dev-erlang/riakc/riakc-2.1.1_p20151111.ebuild2
-rw-r--r--dev-erlang/riakc/riakc-2.4.1.ebuild32
-rw-r--r--dev-erlang/stringprep/Manifest1
-rw-r--r--dev-erlang/stringprep/stringprep-1.0.5.ebuild22
-rw-r--r--dev-erlang/stun/Manifest1
-rw-r--r--dev-erlang/stun/stun-1.0.6.ebuild23
-rw-r--r--net-im/ejabberd/Manifest1
-rw-r--r--net-im/ejabberd/ejabberd-16.08.ebuild298
-rw-r--r--net-im/ejabberd/files/ejabberd-16.08-ejabberdctl.patch62
37 files changed, 777 insertions, 4 deletions
diff --git a/dev-erlang/cache_tab/Manifest b/dev-erlang/cache_tab/Manifest
index 4256f1621287..cca447da05ad 100644
--- a/dev-erlang/cache_tab/Manifest
+++ b/dev-erlang/cache_tab/Manifest
@@ -1 +1,2 @@
DIST cache_tab-1.0.2.tar.gz 12414 SHA256 f44bd4ee2136b6d2dfbb34c523aad973b8e4ee53568cae2e29cf780833052940 SHA512 9a4e225b4a1776771d964ef2b96b8eb976b930bb2e9c5ac93e1e8b238f6e259d086a550d41b4931fbde293306892cdde2a38a4af3afa581a74e9e76b5feef111 WHIRLPOOL 06f5bad8c41d8a7f8269cb598d9abcf583298dc3d326dbb0f5405ae05d4fba19141c93885d4b44b3c0efa0d98e4d2039e7eba9e186d49b0dfdc2b4c3aea3279c
+DIST cache_tab-1.0.3.tar.gz 12600 SHA256 7cfd4736f2939b9c87aea050882af16ebfcf2d18c8ad2ff9fa2fc741c6afe2c5 SHA512 d6d6f23834144b58a590dcbda57c2f0d14fd6030a2ea1e1675d56ac1038618f275bb9f9f9c0f80fc03510f775c1a04637eebcf927daeb9af51e2c70efa8239f4 WHIRLPOOL eb9faffc08dbdb8881f9c3bb9aaa598ce7df8429c9c3b972b97f9a573a8eea37225b3c4af30af312e539648ad1c5276cd156233b2fcd25fddf0802aeaeebfe89
diff --git a/dev-erlang/cache_tab/cache_tab-1.0.3.ebuild b/dev-erlang/cache_tab/cache_tab-1.0.3.ebuild
new file mode 100644
index 000000000000..7eb6a68cf81a
--- /dev/null
+++ b/dev-erlang/cache_tab/cache_tab-1.0.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="In-memory cache Erlang and Elixir library"
+HOMEPAGE="https://github.com/processone/cache_tab"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/p1_utils-1.0.4
+ >=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/esip/Manifest b/dev-erlang/esip/Manifest
index 0ee017ef9c20..ff9a4b625419 100644
--- a/dev-erlang/esip/Manifest
+++ b/dev-erlang/esip/Manifest
@@ -1 +1,2 @@
DIST esip-1.0.4.tar.gz 84478 SHA256 f10e59d06a7764c97f1dc474a99334d532b06c5f2125445f21757016f3ff8cc6 SHA512 50915831796f76986a00f5a2a08f308aa9fee71e92fbb6978e9e20f0c00007c0d442991cc7fc2f6df82560a1509f8189865afe8d0b6f94410c39e07ca4f1092b WHIRLPOOL 74a625a03f39d5c78b0e5a8516c0fe6d8c4e441674c2ffce9fa89609b8a6045bd52916753bdfa2c55d055bbead9e6e727adabbb9f98d388f746308c328f1db93
+DIST esip-1.0.7.tar.gz 84522 SHA256 942622cb808978d7eb0f2faa3c6b1577579bf9faa8617d9db58a9b7fe7a59993 SHA512 f25f2ea146a8fbea8f727210fc222649a6d434b5f2f9c2eaab62d56ecaddcd2f2986a96befb1e1291cff9130276d146321c20948d0469c36797c323f94431f3a WHIRLPOOL bdd25e89e32e742508cf58b4321e382e3c7fe6e0cf8ce7128c39ea1270162930eebf6f88bdfcfac65470c8193b87ef01e38aff8bccc310e1fd4f7c5f5adc078d
diff --git a/dev-erlang/esip/esip-1.0.4.ebuild b/dev-erlang/esip/esip-1.0.4.ebuild
index 91d1a5ea290a..6893710242de 100644
--- a/dev-erlang/esip/esip-1.0.4.ebuild
+++ b/dev-erlang/esip/esip-1.0.4.ebuild
@@ -28,5 +28,5 @@ src_prepare() {
rebar_fix_include_path stun
# ebin contains lonely .gitignore file asking for removal.
- rm -r "${S}/ebin"
+ rm -r "${S}/ebin" || die
}
diff --git a/dev-erlang/esip/esip-1.0.7.ebuild b/dev-erlang/esip/esip-1.0.7.ebuild
new file mode 100644
index 000000000000..f0712f53f7dc
--- /dev/null
+++ b/dev-erlang/esip/esip-1.0.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="ProcessOne SIP server component"
+HOMEPAGE="https://github.com/processone/esip"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/fast_tls-1.0.6
+ >=dev-erlang/stun-1.0.6
+ >=dev-erlang/p1_utils-1.0.4
+ >=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+ rebar_src_prepare
+ rebar_fix_include_path stun
+
+ # ebin contains lonely .gitignore file asking for removal.
+ rm -r "${S}/ebin" || die
+}
diff --git a/dev-erlang/fast_tls/Manifest b/dev-erlang/fast_tls/Manifest
index 50da96b82f44..3da9178220cb 100644
--- a/dev-erlang/fast_tls/Manifest
+++ b/dev-erlang/fast_tls/Manifest
@@ -1 +1,2 @@
DIST fast_tls-1.0.3.tar.gz 57470 SHA256 530f18fee1571fecab3ff75d5dd4d2e94472c892a1b5dba048412ed9b1ec449d SHA512 701016ce045fcd13810f2c287772cc2828576b85bd1458227d9da9ce89c3e10e75c41a02eb78f6e1c155dd75b76ad3d3becf5b40832b1e1b4cf928488e3bdb04 WHIRLPOOL 736ffb0ef419cdb417f7bec4c9a1980072af7e06db4cb0cdb37eb83ff53fc618627b87c167a62dd1daa4db629902aff78780df335505eb9c1ba73a6f8bd67551
+DIST fast_tls-1.0.6.tar.gz 57994 SHA256 96c3ede9fbdcad510865e1a1759901556fa004d51d81a45d4d24031127feee8f SHA512 d13a5758345521c9a295f6bb4aeedc58ea7fafb42ea3955ca61cb75e15c8755c7a331d139f2c544da9e8d23607a6520caf8fe1e1fad7c016acbca07c0d783fb8 WHIRLPOOL e69cfb8901e07e78ab308ce0ceac02167ead6c667465a8e386717509385c998d1e50f2a8b331c3887fbcdd990b958861f8b3e1e3e2e80a42598cbf07f66fc691
diff --git a/dev-erlang/fast_tls/fast_tls-1.0.6.ebuild b/dev-erlang/fast_tls/fast_tls-1.0.6.ebuild
new file mode 100644
index 000000000000..822a641a030d
--- /dev/null
+++ b/dev-erlang/fast_tls/fast_tls-1.0.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="TLS/SSL native driver for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/fast_tls"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="libressl"
+
+DEPEND=">=dev-erlang/p1_utils-1.0.4
+ >=dev-lang/erlang-17.1
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/fast_xml/Manifest b/dev-erlang/fast_xml/Manifest
index 39ba5f4348f8..e75ed7667fd3 100644
--- a/dev-erlang/fast_xml/Manifest
+++ b/dev-erlang/fast_xml/Manifest
@@ -1 +1,2 @@
+DIST fast_xml-1.1.14.tar.gz 86918 SHA256 84be7134c6bb9deaadc28000fa957e34750af51abcc67dd908f2ebc528b4c899 SHA512 3475d5cc5ab670cade221b5ffb610d2dbc52d9699e8d32d17eb3b13da1a486d8351776a50284cdd37ee9d4b6606221c60928f836669a325cb1692290a88d5d1e WHIRLPOOL d05b49323b4d5fc83cea685a36c577faa397d606aeb9ca1e2e450442fd7fed19c22bd7d33e1ef9495b9e2798ea259cb32fcdc704c5227be3009b5d75aa07a120
DIST fast_xml-1.1.3.tar.gz 84926 SHA256 59de96e3defc02c9b916d4cc02545cd963c282266a09ce248ac6b6be4b2347ae SHA512 644934d6538ddf2b49863883a66255966b47f933594aff10325dca7785802d28d3223f79941fb4cfa33776e5a1a5fa74fe84422b7077241fb33fff1c52bd044a WHIRLPOOL 0361480089f055f2cb5afd2662072e9bf12ebfc651fc2dd242feb9797ff805a3b4956a8169fdc513c41b4d6142894a964e4d361d97f39c68ba3526a0d9ad1e51
diff --git a/dev-erlang/fast_xml/fast_xml-1.1.14.ebuild b/dev-erlang/fast_xml/fast_xml-1.1.14.ebuild
new file mode 100644
index 000000000000..346046e877f1
--- /dev/null
+++ b/dev-erlang/fast_xml/fast_xml-1.1.14.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Fast Expat based Erlang XML parsing library"
+HOMEPAGE="https://github.com/processone/fast_xml"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-erlang/p1_utils-1.0.4
+ >=dev-lang/erlang-17.1
+ dev-libs/expat"
+DEPEND="${RDEPEND}
+ test? ( >=dev-lang/elixir-1.1 )"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/fast_yaml/Manifest b/dev-erlang/fast_yaml/Manifest
index 970333ce3688..fb11c78d8b0f 100644
--- a/dev-erlang/fast_yaml/Manifest
+++ b/dev-erlang/fast_yaml/Manifest
@@ -1 +1,2 @@
DIST fast_yaml-1.0.3.tar.gz 49351 SHA256 1ece4a9396c7595c0bd0a4e82a81a6680327efa1fcb9e6d0b85ae06fbb2ac856 SHA512 321de1c0ff830de8a556bd661e600a66bccd944d6503a87a02111bcfb0b23c8c60b128296e7bb07ea39f923a04ebc7cd15e33971ca6691f16a75340c0695aee9 WHIRLPOOL d46238885a7dc80312523a105126d62fa80489d86d8c8be86e36d10e596a566caf86f3ca2d0e458dc6e8481a272c45a9392ff6057d8c9291392a7d038a6085cb
+DIST fast_yaml-1.0.5.tar.gz 49463 SHA256 5286be45f91c8b084a582fe545ee86e2f33dc466cdd308357596186d1b78496c SHA512 9d6b173f6086b2543273493cca460f161d16a4c3cfd8f84945a7040991fecd24a193bf0af47f3d0a326d2ebea3d46fcf5cfa0ff21607ee98e9a0bb6f2a535bab WHIRLPOOL dc505924f1df58ea1a78f0bb1662cbd1f4ee3d20b238a753699df33c0e4ccd3c48e28d94ec8366f1a6c08f5e63a7f1d3b4dcaa4755e4af2924f6ae89e01de450
diff --git a/dev-erlang/fast_yaml/fast_yaml-1.0.5.ebuild b/dev-erlang/fast_yaml/fast_yaml-1.0.5.ebuild
new file mode 100644
index 000000000000..b20489f1a83a
--- /dev/null
+++ b/dev-erlang/fast_yaml/fast_yaml-1.0.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Fast Yaml native library for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/fast_yaml"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/p1_utils-1.0.4
+ >=dev-lang/erlang-17.1
+ dev-libs/libyaml"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/goldrush/goldrush-0.1.8.1.ebuild b/dev-erlang/goldrush/goldrush-0.1.8.1.ebuild
index 30b39fcb7289..ae1dd0301216 100644
--- a/dev-erlang/goldrush/goldrush-0.1.8.1.ebuild
+++ b/dev-erlang/goldrush/goldrush-0.1.8.1.ebuild
@@ -28,5 +28,5 @@ S="${WORKDIR}/${MY_P}"
src_prepare() {
rebar_src_prepare
# 'priv' directory contains only edoc.css, but doc isn't going to be built.
- rm -r "${S}/priv"
+ rm -r "${S}/priv" || die
}
diff --git a/dev-erlang/hamcrest/Manifest b/dev-erlang/hamcrest/Manifest
index 6c1d4a442400..4eb943b171fe 100644
--- a/dev-erlang/hamcrest/Manifest
+++ b/dev-erlang/hamcrest/Manifest
@@ -1 +1,2 @@
DIST hamcrest-0.1.0_p20150103.tar.gz 160516 SHA256 4d218370ab4f557636dc4867f5996637e1cfdbc6e5b6d0703591c9be1b8a0860 SHA512 d7ed0db598f15e5a2724c31d35a2e34ca55ff37d715c1e8a4b35fd438567f1ae2c4d266dee7215690e8508f77f625a551b7ecbef06582a9ffddb9d14d895fab8 WHIRLPOOL 4a8af0847ed2586e8038a62c178afcf69e48ae258c5d430824e28315c2beefa7abf9a68bff03959c4793e2738a6aeec7318133c11784e217bb3d6464705a91bf
+DIST hamcrest-0.1.0_p20160709.tar.gz 160574 SHA256 228b7e3f5f2223c979da7e50a2325a1269a7b797a89d42d3c210a94c6fbe98e4 SHA512 a1d162e72019bcd56c3f1c486e65b7f788e69a1a2985e5500920565bf6c40b6dd7b920e720ffc8da81cac3b1919124b8defadec2fcef5b27585e63da3abd852e WHIRLPOOL 645a8e617bea88deb7141075a8996db748ec59aeb37a6a4378368910574da57c60049e97fe944c307d0f058bf3df82b64f1dcd471db5588025f2396dbcec4327
diff --git a/dev-erlang/hamcrest/hamcrest-0.1.0_p20160709.ebuild b/dev-erlang/hamcrest/hamcrest-0.1.0_p20160709.ebuild
new file mode 100644
index 000000000000..0643eff53f71
--- /dev/null
+++ b/dev-erlang/hamcrest/hamcrest-0.1.0_p20160709.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Erlang port of Hamcrest"
+HOMEPAGE="https://github.com/hyperthunk/hamcrest-erlang"
+SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+
+CDEPEND=">=dev-lang/erlang-17.1"
+DEPEND="${CDEPEND}
+ test? ( >=dev-erlang/proper-1.2 )"
+RDEPEND="${CDEPEND}"
+
+DOCS=( NOTES README.markdown TODO.md )
+
+# Override with EAPI default because it's missing hamcrest.app.src and doesn't
+# have any deps.
+src_prepare() {
+ default
+}
+
+src_test() {
+ rebar_remove_deps test.config
+ erebar -C test.config compile ct
+}
diff --git a/dev-erlang/iconv/Manifest b/dev-erlang/iconv/Manifest
index 9c3d1f275a82..97d775c5a99a 100644
--- a/dev-erlang/iconv/Manifest
+++ b/dev-erlang/iconv/Manifest
@@ -1 +1,2 @@
DIST iconv-1.0.0.tar.gz 91905 SHA256 b964bc7a561852a6123f732203a67262c07b392cf201b4a2b1bf48d0cb1c4964 SHA512 858ec07e2a8c2699c553de068451dc6dacf3fb1cf8a8e6727a746b72b191b5647a75a5b01443719a8625c1328c6b502a1f51fc1d367767e71792e38e1e34c1f1 WHIRLPOOL 3d072e869b39c87134f35e123de9fca9d3f3cad14d389186e86e5bfe0fa19760e9c009a3f8e21694140d50a429c9ac9d42e0b6efa5bfdc5032252eeaca2673f7
+DIST iconv-1.0.1.tar.gz 121318 SHA256 ee966275028efa246ad21a798c4e0d6394a35a351b2f4071e11d2d691e577731 SHA512 bbccdc206c027e43a13388fc6c23ae5cd7084686ad56e39593b4a3db2abfe89e8000d2a88706d4b083b21e1399d5e7a527e72fa83c7f5e631ad39c8d39293bc1 WHIRLPOOL 788effaa1eaa6d818fb78fe0757e3967738730c5237776a6d5252d427a06b5672ad78047cbe0a52595872754ea598ab76c826854baf3a1aca6a9c4140538fa76
diff --git a/dev-erlang/iconv/iconv-1.0.1.ebuild b/dev-erlang/iconv/iconv-1.0.1.ebuild
new file mode 100644
index 000000000000..4bc4391145a3
--- /dev/null
+++ b/dev-erlang/iconv/iconv-1.0.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Fast encoding conversion library for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/iconv"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1
+ virtual/libiconv"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
diff --git a/dev-erlang/lager/Manifest b/dev-erlang/lager/Manifest
index a8c6ab75913c..271ba83a3317 100644
--- a/dev-erlang/lager/Manifest
+++ b/dev-erlang/lager/Manifest
@@ -1 +1,2 @@
DIST lager-3.2.0.tar.gz 244340 SHA256 cdb1c17217497ee12175f76aacbcf0346902de4da225b08cefa6015504b48c13 SHA512 136274c8d1715d996b599317e4ac02e597c084351d3f7aea806ed9f0236a47c41dfff0b42a989dd4b6404e75e66b334600643aaec20d182edc9504d123920092 WHIRLPOOL 05a6b9f1423ca313d553f4e64a5b3d255e487c2dfade6207396f16afe42b87806545d14508d4fddeb96eec5bc3ffb368d451f64b5c90bbeb0285503137bae516
+DIST lager-3.2.1.tar.gz 244701 SHA256 5ef0f65e0c18a7df5c5f2cd8e96780396f13369127d87857e7931670c79a9327 SHA512 2b9f82224943fd196f8aa12f228618996c3dcb2e83c8bf2633375e38771a4817e791db1d54493ab02835382796444266b623fce5686c864e21e49affddabea32 WHIRLPOOL ac172e6574c6eb36d12cbb15b5304a4966a34c6892e4e0ace5cfe84dcdbcd0e18c43bfe3fdeccba967b7b69222ff28b6858e5eb419b131071c484dbdb3575ce4
diff --git a/dev-erlang/lager/lager-3.2.0.ebuild b/dev-erlang/lager/lager-3.2.0.ebuild
index f29930a7978c..4d83f9a97ba6 100644
--- a/dev-erlang/lager/lager-3.2.0.ebuild
+++ b/dev-erlang/lager/lager-3.2.0.ebuild
@@ -31,5 +31,5 @@ PATCHES=(
src_prepare() {
rebar_src_prepare
# 'priv' directory contains only edoc.css, but doc isn't going to be built.
- rm -r "${S}/priv"
+ rm -r "${S}/priv" || die
}
diff --git a/dev-erlang/lager/lager-3.2.1.ebuild b/dev-erlang/lager/lager-3.2.1.ebuild
new file mode 100644
index 000000000000..125310bc9b32
--- /dev/null
+++ b/dev-erlang/lager/lager-3.2.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Logging framework for Erlang/OTP"
+HOMEPAGE="https://github.com/basho/lager"
+SRC_URI="https://github.com/basho/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/goldrush-0.1.8
+ >=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md TODO )
+
+src_prepare() {
+ rebar_src_prepare
+ # 'priv' directory contains only edoc.css, but doc isn't going to be built.
+ rm -r "${S}/priv" || die
+}
diff --git a/dev-erlang/p1_utils/Manifest b/dev-erlang/p1_utils/Manifest
index 822621005f3f..a5cffbca5b2a 100644
--- a/dev-erlang/p1_utils/Manifest
+++ b/dev-erlang/p1_utils/Manifest
@@ -1 +1,2 @@
DIST p1_utils-1.0.4.tar.gz 44082 SHA256 3fb5157f1c1cc22c992b2b6541a95cedafbc1a2a5f6ae7abca3707150ff557f5 SHA512 a86da4d5201ea9fa16574e4351f5f4ba32eb36fb61feb20231e4ee7c9bfe03a12724b6b50777adc65319055c29b8a3313c9fe72263089ad8a4c8b7ba9f30a3b8 WHIRLPOOL 1f989a9e0fdae2f0b0528df83b0c82317532436fd38c25317e771e213d2951a77206d279d841457ee07d6149eab50af0f84baea94d720fb155d432d14982fc1d
+DIST p1_utils-1.0.5.tar.gz 44167 SHA256 ef1009ea2fd3ffbe46747dd911e2b790621991b07ebbbe66d81893f9f5f8f7ee SHA512 40d030e00eb5d9623035200c0a3650d2e0bc34c2cee3e46f8084c04643649fcaf33d265395d5d7414357e7e052a7be8929d3720e2c7a13a20a1379426fb5a5f2 WHIRLPOOL 628d057f635d4ca30d952c460861fba2f781a9dcee7bb5ce62e60c29668159a051d5a973751f72f66e5c8726d3ff80cfd339125650d3dc8b4a5d7f83f8ae23f8
diff --git a/dev-erlang/p1_utils/p1_utils-1.0.5.ebuild b/dev-erlang/p1_utils/p1_utils-1.0.5.ebuild
new file mode 100644
index 000000000000..5a2e563409ba
--- /dev/null
+++ b/dev-erlang/p1_utils/p1_utils-1.0.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Erlang utility modules from ProcessOne"
+HOMEPAGE="https://github.com/processone/p1_utils"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/proper/Manifest b/dev-erlang/proper/Manifest
index 12c534063cf3..efcd7d62305b 100644
--- a/dev-erlang/proper/Manifest
+++ b/dev-erlang/proper/Manifest
@@ -1 +1,2 @@
DIST proper-1.1_p20160426.tar.bz2 268512 SHA256 35a9eba20bd22f9f6231c660d34d07a7bb8532d7fb90e1493d3cd2a9186603d1 SHA512 da9d5bfec99df620d1813a4690235b3862eaaca2c360303dabb27a6cf828046e46ee2adbb1941b2b5330621e30808fb269995e0b1dec0d29cf96f07f32fd1da7 WHIRLPOOL 5dd22bdaefce6ee32e9a4cf9b04c71a0373c88b5311f9d97bbd69db7c910420f83a843cf304040c04dbd233a248abbbf8c62d386065c9805c8bdcf0a6c2c81f7
+DIST proper-1.2.tar.gz 291892 SHA256 ec5e1087652640dfc33db82e53130b73e4ad9193dafc8662cda0fccf8a7a7f0e SHA512 07030eaf63d7e28d5df168ab6b49bf1ad1850b962453079f8421ce4b682caa0e6bf166a71e7abebff3d61c3ada7da86fe3b6ffee3a8ddadb9686e75733cbf75e WHIRLPOOL 8f8054d1e0768ae8ac7f03a41dabbe0237705d261f47de23ea6bdaaf775131d55ad34fae210d10c9e56868a4eab971db0cda8ef8d961cc82ed032922088bbefc
diff --git a/dev-erlang/proper/proper-1.2.ebuild b/dev-erlang/proper/proper-1.2.ebuild
new file mode 100644
index 000000000000..8e54ab08af91
--- /dev/null
+++ b/dev-erlang/proper/proper-1.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="QuickCheck-inspired property-based testing tool for Erlang"
+HOMEPAGE="https://github.com/manopapad/proper"
+SRC_URI="https://github.com/manopapad/proper/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md THANKS )
+
+src_configure() {
+ ./configure
+}
diff --git a/dev-erlang/protobuffs/Manifest b/dev-erlang/protobuffs/Manifest
index 7375676d945e..f39528cc694e 100644
--- a/dev-erlang/protobuffs/Manifest
+++ b/dev-erlang/protobuffs/Manifest
@@ -1 +1,2 @@
DIST protobuffs-0.8.2.tar.gz 132660 SHA256 82e196d6d9b95e2df1f420f2d39ca54f6eba92e65ca5aa6119f8310822e6b4d3 SHA512 56e9f8d41c500769724adadf025e3915e2b1ab6b68f1664080a49e783facf3d79b5ec20eb8664db9babeea21fc0637c88b1e4a121ca810247e32831a79171b11 WHIRLPOOL 368524db4587446e75d71b340c2369775c6b9ee5742aef60ee1da41a506c9b72ce4f9ff2fc3ad17d399f4d959415ca013562b6d12da9f68a9ac38516a8a34805
+DIST protobuffs-0.9.0.tar.gz 237560 SHA256 0194ad3ce489f9b76fd6566763819d7ee2036e1e031c45347c16086478d5a1c1 SHA512 f5838723c5e5ae55f412848978729347186075917893e0b74e5af966ced9f12e8bc65906f3e591c78a99e64d70461df46e5719b83c262e9bbc5acfd1e50ae1d2 WHIRLPOOL 86185332a736e69a9667e8aa732a6a4631bb411c7d66f0a6d7b319c265add8ae55d76662d3eadae87c45bce5f280c89460da391a639cb15671027f80cd2c4e79
diff --git a/dev-erlang/protobuffs/protobuffs-0.9.0.ebuild b/dev-erlang/protobuffs/protobuffs-0.9.0.ebuild
new file mode 100644
index 000000000000..8ae511da4257
--- /dev/null
+++ b/dev-erlang/protobuffs/protobuffs-0.9.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+MY_PN="erlang_protobuffs"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Google's Protocol Buffers for Erlang"
+HOMEPAGE="https://github.com/basho/erlang_protobuffs"
+SRC_URI="https://github.com/basho/${MY_PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+
+CDEPEND=">=dev-lang/erlang-17.1"
+DEPEND="${CDEPEND}
+ test? (
+ >=dev-erlang/meck-0.8.2
+ >=dev-erlang/proper-1.1
+ )"
+RDEPEND="${CDEPEND}"
+
+DOCS=( AUTHORS ChangeLog README.md RELNOTES.md )
+
+S="${WORKDIR}/${MY_P}"
+
+src_test() {
+ ./scripts/generate_emakefile.escript || die
+ erebar ct
+ # FIXME: 1 test fails, reported upstream:
+ # FIXME: https://github.com/basho/erlang_protobuffs/issues/100
+ # FIXME: erebar eunit
+}
diff --git a/dev-erlang/riak_pb/Manifest b/dev-erlang/riak_pb/Manifest
index 5ee06c5dbba7..d60e6bfb855d 100644
--- a/dev-erlang/riak_pb/Manifest
+++ b/dev-erlang/riak_pb/Manifest
@@ -1 +1,2 @@
DIST riak_pb-2.1.0.7.tar.gz 224466 SHA256 a93c5ca952ec81e52d705dc280c3190a4a4f73419a40c4e6cc27c586d1d40dc1 SHA512 671b164e1eeaf99ccf726f834bc7e819c5cb232361348b45480411f49c1b0a59158abde016b2fdff47240f275bb594ce70f1deeed0c0b2067e79721f6eb13048 WHIRLPOOL 15731399df238fc137356a03523949797413177f18a1d2244bf2e9cb9e7a2d3bd064b5bb71dc5db60ad22392ceb22ce4ca17a9c323e831647b7850d6258f55bb
+DIST riak_pb-2.1.4.2.tar.gz 235730 SHA256 54064a2115dbcf8daa5265b8d338015ccaa208766b0414af273102c395794b6f SHA512 82d06323fe1e1528319ed95dcff4612a27625df2684519739329e92dcba46864ee23684154f28f312952cc7c341a30b6ad3c72feeab4a9e0ad5101cf9218bd0f WHIRLPOOL c4178901fc569c15f926818bf9db744b0b5db162ee08eeba0b6662036aa0507fc3f72988b17acfe68ec3b617291c1ed86522c89622439d992e0ddd53ac110db9
diff --git a/dev-erlang/riak_pb/riak_pb-2.1.4.2.ebuild b/dev-erlang/riak_pb/riak_pb-2.1.4.2.ebuild
new file mode 100644
index 000000000000..8d5e86dd63d7
--- /dev/null
+++ b/dev-erlang/riak_pb/riak_pb-2.1.4.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Riak Protocol Buffers messages"
+HOMEPAGE="https://github.com/basho/riak_pb"
+SRC_URI="https://github.com/basho/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/protobuffs-0.9.0
+ >=dev-erlang/hamcrest-0.1.0_p20160709
+ >=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md RELNOTES.md )
diff --git a/dev-erlang/riakc/Manifest b/dev-erlang/riakc/Manifest
index bc0e3b55e98d..a2d5bfacc157 100644
--- a/dev-erlang/riakc/Manifest
+++ b/dev-erlang/riakc/Manifest
@@ -1 +1,2 @@
DIST riakc-2.1.1_p20151111.tar.gz 229778 SHA256 9d3b066e05b0b28d84b03cb87873ed28183056e70e9f64ac703e2a0eb2005719 SHA512 b9dfaf4869ed087cfb093626d1dafc496ecd46f367cffb93768e645e1d8d42d577f13ce9a2516d32efd9e2aa1b0214e4572b77f5498979683fceb5d490f0de43 WHIRLPOOL ac3ae051d53f6a8845b49dbb6f87840cea12abfe1d0e782adfbb8194d8894e1f171124f29f9416e895d33fe04434e7f528c5a6c1dea88e7dea3b7c6cb1def774
+DIST riakc-2.4.1.tar.gz 271545 SHA256 d2226db72ded3e830496b86c498fa8e120a2322631d6389eec3fa58ef3f83e0e SHA512 ee33dcf87db0587e81411794d8916d1d5b0c9f7603a814bc44f5916e4c32342395420b695c966311985ed771d4894210c3e5e8fe9cc86bfe20ccc61e1b2751ca WHIRLPOOL 7f3ac4cccaea0873deb0ebea39f5ce0d6beec5942f7f6e2c6b36000125037ca87ebe938ea055b68273907349771074c97bb0d79af95e1bcf9e069b7d8aeddd87
diff --git a/dev-erlang/riakc/riakc-2.1.1_p20151111.ebuild b/dev-erlang/riakc/riakc-2.1.1_p20151111.ebuild
index 64c0edb08a0a..7cb80b77ad7f 100644
--- a/dev-erlang/riakc/riakc-2.1.1_p20151111.ebuild
+++ b/dev-erlang/riakc/riakc-2.1.1_p20151111.ebuild
@@ -24,5 +24,5 @@ DOCS=( README.md )
src_prepare() {
rebar_src_prepare
# 'priv' directory contains only edoc.css, but doc isn't going to be built.
- rm -r "${S}/priv"
+ rm -r "${S}/priv" || die
}
diff --git a/dev-erlang/riakc/riakc-2.4.1.ebuild b/dev-erlang/riakc/riakc-2.4.1.ebuild
new file mode 100644
index 000000000000..0ee77e4cb167
--- /dev/null
+++ b/dev-erlang/riakc/riakc-2.4.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+MY_PN="riak-erlang-client"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Erlang clients for Riak"
+HOMEPAGE="https://github.com/basho/riak-erlang-client"
+SRC_URI="https://github.com/basho/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/riak_pb-2.1.4.1
+ >=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md RELNOTES.md )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ rebar_src_prepare
+ # 'priv' directory contains only edoc.css, but doc isn't going to be built.
+ rm -r "${S}/priv" || die
+}
diff --git a/dev-erlang/stringprep/Manifest b/dev-erlang/stringprep/Manifest
index 8c6f122c743e..53055c2bbf67 100644
--- a/dev-erlang/stringprep/Manifest
+++ b/dev-erlang/stringprep/Manifest
@@ -1 +1,2 @@
DIST stringprep-1.0.3.tar.gz 95189 SHA256 ec6c99adb3b9551993b6a6166a17af3d34f1ca5bd1cd16e728876764a1eab9f5 SHA512 a42ad55ddfe69f34025fb4ce8f357b13ca3f24449da7ca1e4dc5d78dd350d39530c39d1f3542fe0cba8081c6bc5d3441a606f227733d7a6d87d658a703a0feb1 WHIRLPOOL 890664f795b31d76f460e095750e0f3bec318fbc8db97910a83c95f05f6bc63ada7bab497ddb3231eccf60645a33cbea875bc20382baf40b1974e40ae6630c1d
+DIST stringprep-1.0.5.tar.gz 95323 SHA256 ff5113f1cc77580ada72c97f89cbb91a9026d683a7734adf67e95a8831d3903b SHA512 08132b1c6ceb7e4d069677e8a49ef2543b7d2491d745b3b68cc59b1786ad9884db5e694317ea44059c285ce63df4e7ababc6e0fbad2f36105479e6a07e159a05 WHIRLPOOL e5479b87617b779b53090e443f70f784d96a8f91bd6a0f74d4f565024d3b6981f11ee6d9c24a90ba0959ad6ccbe39500ba1cbdce59840e2cf7d353d94ec2d378
diff --git a/dev-erlang/stringprep/stringprep-1.0.5.ebuild b/dev-erlang/stringprep/stringprep-1.0.5.ebuild
new file mode 100644
index 000000000000..bab9558b8bb8
--- /dev/null
+++ b/dev-erlang/stringprep/stringprep-1.0.5.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Fast Stringprep implementation for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/stringprep"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 tcltk"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/p1_utils-1.0.4
+ >=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/stun/Manifest b/dev-erlang/stun/Manifest
index f8e8d26647f8..007e9d06dcda 100644
--- a/dev-erlang/stun/Manifest
+++ b/dev-erlang/stun/Manifest
@@ -1 +1,2 @@
DIST stun-1.0.3.tar.gz 28646 SHA256 aae567e4322c8bce604b50cdd41e7634d6047300ef67308199d81aff77d9992f SHA512 c15918f4b1f81477a7834dc5ba837fcd512249bda569cf3ffd3066056e6f1abacfeab3d0dde575402291d841f257a3b33e27d6c76250ae353d77e3fdd87f9786 WHIRLPOOL 9028eed54f0ae62e8ecfb760ae1a94ea834fd397ab35e4332ea2d1b158271809414e21bed60ff9c936e9637e60d107b49a0f30032f3fc40ee97421e20012bb1e
+DIST stun-1.0.6.tar.gz 28681 SHA256 21a25d0ec6292c13bc77e3225bd3f0b2b26d70f815c6e8904c825028629e70cd SHA512 30a34a660d246ed33015e2f4b890203a2648553ed6e2dced87e30bca2eb9d09486684947332f7239d535ce19a36028a0642136e5b574f3c5b867f598341bcaf9 WHIRLPOOL f27e281f21156859533d39524537e8327a58523e38e0114a00af1e6f16769fc6875b0547421cd65c190e812716105842880bd6ad435b297077d2c58be725ddb6
diff --git a/dev-erlang/stun/stun-1.0.6.ebuild b/dev-erlang/stun/stun-1.0.6.ebuild
new file mode 100644
index 000000000000..07b9f60f72cd
--- /dev/null
+++ b/dev-erlang/stun/stun-1.0.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="STUN and TURN library for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/stun"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/fast_tls-1.0.6
+ >=dev-erlang/p1_utils-1.0.4
+ >=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index bba25e2c80f1..8bcc74c0ece3 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1 +1,2 @@
DIST ejabberd-16.04.tar.gz 1715963 SHA256 3d964fe74e438253c64c8498eb7465d2440823614a23df8d33bdf40126d72cc3 SHA512 5975d5a164060cca59b6d92de2c432f063061e832b2e03cae351fe3c16b178259489dc0b82ea800f1c2388eeb7e3aa4340630ad3c10a22cc6d6f0b4eef8fa0f2 WHIRLPOOL d9018835aaa736040f63222c73b54ea65385532989390c007f4cb736b474da40d9fdceb6c377a251398fb6de87869a13dec0ac160fe9a0d081337efd35dc66b4
+DIST ejabberd-16.08.tar.gz 1739542 SHA256 b45598a6f2f1b398a19f23e3280b45eccc833d3339b1aeb6ec08ded7c19b1137 SHA512 661bf33e6d7f4c53d0c3679d1a9428fba11c22bad7d8bd535b49d7eeeff4de215a7a94f8300683e1dbaf2e68ea908f6e54cfe0ed2f1dc82326a46659e7c70f55 WHIRLPOOL 41f5ae825997818671d6db94ac62108a0b02f8eb6eed07ebaa04287ee2d7955dc4d15c3ce18cbf20240e4b2a14d48ccb8bf383b510851be12326131c4c829788
diff --git a/net-im/ejabberd/ejabberd-16.08.ebuild b/net-im/ejabberd/ejabberd-16.08.ebuild
new file mode 100644
index 000000000000..125bd012a41c
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-16.08.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+SSL_CERT_MANDATORY=1
+
+inherit eutils pam rebar ssl-cert systemd
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/"
+SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis
+ riak roster-gw sqlite zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO: >=dev-erlang/meck-0.8.4
+# TODO: >=dev-erlang/moka-1.0.5b
+# TODO: )
+CDEPEND="
+ >=dev-erlang/cache_tab-1.0.3
+ >=dev-erlang/esip-1.0.7
+ >=dev-erlang/fast_tls-1.0.6
+ >=dev-erlang/fast_xml-1.1.14
+ >=dev-erlang/fast_yaml-1.0.5
+ >=dev-erlang/jiffy-0.14.7
+ >=dev-erlang/lager-3.2.1
+ >=dev-erlang/luerl-0.2
+ >=dev-erlang/p1_oauth2-0.6.1
+ >=dev-erlang/p1_utils-1.0.5
+ >=dev-erlang/p1_xmlrpc-1.15.1
+ >=dev-erlang/stringprep-1.0.5
+ >=dev-erlang/stun-1.0.6
+ >=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
+ >=net-im/jabber-base-0.01
+ ldap? ( =net-nds/openldap-2* )
+ mysql? ( >=dev-erlang/p1_mysql-1.0.1 )
+ nls? ( >=dev-erlang/iconv-1.0.1 )
+ odbc? ( dev-db/unixODBC )
+ pam? ( >=dev-erlang/p1_pam-1.0.0 )
+ postgres? ( >=dev-erlang/p1_pgsql-1.1.0 )
+ redis? ( >=dev-erlang/eredis-1.0.8 )
+ riak? (
+ >=dev-erlang/hamcrest-0.1.0_p20150103
+ >=dev-erlang/riakc-2.1.1_p20151111
+ )
+ sqlite? ( >=dev-erlang/sqlite3-1.1.5 )
+ zlib? ( >=dev-erlang/ezlib-1.0.1 )"
+DEPEND="${CDEPEND}
+ >=sys-apps/gawk-4.1"
+RDEPEND="${CDEPEND}
+ captcha? ( media-gfx/imagemagick[truetype,png] )"
+
+DOCS=( README )
+PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" )
+
+EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
+# Paths in net-im/jabber-base
+JABBER_ETC="${EPREFIX}/etc/jabber"
+JABBER_LOG="${EPREFIX}/var/log/jabber"
+JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
+
+# Adjust example configuration file to Gentoo.
+# - Use our sample certificates.
+# - Correct PAM service name.
+adjust_config() {
+ sed -e "s|\"/path/to/ssl.pem\"|\"${EJABBERD_CERT}\"|g" \
+ -e "s|\"pamservicename\"|\"xmpp\"|" \
+ -i "${S}/ejabberd.yml.example" \
+ || die 'failed to adjust example config'
+}
+
+# Set paths to ejabberd lib directory consistently to point always to directory
+# suffixed with version.
+correct_ejabberd_paths() {
+ sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
+ -i "${S}/Makefile.in" \
+ || die 'failed to set ejabberd path in Makefile.in'
+ sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
+ -i "${S}/ejabberdctl.template" \
+ || die 'failed to set ejabberd path in ejabberdctl.template'
+ sed -e 's|\(captcha_cmd:[[:space:]]*"\).\+"|\1'$(get_ejabberd_path)'/priv/bin/captcha.sh"|' \
+ -i "${S}/ejabberd.yml.example" \
+ || die 'failed to correct path to captcha.sh in example config'
+}
+
+# Get epam-wrapper from 'files' directory and correct path to lib directory in
+# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
+# file exists there already.
+customize_epam_wrapper() {
+ local epam_wrapper_src="$1"
+ local epam_wrapper_dst="${S}/epam-wrapper"
+
+ [[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
+ sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
+ "${epam_wrapper_src}" >"${epam_wrapper_dst}" \
+ || die 'failed to install epam-wrapper'
+}
+
+# Check if there already exists a certificate.
+ejabberd_cert_exists() {
+ local cert
+
+ for cert in $(gawk -- \
+ 'match($0, /^[[:space:]]*certfile: "([^"]+)"/, m) {print m[1];}' \
+ "${EROOT%/}${JABBER_ETC}/ejabberd.yml"); do
+ [[ -f ${cert} ]] && return 0
+ done
+
+ return 1
+}
+
+# Generate and install sample ejabberd certificate. It's installed into
+# EJABBERD_CERT path.
+ejabberd_cert_install() {
+ SSL_ORGANIZATION="${SSL_ORGANIZATION:-ejabberd XMPP Server}"
+ install_cert "${EJABBERD_CERT%.*}"
+ chown root:jabber "${EROOT%/}${EJABBERD_CERT}" || die
+ chmod 0440 "${EROOT%/}${EJABBERD_CERT}" || die
+}
+
+# Get path to ejabberd lib directory.
+#
+# This is the path ./configure script Base for this path is path set in
+# ./configure script which is /usr/lib by default. If libdir is explicitely set
+# to something else than this should be adjusted here as well.
+get_ejabberd_path() {
+ echo "/usr/$(get_libdir)/${P}"
+}
+
+# Make ejabberd.service for systemd from upstream provided template.
+make_ejabberd_service() {
+ sed -r \
+ -e 's!@ctlscriptpath@!/usr/sbin!' \
+ -e 's!(User|Group)=(.*)!\1=jabber!' \
+ "${PN}.service.template" >"${PN}.service" \
+ || die 'failed to make ejabberd.service'
+}
+
+# Set paths to defined by net-im/jabber-base.
+set_jabberbase_paths() {
+ sed -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 "${S}/Makefile.in" \
+ || die 'failed to set paths in Makefile.in'
+ sed -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 "${S}/ejabberdctl.template" \
+ || die 'failed to set paths ejabberdctl.template'
+}
+
+# Skip installing docs because it's only COPYING that's installed by Makefile.
+skip_docs() {
+ gawk -i inplace '
+/# Documentation/, /^[[:space:]]*#?[[:space:]]*$/ {
+ if ($0 ~ /^[[:space:]]*#?[[:space:]]*$/) {
+ print $0;
+ } else {
+ next;
+ }
+}
+1
+' "${S}/Makefile.in" || die 'failed to remove docs section from Makefile.in'
+}
+
+src_prepare() {
+ default
+
+ rebar_remove_deps
+ correct_ejabberd_paths
+ set_jabberbase_paths
+ make_ejabberd_service
+ skip_docs
+ adjust_config
+ customize_epam_wrapper "${FILESDIR}/epam-wrapper"
+
+ # Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
+ # rather than its parent which is default. That way ejabberd directory
+ # takes precedence is module lookup.
+ local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)"
+ sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \
+ -i "${S}/ejabberdctl.template" \
+ || die 'failed to set ERL_LIBS in ejabberdctl.template'
+}
+
+src_configure() {
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --enable-user=jabber \
+ $(use_enable debug) \
+ $(use_enable full-xml) \
+ $(use_enable hipe) \
+ $(use_enable mssql) \
+ $(use_enable mysql) \
+ $(use_enable nls iconv) \
+ $(use_enable odbc) \
+ $(use_enable pam) \
+ $(use_enable postgres pgsql) \
+ $(use_enable redis) \
+ $(use_enable riak) \
+ $(use_enable roster-gw roster-gateway-workaround) \
+ $(use_enable sqlite) \
+ $(use_enable zlib)
+}
+
+src_compile() {
+ emake REBAR='rebar -v' src
+}
+
+src_install() {
+ default
+
+ if use pam; then
+ local epam_path="$(get_ejabberd_path)/priv/bin/epam"
+
+ pamd_mimic_system xmpp auth account || die "cannot create pam.d file"
+ into "$(get_ejabberd_path)/priv"
+ newbin epam-wrapper epam
+ # PAM helper module permissions
+ # https://www.process-one.net/docs/ejabberd/guide_en.html#pam
+ fowners root:jabber "${epam_path}"
+ fperms 4750 "${epam_path}"
+ fi
+
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ systemd_dounit "${PN}.service"
+ systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotate" "${PN}"
+}
+
+pkg_postinst() {
+ if [[ ! ${REPLACING_VERSIONS} ]]; then
+ echo
+ elog "For configuration instructions, please see"
+ elog " http://www.process-one.net/en/ejabberd/docs/"
+ echo
+ if [[ " ${REPLACING_VERSIONS} " =~ \ 2\. ]]; then
+ ewarn "If you have used pubsub in ejabberd-2.* you may encounter issues after"
+ ewarn "migration to ${PV}. pubsub data may not be migrated automatically and"
+ ewarn "you may need to run migration script manually, see:"
+ ewarn
+ ewarn " https://github.com/processone/ejabberd/issues/479#issuecomment-124497456"
+ ewarn
+ ewarn "In case you don't care about all stored moods, activities, geoinfo and you"
+ ewarn "know you don't store in pubsub anything important, you can just remove"
+ ewarn "pubsub tables:"
+ ewarn
+ ewarn " rm ${EROOT%/}${JABBER_SPOOL}/pubsub_*"
+ ewarn
+ ewarn "See also: https://bugs.gentoo.org/show_bug.cgi?id=588244"
+ echo
+ fi
+ elif [[ -f ${EROOT}etc/jabber/ejabberd.cfg ]]; then
+ 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"
+ elog " running. Usually this just means the ejabberd and epmd daemons and possibly"
+ elog " the pam-related process (epam) if pam support is enabled."
+ elog "2. Run \`ejabberdctl start\` with sufficient permissions. Note that this can"
+ elog " fail to start ejabberd properly for various reasons. Check ejabberd's main"
+ elog " log file at /var/log/jabber/ejabberd.log to confirm it started successfully."
+ elog "3. Run"
+ elog " \`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"
+ elog " file."
+ echo
+ fi
+
+ if ! ejabberd_cert_exists; then
+ ejabberd_cert_install
+ fi
+
+ if use pam; then
+ # sfperms drops read bit from files with suid. Reapply it.
+ # Fix bug #592218.
+ local epam_path="$(get_ejabberd_path)/priv/bin/epam"
+ chmod g+r "${EROOT%/}${epam_path}" \
+ || die "failed to correct ${epam_path} permissions"
+ fi
+}
diff --git a/net-im/ejabberd/files/ejabberd-16.08-ejabberdctl.patch b/net-im/ejabberd/files/ejabberd-16.08-ejabberdctl.patch
new file mode 100644
index 000000000000..6001c651f5d6
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-16.08-ejabberdctl.patch
@@ -0,0 +1,62 @@
+From 185923a3c5f11c2d29599416a52b6594bc94d8c9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Mon, 29 Aug 2016 22:29:41 +0100
+Subject: [PATCH] Adjust ejabberdctl for Gentoo jabberbase setup
+
+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 | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/ejabberdctl.template b/ejabberdctl.template
+index 5b34ebe..3c080fd 100755
+--- a/ejabberdctl.template
++++ b/ejabberdctl.template
+@@ -16,6 +16,7 @@ IEX={{bindir}}/iex
+ EPMD={{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 @@ if [ "$INSTALLUSER" != "" ] ; then
+ 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
+@@ -91,6 +92,7 @@ EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log
+ 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"
+@@ -149,6 +151,8 @@ export ERL_MAX_ETS_TABLES
+ export CONTRIB_MODULES_PATH
+ export CONTRIB_MODULES_CONF_DIR
+ export ERL_LIBS
++export HOME
++export SHELL
+
+ shell_escape_str()
+ {
+--
+2.9.2
+