gentoo resync : 07.05.2021

9 files changed, 34 insertions, 13 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index f730daea8845..36cdc93df7b5 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/cdctl/Manifest b/app-misc/cdctl/Manifest
index 4b78447b3087..ce333699fd2b 100644
--- a/app-misc/cdctl/Manifest
+++ b/app-misc/cdctl/Manifest
@@ -1,4 +1,4 @@
-AUX cdctl-0.16-Makefile.in.patch 1474 BLAKE2B 436f47f59a21eea1785c70285532983854a445258eb7a91d01d1c5dc6cd29c4041b1d6999b61a56614bfe9d69bf6824823c783150dcef21a1fb1722ec7929601 SHA512 78d9c1a4b1e3c29fb9b83d6b9250e07157715fa70a00798f6bf49e0af2c2269dfec816df76f1818d401992b793504e8049df836bc0d8a73ab2f0488f4689b5e2
+AUX cdctl-0.16-Makefile.in.patch 1512 BLAKE2B dc15b4c76021f45fbb982e3953836f620fe425ca07c38dd7a3d1f4878cb150c406fcc2055f25dcece692e5d5d455a12f8898a3b4e0c4688beb424ca0dbeb8247 SHA512 f6781cc55b07a2c270c3e1e9912c6c1db1e3d09aced93bcaa71664956cfd9fa65b84f0f7d9e0224b05a7dba9fab8cd0484141161e13ee4a5c245b2948e858652
 DIST cdctl-0.16.tar.gz 34121 BLAKE2B aee95efe468c215102afcd40262f0f3e9196551a661052a9f0909ca068a6b74a25f3cdb01ac62fde2f940dcd6da6e5f4a33328331723b7a14d836bcab1c0c479 SHA512 e1c341cf0acabc28c8aedb3265e65ffe90668b83eb44d23577049cc81a160ab0ec8b6e813cf8ffe20aaf83b4d056a8f07c2e958f5a6086db3843b84b36e060b4
-EBUILD cdctl-0.16.ebuild 455 BLAKE2B dce516cd538a38d7b6bd4897f28a4ab27e237e0f8b433054c9580b36f80e2424afcc9044a42215d874310914bc3c64b8da786409a1abd192e8bd9c235bb8be4c SHA512 25377cb9d0931005e4cc5edbb483c5aa76c7d0e0bc2634a58378ed66f22479db96fe129dad3f22e6f83a9832e5f92f61358c6a94a9063f5337446956c7723bff
+EBUILD cdctl-0.16.ebuild 515 BLAKE2B 815fd12d6dd9646a4472879f0642cab4ef63a4d3b9a06a3321b4c2fd34e5f6b730251bca8b34e46031b2b2ed40d6e25c7779c9db63b23cc5f7d38b510f5c21b6 SHA512 3f11e6ce55cfa5919aafc52bbc8507d3e1f747bc47d415b5d03ad9051383127f8e2e62b12cdca7b5ff83d055359e9d283d5342a26e140d65ca2261c0c3ebe62e
 MISC metadata.xml 242 BLAKE2B 965d7f590657a56f8d90dace39b217902fd1f1f834b1b61d6e4119b92f8a85c090afb74eedc5cd987ba809f193ddf4cbeb44ed27de98e7f96c3bdd4a2332eecd SHA512 289f7a2af6d7c9dc7733456dd71cdc014bd0dd13d84d76605aa3ae4ba4bc39cab188b744309c974c14a2780662761ba2670a44037b40f07394e65c55c985ac6d
diff --git a/app-misc/cdctl/cdctl-0.16.ebuild b/app-misc/cdctl/cdctl-0.16.ebuild
index e552ac85380b..29c33f701e51 100644
--- a/app-misc/cdctl/cdctl-0.16.ebuild
+++ b/app-misc/cdctl/cdctl-0.16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Utility to control your cd/dvd drive"
 HOMEPAGE="http://cdctl.sourceforge.net/"
