gentoo auto-resync : 10:07:2022 - 13:27:24

6 files changed, 10 insertions, 65 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 554dd568d933..54f73851440c 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest
index ef098e18c731..9861e7830f56 100644
--- a/app-text/t1utils/Manifest
+++ b/app-text/t1utils/Manifest
@@ -1,6 +1,3 @@
-AUX t1utils-1.41-memmem.patch 703 BLAKE2B 3d7801d11e9120701c3229bb495d5cbef8b538a1486bcbe40039b2915af9ed11c444f20914d8e678af4a8beb9db999052c53d7bb04ea912f0c665871ec7848fb SHA512 ab7a8f5273aaf478c4e2fd9aa201d5b081adfa431e147ccd429ca5eaefca1858008e09dbe62d7847ae3fe307d5b1f72a16093d026f7d73f665531abde5f5c60b
-DIST t1utils-1.41.tar.gz 176552 BLAKE2B 69ccc07a3b98de18355b09532129f80e4188d64817a1ad4e8439b3a0e37917a63b9e187a25fedfc5aba486b2e60279586a425992e9f25a111ba9c77ed3863f6e SHA512 b532d3af38a73903a512eb1297ba7510747dcbe8362acc4a0f20f2a3c786d82d8f5b22997ed3867114f33153a34cdd71c4c8e6a093db3cecc3825b6e4725a00b
 DIST t1utils-1.42.tar.gz 184666 BLAKE2B 63ebb856b7bd69751242b9858c47562fd720f098bda2dca694a13cf192e6970ae11d43cc2b2c0a1dde0a46d9d1762baf04ab279907a26270cae8ab04f2af02da SHA512 507b3179dad9479948331fc655d8d6d970a77923f55f5bee4ed5ae9c2222e27f410e62d96c4f27ecae9392335ca1df1f8bbb7ba7087a6268aeeee99d40aa42ed
-EBUILD t1utils-1.41-r2.ebuild 647 BLAKE2B af44e224f01fe627267a3b5a5054a4ea6cd22dd602a4d6091db1eac73da73ed8b911609b67a35e6469b7cdd7132ef56eda107a6254cc53f7bcfda22b2faed394 SHA512 49bbd7b7fc14ceb3583d3b4277d0e225a883b0873b69c159e709cea02236c6f5c82a2cb26668d2d92cd76a67ee98640ff3826c4686f1485f00e308cf26f6b4c0
 EBUILD t1utils-1.42.ebuild 542 BLAKE2B 78c6a5a00b3b177744434ba10111082b46ebd8e136a89d9ddd56a888a9f9d586180ba7fc316cab810c21036755663072d482cd7ae789b263ece81873b6bd73cf SHA512 2de00f97e597e2c1aa7bb89db448381d5155b178c01dd781e60db94bb6da88e3b66573c1e76b37745b04d615f63b082d9b2d0b70bff8511928e17f6395a5c197
 MISC metadata.xml 348 BLAKE2B 6bfc533631d2566e3ee69cd2984da33fc89afe690b4501ed2a1e40b8f961fde4e9049f67a3a32de0cfb54fccae798f29c24f86c3d57854ddfa904bacc275d702 SHA512 b329f25a743f60cacddf37ab7ec8c22cc64a2bf06c02f3115e46a80974a761e456d8ded059e8a8ec09abcd8653a16e6fd81fcf2af7d11f3c479716d69f556fbc
