[gentoo-commits] repo/gentoo:master commit in: dev-util/quilt/

[Mike Pagano]

commit:     fda11baa700ad25d77c78ca0969f180cc1da8455
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 15 20:45:21 2019 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Sun Dec 15 20:45:32 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fda11baa

dev-util/quilt: EAPI bump. Minor fixes.

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 dev-util/quilt/quilt-9999.ebuild | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/dev-util/quilt/quilt-9999.ebuild b/dev-util/quilt/quilt-9999.ebuild
index 4a4042e9a2f..1698d8c89c9 100644
--- a/dev-util/quilt/quilt-9999.ebuild
+++ b/dev-util/quilt/quilt-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 EGIT_REPO_URI="git://git.sv.gnu.org/quilt.git"
 
-[[ ${PV} == 9999 ]] && inherit git-2
+[[ ${PV} == 9999 ]] && inherit git-r3
 
-inherit bash-completion-r1 eutils
+inherit bash-completion-r1
 
 DESCRIPTION="quilt patch manager"
 HOMEPAGE="https://savannah.nongnu.org/projects/quilt";
@@ -30,8 +30,11 @@ RDEPEND="
 "
 
 src_prepare() {
+
+       default
+
        # Add support for USE=graphviz
-       use graphviz || epatch "${FILESDIR}/${PN}-0.60-no-graphviz.patch"
+       use graphviz || eapply "${FILESDIR}/${PN}-0.66-no-graphviz.patch"
 
        # remove failing test, because it fails on root-build
        rm -rf test/delete.test
@@ -45,15 +48,14 @@ src_configure() {
 }
 
 src_install() {
-       emake BUILD_ROOT="${ED}" install
-
-       rm -rf "${ED}"/usr/share/doc/${P}
-       dodoc AUTHORS TODO quilt.changes doc/README doc/README.MAIL \
-               doc/quilt.pdf
+       emake BUILD_ROOT="${D}" install
 
        rm -rf "${ED}"/etc/bash_completion.d
        newbashcomp bash_completion ${PN}
 
+       rm -rf "${ED}"usr/share/doc/${PN}
+       dodoc AUTHORS TODO "doc/README" "doc/README.MAIL" "doc/quilt.pdf"
+
        # Remove the compat symlinks
        rm -rf "${ED}"/usr/share/quilt/compat