gentoo resync : 12.07.2021

8 files changed, 19 insertions, 8 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 28b5a85e4a6c..6cc10ba2663a 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index c323ba0dd2ce..121aff842d75 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -18,5 +18,5 @@ EBUILD emacs-26.3-r4.ebuild 11785 BLAKE2B 807bbd1eda823268087003da546d68b5837c49
 EBUILD emacs-27.1-r4.ebuild 14334 BLAKE2B c524e15aa87eebb1eacb52368fc11b17c429a10c83509e883cea3fada349d7a63e7947b1f3c050641ed65fabfbad2ebe965ec19f96b062ddc62162d344bc044a SHA512 7238304e452cf3bae3930c25726fb92a8b76c35155c35793a69aae08b23b7066b34cbb1ae18bd385388ec07170da14008cd89397bd9483a9033f4feaf1632baa
 EBUILD emacs-27.2-r2.ebuild 14431 BLAKE2B 037523522bc7036fdb4b612a6684ce37d213b16b8472b04ffe317d3f9d721d67a7bb7b7ed527f4d970b9030b0dae26b6f1c622238556522f71a9933dc7bd7399 SHA512 25c0edc1c7eee90126ca5b25e55542409ca727914613a1ee3c4aee4c6f28cd401a15f9606e6418afc507844df75f577701825255c8e216e5b4f3eb1514f160bc
 EBUILD emacs-27.2.9999.ebuild 14298 BLAKE2B 5649b3f948225639e73f6b4570f6facf9e81f57476354604c78a178be8f146d0e9325d98f3eb52689d2e02ba522ffe690e33e9c610b6e99584704a2f140b805e SHA512 e22fe0e2da09c9823bcedb148060a56d5b481826fe98f09a6112b3b27d65778e0db12a748e7ec42805345729a0ed0bc0ea46a7878e12588cf4cf999d69f6746b
-EBUILD emacs-28.0.9999.ebuild 14185 BLAKE2B 76d5f0f59a0cc1fd4399e7aad1544d26d5abc0473ee01e7541a633fa743b2be880c8a81212fc37845bad64292851fdda8ec67833760316d8d2c7980d0c7fd37e SHA512 8e3b7413a3d8224a3b8642546f2d47afd5bf3c0404caa60deb97c20d6c4178fec990785b51df5a1f6ba0d5d156161195cd818ba3df7fc8e92fa8802d32ca129d
+EBUILD emacs-28.0.9999.ebuild 14450 BLAKE2B dd079bf7a0a17ef35b16787419aef1531b4b7145fb74f4b9626aabac389ea18beb78f9a8668eb9f6e3d705c0d6644f1ffdd57428f98a034263a0a80e00f5b434 SHA512 9ccc3676c8b09e41a1734cbb8ad527072195667856f545807842e3aa25cb600d834bb6e8a1878ece4abe72e082d18115b6d2cc26a513c24cd08ddf89933fa6ba
 MISC metadata.xml 3129 BLAKE2B d0bfee8c1d5de0496d4b7bb5fff30f8b5c19911ccdf40d8bf34c990c57a61f6a6b68528e2a393174b190c59ffa1ff657c0d5dd6b9ff1d15e59641ae2b7da749c SHA512 1e37638584eefe022ffb08951adce160d6342aa90e92cfb0481689b662ff6a04a9327bb8c03fbc302315a17c4918d082ee076caadea34a2c461957f079da2279
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
index aeefea10ed81..682e0651a360 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -141,9 +141,17 @@ src_prepare() {
 			|| die "Upstream version number changed to ${FULL_VERSION}"
 	fi
 
-	# These files ignore LDFLAGS. We assign the variable here, because
-	# for live ebuilds FULL_VERSION doesn't exist in global scope
-	use jit && QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
+	if use jit; then
+		# These files ignore LDFLAGS. We assign the variable here, because
+		# for live ebuilds FULL_VERSION doesn't exist in global scope
+		QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
+
+		# gccjit doesn't play well with ccache #801580
+		# For now, work around the problem with an explicit LIBRARY_PATH
+		has ccache ${FEATURES} \
+			&& export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
+				| sed -n '/^libraries:/{s:^[^/]*::;p}')
+	fi
 
 	default
 
