summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno Böck <hanno@gentoo.org>2020-04-30 11:44:25 +0200
committerHanno Böck <hanno@gentoo.org>2020-04-30 11:44:25 +0200
commitfdfa70080cd3916f32561b479da795248eddf738 (patch)
tree555c04dce1e9179216c88149e09494fca0d429ce /net-im/ejabberd
parentdev-java/tomcat-servlet-api: removed obsolete 7.0.100 and 8.5.51 (diff)
downloadgentoo-fdfa70080cd3916f32561b479da795248eddf738.tar.gz
gentoo-fdfa70080cd3916f32561b479da795248eddf738.tar.bz2
gentoo-fdfa70080cd3916f32561b479da795248eddf738.zip
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
Diffstat (limited to 'net-im/ejabberd')
-rw-r--r--net-im/ejabberd/ejabberd-20.03.ebuild2
-rw-r--r--net-im/ejabberd/files/ejabberd-19.08-0002-Dont-overwrite-service-file.patch15
2 files changed, 1 insertions, 16 deletions
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