From fdfa70080cd3916f32561b479da795248eddf738 Mon Sep 17 00:00:00 2001 From: Hanno Böck Date: Thu, 30 Apr 2020 11:44:25 +0200 Subject: net-im/ejabberd: Remove duplicate patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Both patch files for old and new version were identical. Signed-off-by: Hanno Böck Package-Manager: Portage-2.3.99, Repoman-2.3.22 --- net-im/ejabberd/ejabberd-20.03.ebuild | 2 +- .../ejabberd-19.08-0002-Dont-overwrite-service-file.patch | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 net-im/ejabberd/files/ejabberd-19.08-0002-Dont-overwrite-service-file.patch (limited to 'net-im') 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 -- cgit v1.2.3-65-gdbad