[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/files/, net-im/ejabberd/

2022-10-28 Thread Florian Schmaus 
commit: e0ed0500560d9f796c8a197e10ecfd6f2d993e5c
Author: Florian Schmaus  gentoo  org>
AuthorDate: Fri Oct 28 19:10:54 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Fri Oct 28 20:57:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0ed0500

net-im/ejabberd: add 22.10

Closes: https://github.com/gentoo/gentoo/pull/28011
Signed-off-by: Florian Schmaus  gentoo.org>

 net-im/ejabberd/Manifest   |   1 +
 net-im/ejabberd/ejabberd-22.10.ebuild  | 219 +
 ...djust-ejabberd.service.template-to-Gentoo.patch |  16 ++
 3 files changed, 236 insertions(+)

diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index df8cc1d38ab8..308fe35abac5 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,2 +1,3 @@
 DIST ejabberd-22.05.tar.gz 2527957 BLAKE2B 
d7fc614b8fe88bc8997d78821334a5e26a4201a5d199e6a04fe668e192ed0c7a37b68aff2fd9c6740844634c005b492b1dd76de4b9ed841863d0285f6097edd9
 SHA512 
33f98a9c45ff8257d240e7b90181e399ecab84e361f5619dc8d57252642e81d4958467cfa89b90681f3cf0d1d56a3079eb98d4e80cc6af5ca11938bb2a69f865
 DIST ejabberd-22.05.tar.gz.asc 195 BLAKE2B 
634cb0a338c68d8ee1d3b2e3e267a758deff3a925c93273c5aaa209d12a5bb40565831869cc7e81fa66de8648211eb60f9644ac7d4d0ec557e9332a8cdd9dfce
 SHA512 
42ffc224915f3f0ac4df42cfe0c35e65861be38856e398ac6172cdcbf5de543ae808a4b201a1c1d64d10234d02d754d1376ff21ee9d679095497479c717c17da
+DIST ejabberd-22.10.tar.gz 2553163 BLAKE2B 
670721da1800b489103df49c24bb961cb048e02faffa57921c9740f2effadb8fd5b70841afaf9fc56160e4bb00d6d6d73014cdd3e2aaa683c351fd0d42d53bf3
 SHA512 
3010b0767017d63c1b1a8b062f881d98be6308f2ae065c58302288096058ed8030e37c73eaf037ee1e61d1040f4e61071b2d62e146c61109ee782b9e6b708942

diff --git a/net-im/ejabberd/ejabberd-22.10.ebuild 
b/net-im/ejabberd/ejabberd-22.10.ebuild
new file mode 100644
index ..d872abcb6285
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-22.10.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools pam rebar systemd
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
+SRC_URI="
+   https://github.com/processone/${PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
+   roster-gw selinux sip sqlite +stun zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO:>=dev-erlang/luerl-0.3
+# TODO: )
+DEPEND="
+   >=dev-lang/erlang-19.3[odbc?,ssl]
+   >=dev-erlang/cache_tab-1.0.30
+   >=dev-erlang/eimp-1.0.22
+   >=dev-erlang/fast_tls-1.1.16
+   >=dev-erlang/fast_xml-1.1.49
+   >=dev-erlang/fast_yaml-1.0.34
+   >=dev-erlang/yconf-1.0.14
+   >=dev-erlang/jiffy-1.0.5
+   >=dev-erlang/jose-1.11.2
+   >=dev-erlang/lager-3.9.1
+   >=dev-erlang/p1_oauth2-0.6.11
+   >=dev-erlang/p1_utils-1.0.25
+   >=dev-erlang/stringprep-1.0.29
+   >=dev-erlang/xmpp-1.6.0
+   >=dev-erlang/pkix-1.0.9
+   >=dev-erlang/mqtree-1.0.15
+   >=dev-erlang/idna-6.0.0-r1
+   >=dev-erlang/p1_acme-1.0.20
+   >=dev-erlang/base64url-1.0.1
+   ldap? ( =net-nds/openldap-2* )
+   mysql? ( >=dev-erlang/p1_mysql-1.0.20 )
+   odbc? ( dev-db/unixODBC )
+   pam? ( >=dev-erlang/epam-1.0.12 )
+   postgres? ( >=dev-erlang/p1_pgsql-1.1.19 )
+   redis? ( >=dev-erlang/eredis-1.2.0 )
+   sip? ( >=dev-erlang/esip-1.0.48 )
+   sqlite? ( >=dev-erlang/sqlite3-1.1.13 )
+   stun? ( >=dev-erlang/stun-1.2.6 )
+   zlib? ( >=dev-erlang/ezlib-1.0.12 )
+"
+RDEPEND="
+   ${DEPEND}
+   >=acct-user/ejabberd-2[pam?]
+   captcha? ( media-gfx/imagemagick[truetype,png] )
+   selinux? ( sec-policy/selinux-jabber )
+"
+
+DOCS=( CHANGELOG.md README.md )
+PATCHES=(
+   
"${FILESDIR}/ejabberd-22.10-adjust-ejabberd.service.template-to-Gentoo.patch"
+)
+
+# 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}"
+}
+
+src_prepare() {
+   default
+
+   eautoreconf
+
+   rebar_remove_deps
+
+   # Set paths to ejabberd lib directory consistently to point always to 
directory
+   # suffixed with version.
+   sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
+   -i "${S}/Makefile.in" \
+   || die 'failed to set ejabberd path in Makefile.in'
+   sed -e

[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/files/, net-im/ejabberd/

2022-05-18 Thread Florian Schmaus 
commit: bd1911fdc84b38dfd4136b8986b49940bc34c946
Author: Florian Schmaus  gentoo  org>
AuthorDate: Wed May 18 07:03:41 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Wed May 18 07:05:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd1911fd

net-im/ejabberd: bring back logrotate

Bug: https://bugs.gentoo.org/841976
Signed-off-by: Florian Schmaus  gentoo.org>

 .../{ejabberd-22.05.ebuild => ejabberd-22.05-r1.ebuild} |  3 +++
 net-im/ejabberd/files/ejabberd-22.05.logrotate  | 13 +
 2 files changed, 16 insertions(+)

diff --git a/net-im/ejabberd/ejabberd-22.05.ebuild 
b/net-im/ejabberd/ejabberd-22.05-r1.ebuild
similarity index 98%
rename from net-im/ejabberd/ejabberd-22.05.ebuild
rename to net-im/ejabberd/ejabberd-22.05-r1.ebuild
index 029431d351cb..eae32ae4c02d 100644
--- a/net-im/ejabberd/ejabberd-22.05.ebuild
+++ b/net-im/ejabberd/ejabberd-22.05-r1.ebuild
@@ -168,6 +168,9 @@ src_install() {
newinitd "${FILESDIR}/${PN}-22.05.initd" "${PN}"
systemd_dounit "${PN}.service"
 
+   insinto /etc/logrotate.d
+   newins "${FILESDIR}/${PN}-22.05.logrotate" "${PN}"
+
keepdir /var/{lib,log}/ejabberd
 }
 

diff --git a/net-im/ejabberd/files/ejabberd-22.05.logrotate 
b/net-im/ejabberd/files/ejabberd-22.05.logrotate
new file mode 100644
index ..fd51673fc428
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-22.05.logrotate
@@ -0,0 +1,13 @@
+/var/log/ejabberd/*.log {
+   su ejabberd ejabberd
+   weekly
+   rotate 4
+   missingok
+   nocreate
+   sharedscripts
+   notifempty
+   compress
+   postrotate
+   /usr/sbin/ejabberdctl reopen-log > /dev/null 2>&1 || true
+   endscript
+}

[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/files/, net-im/ejabberd/

2021-12-10 Thread Florian Schmaus 
commit: 78a9b46fa734d8a64b17c5230ba1f2a5f76f7e76
Author: Florian Schmaus  gentoo  org>
AuthorDate: Fri Dec 10 09:18:16 2021 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Fri Dec 10 13:05:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78a9b46f

net-im/ejabberd: add 21.12

Closes: https://bugs.gentoo.org/810886
Closes: https://github.com/gentoo/gentoo/pull/23239
Signed-off-by: Florian Schmaus  gentoo.org>

 net-im/ejabberd/Manifest   |   1 +
 net-im/ejabberd/ejabberd-21.12.ebuild  | 218 +
 ...djust-ejabberd.service.template-to-Gentoo.patch |  39 
 3 files changed, 258 insertions(+)

diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index a3cfc05ea25e..e50617f20488 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,2 +1,3 @@
 DIST ejabberd-20.04.tar.gz 2022319 BLAKE2B 
02ce782bc58a808f38dff58715204059c51762187abff7f5c77ff08eb13330b66485234eb2204c4336770d75303417ee74077466a07e701aa512158ff641a578
 SHA512 
7c478bbd73577e06f21e26804f4eb57deb52a0ebdd12e45034e810314cb73bb2ec60b55c6f266271eb45d5ebc135a39c498a29706d6d1f5087fd2b509a8844ca
 DIST ejabberd-21.04.tar.gz 1560934 BLAKE2B 
85e7a381b9fdb1274b8aff04ba98587d31aaba6e0c99b0bd5b8ad28f776a7e6dfd8c4425f57591962e69387d42e3416855fa94e914638352af1853f81e88315e
 SHA512 
4f7f645dbca35187c412e75fe90bcb96b87fc71beb073e0b913155e78832499f57218b1c42e0adf139a24cf1e235b4d1d123214a472aabf093a65f5d136b9579
+DIST ejabberd-21.12.tar.gz 2532288 BLAKE2B 
847fa90ce0140c384add489a97d566e3edf9927f71c4abf4f51869f2e0ba4a5183002cb5e4f7a9d7f4ad5ed5902a47b2dd336ab1ef854673a3a2f337326a3fc2
 SHA512 
4f1e56becb9970355b98c0ad177ee162130346e53aa92c274e502fe300d6f4dc7fda8fcca845821087da78379a19a2962b50794b71d139c91764539fcfeec73c

diff --git a/net-im/ejabberd/ejabberd-21.12.ebuild 
b/net-im/ejabberd/ejabberd-21.12.ebuild
new file mode 100644
index ..e4ed2bfaac5c
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-21.12.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pam rebar systemd
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
+SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
+   -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
+   roster-gw selinux sip sqlite +stun zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO:>=dev-erlang/luerl-0.3
+# TODO: )
+DEPEND=">=dev-lang/erlang-19.3[odbc?,ssl]
+   >=dev-erlang/cache_tab-1.0.29
+   >=dev-erlang/eimp-1.0.21
+   >=dev-erlang/fast_tls-1.1.13
+   >=dev-erlang/fast_xml-1.1.48
+   >=dev-erlang/fast_yaml-1.0.32
+   >=dev-erlang/yconf-1.0.12
+   >=dev-erlang/jiffy-1.0.5
+   >=dev-erlang/jose-1.11.1
+   >=dev-erlang/lager-3.9.1
+   >=dev-erlang/p1_oauth2-0.6.10
+   >=dev-erlang/p1_utils-1.0.23
+   >=dev-erlang/stringprep-1.0.27
+   >=dev-erlang/xmpp-1.5.6
+   >=dev-erlang/pkix-1.0.8
+   >=dev-erlang/mqtree-1.0.14
+   >=dev-erlang/idna-6.0.0-r1
+   >=dev-erlang/p1_acme-1.0.16
+   >=dev-erlang/base64url-1.0.1
+   ldap? ( =net-nds/openldap-2* )
+   mysql? ( >=dev-erlang/p1_mysql-1.0.19 )
+   odbc? ( dev-db/unixODBC )
+   pam? ( >=dev-erlang/epam-1.0.12 )
+   postgres? ( >=dev-erlang/p1_pgsql-1.1.16 )
+   redis? ( >=dev-erlang/eredis-1.2.0 )
+   sip? ( >=dev-erlang/esip-1.0.45 )
+   sqlite? ( >=dev-erlang/sqlite3-1.1.13 )
+   stun? ( >=dev-erlang/stun-1.0.47 )
+   zlib? ( >=dev-erlang/ezlib-1.0.10 )"
+RDEPEND="${DEPEND}
+   acct-user/ejabberd
+   captcha? ( media-gfx/imagemagick[truetype,png] )
+   selinux? ( sec-policy/selinux-jabber )
+"
+
+DOCS=( CHANGELOG.md README.md )
+PATCHES=(
+   "${FILESDIR}/${PN}-19.08-ejabberdctl.patch"
+   "${FILESDIR}/adjust-ejabberd.service.template-to-Gentoo.patch"
+)
+
+# 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'
+}
+
+# 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

[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/files/, net-im/ejabberd/

2020-04-30 Thread Hanno Böck 
commit: fdfa70080cd3916f32561b479da795248eddf738
Author: Hanno Böck  gentoo  org>
AuthorDate: Thu Apr 30 09:44:25 2020 +
Commit: Hanno Böck  gentoo  org>
CommitDate: Thu Apr 30 09:44:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdfa7008

net-im/ejabberd: Remove duplicate patch

Both patch files for old and new version were identical.

Signed-off-by: Hanno Böck  gentoo.org>
Package-Manager: Portage-2.3.99, Repoman-2.3.22

 net-im/ejabberd/ejabberd-20.03.ebuild |  2 +-
 .../ejabberd-19.08-0002-Dont-overwrite-service-file.patch | 15 ---
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/net-im/ejabberd/ejabberd-20.03.ebuild 
b/net-im/ejabberd/ejabberd-20.03.ebuild
index aadecdb23d9..7ed076748bb 100644
--- a/net-im/ejabberd/ejabberd-20.03.ebuild
+++ b/net-im/ejabberd/ejabberd-20.03.ebuild
@@ -61,7 +61,7 @@ RDEPEND="${DEPEND}
 
 DOCS=( CHANGELOG.md README.md )
 PATCHES=( "${FILESDIR}/${PN}-19.08-ejabberdctl.patch"
-   "${FILESDIR}/${PN}-19.08-0002-Dont-overwrite-service-file.patch")
+   "${FILESDIR}/${PN}-17.04-0002-Dont-overwrite-service-file.patch")
 
 EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
 # Paths in net-im/jabber-base

diff --git 
a/net-im/ejabberd/files/ejabberd-19.08-0002-Dont-overwrite-service-file.patch 
b/net-im/ejabberd/files/ejabberd-19.08-0002-Dont-overwrite-service-file.patch
deleted file mode 100644
index 2bea750ef04..000
--- 
a/net-im/ejabberd/files/ejabberd-19.08-0002-Dont-overwrite-service-file.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index a0b4553d..4675b88a 100644
 a/Makefile.in
-+++ b/Makefile.in
-@@ -204,8 +204,8 @@ install: all copy-files
-   chmod 755 ejabberd.init
-   #
-   # Service script
--  $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" ejabberd.service.template \
--  > ejabberd.service
-+  [ -f ejabberd.service ] || $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" \
-+  ejabberd.service.template > ejabberd.service
-   chmod 644 ejabberd.service
-   #
-   # Spool directory

[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/files/, net-im/ejabberd/

2020-04-30 Thread Hanno Böck 
commit: 2d8c03f7f20c016978f58edf112225d52ea17dd8
Author: Hanno Böck  gentoo  org>
AuthorDate: Thu Apr 30 08:16:32 2020 +
Commit: Hanno Böck  gentoo  org>
CommitDate: Thu Apr 30 08:16:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d8c03f7

net-im/ejabberd: Version bump.

Based on ebuild from Vampik's overlay with small changes.
Remove old postinst warnings, add warning for needed config changes
for updates from 17.x.

Closes: https://bugs.gentoo.org/626260
Signed-off-by: Hanno Böck  gentoo.org>
Package-Manager: Portage-2.3.99, Repoman-2.3.22

 net-im/ejabberd/Manifest   |   1 +
 net-im/ejabberd/ejabberd-20.03.ebuild  | 292 +
 ...rd-19.08-0002-Dont-overwrite-service-file.patch |  15 ++
 .../files/ejabberd-19.08-ejabberdctl.patch |  38 +++
 net-im/ejabberd/metadata.xml   |   7 +-
 5 files changed, 350 insertions(+), 3 deletions(-)

diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 57e9e73b4c0..20a2eb6b380 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1 +1,2 @@
 DIST ejabberd-17.04.tar.gz 1690441 BLAKE2B 
2d31f1f0a393c6531653a55021b9deb729357bb53e86e85b85796a65f505257bcf7a14b0d168af2d13a6820e1524e1164ea7f17797df23ae41d7a8379f9e2066
 SHA512 
03467434dba92bd1ff2f70d78aa8fcf86fc73cb5273e4947229e1d14225e7b0d0133c3da7c8efe4c9db13aab932f40f757be46b120d0f280f96d62c203d7
+DIST ejabberd-20.03.tar.gz 2006603 BLAKE2B 
67fa7d86e6802f24e783e91a8cb498375ca615bf22422ebe8bf630eb721e50574f468cfe25271172ebdfdca0c1df24dc6dd7f96a289153a017c32eb82af06d82
 SHA512 
f3ab666d9ffa596386ef121161dc7eeedca85cb7f5d290ad0882cd9557ea4166467bce9c082bdb423f932b44999c8e887d6a386d53564febf360f306feda3952

diff --git a/net-im/ejabberd/ejabberd-20.03.ebuild 
b/net-im/ejabberd/ejabberd-20.03.ebuild
new file mode 100644
index 000..aadecdb23d9
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-20.03.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SSL_CERT_MANDATORY=1
+
+inherit eutils pam rebar ssl-cert systemd
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
+SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
+   -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml hipe ldap mssql mysql odbc pam postgres redis
+   roster-gw sip sqlite stun zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO:>=dev-erlang/luerl-0.3
+# TODO: )
+DEPEND=">=dev-lang/erlang-19.3[hipe?,odbc?,ssl]
+   >=dev-erlang/cache_tab-1.0.22
+   >=dev-erlang/eimp-1.0.14
+   >=dev-erlang/fast_tls-1.1.4
+   >=dev-erlang/fast_xml-1.1.39
+   >=dev-erlang/fast_yaml-1.0.24
+   >=dev-erlang/yconf-1.0.4
+   >=dev-erlang/jiffy-1.0.1
+   >=dev-erlang/jose-1.9.0
+   >=dev-erlang/lager-3.6.10
+   >=dev-erlang/p1_oauth2-0.6.6
+   >=dev-erlang/p1_utils-1.0.18
+   >=dev-erlang/stringprep-1.0.19
+   >=dev-erlang/xmpp-1.4.5
+   >=dev-erlang/pkix-1.0.5
+   >=dev-erlang/mqtree-1.0.7
+   >=dev-erlang/idna-6.0.0
+   >=dev-erlang/p1_acme-1.0.5
+   >=dev-erlang/base64url-1.0
+   >=net-im/jabber-base-0.01
+   ldap? ( =net-nds/openldap-2* )
+   mysql? ( >=dev-erlang/p1_mysql-1.0.14 )
+   odbc? ( dev-db/unixODBC )
+   pam? ( >=dev-erlang/epam-1.0.7 )
+   postgres? ( >=dev-erlang/p1_pgsql-1.1.9 )
+   redis? ( >=dev-erlang/eredis-1.0.8 )
+   sip? ( >=dev-erlang/esip-1.0.32 )
+   sqlite? ( >=dev-erlang/sqlite3-1.1.6 )
+   stun? ( >=dev-erlang/stun-1.0.31 )
+   zlib? ( >=dev-erlang/ezlib-1.0.7 )"
+RDEPEND="${DEPEND}
+   captcha? ( media-gfx/imagemagick[truetype,png] )"
+
+DOCS=( CHANGELOG.md README.md )
+PATCHES=( "${FILESDIR}/${PN}-19.08-ejabberdctl.patch"
+   "${FILESDIR}/${PN}-19.08-0002-Dont-overwrite-service-file.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 certificate.
+adjust_config() {
+   sed -rne "/^#?\s+certfiles:/{p;a\  - ${EJABBERD_CERT}" -e 
":a;n;/^#?\s+-/ba};p" \
+   -i "${S}/ejabberd.yml.example" \
+   || die 'failed to adjust example config'
+   sed -re 's/^#\s+(certfiles)/\1/' \
+   -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

[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/files/, net-im/ejabberd/

2019-02-24 Thread Pacho Ramos 
commit: df82a20555aeb41fec827e3541928b6b40f38365
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Feb 24 10:34:59 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Feb 24 10:53:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df82a205

net-im/ejabberd: Drop old

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Pacho Ramos  gentoo.org>

 net-im/ejabberd/Manifest   |   2 -
 net-im/ejabberd/ejabberd-16.09.ebuild  | 319 
 net-im/ejabberd/ejabberd-17.01-r2.ebuild   | 326 
 net-im/ejabberd/ejabberd-17.04-r1.ebuild   | 327 -
 .../files/ejabberd-16.09-ejabberdctl.patch |  62 
 ...rd-17.01-0001-Dont-overwrite-service-file.patch |  15 -
 .../files/ejabberd-17.01-ejabberdctl.patch |  62 
 7 files changed, 1113 deletions(-)

diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 6ac1c7f8a8c..57e9e73b4c0 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,3 +1 @@
-DIST ejabberd-16.09.tar.gz 1687485 BLAKE2B 
01bdfc0ebfc54bf94f5ce645fdb7e4c86070249fe9c5bd6ae40fb355bb0cce8707b285b8e4519a38148a75d8a14719b2815dd0a987de74fe69099bce1401f9da
 SHA512 
506365eff83f9ab97c9a632c4b8b2428aacbfc570c34ca65a78903d95c64755489ff7327be3efa2172c9d05d7891f83986b1ff3928a7ce806c0ab2aa5dbb647f
-DIST ejabberd-17.01.tar.gz 1638418 BLAKE2B 
016224277c45f753018a4e82783be1924acc1e747f1674ce1c902b06644908762750770debe5c06e8e4befcb4246b65efed4592d948188c30dcbf158bb049688
 SHA512 
d64125f81efbf841eded140d877c950439c11e65377e167994d25f85fa66437aad771d94548d063900bd3c472922e6bfa8f8bbe65413f18e7b641f0ed32db566
 DIST ejabberd-17.04.tar.gz 1690441 BLAKE2B 
2d31f1f0a393c6531653a55021b9deb729357bb53e86e85b85796a65f505257bcf7a14b0d168af2d13a6820e1524e1164ea7f17797df23ae41d7a8379f9e2066
 SHA512 
03467434dba92bd1ff2f70d78aa8fcf86fc73cb5273e4947229e1d14225e7b0d0133c3da7c8efe4c9db13aab932f40f757be46b120d0f280f96d62c203d7

diff --git a/net-im/ejabberd/ejabberd-16.09.ebuild 
b/net-im/ejabberd/ejabberd-16.09.ebuild
deleted file mode 100644
index 8c86270fcf8..000
--- a/net-im/ejabberd/ejabberd-16.09.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SSL_CERT_MANDATORY=1
-
-inherit eutils pam rebar ssl-cert systemd
-
-DESCRIPTION="Robust, scalable and extensible XMPP server"
-HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
-SRC_URI="https://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.4
-   >=dev-erlang/esip-1.0.8
-   >=dev-erlang/fast_tls-1.0.7
-   >=dev-erlang/fast_xml-1.1.15
-   >=dev-erlang/fast_yaml-1.0.6
-   >=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/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 )
-   nls? ( >=dev-erlang/iconv-1.0.2 )
-   odbc? ( dev-db/unixODBC )
-   pam? ( >=dev-erlang/epam-1.0.0
-   =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_p2015
-   )
-   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

[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/files/, net-im/ejabberd/

2017-05-28 Thread Amadeusz Piotr Żołnowski 
commit: 3f1724d261577a5eebdd7cc64605c41baa7a4f48
Author: Amadeusz Żołnowski  gentoo  org>
AuthorDate: Sun May 28 13:08:41 2017 +
Commit: Amadeusz Piotr Żołnowski  gentoo  org>
CommitDate: Sun May 28 13:08:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f1724d2

net-im/ejabberd: Bump version

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-im/ejabberd/Manifest   |   1 +
 net-im/ejabberd/ejabberd-17.04.ebuild  | 302 +
 .../files/ejabberd-17.04-ejabberdctl.patch |  62 +
 3 files changed, 365 insertions(+)

diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index fcc89f207ce..c5017485df3 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,2 +1,3 @@
 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 
7b670b0876b4fb804410730571175c253e094fab6fc8c9412eae4e14b844ad38596426b4334bd751a056f940dfd60c1c06d2560af5b36061eb54553886fb
+DIST ejabberd-17.04.tar.gz 1690441 SHA256 
b8395bc65b09f135a60320b62338258acd6056cc241e9e245fde267fb18dd3c9 SHA512 
03467434dba92bd1ff2f70d78aa8fcf86fc73cb5273e4947229e1d14225e7b0d0133c3da7c8efe4c9db13aab932f40f757be46b120d0f280f96d62c203d7
 WHIRLPOOL 
c345a6b31e5ea63d72779630d7db8868e997e876ef929dc0de3df0584ca3dcbec1d36e6bb1cacdcc3ee428f9f82b4dbc73d3f08446ace0daa8beccd2fe9a8bfe

diff --git a/net-im/ejabberd/ejabberd-17.04.ebuild 
b/net-im/ejabberd/ejabberd-17.04.ebuild
new file mode 100644
index 000..75726aedb77
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-17.04.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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.7
+   >=dev-erlang/esip-1.0.11
+   >=dev-erlang/fast_tls-1.0.11
+   >=dev-erlang/fast_xml-1.1.21
+   >=dev-erlang/fast_yaml-1.0.9
+   >=dev-erlang/jiffy-0.14.8
+   >=dev-erlang/lager-3.2.1
+   >=dev-erlang/luerl-0.2
+   >=dev-erlang/p1_oauth2-0.6.1
+   >=dev-erlang/p1_utils-1.0.8
+   >=dev-erlang/stringprep-1.0.8
+   >=dev-erlang/stun-1.0.10
+   >=dev-erlang/xmpp-1.1.9
+   >=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.2 )
+   nls? ( >=dev-erlang/iconv-1.0.4 )
+   odbc? ( dev-db/unixODBC )
+   pam? ( >=dev-erlang/epam-1.0.2 )
+   postgres? ( >=dev-erlang/p1_pgsql-1.1.2 )
+   redis? ( >=dev-erlang/eredis-1.0.8 )
+   riak? (
+   >=dev-erlang/hamcrest-0.1.0_p20150103
+   >=dev-erlang/riakc-2.4.1
+   )
+   sqlite? ( >=dev-erlang/sqlite3-1.1.5 )
+   zlib? ( >=dev-erlang/ezlib-1.0.2 )"
+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.

[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/files/, net-im/ejabberd/

2017-05-28 Thread Amadeusz Piotr Żołnowski 
commit: f7e77ea56eaafd2422d5009d52cae79ef264
Author: Amadeusz Żołnowski  gentoo  org>
AuthorDate: Sun May 28 13:29:55 2017 +
Commit: Amadeusz Piotr Żołnowski  gentoo  org>
CommitDate: Sun May 28 13:29:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7e77ea5

net-im/ejabberd: Bump version

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-im/ejabberd/ejabberd-17.04.ebuild  |  3 +-
 ...7.04-0001-Don-t-configure-or-compile-deps.patch | 53 ++
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/net-im/ejabberd/ejabberd-17.04.ebuild 
b/net-im/ejabberd/ejabberd-17.04.ebuild
index 75726aedb77..8b82f975af8 100644
--- a/net-im/ejabberd/ejabberd-17.04.ebuild
+++ b/net-im/ejabberd/ejabberd-17.04.ebuild
@@ -62,7 +62,8 @@ RDEPEND="${CDEPEND}
captcha? ( media-gfx/imagemagick[truetype,png] )"
 
 DOCS=( README )
-PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" )
+PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch"
+   "${FILESDIR}/${P}-0001-Don-t-configure-or-compile-deps.patch" )
 
 EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
 # Paths in net-im/jabber-base

diff --git 
a/net-im/ejabberd/files/ejabberd-17.04-0001-Don-t-configure-or-compile-deps.patch
 
b/net-im/ejabberd/files/ejabberd-17.04-0001-Don-t-configure-or-compile-deps.patch
new file mode 100644
index 000..0a42f549b58
--- /dev/null
+++ 
b/net-im/ejabberd/files/ejabberd-17.04-0001-Don-t-configure-or-compile-deps.patch
@@ -0,0 +1,53 @@
+From 4086249e78cde107df84e6ad022e9d9821cecc40 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= 
+Date: Sun, 28 May 2017 14:22:08 +0100
+Subject: [PATCH] Don't configure or compile deps
+
+---
+ rebar.config.script | 23 ---
+ 1 file changed, 23 deletions(-)
+
+diff --git a/rebar.config.script b/rebar.config.script
+index 19142b9e..04f8b310 100644
+--- a/rebar.config.script
 b/rebar.config.script
+@@ -242,27 +242,6 @@ CtParams = fun(CompileOpts) ->
+   TestConfig]
+  end,
+ 
+-GenDepConfigureLine =
+-fun(DepPath, Flags) ->
+-  ["sh -c 'if test ! -f ",DepPath,"config.status -o ",
+-   "config.status -nt ",DepPath,"config.status; ",
+-   "then (cd ", DepPath, " && ",
+-   "CFLAGS=\"", CFlags,"\" ",
+-   "CPPFLAGS=\"", CPPFlags, "\" "
+-   "LDFLAGS=\"", LDFlags, "\"",
+-   " ./configure ", string:join(Flags, " "),
+-   "); fi'"]
+-end,
+-
+-GenDepsConfigure =
+-fun(Hooks) ->
+-  lists:map(fun({Pkg, Flags}) ->
+-DepPath = ResolveDepPath("deps/" ++ Pkg ++ "/"),
+-{'compile',
+- lists:flatten(GenDepConfigureLine(DepPath, Flags))}
+-end, Hooks)
+-end,
+-
+ ProcessErlOpt = fun(Vals) ->
+   lists:map(
+ fun({i, Path}) ->
+@@ -315,8 +294,6 @@ Rules = [
+ AppendList([{coveralls, ".*", {git, 
"https://github.com/markusn/coveralls-erl.git;, "master"}}]), []},
+{[post_hooks], [cover_enabled], os:getenv("TRAVIS") == "true",
+ AppendList2(TravisPostHooks), [], false},
+-   {[pre_hooks], [post_hook_configure], true,
+-AppendList2(GenDepsConfigure), [], []},
+{[ct_extra_params], [eunit_compile_opts], true,
+ AppendStr2(CtParams), "", []},
+{[erl_opts], true,
+-- 
+2.12.2
+

[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/files/, net-im/ejabberd/

2017-05-27 Thread Amadeusz Piotr Żołnowski 
commit: 8be8ae98b60da239244a5378f12999b6ce4c353f
Author: Amadeusz Żołnowski  gentoo  org>
AuthorDate: Sat May 27 19:48:33 2017 +
Commit: Amadeusz Piotr Żołnowski  gentoo  org>
CommitDate: Sat May 27 20:55:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8be8ae98

net-im/ejabberd: Remove older versions

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-im/ejabberd/Manifest   |   2 -
 net-im/ejabberd/ejabberd-16.04-r1.ebuild   | 299 -
 net-im/ejabberd/ejabberd-16.04.ebuild  | 280 ---
 net-im/ejabberd/ejabberd-16.08.ebuild  | 298 
 .../files/ejabberd-16.04-ejabberdctl.patch |  49 
 .../files/ejabberd-16.08-ejabberdctl.patch |  62 -
 6 files changed, 990 deletions(-)

diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index c0f2fe3a01a..fcc89f207ce 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,4 +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
 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 
7b670b0876b4fb804410730571175c253e094fab6fc8c9412eae4e14b844ad38596426b4334bd751a056f940dfd60c1c06d2560af5b36061eb54553886fb

diff --git a/net-im/ejabberd/ejabberd-16.04-r1.ebuild 
b/net-im/ejabberd/ejabberd-16.04-r1.ebuild
deleted file mode 100644
index 84354c2c2a2..000
--- a/net-im/ejabberd/ejabberd-16.04-r1.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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.2
-   >=dev-erlang/esip-1.0.4
-   >=dev-erlang/fast_tls-1.0.3
-   >=dev-erlang/fast_xml-1.1.3
-   >=dev-erlang/fast_yaml-1.0.3
-   >=dev-erlang/jiffy-0.14.7
-   >=dev-erlang/lager-3.0.2
-   >=dev-erlang/luerl-0.2
-   >=dev-erlang/p1_oauth2-0.6.1
-   >=dev-erlang/p1_utils-1.0.4
-   >=dev-erlang/p1_xmlrpc-1.15.1
-   >=dev-erlang/stringprep-1.0.3
-   >=dev-erlang/stun-1.0.3
-   >=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.0 )
-   odbc? ( dev-db/unixODBC )
-   pam? ( >=dev-erlang/epam-1.0.0
-   =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_p2015
-   )
-   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

[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/files/, net-im/ejabberd/

2016-08-21 Thread Amadeusz Piotr Żołnowski 
commit: c8542b3bce05ec947f3c3b0a1718624acb54791e
Author: Amadeusz Żołnowski  gentoo  org>
AuthorDate: Sun Aug 21 10:49:14 2016 +
Commit: Amadeusz Piotr Żołnowski  gentoo  org>
CommitDate: Sun Aug 21 10:49:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8542b3b

net-im/ejabberd: Remove older, bundled version of ejabberd

Clean up unused flags in metadata.xml.

Package-Manager: portage-2.3.0

 net-im/ejabberd/Manifest   |  29 --
 net-im/ejabberd/ejabberd-16.01-r1.ebuild   | 348 -
 .../files/ejabberd-16.01-ejabberdctl.patch |  49 ---
 net-im/ejabberd/metadata.xml   |  10 +-
 4 files changed, 1 insertion(+), 435 deletions(-)

diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index b2fcc5e..bba25e2 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,30 +1 @@
-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-16.01.tgz 1651587 SHA256 
e2cc479d5870539b2e6756690b227969c88a541d464d1fc6e1cbf7270ad7d681 SHA512 
f0614db0d0eaf6d4f25b75b8eefbcf93260549876535fd5d82498c75779d182b19ec249ffb9b1b168cb5a887e8e6933eb868892b4aa5cd2933b739d263adca8a
 WHIRLPOOL 
65bc13ba5e380a999ed2ae9c816856f90e24393343d16ae52349350687dfdb15857a3358d856de5694c30718cefc5513b9d3c75871bb368cac54547becc1607a
 DIST ejabberd-16.04.tar.gz 1715963 SHA256 
3d964fe74e438253c64c8498eb7465d2440823614a23df8d33bdf40126d72cc3 SHA512 
5975d5a164060cca59b6d92de2c432f063061e832b2e03cae351fe3c16b178259489dc0b82ea800f1c2388eeb7e3aa4340630ad3c10a22cc6d6f0b4eef8fa0f2
 WHIRLPOOL 
d9018835aaa736040f63222c73b54ea65385532989390c007f4cb736b474da40d9fdceb6c377a251398fb6de87869a13dec0ac160fe9a0d081337efd35dc66b4
-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 
afa8e687e3f06b2cbbdac2cc2933e4a136698661da350e16b1ecac34bbccdae9175d5a4e1ce2a4e237d0d8e846fcfb00d3a7143a5ac0c230a73dfef6c660
 WHIRLPOOL 
5cff5953b8c4096d8ec402f3be6ee94e839e50d3c087468d48c63ce914a50f35c80f93f2920564cdd74faeaa5047eb8a7176045c834347ffcc2566333540f4b8
-DIST

[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/files/, net-im/ejabberd/

2016-02-15 Thread Amadeusz Piotr Żołnowski 
commit: 2235a555a140fa024b657bb57ee8fac5832ab58b
Author: Amadeusz Żołnowski  gentoo  org>
AuthorDate: Mon Feb 15 21:15:19 2016 +
Commit: Amadeusz Piotr Żołnowski  gentoo  org>
CommitDate: Mon Feb 15 21:49:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2235a555

net-im/ejabberd: Bump version

Commit on behalf of Vadim Efimov  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

 net-im/ejabberd/Manifest   |  29 ++
 net-im/ejabberd/ejabberd-16.01.ebuild  | 346 +
 .../files/ejabberd-16.01-ejabberdctl.patch |  49 +++
 net-im/ejabberd/metadata.xml   |   7 +-
 4 files changed, 430 insertions(+), 1 deletion(-)

diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index b3e9e08..d0c30fc 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 
99399323150990cda15e707385f0f26fa790d4ba188a97ac46db9c25e72a7ec72a875573136f17a18648017074d76e4e267b544dc4c95a5101ed9ad6815d
 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