gentoo resync : 09.12.2017

5 files changed, 6 insertions, 3 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index a2336b4c4625..b9dd193b726b 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 5d28707fe725..b41a20e841d5 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -12,7 +12,7 @@ AUX epam-wrapper 336 BLAKE2B 914ba9c7469ba58fd29a4c70485c77ff2a93000e397aa8c58aa
 DIST ejabberd-16.09.tar.gz 1687485 SHA256 7b44ab3af3310ca73624c47b65cf30a651d5a1398413e8af51c610d788fb8f14 SHA512 506365eff83f9ab97c9a632c4b8b2428aacbfc570c34ca65a78903d95c64755489ff7327be3efa2172c9d05d7891f83986b1ff3928a7ce806c0ab2aa5dbb647f WHIRLPOOL 6c56ad58b4e247cedf29cf247fdadddf727270311a0ba21eef88f84ee6b997ad8be75448e3bfdaa67d978ea167e2feb21bc9ce0839741a62fb60fa045e45edf2
 DIST ejabberd-17.01.tar.gz 1638418 SHA256 7efa8f25fe01bce876f9379ba7b4f49752a0fddc6a78e5ae82196fdc7f70c90b SHA512 d64125f81efbf841eded140d877c950439c11e65377e167994d25f85fa66437aad771d94548d063900bd3c472922e6bfa8f8bbe65413f18e7b641f0ed32db566 WHIRLPOOL 7b670b087cccc6b4fb804410730571175c253e094fab6fc8c9412eae4e14b844ad38596426b4334bd751a056f940dfd60c1c06d2560af5b36061eb54553886fb
 DIST ejabberd-17.04.tar.gz 1690441 SHA256 b8395bc65b09f135a60320b62338258acd6056cc241e9e245fde267fb18dd3c9 SHA512 03467434dba92bd1ff2f70d78aa8fcf86fc73cb52aaaa73e4947229e1d14225e7b0d0133c3da7c8efe4c9db13aab932f40f757be46b120d0f280f96d62c203d7 WHIRLPOOL c345a6b31e5ea63d72779630d7db8868e997e876ef929dc0de3df0584ca3dcbec1d36e6bb1cacdcc3ee428f9f82b4dbc73d3f08446ace0daa8beccd2fe9a8bfe
-EBUILD ejabberd-16.09.ebuild 10402 BLAKE2B d3af8bf999ba41ebf73ac0869e85ae2100c58a8ebc924badc455672631c3ed61444309e6c039662c6b3fd2f2dec61b53a65a1d1dd8af5cc600eb958981be48da SHA512 fe39e30114f9500bf4ac425014412f420976d1fa0ec339ddace2e4ff679b1466b67d7545db094b6db1b7e4026574448550c265405d488304eb6fd6a547f12ee7
-EBUILD ejabberd-17.01-r2.ebuild 10578 BLAKE2B e1c3d296cb169bfcf6f2803f38a7a035a06cd2b3b5b487f379753d76f0dc67941c35f63966da9ac9f0322bebc1bc8adcb448df54f07d53108275563b20129cd8 SHA512 4734338caeef8b82849609d080c243c6f0444254cb1428f6bf69ab02775cf48173d2c8fae461adbd7f3a6386b6f9bab35d29f36eb2098f2aeeef8ecae57f47fa
-EBUILD ejabberd-17.04-r1.ebuild 10647 BLAKE2B b86e4d7415d8c2d2d4f6219c737a1309711b83e3d1fc87dae4dbf8729cd6a1ef25a74a1cdd11a3c1898acf7409481f0b03a4e03890795624917cf30f1689fca4 SHA512 d2810306064326f80ff35be3c8ac81f513f846f0e91a01833e3a81834d015d6561051e25f608aa78a4811fa27deee776b4bf82f3a9ab56c4115b8be342773577
+EBUILD ejabberd-16.09.ebuild 10427 BLAKE2B 7d818f4536e2407a3cd35a8a408eeb7a3d3322c5ea1b26326680b213fec2c02f372e6db3059a8ba3efbad9a8735089004ebb212b82bad2dec2ee8b510c235b22 SHA512 e0064b4c056dee67b5f2172e67cc79d14db099f63ef6b00e07d61fa3bf81df64904daa7ae0d3abad4d15b930a480dcff0f2ae313bf3e673e76aecfadce6288b2
+EBUILD ejabberd-17.01-r2.ebuild 10603 BLAKE2B 1cd899495a57bdf747a306c28bf417820faf1586e6231a8f669ae0f1af79ef0348f317441df69ac1eab70bc9bd3978de8586dd127ef2d24ab04c81d0bdb891ff SHA512 f49a109c640294df7cdd78a1d60042fa986e2fd82258519a68ad28fa54e74e85ca127ddccd3e051461a7c31d32ac3eb743c6015a5b95b71be4891c98b69c8095
+EBUILD ejabberd-17.04-r1.ebuild 10672 BLAKE2B dc1ae777da1a9434de40d0dc43cd1d2c9eb8cb095fe6c799aee44ae6bc8abaa43734dac59c7d7a7d087d9e470ba33ccd7c17afec1a80a7c41f2b0fb9e86527e3 SHA512 36cc8cd223aa76edd29d98c59d98fff9b7de0b78a404fa322c9e7c7fc83453d0a60b6adaedb9cc0853513fbcbcc0d34d62119e38d8f7a954ac847127f573f0b5
 MISC metadata.xml 1722 BLAKE2B b88f8d75b4e5ce0a61e7fbc2402d8c7f8e7976965fb0cd7f933d2a4136e378ad79bfef107b8e557c383ef84d4fee38ff3d670c3aae6815a457c649083e1590a3 SHA512 943a50b2d49defcb82428ec1470bf05e890a4c753463da857fca4cb01fdb032aade634c69f9ebf4c3b7cf1023ed9bc2c11e7aa94e8cfed57af1a5dc328bb5d78
