gentoo christmass resync : 25.12.2020

3 files changed, 2 insertions, 37 deletions

diff --git a/app-text/wdiff/Manifest b/app-text/wdiff/Manifest
index ef3e646a52b7..aa36a4ccdac6 100644
--- a/app-text/wdiff/Manifest
+++ b/app-text/wdiff/Manifest
@@ -1,4 +1,3 @@
 DIST wdiff-1.2.2.tar.gz 1478567 BLAKE2B 80de7ecdd8fef1a4c9e6e0830e1af52d5087abc235dbe2bcf7542c0f017c1a21036243162fa6f70e714f3544d74e9a1add70dc22e69f306a17ce9bdd49c5bc15 SHA512 9272c225f4f61612197fe151cf8c913107169ac9fcd6c9f8472a0f56d9124d78a060944cea1b51489ca34311220f23638d043d43c733a3252cdbb7cceb1085ed
-EBUILD wdiff-1.2.2-r1.ebuild 880 BLAKE2B 4c386057db6fa83679b42c0314abe6336dda9bfcdfc2c5887037595f210b8eaa81509ecacf991ee77b90597ae5fe21c19d3cbb27b73854468840977bb2c391fd SHA512 ad0383422e8aa931adeeb787d47d2fc2c189fa2b65bf6f7cb70657b6846de9bd71a1a1541d3423434689c75ee133cb8af3f80603408c0933e2e95eb5485bcb5b
-EBUILD wdiff-1.2.2.ebuild 851 BLAKE2B 20168eee855349d4e7a5058b1b8e93ee39bc94231856598a6729db90b41e034c69f1b92ddce2f88d32b57d2da0e1068084ee82352d9924e68a4901901bf6f04b SHA512 2fe11c3f47e3a20ac3b265738182d607cbbbee88629257d288a2a77d97c9249abf5f3523fa19cb2a3799c290854c69f069d7e2efe9e6f99408fb00be3e8d9d57
+EBUILD wdiff-1.2.2-r1.ebuild 879 BLAKE2B 0c93fc63215b814bfeb75a3274f3338ce4e7c38fc35797a7ad29167703fb0e24074ef7a290bb18a84abf43503b78b3058f5999c92cb28637521076fc45e786ac SHA512 4148216f54eda9939d84ac8d6839121ae0b79d53704dc8762e90df4d0f27f8747cd70b8d14a085b639c4a8fa6309286e2bde92c7bfe86f6ff64c310b560f4bbf
 MISC metadata.xml 377 BLAKE2B ddada9afaa9d6031b4493ad27870959d71c7ad7852399b36468f41c0c11dbd591e0809101927d82a4f80520562b1fb8b65d577086218cc922a7b0e03b761005a SHA512 675191d217533506137aa85c390cbcf2c9683157b451c862701b5ab59d3ca437266243af0cb458f7ee5150fadb444a7eda648091eaa8b4f7e211e0bd98d92c7a
diff --git a/app-text/wdiff/wdiff-1.2.2-r1.ebuild b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
index f8235bcf109d..e16047fa8605 100644
--- a/app-text/wdiff/wdiff-1.2.2-r1.ebuild
+++ b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="experimental test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/wdiff/wdiff-1.2.2.ebuild b/app-text/wdiff/wdiff-1.2.2.ebuild
deleted file mode 100644
index 04b92d04f62d..000000000000
--- a/app-text/wdiff/wdiff-1.2.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Create a diff disregarding formatting"
-HOMEPAGE="https://www.gnu.org/software/wdiff/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="experimental test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-apps/diffutils
-	sys-apps/less
-	sys-libs/ncurses"
-DEPEND="${RDEPEND}
-	test? ( app-misc/screen )"
-
-src_configure() {
-	econf \
-		$(use_enable experimental)
-}
-
-src_test() {
-	# The test suite hangs in the '3: use pager' test
-	# when an incompatible screenrc is found
-	touch tests/screenrc || die
-	export SYSSCREENRC=tests/screenrc SCREENRC=tests/screenrc
-	default
-}