diff --git a/app-text/t1utils/files/t1utils-1.41-memmem.patch b/app-text/t1utils/files/t1utils-1.41-memmem.patch
deleted file mode 100644
index db6f19549e5e..000000000000
--- a/app-text/t1utils/files/t1utils-1.41-memmem.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 3f1ddda424353f0f926dd28efa47b0ac61556ce8
-Author: Eddie Kohler <ekohler@gmail.com>
-Date:   Wed Aug 16 12:37:34 2017 -0400
-
-    Check for memmem declaration; sometimes it is not declared by default.
-
-diff --git a/configure.ac b/configure.ac
-index 5b4e3ff..b4dc4fb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -19,6 +19,7 @@ dnl strerror()?
- dnl
- 
- AC_REPLACE_FUNCS([strerror memmem])
-+AC_CHECK_DECLS([memmem])
- 
- 
- dnl
-@@ -88,7 +89,7 @@ char* strerror(int errno);
- #endif
- 
- /* Prototype memmem if we don't have it. */
--#if !HAVE_MEMMEM
-+#if !HAVE_MEMMEM || !HAVE_DECL_MEMMEM
- void* memmem(const void* haystack, size_t haystack_len,
-              const void* needle, size_t needle_len);
- #endif
diff --git a/app-text/t1utils/t1utils-1.41-r2.ebuild b/app-text/t1utils/t1utils-1.41-r2.ebuild
deleted file mode 100644
index 072c9c1ef29f..000000000000
--- a/app-text/t1utils/t1utils-1.41-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Type 1 Font utilities"
-SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
-HOMEPAGE="http://www.lcdf.org/type/#t1utils"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="BSD"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	!<media-libs/freetype-1.4_pre20080316"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-memmem.patch
-)
-DOCS=( NEWS.md README.md )
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/app-text/wdiff/Manifest b/app-text/wdiff/Manifest
index 614147cc1f78..c80186287d49 100644
--- a/app-text/wdiff/Manifest
+++ b/app-text/wdiff/Manifest
@@ -1,3 +1,3 @@
 DIST wdiff-1.2.2.tar.gz 1478567 BLAKE2B 80de7ecdd8fef1a4c9e6e0830e1af52d5087abc235dbe2bcf7542c0f017c1a21036243162fa6f70e714f3544d74e9a1add70dc22e69f306a17ce9bdd49c5bc15 SHA512 9272c225f4f61612197fe151cf8c913107169ac9fcd6c9f8472a0f56d9124d78a060944cea1b51489ca34311220f23638d043d43c733a3252cdbb7cceb1085ed
-EBUILD wdiff-1.2.2-r1.ebuild 868 BLAKE2B 0ac7ddaa3e76beb71c015caee820e09d484ffd4bfcc96c40213f3761d0e7745ff2447196a69439451e3f518022f0c20c46ce28be0a2402c66205173b9c24515c SHA512 2c382c2869049ab9881283b90814c9352a2a707a54e53ab924a5eb03d1c747c88606b05e9b5182fbf8fe68dd5ac376c0e9917f5e74a84ab7cb88770d634e464b
+EBUILD wdiff-1.2.2-r2.ebuild 877 BLAKE2B 4b52042a689f1cff350530def560e77363c5be4f24299bf337643069266dc9c6d6b693077708e9b3d9581827d69c0b4c25935901665ecf78a494e122662988cc SHA512 d1a7c44fe9514907f5487d82f6db161e7a7e16fe94c03195aa6286443c399ba6a88e88bc42a658bd3191f056091f9dc124dd7e4ed6b2b664df42232a52f333f5
 MISC metadata.xml 378 BLAKE2B 95e3d451a7fd7af4da58c03b88615a0547c6063c0e4601dde7781db46f0805b06a76d900a0407ace672cf76c2b6c481f775c2b1d7da5653418e26ad71ae7ec32 SHA512 1da43e6a6e6907de98682dcb9221b33327d2fec70675452e40262eada16d7c94f312a1dbe40a770b064d4034848d84801f3a9c5f887a669664722198cadfea6b
diff --git a/app-text/wdiff/wdiff-1.2.2-r1.ebuild b/app-text/wdiff/wdiff-1.2.2-r2.ebuild
index 9f0af0d46f14..4418e21d3f05 100644
--- a/app-text/wdiff/wdiff-1.2.2-r1.ebuild
+++ b/app-text/wdiff/wdiff-1.2.2-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Create a diff disregarding formatting"
 HOMEPAGE="https://www.gnu.org/software/wdiff/"
@@ -16,14 +16,16 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	sys-apps/diffutils
 	sys-apps/less
-	sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
+	sys-libs/ncurses:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-apps/texinfo
-	test? ( app-misc/screen )"
+	test? ( app-misc/screen )
+"
 
 src_configure() {
-	econf \
-		$(use_enable experimental)
+	econf $(use_enable experimental)
 }
 
 src_test() {
@@ -31,5 +33,6 @@ src_test() {
 	# when an incompatible screenrc is found
 	touch tests/screenrc || die
 	export SYSSCREENRC=tests/screenrc SCREENRC=tests/screenrc
+
 	default
 }