gentoo resync : 03.11.2019

4 files changed, 2 insertions, 112 deletions

diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest
index ff2d1518b7a7..d8896cadbf91 100644
--- a/dev-util/quilt/Manifest
+++ b/dev-util/quilt/Manifest
@@ -1,8 +1,5 @@
-AUX quilt-0.50-no-graphviz.patch 1477 BLAKE2B f070303e072b26bb70de578277ee9fcfa56975d6c4a3927835f0d3a17d3c40bea5e57ce5863c5f91939e6b0f8ff9b63ebbd039458b474591fc3e545efb4e1515 SHA512 281c3f080e6ce6d4fd38e881b5cf111bc8313a9171a1c93edf9393b4f33eb0bd4fdb4c1b1df2cc888391acc6016c0eae9183948f5a76b8dc492e2ebb99f84f98
 AUX quilt-0.66-no-graphviz.patch 1464 BLAKE2B b1a67706f29f3986de0202a4ea68aa2f001989354bf9ab91996cb4f5dbb6578baf28fc1ac781a18525d04fb92d9f6d554efcc598dabbdf1a35b0f63b93c3cd8d SHA512 3f935a6e137998f7d0391ef87f5324c8882490001b37333de22efc068bda8a7e84ccefc3e85616c3aa93894acb8a0841a2b089c59c6a658d1157298d4132707c
-DIST quilt-0.50.tar.gz 452769 BLAKE2B 5d466d1feca8a1f702db9d5f2bb4340331d06e413992fc8f30111d48daf71f560d60444ddb49cc06096552f32feb44cfd369f370222f574cea4664f4324d04fa SHA512 c6258872bc591b35e93ba09cc17b4954696faf391aff71b7789cc8cc58c4c54e51b605896937bd1aa54545eed6bf1e9b70352ad9b643f869154e6953c0340365
 DIST quilt-0.66.tar.gz 413069 BLAKE2B 41201d54cb26d4761413365fe19b65bd6971ada1e69198d2edbc346df6a3060ff3af4d80551d68ab4ffe003183bc0a28515ce1d070db95f2b1a04a0680ac4fb2 SHA512 c2cb75c0937612e1e0da25b713acf629b6b5aacbd8254d8bd17220b63c7b8ca996cd9d0315a32d67d54a4a7dc01b212cdda33afaacf3db063da757f1973306f4
-EBUILD quilt-0.50.ebuild 1506 BLAKE2B 8bcc89c45c61601cfe777bef33830c4f2bbe949209cde060b18c05f3b4435752996bdaa0e4916a87e787f04de95127783b850dcd1639309b8e3332e6b088a6ec SHA512 80bf6055c1096b7b8898166d2e86f434f5bb8351e50ae2eaf64c95cd49e287e504f12fe0a628554d3aaad3264b1ed174fcae56744fefa59479bb4743089ebcf3
-EBUILD quilt-0.66.ebuild 1647 BLAKE2B 621b6ae0d8e140cdc01cbb91c0dfb0bb8f2881aa22f7da8b7794e9ca996da7d0077a0313a8411dcbda3db53326f976dd7aaf6ad2fbb60770ed1664fd2440fbe6 SHA512 0da0428658e047279803a197a71dd1099f00ecb7eb6d571e3b4e0cb7d336f460fdc17cbb5c4e5c2eab1d87d471c520e9c52486a047b03ee13ff3e172b18710ab
+EBUILD quilt-0.66.ebuild 1646 BLAKE2B e1484c788cf95f4f517f1b9f17e0b93b0edf6746f5b8389aaa7342e638f5a850e2a5790fc0c183536463276e86fc8d02d2ffeb20e35a3152332bb54ea0b7f668 SHA512 b186b163a1c12399f334a50272e205e9e22135539735052ca6a4b35be497ea93848edd35a5b1470211b2fa755d7d1ec2dc054db88c172a1e2b57dfb38fe1278a
 EBUILD quilt-9999.ebuild 1764 BLAKE2B a013dfb3d65d2e69077e75673bcdad06216b40cc35a198346681e42162567f327ec4a0583868b1e62d7dfd8ea451abe3d420f0e7cf9b3491b066bdf4ffb56179 SHA512 ab39ceb5756c763b911a077ca98cde61143332b21708f62963ec0632ae3b02e4d319bc92a3b7c9fd74a5fbb04d6c537088bc63aeff1fc5b06f97fece2d07e2ef
 MISC metadata.xml 218 BLAKE2B 01c06279fa64627fda89adb9c5748c7629ff3eb46c10acc15b327a0f432d50b86de1d3980ccdafa9b620582db9abdf4d4506b1a53baebd6334f1a890a10783b1 SHA512 cff4a2ad321709df053184879b278c5a5abc74790344f6170cf020cf45a20d8062421e20d215c73002077d66c6367de5fcede710c2ffdd9f067cdf1f40b784ee
