gentoo resync : 28.04.2019

6 files changed, 21 insertions, 158 deletions

diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest
index 2adcaf62f008..2a7497039d43 100644
--- a/dev-util/quilt/Manifest
+++ b/dev-util/quilt/Manifest
@@ -1,12 +1,8 @@
 AUX quilt-0.50-no-graphviz.patch 1477 BLAKE2B f070303e072b26bb70de578277ee9fcfa56975d6c4a3927835f0d3a17d3c40bea5e57ce5863c5f91939e6b0f8ff9b63ebbd039458b474591fc3e545efb4e1515 SHA512 281c3f080e6ce6d4fd38e881b5cf111bc8313a9171a1c93edf9393b4f33eb0bd4fdb4c1b1df2cc888391acc6016c0eae9183948f5a76b8dc492e2ebb99f84f98
-AUX quilt-0.63-bash-completion.patch 584 BLAKE2B 68b9a9aa31b7c59ae32661877629b98c65660cd87d8ef2f3c7787f61acb5d6835ee385b8cef6a6dd611f1f819bb3bec5f5a1866db901c37a721d6b07e9eadf39 SHA512 6ec0a3d36d347573f791c7a8217f65a46c35b7fa510a5092b4d425814656f4ef0d9318da42020dc059caeaa631f13d3c5780bbb3ad19e20c87b60a60d32a7bc8
-AUX quilt-0.63-no-graphviz.patch 1431 BLAKE2B 09823c8292e031a0c660210a7b98abb09d7697603611879319dac49118ea8901ebbdcbe0f60faa100670578eeec5fe8e15a78217bab45b52e7fa890b4bd4d880 SHA512 9e66299df9e83f8d89d25b9d72fccff60c2ada37029f3542667c267527fc4b9f36101c752b8393b137553e7ac277ee344158ca131e931c1a61103621ae4a7027
-AUX quilt-0.65-no-graphviz.patch 1482 BLAKE2B 5ab4cd1b728c61582c513229303e9b4eb0c0a10942ec810546da26c4372c9b41521817d1f5a133a5e3c3906c194458d027316e97f7d3a364cc05696966482355 SHA512 4a70ac2abf6e7f2a63d138035ca5a8194bf4fbee5ee2f7be8c3587cbc94104ffb7abca89e37b2b3bfe9063554bab358a86adb92e553ad72099d8baf35b48444d
+AUX quilt-0.66-no-graphviz.patch 1466 BLAKE2B 5338e26ec3f8f9181f85952b51846d182c69191729c0df4286d3663822ace8e008f2786e71352d1b1cc466a1a85b976a5b64dfb5bc771fad8b802a7aacf40720 SHA512 217576f0b0fac1687dbaabfc2618fd78496f367495af19c8cf368be9abe1d648b0b4eee7887b3c3d5cc5f358076b81ad4fe0a9d26903eae7642a15ba3334d432
 DIST quilt-0.50.tar.gz 452769 BLAKE2B 5d466d1feca8a1f702db9d5f2bb4340331d06e413992fc8f30111d48daf71f560d60444ddb49cc06096552f32feb44cfd369f370222f574cea4664f4324d04fa SHA512 c6258872bc591b35e93ba09cc17b4954696faf391aff71b7789cc8cc58c4c54e51b605896937bd1aa54545eed6bf1e9b70352ad9b643f869154e6953c0340365
-DIST quilt-0.63.tar.gz 389593 BLAKE2B b7aa02819e10d61f45615f3b4beaba993e5a08ee99440d015d1c7a46f34affac391e44a8f75c682d4833055388e27214acaf96533a93728cc0c7863fc74e9722 SHA512 e6d5c601805b664a5586a557799e7b321b6b28f7ccec708f52aa96371c987e5791aa54418c9b89d34154e4967ddfe7a261e37195fd29b6aa529e8fa6e5007c45
-DIST quilt-0.65.tar.gz 410780 BLAKE2B 14b0a36afac1376b18e2bcfb672ea3d497a996223dae2cfa966684eda8e819f9d9bfc87f8307dd2c3a3e4246804ca239725325f9e57a5b60986d6f60ea02fbfc SHA512 37dffe34fe209371f2fbc0af2dbb4dcfa6edd2221aed15f31a0651a0bd457f2af03a98450a3e63406f70e040e944246e5b23733b820665eeb3fd4ff2bdde3a08
+DIST quilt-0.66.tar.gz 413069 BLAKE2B 41201d54cb26d4761413365fe19b65bd6971ada1e69198d2edbc346df6a3060ff3af4d80551d68ab4ffe003183bc0a28515ce1d070db95f2b1a04a0680ac4fb2 SHA512 c2cb75c0937612e1e0da25b713acf629b6b5aacbd8254d8bd17220b63c7b8ca996cd9d0315a32d67d54a4a7dc01b212cdda33afaacf3db063da757f1973306f4
 EBUILD quilt-0.50.ebuild 1506 BLAKE2B 8bcc89c45c61601cfe777bef33830c4f2bbe949209cde060b18c05f3b4435752996bdaa0e4916a87e787f04de95127783b850dcd1639309b8e3332e6b088a6ec SHA512 80bf6055c1096b7b8898166d2e86f434f5bb8351e50ae2eaf64c95cd49e287e504f12fe0a628554d3aaad3264b1ed174fcae56744fefa59479bb4743089ebcf3
