From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 15 Jan 2020 15:51:32 +0000
Subject: gentoo resync : 15.01.2020

---
 dev-util/quilt/Manifest          |  2 +-
 dev-util/quilt/quilt-9999.ebuild | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'dev-util/quilt')

diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest
index 776b1eb77bd2..afd6c7a4a237 100644
--- a/dev-util/quilt/Manifest
+++ b/dev-util/quilt/Manifest
@@ -1,5 +1,5 @@
 AUX quilt-0.66-no-graphviz.patch 1464 BLAKE2B b1a67706f29f3986de0202a4ea68aa2f001989354bf9ab91996cb4f5dbb6578baf28fc1ac781a18525d04fb92d9f6d554efcc598dabbdf1a35b0f63b93c3cd8d SHA512 3f935a6e137998f7d0391ef87f5324c8882490001b37333de22efc068bda8a7e84ccefc3e85616c3aa93894acb8a0841a2b089c59c6a658d1157298d4132707c
 DIST quilt-0.66.tar.gz 413069 BLAKE2B 41201d54cb26d4761413365fe19b65bd6971ada1e69198d2edbc346df6a3060ff3af4d80551d68ab4ffe003183bc0a28515ce1d070db95f2b1a04a0680ac4fb2 SHA512 c2cb75c0937612e1e0da25b713acf629b6b5aacbd8254d8bd17220b63c7b8ca996cd9d0315a32d67d54a4a7dc01b212cdda33afaacf3db063da757f1973306f4
 EBUILD quilt-0.66.ebuild 1617 BLAKE2B 50ea4e59b5baaf315c4b6ba71f589f716f3dc8f29079c8a28ff7f66c16ef080ba77e22409c7c39ac92998b17ac9361bc5e55ce228858e61a1cf30a9bb2fad2d5 SHA512 5e62c6ecaeb0db16a54aeeb6e137442d9ace3ab85f64827caf34c27efd8671d5b62a33dcd748a9a479c288d9736116537f6170d78ee5b3af7320b57d21925990
-EBUILD quilt-9999.ebuild 1764 BLAKE2B a013dfb3d65d2e69077e75673bcdad06216b40cc35a198346681e42162567f327ec4a0583868b1e62d7dfd8ea451abe3d420f0e7cf9b3491b066bdf4ffb56179 SHA512 ab39ceb5756c763b911a077ca98cde61143332b21708f62963ec0632ae3b02e4d319bc92a3b7c9fd74a5fbb04d6c537088bc63aeff1fc5b06f97fece2d07e2ef
+EBUILD quilt-9999.ebuild 1753 BLAKE2B 68bd7408caa296dd0d88fe40a39dfb231749a3c96121ce74ff793ea79d7252f57b43a07f04b0bdf2586a319c4b8b59b3a6f9ea00251e0d123b81a135a821ad82 SHA512 9eac74ba4f87b97bfe3d095b83027b5d8c4e67bd624ee8bd1cbc045c3bdc2b3caa1118e932c19bb396c951871130c15197e96bf7ca10dec83502ab2498eebbef
 MISC metadata.xml 218 BLAKE2B 01c06279fa64627fda89adb9c5748c7629ff3eb46c10acc15b327a0f432d50b86de1d3980ccdafa9b620582db9abdf4d4506b1a53baebd6334f1a890a10783b1 SHA512 cff4a2ad321709df053184879b278c5a5abc74790344f6170cf020cf45a20d8062421e20d215c73002077d66c6367de5fcede710c2ffdd9f067cdf1f40b784ee
diff --git a/dev-util/quilt/quilt-9999.ebuild b/dev-util/quilt/quilt-9999.ebuild
index 4a4042e9a2f0..1698d8c89c9e 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
 
-- 
cgit v1.2.3