gentoo resync : 06.04.2022

3 files changed, 24 insertions, 2 deletions

diff --git a/sys-devel/dev86/Manifest b/sys-devel/dev86/Manifest
index b0c6216c291a..edc125b5eb51 100644
--- a/sys-devel/dev86/Manifest
+++ b/sys-devel/dev86/Manifest
@@ -1,7 +1,8 @@
 AUX dev86-0.16.19-fortify.patch 325 BLAKE2B 3747ed3c7cc2df559bfdec185e1db8d45138f2819cefcfeabe4687f4b270e18ddefd334403fcaacbff0a9f0882a5e9b473b7d42da649dc189b3f84fd47a082d5 SHA512 04195831db5802ae25a5a1957979b5439168c708d9d3702a62c1d267090fca59e565ac78bb3a6bfb312282ce002b52760903e9d4ab30f3c906568a70dc349696
 AUX dev86-0.16.21-make.patch 2299 BLAKE2B 7bc53ca455c545fe72b71a0daae8de8fd54da6ec915edfabd0d44acef2d3525936272fa666de5f6126013491d4b9f8b93f2086106177210d3490620eeec7771e SHA512 d75913f1c340a4601ca56cda5ad9cf389c0bac874b8f23e2a1362150e26d02ca3da53aee96a47136a3daf06b3020744680e3e479870199f1304bb2f9afd1ab45
 AUX dev86-0.16.21-non-void-return-clang.patch 425 BLAKE2B e781f5f38fb5cd4c427aaccc6d47f8935797bc92ac4024ca6bef2c40585ace38bd720e9cf4b3be391d81ff0e4e8708bbf5758979d544417e135430cbd1a06af8 SHA512 57781aab833999b86d57a4c62d686b61f11a64225debf82ca57252bfe5043d0bdef04749bbbf3e1af73a6d40242ebd5efa41b147e4677b7c8ed4b071c5100318
+AUX dev86-0.16.21-void-return-check-msdos-clang-fix.patch 512 BLAKE2B 41644161eeb5f28a016f5c70bd5a303217cea9eda2b9c81625779b7d07c01de625d63b53292eea876e48610c88bc836d7e63b41d169cd0be666a02aad178bf03 SHA512 97ef0ecf2294fe1bf6db6ad393023075a9713c4d44ea7acc4a0cb2569e25be8ee35e51d69d9cc2e554f36e8a022a6f686ec0ed1f84ae19560ec91c6da2bc6a81
 AUX dev86-pic.patch 574 BLAKE2B e6566a39aad0a48b2b1c626630fce8071567c98efd06a37105e5012c6a0c06341a801809efb3d4b3da9ff2313bdbf14c14d885b9eed37ae6ca93011ec3b9edd3 SHA512 44f0649fbb4b2514ecdd54c988db1a5547d68afed2bff7ebe15163ff287fd4be81bc2d700ed92414caea5c967b7455817fdefd1d19a86609221940a495b5ceda
 DIST Dev86src-0.16.21.tar.gz 717215 BLAKE2B 977353422937f57d2046f151a53008dcec90f4060d60675dcb81fa58af5f1ed758a1950dcbd211cda57c84b55bf58ffbad28195ff115db50a7a1108d434b8b4e SHA512 6d35dc3c7f9735cf7967cdb2bc0f7bee967ae26667cd8cef56bbdf7d7855ef1d35057db4c0031ff86b9b95d3c8ee44aff408446115b35b6c10cf207a33838016
-EBUILD dev86-0.16.21-r3.ebuild 1919 BLAKE2B 566770e3b438c41603beba8e763dfde921ebfaaccc265d9cd7b3e8d36aeb0df95ab17b06f31f7f2f4d11df93afa151b5aed464f6dbf7f0ee1dd20944881556ee SHA512 0a205a20255a1e0322cde64bfc1d860f06041b3044e63198e250456d6e9f8727358c182fd50e9537b2a85efdff235765260ce65c02e74b88247534e12677287d
+EBUILD dev86-0.16.21-r3.ebuild 1979 BLAKE2B 589d7ac1ef48e1deeb404f3e6b5dbd8d1da2b7a1b3a0639880cb81398eaad6e056029144f6e9270e63430506a8766426fa043698912c63b3f1fe71804cc94165 SHA512 5935239b7e3b4c0f60144424ffd01efc286bacabd3600b4dfbfa2d4e941cae37573b6f8ec9bb2d06b7b9968e14131fbca5391f6d00d50612d3271b4b005c876e
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sys-devel/dev86/dev86-0.16.21-r3.ebuild b/sys-devel/dev86/dev86-0.16.21-r3.ebuild
index 2af636abe3e1..e3784e658bfb 100644
--- a/sys-devel/dev86/dev86-0.16.21-r3.ebuild
+++ b/sys-devel/dev86/dev86-0.16.21-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,6 +22,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.16.19-fortify.patch"
 	"${FILESDIR}/${P}-non-void-return-clang.patch"
 	"${FILESDIR}/${PN}-0.16.21-make.patch"
+	"${FILESDIR}/${P}-void-return-check-msdos-clang-fix.patch"
 )
 
 src_prepare() {
diff --git a/sys-devel/dev86/files/dev86-0.16.21-void-return-check-msdos-clang-fix.patch b/sys-devel/dev86/files/dev86-0.16.21-void-return-check-msdos-clang-fix.patch
new file mode 100644
index 000000000000..39e3a1296c21
--- /dev/null
+++ b/sys-devel/dev86/files/dev86-0.16.21-void-return-check-msdos-clang-fix.patch
@@ -0,0 +1,20 @@
+--- a/bootblocks/makeboot.c	2020-11-30 00:28:40.383078094 +0300
++++ b/bootblocks/makeboot.c	2020-11-30 00:28:26.969025659 +0300
+@@ -183,6 +183,8 @@
+ unsigned char bpb_flags[100];
+ int has_bpb_overrides = 0;
+
++static void check_msdos();
++
+ main(argc, argv)
+ int argc;
+ char ** argv;
+@@ -1122,7 +1124,7 @@
+
+ /**************************************************************************/
+
+-check_msdos()
++static void check_msdos()
+ {
+    decode_super(buffer);
+    if( dosflds[DOS_CLUST].value == 0 )	/* MSDOS v1.0 */