From: Hanno Böck <hanno@gentoo.org>
Date: Thu, 30 Apr 2020 09:44:25 +0000 (+0200)
Subject: net-im/ejabberd: Remove duplicate patch
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fdfa70080cd3916f32561b479da795248eddf738;p=gentoo.git

net-im/ejabberd: Remove duplicate patch

Both patch files for old and new version were identical.

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

diff --git a/net-im/ejabberd/ejabberd-20.03.ebuild b/net-im/ejabberd/ejabberd-20.03.ebuild
index aadecdb23d9b..7ed076748bb0 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 2bea750ef04e..000000000000
--- 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