@@ -20,3 +20,8 @@ src_prepare() {
 	default
 	eautoreconf
 }
+
+src_configure() {
+	tc-export CC
+	default
+}
diff --git a/app-misc/cdctl/files/cdctl-0.16-Makefile.in.patch b/app-misc/cdctl/files/cdctl-0.16-Makefile.in.patch
index f6f4ad3abdcf..ed338d7d1687 100644
--- a/app-misc/cdctl/files/cdctl-0.16-Makefile.in.patch
+++ b/app-misc/cdctl/files/cdctl-0.16-Makefile.in.patch
@@ -1,9 +1,9 @@
---- cdctl/Makefile.in
-+++ cdctl/Makefile.in
-@@ -1,8 +1,8 @@
- CC=gcc
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1,8 +1,7 @@
+-CC=gcc
 -CFLAGS=-Wall -g
-+CFLAGS:=-Wall -g
++CFLAGS += -Wall
  BINS=cdctl sndreset
  OBJS=cdctl.o version.o ioctls.o iso_header.o
 -DOCS=NEWS NUTSANDBOLTS LICENSE PUBLICKEY README SEGFAULTS
@@ -11,7 +11,7 @@
  # NOTE:  all man pages are installed in $(mandir)/man1 -- see install-mans
  MANS=cdctl.1
  MOS=cdctl.mo
-@@ -22,6 +22,8 @@
+@@ -22,6 +21,8 @@ INSTALL = @INSTALL@
  INSTALL_DIR = $(INSTALL) -d
  INSTALL_DATA = $(INSTALL) -m 644
  
@@ -20,7 +20,7 @@
  all: $(BINS)
  
  cdctl: $(OBJS)
-@@ -35,25 +37,21 @@
+@@ -35,25 +36,21 @@ iso_header.o: iso_header.c
  indent:
  	indent -kr -cdb -sc *.c
  
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 02f582e14536..cf71b7275f0e 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -15,5 +15,5 @@ DIST elasticsearch-oss-6.8.15.tar.gz 68240776 BLAKE2B 431d845e02f2118a98021af442
 DIST elasticsearch-oss-7.10.2-no-jdk-linux-x86_64.tar.gz 76383466 BLAKE2B e99c04b0d10ef5755986515c7127ebde00b58e0eba69b6a05e12bd0bffee70266bbb023680584bfe0f321d5a3cf79af89cce3a5191923ad721a9f6039ab82743 SHA512 7b63237996569ccdc7c9d9e7cc097fcb23865396eddac30e5f02543484220d2fc70a7285b430877e5e76a5d8716d9682de9fc40d5e57a08f331e82011fc59756
 EBUILD elasticsearch-6.8.15.ebuild 2539 BLAKE2B de446b12484037a7952b5b21537189b1ee7157d87a779109e025648fe8cfe3c82f3c8d59dc823350faddc5ec0c6b01e7461739da052226134353ae9c3e388cea SHA512 ee3431551b5a0c2896172e00f42b96da8c400526fd907ba6c4e6e0b352a224fa85589c5b17924d42915490b0449b207652c6442b6fcd51a37d080f82b944069f
 EBUILD elasticsearch-7.10.2.ebuild 2465 BLAKE2B 8f830c799809cd2d12d47398d0ebc5a457d37a1b379af832f98a87b22f59e374147ddeb5cfbcbc3350c71d59006bb1c33f6dcfb4d58580440d555bf3ca5288f9 SHA512 03c22a13310360daacd75a2894bd0f1d241b8f0c26ecf1f6256cdb20e060d6046e9a92fbf7e2be1aad22c7e477b1e47cf2d5652e7909b294111c339d49f7d3cc
