[gentoo-commits] repo/gentoo:master commit in: app-emacs/wikipedia-mode/, app-emacs/wikipedia-mode/files/

[Ulrich Müller]

commit:     b81d40831c043d33ef51c4f277c44d3646c03e7f
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  3 10:06:48 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Oct  3 10:07:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b81d4083

app-emacs/wikipedia-mode: Bump EAPI to 7.

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 .../files/wikipedia-mode-0.5-require-outline-magic.patch    |  4 ++--
 ...edia-mode-0.5-r1.ebuild => wikipedia-mode-0.5-r2.ebuild} | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app-emacs/wikipedia-mode/files/wikipedia-mode-0.5-require-outline-magic.patch b/app-emacs/wikipedia-mode/files/wikipedia-mode-0.5-require-outline-magic.patch
index caefca75763..9ec17844508 100644
--- a/app-emacs/wikipedia-mode/files/wikipedia-mode-0.5-require-outline-magic.patch
+++ b/app-emacs/wikipedia-mode/files/wikipedia-mode-0.5-require-outline-magic.patch
@@ -1,5 +1,5 @@
---- wikipedia-mode.el~
-+++ wikipedia-mode.el
+--- a/wikipedia-mode.el
++++ b/wikipedia-mode.el
 @@ -386,2 +386,3 @@
  (require 'font-lock)
 +(require 'outline-magic)

diff --git a/app-emacs/wikipedia-mode/wikipedia-mode-0.5-r1.ebuild b/app-emacs/wikipedia-mode/wikipedia-mode-0.5-r2.ebuild
similarity index 60%
rename from app-emacs/wikipedia-mode/wikipedia-mode-0.5-r1.ebuild
rename to app-emacs/wikipedia-mode/wikipedia-mode-0.5-r2.ebuild
index 89c4f20828b..c70b2cb4fe4 100644
--- a/app-emacs/wikipedia-mode/wikipedia-mode-0.5-r1.ebuild
+++ b/app-emacs/wikipedia-mode/wikipedia-mode-0.5-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit elisp eutils
+inherit elisp
 
 DESCRIPTION="Mode for editing Wikipedia articles off-line"
 HOMEPAGE="https://www.emacswiki.org/emacs/WikipediaMode"
@@ -14,11 +14,12 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="outline-magic"
 
-DEPEND="outline-magic? ( app-emacs/outline-magic )"
-RDEPEND="${DEPEND}"
+RDEPEND="outline-magic? ( app-emacs/outline-magic )"
+BDEPEND="${RDEPEND}"
 
 SITEFILE="50${PN}-gentoo.el"
 
 src_prepare() {
-	use outline-magic && epatch "${FILESDIR}/${P}-require-outline-magic.patch"
+	use outline-magic && eapply "${FILESDIR}"/${P}-require-outline-magic.patch
+	eapply_user
 }