[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-flow/

[Johannes Huber]

commit:     143c67084aba220df5bc012fa0decc2cbc58ad40
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  9 13:49:15 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jan  9 13:51:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=143c6708

dev-vcs/git-flow: EAPI 6

Package-Manager: portage-2.2.26

 dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild              |  2 +-
 ...t-flow-1.8.0-r1.ebuild => git-flow-1.8.0-r2.ebuild} | 18 +++++-------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild 
b/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
index 7967fb0..3c7de0d 100644
--- a/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

diff --git a/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild 
b/dev-vcs/git-flow/git-flow-1.8.0-r2.ebuild
similarity index 74%
copy from dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
copy to dev-vcs/git-flow/git-flow-1.8.0-r2.ebuild
index 7967fb0..969188d 100644
--- a/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.8.0-r2.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 MY_PN="${PN/-/}"
 COMP_PN="${PN}-completion"
 COMP_PV="0.5.1"
 COMP_P="${COMP_PN}-${COMP_PV}"
-inherit eutils bash-completion-r1
+inherit bash-completion-r1
 
 DESCRIPTION="Git extensions to provide high-level repository operations for 
Vincent Driessen's branching model"
 HOMEPAGE="https://github.com/petervanderdoes/gitflow";
@@ -17,7 +17,7 @@ 
https://github.com/petervanderdoes/${COMP_PN}/archive/${COMP_PV}.tar.gz -> ${COM
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
@@ -29,20 +29,12 @@ DOCS=( AUTHORS Changes.mdown README.mdown )
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
-src_prepare() {
-       [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-       debug-print "$FUNCNAME: applying user patches"
-       epatch_user
-}
-
 src_compile() {
        true
 }
 
 src_install() {
        emake prefix="${D}/usr" install
-
-       [[ ${DOCS[@]} ]] && dodoc "${DOCS[@]}"
-
+       einstalldocs
        newbashcomp "${WORKDIR}/${COMP_P}/${COMP_PN}.bash" ${PN}
 }