diff --git a/app-editors/vile/Manifest b/app-editors/vile/Manifest
index d53f2c4c705d..a08088e38e00 100644
--- a/app-editors/vile/Manifest
+++ b/app-editors/vile/Manifest
@@ -1,5 +1,5 @@
 DIST vile-9.8t.tgz 2352119 BLAKE2B fc1c75eba09e8be99945ba0d178fd150576d8108f906afb20dba265adaee9e5bea4869415d3ebceabf0b6b56c147add79e9c7e4fe34d7f4744930c3728e4a4a4 SHA512 4be4e37c7231395cae9236796073c2c3e428f1945283785a931c5d4cce94e0f970efa6634b0f9053679a00f4b4577704ea38ded2129e444b26ee9935a1c3d229
 DIST vile-9.8u.tgz 2375989 BLAKE2B 86e2bb01fab7c429233484493aa33c0b807f7babedf6e69f4c526a6677471ff8e43287114073d22ebb229a801ef003779ab587c9a17474519148e1f64d58460e SHA512 fad06c8e341feec7e9aed1e53cd9a1e7fe79fdeb050aba743ac4edfb6096db88c1ef63377d6ecbeddd0eb8ad46a323bcc55d09b1ff221a75cd74a3f991e3f24d
-EBUILD vile-9.8t.ebuild 921 BLAKE2B 673d5ff4ccdabf5a4f4bdd3d31bb23dc84fb80af53b35b7c8b8a5d9564104874975a48ab3867ab01898e069f21cfb946d2906cbd9baee400abee37dcba3c4d2e SHA512 51e426b58461b8abb10bc6615cb88822f9d512697ed67778f2f336b78686abbcee2cdd4c0a76632a7f0b5e41ee8e371dfdc4c0c02d0c4c4ae78171d98a32ead5
-EBUILD vile-9.8u.ebuild 1039 BLAKE2B c8538486cc0306c50c009aabda87afa7d745fa8ba305e215cde75a50c0348385c33f9cb26f871c675587efc96581db5d096fb74e7a482c1f79c4274d8c367bfb SHA512 b94e2d46c0df35f053830d0ed3fca9eb9a242eff1e3456c591d679a72068293b67966b686e3c9693c34fcd1e2c9a1420158d94ea09b5bf10df64876f783408bf
+EBUILD vile-9.8t-r1.ebuild 941 BLAKE2B f7cfc4255b87f970d0f400802a68d75d8af4888dd40424d5007000f59c4ce3da969828867f40cb1fd1819803d09d632422587596b94f18f062e5f0f4e4887715 SHA512 ff42c353da28b1f6f7318e771b896f75786f284f6854acaf6207a523679507578ceffd99abd1f74dbb6ce88106c21099290145ddb098c03fcc095070ca6472b1
+EBUILD vile-9.8u-r1.ebuild 1059 BLAKE2B 02dfb4fb0f2e651ddd5e68380ae998adb2d3f2968f9e72444ad199b92be43ed8ff23a2ca524fa3203893477221544282aebe6873497eb1f533753bfceb1e48f4 SHA512 907ab99d754e091b15df9d1af70de1b19f0df7728906c617cd453a08c429fba2dfa6d53caccbb48b05007b3c5e0b74edd32e088d3ab03f24d18f96b392715e63
 MISC metadata.xml 346 BLAKE2B aa1d8324ae0a63097138e7e87ed1c43fd6cf76eab1a2e33645f788691f9b96595e6edfb40a5560ac5e5ec4ca36d0dd972a444ebf9c3cf800344d7137d7d526f8 SHA512 5e073e0fa1ed8d705cbb1cf8f750c61a46692dc6914d6ebb8fc3281d8bd4d206fe17b544bcb3e05033296de8a4a4f34189deef26800521a22d04be275089e084