diff --git a/net-im/ejabberd/ejabberd-16.09.ebuild b/net-im/ejabberd/ejabberd-16.09.ebuild
index 99e4a3aabcc2..f313dbb0deb3 100644
--- a/net-im/ejabberd/ejabberd-16.09.ebuild
+++ b/net-im/ejabberd/ejabberd-16.09.ebuild
@@ -41,6 +41,7 @@ CDEPEND="
 	>=dev-erlang/stringprep-1.0.6
 	>=dev-erlang/stun-1.0.7
 	>=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
+	!>=dev-lang/erlang-20.0
 	>=net-im/jabber-base-0.01
 	ldap? ( =net-nds/openldap-2* )
 	mysql? ( >=dev-erlang/p1_mysql-1.0.1 )
diff --git a/net-im/ejabberd/ejabberd-17.01-r2.ebuild b/net-im/ejabberd/ejabberd-17.01-r2.ebuild
index 7bada46b7dc2..ec624d2c5338 100644
--- a/net-im/ejabberd/ejabberd-17.01-r2.ebuild
+++ b/net-im/ejabberd/ejabberd-17.01-r2.ebuild
@@ -42,6 +42,7 @@ CDEPEND="
 	>=dev-erlang/stun-1.0.9
 	>=dev-erlang/xmpp-1.1.6
 	>=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
+	!>=dev-lang/erlang-20.0
 	>=net-im/jabber-base-0.01
 	ldap? ( =net-nds/openldap-2* )
 	mysql? ( >=dev-erlang/p1_mysql-1.0.2 )
diff --git a/net-im/ejabberd/ejabberd-17.04-r1.ebuild b/net-im/ejabberd/ejabberd-17.04-r1.ebuild
index 729fae6076e2..5ca27008f2c4 100644
--- a/net-im/ejabberd/ejabberd-17.04-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-17.04-r1.ebuild
@@ -42,6 +42,7 @@ CDEPEND="
 	>=dev-erlang/stun-1.0.10
 	>=dev-erlang/xmpp-1.1.9
 	>=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
+	!>=dev-lang/erlang-20.0
 	>=net-im/jabber-base-0.01
 	ldap? ( =net-nds/openldap-2* )
 	mysql? ( >=dev-erlang/p1_mysql-1.0.2 )