[gentoo-commits] proj/emacs:master commit in: app-emacs/ebuild-mode/

[Ulrich Müller]

commit:     dae61221966328a59600f2e475915dfea3c49082
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 15:33:56 2015 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 15:35:20 2015 +0000
URL:        https://gitweb.gentoo.org/proj/emacs.git/commit/?id=dae61221

app-emacs/ebuild-mode: Merge changes from Portage tree.

Package-Manager: portage-2.2.26

 app-emacs/ebuild-mode/ChangeLog               | 3 +++
 app-emacs/ebuild-mode/ebuild-mode-9999.ebuild | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app-emacs/ebuild-mode/ChangeLog b/app-emacs/ebuild-mode/ChangeLog
index a840761..a6c2414 100644
--- a/app-emacs/ebuild-mode/ChangeLog
+++ b/app-emacs/ebuild-mode/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Dec 2015; Ulrich Müller <ulm@g.o> ebuild-mode-9999.ebuild:
+  Merge changes from Portage tree.
+
   25 Apr 2015; Ulrich Müller <ulm@g.o> ebuild-mode-9999.ebuild:
   Update EGIT_REPO_URI.
 

diff --git a/app-emacs/ebuild-mode/ebuild-mode-9999.ebuild b/app-emacs/ebuild-mode/ebuild-mode-9999.ebuild
index 21c575e..09f9ea5 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-9999.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-9999.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
-EAPI=5
+EAPI=6
 
 EGIT_REPO_URI="git://anongit.gentoo.org/proj/emacs-tools.git"
 EGIT_BRANCH="${PN}"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
 
-inherit readme.gentoo elisp git-r3
+inherit readme.gentoo-r1 elisp git-r3
 
 DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="http://wiki.gentoo.org/wiki/Project:Emacs"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
 
 LICENSE="GPL-2+"
 SLOT="0"