-EBUILD elasticsearch-7.12.0.ebuild 2295 BLAKE2B 79ba465b21d2feee5c481eab2e0feb870bcda696d0ff2375fe49e75a8d7c6ebd040fe1fbca764bb61a8b8116d11a18a609dc230e794cb045aca70dba652b9b82 SHA512 57988aaeed4b5b0c6a3251e9bf7e5b13a07cd766710a8baf9c753beb8f7b16e3e18d8c9988f6c880afa76eb13ee2cae4afeda6b8d916f09a6d9fce8a5ab16bbc
+EBUILD elasticsearch-7.12.0.ebuild 2454 BLAKE2B e41faa9592270795a3778d345db25c8029f8872644fe456dde749df19ddb6bd9fad3bc746e1b08ee94238ec437521d28cbef7c113d6ac85218bd1c4bdd03104b SHA512 c361cc56c306005896562c34f53fadf0ac586df353f9db925ff2e9abf07e7534bf8d3b33f5c04998ca06835d265bf58f1562f8a9e7314f318868fe526699136a
 MISC metadata.xml 611 BLAKE2B 91d02c98271689922fc5d79355a378cb29a3c88e45b089ad89afb182e50f6a0bb19fa8160e2455eb8815e9b2655cea6232ba7845cfa970b4d82529993b5447b8 SHA512 daa5f2349a139c5952f9831c9517e6af48ebe337506f77e7ddbe67fc5ad6f243ecea82c858b7687e3baef26f20e1e3f0d2453f72ce00a5985c2a618dff2a6361
diff --git a/app-misc/elasticsearch/elasticsearch-7.12.0.ebuild b/app-misc/elasticsearch/elasticsearch-7.12.0.ebuild
index 1eba30da241b..01bfc5af53fd 100644
--- a/app-misc/elasticsearch/elasticsearch-7.12.0.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-7.12.0.ebuild
@@ -17,6 +17,9 @@ RDEPEND="acct-group/elasticsearch
 	virtual/jre"
 
 QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