-EBUILD quilt-0.63.ebuild 1934 BLAKE2B e921625ccce5e227def5d9b5bb942a7bee3acb7193ff28cdcac545a2fbc2a34f4ec3dd6caa66a8ffa41ffbac88dfb9bd3e963abf9340409b7acd2f2a9b810c0b SHA512 5d60f84f0fa3abd6e15f428182523f9417b5541c3301374b60bfe3704aa2e488628d501f1dffd47028db92de44e95c8fc2e89217d9fe789faff7f56d6c636082
-EBUILD quilt-0.65.ebuild 1647 BLAKE2B 241059eba66ff1af2c563bef7a12cd44e87667e4f1a2260e55c4af1b95fbf4f057d71f0b0c34c21ceb6eab1c0cec0ceaf43e704442e1d5e53052475d743c1c6e SHA512 7be1c157aac11b74de9fe6bd2bb18719f9b5428f58ce8b9d1b1277eeba0f130f591c9815836c6d60004d8774bb5f463aaacdd9ae479ceaa00374fb73bcee49b3
+EBUILD quilt-0.66.ebuild 1644 BLAKE2B 56a0b269585e9918ceaf72a883b23478804700c213b514d92d1dee4e2392b2babc00a879b91041131841bc675b083e5470c01ca38a8c8e96a7a3b6db75176682 SHA512 8c8d5f2084b6fa73bbf830dc410c956123716b65ce05f82bb81af9a79f5e67c2857073a6158c98e5e42693468333705a33224463806169692084a6a6a32b38ed
 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.63-bash-completion.patch b/dev-util/quilt/files/quilt-0.63-bash-completion.patch
deleted file mode 100644
index c85caca5c9e1..000000000000
--- a/dev-util/quilt/files/quilt-0.63-bash-completion.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- bash_completion.orig	2014-10-21 18:15:29.549789267 -0400
-+++ bash_completion	2014-10-21 18:15:38.489789221 -0400
-@@ -11,8 +11,6 @@
- # completion to work then you must set QUILT_PC in your global environment
- # (for example in ~/.profile) and not just in your quiltrc file.
- 
--if type quilt &> /dev/null ; then
--
- if ! type _expand &> /dev/null ; then
-     # This function expands tildes in pathnames
-     #
-@@ -310,5 +308,3 @@ _quilt_completion()
- && _quilt_complete_opt="-o filenames"
- complete -F _quilt_completion $_quilt_complete_opt quilt
- unset -v _quilt_complete_opt
--
--fi
diff --git a/dev-util/quilt/files/quilt-0.63-no-graphviz.patch b/dev-util/quilt/files/quilt-0.63-no-graphviz.patch
deleted file mode 100644
index 80458120f4f1..000000000000
--- a/dev-util/quilt/files/quilt-0.63-no-graphviz.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- Makefile.in.orig	2014-10-21 17:08:25.639810130 -0400
-+++ Makefile.in	2014-10-21 17:09:03.269809935 -0400
-@@ -79,8 +79,7 @@ QUILT :=	$(QUILT_IN)
- SRC +=		$(QUILT_SRC:%=quilt/%)
- DIRT +=		$(QUILT_IN:%=quilt/%)
- 
--SCRIPTS_IN :=	patchfns inspect dependency-graph edmail	\
--		remove-trailing-ws backup-files
-+SCRIPTS_IN :=  patchfns inspect edmail remove-trailing-ws backup-files
- 
- SCRIPTS_SRC :=	$(SCRIPTS_IN:%=%.in)
- SCRIPTS :=	$(SCRIPTS_IN)
---- bash_completion.orig	2014-10-21 17:09:08.789809906 -0400
-+++ bash_completion	2014-10-21 17:09:53.189809676 -0400
-@@ -100,7 +100,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'
- 
-@@ -194,19 +194,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 --quiltrc - applied 2>/dev/null)" -- $cur ) )
--		;;
--	   esac
--	   ;;
- 	grep)
- 	   _longopt grep
- 	   COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-h" -- $cur ) )
diff --git a/dev-util/quilt/files/quilt-0.65-no-graphviz.patch b/dev-util/quilt/files/quilt-0.66-no-graphviz.patch
index ea06a9eebefb..324a38dfef49 100644
--- a/dev-util/quilt/files/quilt-0.65-no-graphviz.patch
+++ b/dev-util/quilt/files/quilt-0.66-no-graphviz.patch
@@ -3,28 +3,28 @@
 @@ -78,8 +78,7 @@ QUILT :=	$(QUILT_IN)
  SRC +=		$(QUILT_SRC:%=quilt/%)
  DIRT +=		$(QUILT_IN:%=quilt/%)