diff --git a/dev-util/quilt/files/quilt-0.50-no-graphviz.patch b/dev-util/quilt/files/quilt-0.50-no-graphviz.patch
deleted file mode 100644
index 04e0d7d3a9a1..000000000000
--- a/dev-util/quilt/files/quilt-0.50-no-graphviz.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: b/Makefile.in
-===================================================================
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -82,8 +82,7 @@ QUILT :=	$(QUILT_IN)
- SRC +=		$(QUILT_SRC:%=quilt/%)
- DIRT +=		$(QUILT_IN:%=quilt/%)
- 
--SCRIPTS_IN :=	patchfns parse-patch inspect dependency-graph edmail	\
--		remove-trailing-ws
-+SCRIPTS_IN :=	patchfns parse-patch inspect edmail remove-trailing-ws
- 
- SCRIPTS_SRC :=	$(SCRIPTS_IN:%=%.in)
- SCRIPTS :=	$(SCRIPTS_IN)
-Index: b/bash_completion
-===================================================================
---- a/bash_completion
-+++ b/bash_completion
-@@ -95,7 +95,7 @@ _quilt_completion()
-     prev=${COMP_WORDS[COMP_CWORD-1]}
- 
-     # quilt sub commands 
--    cmds='add annotate applied delete diff edit files fold fork graph \
-+    cmds='add annotate applied delete diff edit files fold fork \
-           grep header import mail new next patches pop previous push refresh \
- 	  remove rename revert series setup snapshot top unapplied'
- 
-@@ -189,19 +189,6 @@ _quilt_completion()
- 	        ;;
- 	   esac
- 	   ;;
--	graph)
--	   case $prev in
--	     -T)
--	     	COMPREPLY=( $( compgen -W "ps" -- $cur ) )
--		;;
--	     --edge-labels)
--	        COMPREPLY=( $( compgen -W "files" -- $cur ) )
--		;;
--	     *)
--		COMPREPLY=( $( compgen -W "-T -h --all --reduce --lines --edge-labels $(quilt applied 2>/dev/null)" -- $cur ) )
--		;;
--	   esac
--	   ;;
- 	grep)
- 	   _longopt grep
- 	   COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-h" -- $cur ) )
diff --git a/dev-util/quilt/quilt-0.50.ebuild b/dev-util/quilt/quilt-0.50.ebuild
deleted file mode 100644
index d5d270c6d424..000000000000
--- a/dev-util/quilt/quilt-0.50.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="quilt patch manager"
-HOMEPAGE="https://savannah.nongnu.org/projects/quilt"
-SRC_URI="https://savannah.nongnu.org/download/quilt/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 sparc x86"
-IUSE="emacs graphviz"
-
-RDEPEND="sys-apps/ed
-	dev-util/diffstat
-	graphviz? ( media-gfx/graphviz )
-	>=sys-apps/coreutils-8.5"
-
-PDEPEND="emacs? ( app-emacs/quilt-el )"
-
-pkg_setup() {
-	use graphviz && return 0
-	echo
-	elog "If you intend to use the folding functionality (graphical illustration of the"
-	elog "patch stack) then you'll need to remerge this package with USE=graphviz."
-	echo
-	epause 5
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Add support for USE=graphviz
-	use graphviz || epatch "${FILESDIR}/${P}-no-graphviz.patch"
-
-	# Some tests are somewhat broken while being run from within portage, work
-	# fine if you run them manually
-	rm "${S}"/test/delete.test "${S}"/test/mail.test
-}
-
-src_install() {
-	emake BUILD_ROOT="${D}" install || die "make install failed"
-
-	rm -rf "${D}"/usr/share/doc/${P}
-	dodoc AUTHORS TODO quilt.changes doc/README doc/README.MAIL \
-		doc/quilt.pdf
-
-	rm -rf "${D}"/etc/bash_completion.d
-	newbashcomp bash_completion ${PN}
-
-	# Remove the compat symlinks
-	rm -rf "${D}"/usr/share/quilt/compat
-
-	# Remove Emacs mode; newer version is in app-emacs/quilt-el, bug 247500
-	rm -rf "${D}"/usr/share/emacs
-}
diff --git a/dev-util/quilt/quilt-0.66.ebuild b/dev-util/quilt/quilt-0.66.ebuild
index f82d56b85a6f..13481d763f2f 100644
--- a/dev-util/quilt/quilt-0.66.ebuild
+++ b/dev-util/quilt/quilt-0.66.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://savannah.nongnu.org/download/quilt/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
 IUSE="emacs graphviz elibc_Darwin elibc_SunOS"
 
 RDEPEND="sys-apps/ed