From f8903a96fbfc3562162c319d643d3ab8723f0abe Mon Sep 17 00:00:00 2001
From: =?utf8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@gentoo.org>
Date: Sat, 27 Aug 2016 11:28:41 +0100
Subject: [PATCH] net-im/ejabberd: Clean up files directory

service file is no longer used because it's provided by upstream. Suffix
"-3" in init and confd file names is no longer neccessary because
there's only one version of the initd script.

Package-Manager: portage-2.3.0
---
 net-im/ejabberd/ejabberd-16.04.ebuild           |  4 ++--
 .../files/{ejabberd-3.confd => ejabberd.confd}  |  0
 .../files/{ejabberd-3.initd => ejabberd.initd}  |  2 +-
 net-im/ejabberd/files/ejabberd.service          | 17 -----------------
 4 files changed, 3 insertions(+), 20 deletions(-)
 rename net-im/ejabberd/files/{ejabberd-3.confd => ejabberd.confd} (100%)
 rename net-im/ejabberd/files/{ejabberd-3.initd => ejabberd.initd} (96%)
 delete mode 100644 net-im/ejabberd/files/ejabberd.service

diff --git a/net-im/ejabberd/ejabberd-16.04.ebuild b/net-im/ejabberd/ejabberd-16.04.ebuild
index 7fd509dcef46..211f21d76099 100644
--- a/net-im/ejabberd/ejabberd-16.04.ebuild
+++ b/net-im/ejabberd/ejabberd-16.04.ebuild
@@ -224,8 +224,8 @@ src_install() {
 		fperms 4750 "${epam_path}"
 	fi
 
-	newconfd "${FILESDIR}/${PN}-3.confd" "${PN}"
-	newinitd "${FILESDIR}/${PN}-3.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
 	systemd_dounit "${PN}.service"
 	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
 
diff --git a/net-im/ejabberd/files/ejabberd-3.confd b/net-im/ejabberd/files/ejabberd.confd
similarity index 100%
rename from net-im/ejabberd/files/ejabberd-3.confd
rename to net-im/ejabberd/files/ejabberd.confd
diff --git a/net-im/ejabberd/files/ejabberd-3.initd b/net-im/ejabberd/files/ejabberd.initd
similarity index 96%
rename from net-im/ejabberd/files/ejabberd-3.initd
rename to net-im/ejabberd/files/ejabberd.initd
index 2827aeb43d42..aed39b87b052 100644
--- a/net-im/ejabberd/files/ejabberd-3.initd
+++ b/net-im/ejabberd/files/ejabberd.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/net-im/ejabberd/files/ejabberd.service b/net-im/ejabberd/files/ejabberd.service
deleted file mode 100644
index 0b792565b75e..000000000000
--- a/net-im/ejabberd/files/ejabberd.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=A distributed, fault-tolerant Jabber/XMPP server
-After=network.target
-
-[Service]
-Type=oneshot
-User=jabber
-LimitNOFILE=16000
-RestartSec=5
-ExecStart=/usr/sbin/ejabberdctl \
-	--config /etc/jabber/ejabberd.cfg --ctl-config /etc/jabber/ejabberdctl.cfg \
-	--logs "/var/log/jabber" --spool "/var/spool/jabber" start
-ExecStop=/usr/sbin/ejabberdctl stop
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
-- 
2.26.2