gentoo resync : 17.02.2021

3 files changed, 68 insertions, 5 deletions

diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest
index 34eda2f34275..d5b9f330b270 100644
--- a/dev-util/quilt/Manifest
+++ b/dev-util/quilt/Manifest
@@ -1,5 +1,6 @@
 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-r1.ebuild 1659 BLAKE2B 2140fe7dbc502aa1da6ccf0170a644e832761b03de244c996df12e38b28feb67245fea12e268387d654f4427117f9ecc4f67f52058406947b8905cf549fef823 SHA512 f0cd020a1476b443ec880959d4378294811929bb6c50f2a9e2a0a28d7bae0e5560a0d2bfaa82b958d0d58faeeb7643ee8b707cf7c85e9da7335ff71917ccf68a
 EBUILD quilt-0.66.ebuild 1649 BLAKE2B 8e1d391368e2a18344b60bd8e715200658f8d3e87f4c1a72185ea5e0b88b3749060571975e340c8b7dd8156238abd71b8792d823b52bc2843e58ad1545a66d64 SHA512 97fae7a33f76f89bdbb72d56ab18e37f2b055226bcab9755dce7b8fbc07f44c2cc720542588a91f9eb8cd42aae3d423fd385fd0324bfba789302759fb9fb2071
-EBUILD quilt-9999.ebuild 1742 BLAKE2B 5a7b4b2412500323224d462b4bdd15ed5ba3b5eaca34f7dd17cf238a75fe340e3e430536ce6bf96464b70a043b4fa231693ecc942720f250599e1ecd2d0126f3 SHA512 625ecfbf37f5eeb217f3a2e208fd8ad7332fa3abc792373fce12ad83ae82d7493199bd833fbcace9f74eba7989b1c0ac1bfcb21df5a57e5797db8027e6bfd400
+EBUILD quilt-9999.ebuild 1752 BLAKE2B b9b3ab429a3a58a65ac0abc85a1e5c80d3aa4d4856946341eb637880d8b71400e353935cbde8bc5139b236f3c9770e7ac67d2a53e3108b8a757a4d6a00267815 SHA512 94111e12516af2c41f721f4debaea35328dbd93af578b50de90e93a38e331e226e1b4b53dd3bed1b95cbea5465ebc58bc3ccbfff232876e3f20b000a6a342225
 MISC metadata.xml 218 BLAKE2B 01c06279fa64627fda89adb9c5748c7629ff3eb46c10acc15b327a0f432d50b86de1d3980ccdafa9b620582db9abdf4d4506b1a53baebd6334f1a890a10783b1 SHA512 cff4a2ad321709df053184879b278c5a5abc74790344f6170cf020cf45a20d8062421e20d215c73002077d66c6367de5fcede710c2ffdd9f067cdf1f40b784ee
diff --git a/dev-util/quilt/quilt-0.66-r1.ebuild b/dev-util/quilt/quilt-0.66-r1.ebuild
new file mode 100644
index 000000000000..4297340cae98
--- /dev/null
+++ b/dev-util/quilt/quilt-0.66-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="quilt patch manager"
+HOMEPAGE="https://savannah.nongnu.org/projects/quilt"
+SRC_URI="https://savannah.nongnu.orgdownload/quilt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+IUSE="emacs graphviz elibc_Darwin elibc_SunOS"
+# unresolved test failures
+RESTRICT="test"
+
+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.32-r1"
+
+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_prepare() {
+	# Add support for USE=graphviz
+	use graphviz || PATCHES+=( "${FILESDIR}"/${PN}-0.66-no-graphviz.patch )
+	default
+}
+
+src_configure() {
+	[[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] && \
+		myconf="${myconf} --with-getopt=${EPREFIX}/usr/bin/getopt-long"
+	econf ${myconf}
+}
+
+src_install() {
+	emake BUILD_ROOT="${D}" install
+
+	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-9999.ebuild b/dev-util/quilt/quilt-9999.ebuild
index ce1acb35fbf5..8fee81630b8f 100644
--- a/dev-util/quilt/quilt-9999.ebuild
+++ b/dev-util/quilt/quilt-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 EGIT_REPO_URI="git://git.sv.gnu.org/quilt.git"
 
@@ -25,7 +25,7 @@ RDEPEND="
 	sys-apps/ed
 	elibc_Darwin? ( app-misc/getopt )
 	elibc_SunOS? ( app-misc/getopt )
-	>=sys-apps/coreutils-8.5
+	>=sys-apps/coreutils-8.32-r1
 	graphviz? ( media-gfx/graphviz )
 "
 
@@ -53,7 +53,7 @@ src_install() {
 	rm -rf "${ED}"/etc/bash_completion.d
 	newbashcomp bash_completion ${PN}
 
-	rm -rf "${ED}"usr/share/doc/${PN}
+	rm -rf "${ED}"/usr/share/doc/${PN}
 	dodoc AUTHORS TODO "doc/README" "doc/README.MAIL" "doc/quilt.pdf"
 
 	# Remove the compat symlinks
@@ -64,7 +64,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if ! has_version app-emacs/quilt-el ; then
+	if ! has_version -r 'app-emacs/quilt-el' ; then
 		elog "If you plan to use quilt with emacs consider installing \"app-emacs/quilt-el\""
 	fi
 }