gentoo resync : 06.04.2022

4 files changed, 2 insertions, 129 deletions

diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest
index f10f323fffee..b86df27efd96 100644
--- a/dev-util/quilt/Manifest
+++ b/dev-util/quilt/Manifest
@@ -1,8 +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
 DIST quilt-0.67.tar.gz 543713 BLAKE2B 691b42378a862bfaa8ac9ca042d03d149aaada05894e1d9b92ad4ddf213bf13674c08b72788626ed49c8ccbc792c31e5bc827f8911bf7b0e23733fbc75fca1d1 SHA512 2dcf9396444484e1664f3dc9bf6a024d11fbaac4e984a295b269bab2649e254dafe3dd89d8f79cfaf1c33d2aa80a803ea55eef4debbc1ebc8d3459ecfa52e4ec
-EBUILD quilt-0.66-r1.ebuild 1635 BLAKE2B c665bc5c5190dbbbfaa5796e3f6eae2ef1a0598f65aa6e931e6f5d49159fa1568119f0c140f6e7345b575342bc41c7b04a86d45c888a4dda48a334aa41d580a1 SHA512 30e0dd710f9edd6899a5ef275c8d1e177075fc55a906ddd4b46932e501644b11db23e5e402da4ed44b9db20183b40e8e22219163683056f2efbff03caf4dbe7a
-EBUILD quilt-0.66.ebuild 1618 BLAKE2B ee99ef5fc2fb874c0e47978b30fac99dd59ef417597df3d5b0887ca487a599d10e2993c7bbc29242a2cd607c7d31d5b5787108ebec2d31cc8befdd991133ded9 SHA512 fe14718b5e5f1c853a5945cfdf1a9b7c056095e6244d395d7d24264a2c77b4b6b01555a5175ef471c0ac6117f722da99b284004aeca43f089968785229b7e619
-EBUILD quilt-0.67.ebuild 1630 BLAKE2B 57c246dd2e45c636e7fe57ffc14e4506a8034a46adc0686d1254b2e68077b1bf52119677659d1ba1de29193f2e7abfa63bf6991f53180f092dacdb4e1473af53 SHA512 e4207a85ccea119d15d8f491e412c679aa33e39cc447a5e27ef0c0a54def02f38dcae836e8d6e2372f16a9ad739716ef08628f4c141438799f7590488700c8ae
+EBUILD quilt-0.67.ebuild 1629 BLAKE2B 43a5a0ad350cefe382714dc6a17a7c3022878ba9698ab8a48edfb2959a6a9ab96fd37876ad706caa52f25b4197216b0a4a3f0e70821f9bddcf7e68f9934970ed SHA512 d192ba0db2dd5f759f916a35a967c8cdf15957cbe2fa86860866888185c95924d316772bc65a3d5103b523057442db6c52ca7f28d914cf64b8a2edfbdbc41c11
 EBUILD quilt-9999.ebuild 1746 BLAKE2B b00a57925f3ca01cdb4ec993b7cb28568e2ea95e39332303977436c1f9930d67186c3a89e615079c3284773a01f8ab8972210af252f106ee86807e9f1a173cc7 SHA512 252b30cbff0fc323ebcbc382b6db37b935061868cb09513691999eede9c54b114071de0ac4aeb0dfdfb5517a77dc7c125beb7b22f9209cbd8e1d6babe85381ec
 MISC metadata.xml 219 BLAKE2B 99596733d1861998d5b90023ad2e31e0d9f6ae4def18bcd7238d393007f97263aee3113b4e39d9e0f3c1d32675ea7c1a0b3aba61bd4b0105a23601a3544e2e2d SHA512 74ec2dcbd88d75c0785ac4cbfff8b0ce83f8d4e7f87e37c41e0e0e563103ff535093343bbf2589cc632b9bc66a4363c4fb9d0344d40409360d03df44ef889b6b
diff --git a/dev-util/quilt/quilt-0.66-r1.ebuild b/dev-util/quilt/quilt-0.66-r1.ebuild
deleted file mode 100644
index 4ae623c1eb56..000000000000
--- a/dev-util/quilt/quilt-0.66-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit bash-completion-r1
-
-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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-IUSE="emacs graphviz"
-# 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-0.66.ebuild b/dev-util/quilt/quilt-0.66.ebuild
deleted file mode 100644
index fc703175e976..000000000000
--- a/dev-util/quilt/quilt-0.66.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit bash-completion-r1
-
-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 ~x64-solaris"
-IUSE="emacs graphviz"
-# 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.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_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-0.67.ebuild b/dev-util/quilt/quilt-0.67.ebuild
index b9fcafe87bc3..8b955a150e4e 100644
--- a/dev-util/quilt/quilt-0.67.ebuild
+++ b/dev-util/quilt/quilt-0.67.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 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 IUSE="emacs graphviz"
 # unresolved test failures
 RESTRICT="test"