+QA_PREBUILT="
+	usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/bin/.*
+	usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/lib/.*"
 
 src_prepare() {
 	default
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 4e2a3339e66c..74f3f6fdc050 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -2,6 +2,6 @@ AUX mc-4.8.26-file-seccomp.patch 4794 BLAKE2B f6b2ba15b2f7f57aa620fc5745816be434
 AUX mc-4.8.26-shadow-crash.patch 936 BLAKE2B 65bf04b92a193de03457f95b94c7eff7677cedc0886fff4d934bd4e3bf94babf3650d5e56ad54eb73e41791e67089c9a65b6628615b87609035e6b823fd317e6 SHA512 8874e98bc5a9b032ff094d3042c71bf279f42c71840920ac3221011ae991fb199050e60d47ee8a65ef82bc5b64e4c14233fd3909c49de807fabf771a953a6c6a
 DIST mc-4.8.26.tar.xz 2492612 BLAKE2B e13ab99fb7d5a9e2cf1149ad96d763681b0186fbf5c03fc9e349a57a4a6f48b598c9eeed85e4cb94a18c5c5b89d4ee0e21f6d34c8cfd5e21da53551085aa3469 SHA512 f2f06915b775ecc94016fe5d5db9301e953cc89ee0708e79ee96e14a9f53142a467b27061ca57f65b40310fa86d4d13e2f2a29a601f8fefa6216fb10f73007be
 EBUILD mc-4.8.26-r1.ebuild 2841 BLAKE2B ba0cf54b91292f2184b0e05203d0a407efe28eb13ff378ecd0b881bf46506d43d4a52e1d8d2218f2e864fcfad7167dbdbc0ad19030c3988fac6fd2075eaf238f SHA512 40e67c95d0a0bcf350d25a36edcc00bb850152328794b5a0a03a4243b43a31c82f910e11a10e15ef0eb40bf3f0845454802af223fb20b75fcac24aaad4ebdf17
-EBUILD mc-4.8.26-r2.ebuild 2965 BLAKE2B 1825a073d8256f1c161a6dc734a638fd4310f7cca6cff28caefc4f875d6d0f01c112fa90d217f99134caaef8353ae933b625a48a5b682d2d8693cf9909c4e889 SHA512 11c2ef50e23400f675cf91a8e68000f6cb2baf781d74dbf74ae6fb63a581ad582e96a17734b5a8121487f5ccd4c6a5ed65c943cc6164182b3bc1dd94f9ce88d6
-EBUILD mc-9999.ebuild 3039 BLAKE2B 080662107814c15a4889a73c9f3b9338a305fb10b5ae2369acfb6f2f818d63215e8e176af0d8fed2fda6a47f83d8de45bbd37d6c0c4be108e3a8dec8bcb9203c SHA512 e107269656f99702c1c544e161dc0a36663798d4bb3798213a5d05d6cca1a0c072f487d833a5cfe2f2b48abb983ed5ace4041258661bd61dcff0f8d3ed0d9cd4
+EBUILD mc-4.8.26-r2.ebuild 3289 BLAKE2B 32b33f2266c28eda35403d1e9d50e12a1e4e5d8867390033cad1f87e63f94752e5edab760758a8c816ad58dc32a9f5124f477362f9b25230fcf896b8c1310b5f SHA512 1bc54410a2d5728c70433deddfcadec844d17ca92c33a416ce3b631ae990ca1b62a6855eba57faa3a7ee32e7a92d3a5b7d667b6be3548cc954f222c966e05c77
+EBUILD mc-9999.ebuild 3362 BLAKE2B 28f6d8342efa7d7a5220f96037919a29c85bbae55c3379d81bccce6889e346f9589431a54f183d31991c79c000f3d931d75efd1df5fca4b842ab6e2e0ee37970 SHA512 b356eec5b771b2b977e084caf61bdc0448091caa2fd422552339c9ca56afdc7fde364dac504e8667ecce69816687e66c4d0e625f8133d1e080e7862caca96d7a
 MISC metadata.xml 773 BLAKE2B c7f3bb9bfb49c380a0493eabadcedec215df8696c5d52433aaccdffa0bf5ba3b89c77c291e19ed88c5ac29718e34eece1d3dabbc3ba6c1ec7862970f3900e204 SHA512 c5c0ca5a41a78cf746e14264b291f81ccffaa9c34a4149d27a9293cca8d304cb4844c07979b31218b250c3baeaccef2cba529c2ab43e81dc5552dca34ddbd4da
diff --git a/app-misc/mc/mc-4.8.26-r2.ebuild b/app-misc/mc/mc-4.8.26-r2.ebuild
index 5c6783cbf2cc..47e5f652e710 100644
--- a/app-misc/mc/mc-4.8.26-r2.ebuild
+++ b/app-misc/mc/mc-4.8.26-r2.ebuild
@@ -112,6 +112,13 @@ src_install() {
 }
 
 pkg_postinst() {
+	if use spell && ! has_version app-dicts/aspell-en ; then
+		elog "'spell' USE flag is enabled however app-dicts/aspell-en is not installed."
+		elog "You should manually set 'spell_language' in the Misc section of ~/.config/mc/ini"
+		elog "It has to be set to one of your installed aspell dictionaries or 'NONE'"
+		elog
+	fi
+
 	elog "To enable exiting to latest working directory,"
 	elog "put this into your ~/.bashrc:"
 	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild
index 936a91cde7d5..ad94e390553a 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.ebuild
@@ -110,6 +110,12 @@ src_install() {
 }
 
 pkg_postinst() {
+	if use spell && ! has_version app-dicts/aspell-en ; then
+		elog "'spell' USE flag is enabled however app-dicts/aspell-en is not installed."
+		elog "You should manually set 'spell_language' in the Misc section of ~/.config/mc/ini"
+		elog "It has to be set to one of your installed aspell dictionaries or 'NONE'"
+		elog
+	fi
 	elog "To enable exiting to latest working directory,"
 	elog "put this into your ~/.bashrc:"
 	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"