gentoo resync : 19.04.2018

5 files changed, 7 insertions, 27 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 0b82eda2cc28..827dab01282b 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index e27a1bc22168..7f7a34bfca19 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -15,5 +15,5 @@ DIST ejabberd-17.04.tar.gz 1690441 BLAKE2B 2d31f1f0a393c6531653a55021b9deb729357
 EBUILD ejabberd-16.09.ebuild 10410 BLAKE2B 5f0e00b9c106afd09dad578411c0e7ff7ec982db5184ec539ae532293c84db06a4b73ce382a3c633bcf0041c7a613b9e1403e9ecfa3196f18b2b9a5c2d372021 SHA512 474c1effa517a9a21866d78362bf915f8377d7e331190a0e2ef6408c5fa9f758b2e0a8917de9106ac56a06ea6953c3786e225164e154197aaaa976cb46686491
 EBUILD ejabberd-17.01-r2.ebuild 10586 BLAKE2B 7c3fb4e4a3cc06877e405747396f166f135ec4db8c7a2c38658fbc1759c12d24a8f7d8a83beb33848e5cf4a20e9d7994e58dcbad314391946710bce35a2fdcb2 SHA512 08d6784ad37852d3c929db73b1ab6be2ee347dda0419791d766e97ad663bd0eb1b2324b59bb9698306c6ea7349fd41124ec173e15a11bd67c44cefd223351073
 EBUILD ejabberd-17.04-r1.ebuild 10655 BLAKE2B dd124adbf6bee8e6824a36cdce3de21fd585fbe257b4ac9ced1e23b56fdb941070381ed1f4996e591d5741f8e9b69d23dbcde37378eb39077963f29d899818db SHA512 3f95cc09543d2a54c9df66311017fa5a5c23651143482632bf42fe7c13077b2fb6e6fde3ac01bbbaa9286421f2ca52b6e1803c39986bdd32f8459182d0b4b80b
-EBUILD ejabberd-17.04-r2.ebuild 10630 BLAKE2B 1866a5c81b847d5e38cc943cb3c86de101f5fcb13cd0d09d3d83df94460158bef9e4371cc693364bfc75b693d4a7fd6801478130a0a2990994e8e5dbbc506bbb SHA512 73c139037e741113d90894e45a78a995401180ae8350a1ca187deffd182644dd2f5109d5fcb4a5778a9973239a3cdd62dd464c4a4b71a018f2fe2d1b17cd3680
+EBUILD ejabberd-17.04-r2.ebuild 10892 BLAKE2B f50b8e0e02f7ea9d0990c66f2ed787fa6b5a170d22dfa836e8c8a228aa57913a23069d32b92e9201309bcf2529567695520288bb4fb6e2de92a6898984726ae8 SHA512 48ea3f20ef1210c2295cb4443e03ec2454079a708be78616e46447336ed27257c08ff0f9f6e288448943fcacd66e14ed681179fc9bba0ce58bed76952752ec82
 MISC metadata.xml 1722 BLAKE2B b88f8d75b4e5ce0a61e7fbc2402d8c7f8e7976965fb0cd7f933d2a4136e378ad79bfef107b8e557c383ef84d4fee38ff3d670c3aae6815a457c649083e1590a3 SHA512 943a50b2d49defcb82428ec1470bf05e890a4c753463da857fca4cb01fdb032aade634c69f9ebf4c3b7cf1023ed9bc2c11e7aa94e8cfed57af1a5dc328bb5d78
diff --git a/net-im/ejabberd/ejabberd-17.04-r2.ebuild b/net-im/ejabberd/ejabberd-17.04-r2.ebuild
index 3d86277c7cd7..8d05cca058b2 100644
--- a/net-im/ejabberd/ejabberd-17.04-r2.ebuild
+++ b/net-im/ejabberd/ejabberd-17.04-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 SSL_CERT_MANDATORY=1
 
-inherit eutils pam rebar ssl-cert systemd
+inherit autotools eutils pam rebar ssl-cert systemd
 
 DESCRIPTION="Robust, scalable and extensible XMPP server"
 HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/"
