| 1 |
commit: fdfa70080cd3916f32561b479da795248eddf738 |
| 2 |
Author: Hanno Böck <hanno <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 30 09:44:25 2020 +0000 |
| 4 |
Commit: Hanno Böck <hanno <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 30 09:44:25 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdfa7008 |
| 7 |
|
| 8 |
net-im/ejabberd: Remove duplicate patch |
| 9 |
|
| 10 |
Both patch files for old and new version were identical. |
| 11 |
|
| 12 |
Signed-off-by: Hanno Böck <hanno <AT> gentoo.org> |
| 13 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 14 |
|
| 15 |
net-im/ejabberd/ejabberd-20.03.ebuild | 2 +- |
| 16 |
.../ejabberd-19.08-0002-Dont-overwrite-service-file.patch | 15 --------------- |
| 17 |
2 files changed, 1 insertion(+), 16 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-im/ejabberd/ejabberd-20.03.ebuild b/net-im/ejabberd/ejabberd-20.03.ebuild |
| 20 |
index aadecdb23d9..7ed076748bb 100644 |
| 21 |
--- a/net-im/ejabberd/ejabberd-20.03.ebuild |
| 22 |
+++ b/net-im/ejabberd/ejabberd-20.03.ebuild |
| 23 |
@@ -61,7 +61,7 @@ RDEPEND="${DEPEND} |
| 24 |
|
| 25 |
DOCS=( CHANGELOG.md README.md ) |
| 26 |
PATCHES=( "${FILESDIR}/${PN}-19.08-ejabberdctl.patch" |
| 27 |
- "${FILESDIR}/${PN}-19.08-0002-Dont-overwrite-service-file.patch") |
| 28 |
+ "${FILESDIR}/${PN}-17.04-0002-Dont-overwrite-service-file.patch") |
| 29 |
|
| 30 |
EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem" |
| 31 |
# Paths in net-im/jabber-base |
| 32 |
|
| 33 |
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 |
| 34 |
deleted file mode 100644 |
| 35 |
index 2bea750ef04..00000000000 |
| 36 |
--- a/net-im/ejabberd/files/ejabberd-19.08-0002-Dont-overwrite-service-file.patch |
| 37 |
+++ /dev/null |
| 38 |
@@ -1,15 +0,0 @@ |
| 39 |
-diff --git a/Makefile.in b/Makefile.in |
| 40 |
-index a0b4553d..4675b88a 100644 |
| 41 |
---- a/Makefile.in |
| 42 |
-+++ b/Makefile.in |
| 43 |
-@@ -204,8 +204,8 @@ install: all copy-files |
| 44 |
- chmod 755 ejabberd.init |
| 45 |
- # |
| 46 |
- # Service script |
| 47 |
-- $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" ejabberd.service.template \ |
| 48 |
-- > ejabberd.service |
| 49 |
-+ [ -f ejabberd.service ] || $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" \ |
| 50 |
-+ ejabberd.service.template > ejabberd.service |
| 51 |
- chmod 644 ejabberd.service |
| 52 |
- # |
| 53 |
- # Spool directory |
Archives