diff --git a/app-editors/vile/vile-9.8t.ebuild b/app-editors/vile/vile-9.8t-r1.ebuild
index 41c4ef2224ed..fa2cb4f2acc2 100644
--- a/app-editors/vile/vile-9.8t.ebuild
+++ b/app-editors/vile/vile-9.8t-r1.ebuild
@@ -13,6 +13,7 @@ KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="perl"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0=
+	virtual/libcrypt:=
 	perl? ( dev-lang/perl )"
 DEPEND="${RDEPEND}
 	sys-devel/flex
diff --git a/app-editors/vile/vile-9.8u.ebuild b/app-editors/vile/vile-9.8u-r1.ebuild
index 290ed240c5f7..480383dbd0b2 100644
--- a/app-editors/vile/vile-9.8u.ebuild
+++ b/app-editors/vile/vile-9.8u-r1.ebuild
@@ -14,6 +14,7 @@ IUSE="perl iconv"
 
 RDEPEND="app-eselect/eselect-vi
 	>=sys-libs/ncurses-5.2:0=
+	virtual/libcrypt:=
 	iconv? ( virtual/libiconv )
 	perl? ( dev-lang/perl )"
 DEPEND="${RDEPEND}"
diff --git a/app-editors/xvile/Manifest b/app-editors/xvile/Manifest
index be54b4ae0114..74144aac759f 100644
--- a/app-editors/xvile/Manifest
+++ b/app-editors/xvile/Manifest
@@ -1,3 +1,3 @@
 DIST vile-9.8t.tgz 2352119 BLAKE2B fc1c75eba09e8be99945ba0d178fd150576d8108f906afb20dba265adaee9e5bea4869415d3ebceabf0b6b56c147add79e9c7e4fe34d7f4744930c3728e4a4a4 SHA512 4be4e37c7231395cae9236796073c2c3e428f1945283785a931c5d4cce94e0f970efa6634b0f9053679a00f4b4577704ea38ded2129e444b26ee9935a1c3d229
-EBUILD xvile-9.8t.ebuild 862 BLAKE2B a4e91bf79dac14018df1d79004375a608eb98afb407acacea681ae9887af065688aabb82cb6b4a7bcae3d2d3bfa59a70a5a707504be8a4e5f5a0acf7b783baf5 SHA512 7bd7b12aba51c326a76155d411d652b2f397c11032cdf1f45365516b41e260f7997f1a7e3fd7574181f54fd57770ba2381277f3732e821136551294c1b5af666
+EBUILD xvile-9.8t-r1.ebuild 882 BLAKE2B ac6b03eb74aca0397660a7e5a9dbab0328b1caf114a470b745ee198decacb259b24849495e82dc5f3669f09848f7ba430daf16fc11e67ae2807f315debf53e57 SHA512 1dad314acddd4ca6ab988225d905f668ff22e43a8ae1aa640b3d42d1eab30070dae53e962c4cbebc342971c68f0b6ffc707175c5414cad4da6e51fd6ffeb0fd9
 MISC metadata.xml 346 BLAKE2B aa1d8324ae0a63097138e7e87ed1c43fd6cf76eab1a2e33645f788691f9b96595e6edfb40a5560ac5e5ec4ca36d0dd972a444ebf9c3cf800344d7137d7d526f8 SHA512 5e073e0fa1ed8d705cbb1cf8f750c61a46692dc6914d6ebb8fc3281d8bd4d206fe17b544bcb3e05033296de8a4a4f34189deef26800521a22d04be275089e084
diff --git a/app-editors/xvile/xvile-9.8t.ebuild b/app-editors/xvile/xvile-9.8t-r1.ebuild
index a18545b97b79..f36ba9af2292 100644
--- a/app-editors/xvile/xvile-9.8t.ebuild
+++ b/app-editors/xvile/xvile-9.8t-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,6 +15,7 @@ IUSE="perl"
 
 RDEPEND="perl? ( dev-lang/perl )
 	~app-editors/vile-${PV}
+	virtual/libcrypt:=
 	>=x11-libs/libX11-1.0.0
 	>=x11-libs/libXt-1.0.0
 	>=x11-libs/libICE-1.0.0