@@ -228,6 +228,11 @@ src_prepare() {
 	sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \
 		-i "${S}/ejabberdctl.template" \
 		|| die 'failed to set ERL_LIBS in ejabberdctl.template'
+
+	# https://github.com/processone/ejabberd/commit/58110e4bc152100078dbc0cb66d4a5257ae645e0,
+	# bug #651932, drop in next version
+	sed -i -e 's/REQUIRE_ERLANG_MAX="9.0.0 (No Max)"/REQUIRE_ERLANG_MAX="100.0.0 (No Max)"/' configure.ac || die
+	eautoreconf
 }
 
 src_configure() {
diff --git a/net-im/purple-events/Manifest b/net-im/purple-events/Manifest
index 15faad55da18..774006644a01 100644
--- a/net-im/purple-events/Manifest
+++ b/net-im/purple-events/Manifest
@@ -1,5 +1,3 @@
-DIST purple-events-0.2.tar.xz 223180 BLAKE2B b521d3750aedc79f814a13fcfa6363131a6ba4932dbff7c6f43f1ba25fb97df44b550bda61e1e7eb3d326e70f827e20d7fe83e5295187898003aa8fd7bebec6d SHA512 2efbeae39d45157f37d6fcc8e45d89980d2adc025d64ec194a5784b0616c8bef80929549a26ce814a4fa8c5cf9fd1621155bcd4fb6d35e6104d318a76b9c4e63
 DIST purple-events-0.99.1.tar.gz 24437 BLAKE2B c4952de806deb6357cfcd59b0392319522c26ac267e991de40adcf1ab622b1df4156854951543a6ad8e0f05b160b31bbf38352a1b5f4a980e24fb37fd8f61dca SHA512 105126fd0dbcc74d6a5878308e43ff27df4c9f1ec20601f382419cb8ebbe1a39e44da6327be86d779dbc66f6251699126776fc8389cdf48dc1569ae6bd8fa6fb
-EBUILD purple-events-0.2.ebuild 491 BLAKE2B 28bf179c7a0f0279f51778966695694396abe558dcfe6e4f466316b544d671dadc8ee8aac5c1414763b66e0128cdaaa011d3fb0dfa68a24344893588423beb05 SHA512 6fee6d318f07a363914730ab67c608a5b165e39c22ce69ae921473093635d7cd81eb2a4ebce1340d809b5523fca07dc5e53c23fb9fb9d8672d345563480e6f09
 EBUILD purple-events-0.99.1.ebuild 583 BLAKE2B e6aab4f9fea39b906e2f92bcf77fd635a6442a3f27de5f199705a9e7f792d13e46813ad3fe9397071e9cd084d49cd120323a9f9eae67f1a7d1482f361912cdf9 SHA512 15f80f3eae1546e7425ac0e0dd61a14b98f436e707a42e1c52928e640d52a4d8d5fe2a53165420c335175bd2705760a7f83e54194d9e4dfd7e6903ed290cd059
 MISC metadata.xml 371 BLAKE2B 15b5dfe09b18b24fbf03af1bf9fec13ee988b6611f7b1ace973d5bb076ee324024c1ad3c84c33f8a19865127c45a087b5c430d57bb805f059358fdd98b88d7b0 SHA512 1a92967f30ac2254f9a886930fd27fdb2d7e0f01435354c013d69eea3c16743a18bea3a48d81312d2d29085217f30c9b03e7764eb0c4987e7f2ea8beb1ecffe7
diff --git a/net-im/purple-events/purple-events-0.2.ebuild b/net-im/purple-events/purple-events-0.2.ebuild
deleted file mode 100644
index f3af9f56c707..000000000000
--- a/net-im/purple-events/purple-events-0.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Allows a fine-grained control over libpurple events"
-HOMEPAGE="http://purple-events.sardemff7.net/"
-SRC_URI="mirror://github/sardemff7/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="net-im/pidgin"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	econf --disable-silent-rules
-}