- 
+
 -SCRIPTS_IN :=	patchfns inspect-wrapper dependency-graph edmail	\
 -		remove-trailing-ws backup-files
 +SCRIPTS_IN := patchfns inspect-wrapper edmail remove-trailing-ws backup-files
- 
+
  SCRIPTS_SRC :=	$(SCRIPTS_IN:%=%.in)
  SCRIPTS :=	$(SCRIPTS_IN)
 --- bash_completion.orig	2017-04-12 09:27:57.643126246 -0400
 +++ bash_completion	2017-04-12 09:30:27.673938451 -0400
 @@ -28,7 +28,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 upgrade'
- 
+	  grep header import mail new next patches pop previous push refresh \
+	  remove rename revert series setup snapshot top unapplied upgrade'
+
 @@ -122,19 +122,6 @@ _quilt_completion()
- 		;;
- 	   esac
- 	   ;;
+		;;
+	   esac
+	   ;;
 -	graph)
 -	   case $prev in
 -	     -T)
@@ -38,6 +38,6 @@
 -		;;
 -	   esac
 -	   ;;
- 	grep)
- 	   type _longopt &> /dev/null && _longopt grep
- 	   COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "-h" -- $cur ) )
+	grep)
+		type _longopt &> /dev/null && _longopt grep
+		COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "-h" -- $cur ) )
diff --git a/dev-util/quilt/quilt-0.63.ebuild b/dev-util/quilt/quilt-0.63.ebuild
deleted file mode 100644
index ea76c38419cf..000000000000
--- a/dev-util/quilt/quilt-0.63.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-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 ~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
-	dev-util/diffstat
-	graphviz? ( media-gfx/graphviz )
-	elibc_Darwin? ( app-misc/getopt )
-	elibc_SunOS? ( app-misc/getopt )
-	>=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
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# 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_prepare() {
-
-	# Apply bash-competion patch see bug #526294
-	epatch "${FILESDIR}/${P}-bash-completion.patch"
-
-	# Add support for USE=graphviz
-	use graphviz || epatch "${FILESDIR}/${P}-no-graphviz.patch"
-}
-
-src_configure() {
-	local myconf=""
-	[[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] && \
-		myconf="${myconf} --with-getopt=${EPREFIX}/usr/bin/getopt-long"
-	econf ${myconf}
-}
-
-src_install() {
-	emake BUILD_ROOT="${D}" install || die "make install failed"
-
-	rm -rf "${ED}"/usr/share/doc/${P}
-	dodoc AUTHORS TODO doc/README doc/README.MAIL doc/quilt.pdf
-
-	rm -rf "${ED}"/etc/bash_completion.d
-	newbashcomp bash_completion ${PN}
-
-	# Remove the compat symlinks
-	rm -rf "${ED}"/usr/share/quilt/compat
-
-	# Remove Emacs mode; newer version is in app-emacs/quilt-el, bug 247500
-	rm -rf "${ED}"/usr/share/emacs
-}
diff --git a/dev-util/quilt/quilt-0.65.ebuild b/dev-util/quilt/quilt-0.66.ebuild
index 40ccf8926d5c..0657d72ccb2b 100644
--- a/dev-util/quilt/quilt-0.65.ebuild
+++ b/dev-util/quilt/quilt-0.66.ebuild
@@ -1,7 +1,7 @@
-# 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"
 
 inherit bash-completion-r1 eutils
 
@@ -32,13 +32,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-
 	# Add support for USE=graphviz
-	use graphviz || epatch "${FILESDIR}/${P}-no-graphviz.patch"
+	use graphviz || eapply -p0 "${FILESDIR}/${P}-no-graphviz.patch"
+	default
 }
 
 src_configure() {
-	local myconf=""
 	[[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] && \
 		myconf="${myconf} --with-getopt=${EPREFIX}/usr/bin/getopt-long"
 	econf ${myconf}
@@ -47,8 +46,8 @@ src_configure() {
 src_install() {
 	emake BUILD_ROOT="${D}" install || die "make install failed"
 
-	rm -rf "${ED}"/usr/share/doc/${P}
-	dodoc AUTHORS TODO doc/README doc/README.MAIL doc/quilt.pdf
+	rm -rf "${ED}"usr/share/doc/${P}
+	dodoc AUTHORS TODO "doc/README" "doc/README.MAIL" "doc/quilt.pdf"
 
 	rm -rf "${ED}"/etc/bash_completion.d
 	newbashcomp bash_completion ${PN}