From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-890038-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 0E06E1382DE
for <garchives@archives.gentoo.org>; Sun, 3 Jul 2016 07:44:29 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 20108E08BA;
Sun, 3 Jul 2016 07:44:26 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 90C22E08BA
for <gentoo-commits@lists.gentoo.org>; Sun, 3 Jul 2016 07:44:25 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 14ACF340D85
for <gentoo-commits@lists.gentoo.org>; Sun, 3 Jul 2016 07:44:24 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id BC9972435
for <gentoo-commits@lists.gentoo.org>; Sun, 3 Jul 2016 07:44:21 +0000 (UTC)
From: "Amadeusz Piotr Żołnowski" <aidecoe@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Amadeusz Piotr Żołnowski" <aidecoe@gentoo.org>
Message-ID: <1467531846.f888bec998225e36910b02954e40593aff2bd15e.aidecoe@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-im/ejabberd/ejabberd-16.04.ebuild
X-VCS-Directories: net-im/ejabberd/
X-VCS-Committer: aidecoe
X-VCS-Committer-Name: Amadeusz Piotr Żołnowski
X-VCS-Revision: f888bec998225e36910b02954e40593aff2bd15e
X-VCS-Branch: master
Date: Sun, 3 Jul 2016 07:44:21 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 99e054c0-d4eb-45a4-8346-b3eeaecdb9cb
X-Archives-Hash: 66c48141e55f4aa26b9238c2c2345649
commit: f888bec998225e36910b02954e40593aff2bd15e
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 2 22:15:49 2016 +0000
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun Jul 3 07:44:06 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f888bec9
net-im/ejabberd: Make ejabberd.service from upstream template
Gentoo-Bug: 587454
Package-Manager: portage-2.3.0
net-im/ejabberd/ejabberd-16.04.ebuild | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/net-im/ejabberd/ejabberd-16.04.ebuild b/net-im/ejabberd/ejabberd-16.04.ebuild
index b7f818f..441023e 100644
--- a/net-im/ejabberd/ejabberd-16.04.ebuild
+++ b/net-im/ejabberd/ejabberd-16.04.ebuild
@@ -134,6 +134,15 @@ get_ejabberd_path() {
echo "$(get_erl_libs)/${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}:}" \
@@ -168,6 +177,7 @@ src_prepare() {
rebar_remove_deps
correct_ejabberd_paths
set_jabberbase_paths
+ make_ejabberd_service
skip_docs
adjust_config
customize_epam_wrapper "${FILESDIR}/epam-wrapper"
@@ -215,7 +225,7 @@ src_install() {
newconfd "${FILESDIR}/${PN}-3.confd" "${PN}"
newinitd "${FILESDIR}/${PN}-3.initd" "${PN}"
- systemd_dounit "${FILESDIR}/${PN}.service"
+ systemd_dounit "${PN}.service"
systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
insinto /etc/logrotate.d