net-im/ejabberd: Remove duplicate patch
authorHanno Böck <hanno@gentoo.org>
Thu, 30 Apr 2020 09:44:25 +0000 (11:44 +0200)
committerHanno Böck <hanno@gentoo.org>
Thu, 30 Apr 2020 09:44:25 +0000 (11:44 +0200)
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

net-im/ejabberd/ejabberd-20.03.ebuild
net-im/ejabberd/files/ejabberd-19.08-0002-Dont-overwrite-service-file.patch [deleted file]

index aadecdb23d9bcc9b6433ef295d7af823caf885c3..7ed076748bb0565f771f68330f0e3c04e02b0bfc 100644 (file)
@@ -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 (file)
index 2bea750..0000000
+++ /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