gentoo resync : 21.06.2020

9 files changed, 114 insertions, 89 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 945a055fe4cb..78fdb57b1211 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 3a0887621d55..e541b86bb221 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -10,6 +10,7 @@ AUX open-iscsi-2.0.874-musl-ethtool-compat.patch 2230 BLAKE2B fada90cbf8173364b7
 AUX open-iscsi-2.0.874-musl-fixes.patch 1478 BLAKE2B a58a8eec59c7dd05e121ab8213dad21d21cb33c91e8b4763816ce6fccc8f9d8f57d9e7bd246e3417e78da0ce61cade5a29433b2b44d025875cd2199dee2e6353 SHA512 264313bc8de01bcad1db858c0b99ca2c294c22eb1b2693e0445083a895afd0cdc9178ff2dad5de18628a6e61723ad5d2e0c0d4789ce07ccae131f575747aa382
 AUX open-iscsi-2.0.875-include-sysmacros.patch 603 BLAKE2B 9c3fcf3bfd0a2ee04c31dd01dbb50680bc9bb434523f0e298d55b762be11f0cd4ef5c7b254466859f755f9e733e8ceaa54795f7dc57518c5136be5ff8001cffe SHA512 686698edc063fbdc47f07dea76ef95e8ae1038eeb3f012f4b6bc098cb0740e9988fc45779e921f4f01ef418d505f194c427308927c67d7af06e03e12b1ae9064
 AUX open-iscsi-2.0.876-Makefiles.patch 1416 BLAKE2B e953a6b5b802feae3068322782f3cd278c878814100fb37bee81400bed76096f08d01575e42d71538ae76086261dccc65104e3df19f3e36e3e660726cdbd3ec5 SHA512 f6038dc8c8d2a31528844f348bc8144616b69bf97f01986a4481b3a81de4bc896204a48c290f8b156d1e85ffd792439251fd52a498d053ed84d21d8b07d1d240
+AUX open-iscsi-2.0.878-gcc10-fno-common.patch 3038 BLAKE2B 9c188ff87e2a4fd418b39380f9b2886ead9be419c1141936b23238559fed82fa90d16f8ecb8f8e191facecd8338a85861968af2bde7d0116ac0e88c0a15ad69d SHA512 1765b2cce24c45f4c151e6ae38a323837074b3a42611e37c63ac36c3b75464ae391dafccc0627a9a063955a86604da8204ecc0aa6241db82246b4757005b9261
 AUX open-iscsi-2.1.1-Makefiles.patch 2185 BLAKE2B ab4dc518f12f0975cf472c94dfa883e98dcce57b2d203c39730ee67c4e6b548ff6554dd4ec8ffd7a624aca99e38c88284ea1bd41cbf89f077e5017e4bc45fd5a SHA512 1b37cfde4889d2f00f91cd173cb323fcb131040ac14351bb66aa4b8250cb527334e869faac4b0fa1ee9160ed7f44ffe2c9cd9a78075d3fec2ca32e0c27c0ba4b
 DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061 SHA512 4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b
 DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e SHA512 1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dbbbbca3d815015ed8696e1694aa19f3231132f90d1e5b36
@@ -18,7 +19,7 @@ DIST open-iscsi-2.1.0.tar.gz 604689 BLAKE2B 1741f4ac5072e3e952ba8268b1f52c6d2961
 DIST open-iscsi-2.1.1.tar.gz 616859 BLAKE2B 7004b0866e55837f06cfe9e45f49f6a482932fda8a2c21c55819d658fb96113f1913290d490f28baccea86ceb755c63b73bd010b201f974c9803d39fbf5d0672 SHA512 88dbea433fe5266714c5c73ce4b60dfb8ddeffcaad4ff77abbdda2a865d29d4307ca51b8f45376f54542b19baed30d5f2f1836a8c136eb0af840f489f47e4fb3
 EBUILD open-iscsi-2.0.873-r1.ebuild 2545 BLAKE2B c6b89937392718933e75616429acab05e7be548457b9aadaa1be77863dc8ed66e3acbaf482a320479b9c7f73507425615af86839209e2e956e08a12061097a41 SHA512 11de4116925ebe35a63ee19bb49a87bccff3c2648f3ea94ea05726d48cb0fe950a3aae9420b697c51f9f1387cea9075dfbffbeae7ca20af1e411769c34610339
 EBUILD open-iscsi-2.0.875.ebuild 3714 BLAKE2B 4d50d94574f3e16ef32a94287048719d83085457b66157ab402bc4c1b8674575910a3275baeef1cd462e8b6cdfa8efd37acb55dcac08e0d47a130d7fea6e2603 SHA512 e82f636a9c91d8dce36d248de9f2e2123505435dd15f1ac9273ccf6628641e8809ff9fd6cfd8b037b88699641e49170d145b2d8fa349156ff6aad2d833cba6a9
-EBUILD open-iscsi-2.0.878.ebuild 3996 BLAKE2B 9bd9e7b64838e3e3e02f0e7fc00706f580687db254bde71c89aa547050025ed1c7d2d10b8f3727d091adf051cc3f73eea456fea28c5bb92c5b11feda56590ee1 SHA512 3da8ce679baa5a0adcf65b553f65cbbe6d22970c409c02bf0f25f8b9bb4b4c9cbda3aaafd85d38289ef437fb08cb53cec83ecdd2634889769e47c852835d1b2d
+EBUILD open-iscsi-2.0.878-r1.ebuild 4048 BLAKE2B ef4daf567e9936937252187c1a4f244c0dec0b0d673eac0a3e743dabf99efced2fb3d3c095395cf81515e406b88cf387c202d80206917e8a80c68a65965582af SHA512 9356340d8bb850ff8a62a4f68c3174499cc9df6924f9496598bc50826983eecc5ca8381176d3f1b1e02a37aedd61ebae0b80935c97d124868e0c5c034b3bb59f
 EBUILD open-iscsi-2.1.0.ebuild 3996 BLAKE2B 9bd9e7b64838e3e3e02f0e7fc00706f580687db254bde71c89aa547050025ed1c7d2d10b8f3727d091adf051cc3f73eea456fea28c5bb92c5b11feda56590ee1 SHA512 3da8ce679baa5a0adcf65b553f65cbbe6d22970c409c02bf0f25f8b9bb4b4c9cbda3aaafd85d38289ef437fb08cb53cec83ecdd2634889769e47c852835d1b2d
 EBUILD open-iscsi-2.1.1.ebuild 4033 BLAKE2B c52114f0167c8cf3ada73ce1dfe8c3c8d9db2859154a7d496ab8e11c176c809f8515fcc8ee21118ebb76e1b049f52410179de2a4f16011cb1725ffca321d9f8f SHA512 d515ce74e88cb35fa3982e45ae27fd5656fe5503c783f36ba27b7ca1d3d0b2d60aef3ecdd0b02c407b1913a87b8514a6be1ac491b7c0a3cb4866e734b561d08c
 MISC metadata.xml 458 BLAKE2B 34a2a9b03797454b48ace319f383d85da5f9fe0f14afa1f1da1dc9afc535a2e1aeddaea0df27811b77fd3099b5754ee0755d49491157ed1e141fc2078c258389 SHA512 bd5e104acd3e07b8965b4eacb7b397b75448fc31b7359f17ee4e24af18fcd00ecd0c64001d42b7a542790151678b9dd02bad9513a69986c60cf91cceebfe86c3
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.878-gcc10-fno-common.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.878-gcc10-fno-common.patch
new file mode 100644
index 000000000000..b61476555fb4
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.0.878-gcc10-fno-common.patch
@@ -0,0 +1,107 @@
+From 499a006a7d6bb154f9e1ab430e4c9e231ba6096a Mon Sep 17 00:00:00 2001
+From: Lee Duncan <lduncan@suse.com>
+Date: Tue, 28 Jan 2020 16:36:56 -0800
+Subject: [PATCH] Updates to support gcc -fno-common option.
+
+This meant cleaning up the definition of some
+global variables, so that they were only defined
+in one place and refered to as external elsewhere.
+---
+ include/iscsi_err.h    | 6 ++++--
+ iscsiuio/configure.ac  | 2 +-
+ iscsiuio/src/uip/uip.h | 4 ++--
+ usr/iscsi_err.c        | 2 ++
+ usr/log.c              | 1 +
+ usr/log.h              | 2 +-
+ 6 files changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/include/iscsi_err.h b/include/iscsi_err.h
+index ed000dd0..04a8723e 100644
+--- a/include/iscsi_err.h
++++ b/include/iscsi_err.h
+@@ -4,7 +4,7 @@
+ #ifndef _ISCSI_ERR_
+ #define _ISCSI_ERR_
+ 
+-enum {
++enum iscsi_error_list {
+ 	ISCSI_SUCCESS			= 0,
+ 	/* Generic error */
+ 	ISCSI_ERR			= 1,
+@@ -73,7 +73,9 @@ enum {
+ 
+ 	/* Always last. Indicates end of error code space */
+ 	ISCSI_MAX_ERR_VAL,
+-} iscsi_err;
++};
++
++extern enum iscsi_error_list iscsi_err;
+ 
+ extern void iscsi_err_print_msg(int err);
+ extern char *iscsi_err_to_str(int err);
+diff --git a/iscsiuio/configure.ac b/iscsiuio/configure.ac
+index b41df0ec..8099f09c 100644
+--- a/iscsiuio/configure.ac
++++ b/iscsiuio/configure.ac
+@@ -78,7 +78,7 @@ AC_CONFIG_COMMANDS([default],[[
+     else
+         echo 'char *build_date = "'`date`'";' > src/unix/build_date.c
+     fi
+-    echo 'char *build_date;'> src/unix/build_date.h
++    echo 'extern char *build_date;'> src/unix/build_date.h
+ ]],[[]])
+ 
+ AC_PREFIX_DEFAULT()
+diff --git a/iscsiuio/src/uip/uip.h b/iscsiuio/src/uip/uip.h
+index 1180ab50..9d9428a2 100644
+--- a/iscsiuio/src/uip/uip.h
++++ b/iscsiuio/src/uip/uip.h
+@@ -70,8 +70,8 @@ struct uip_stack;
+ typedef u16_t uip_ip4addr_t[2];
+ typedef u16_t uip_ip6addr_t[8];
+ 
+-const uip_ip6addr_t all_zeroes_addr6;
+-const uip_ip4addr_t all_zeroes_addr4;
++extern const uip_ip6addr_t all_zeroes_addr6;
++extern const uip_ip4addr_t all_zeroes_addr4;
+ 
+ #define ETH_BUF(buf) ((struct uip_eth_hdr *)buf)
+ #define VLAN_ETH_BUF(buf) ((struct uip_vlan_eth_hdr *)buf)
+diff --git a/usr/iscsi_err.c b/usr/iscsi_err.c
+index 23c61fc3..4a057d57 100644
+--- a/usr/iscsi_err.c
++++ b/usr/iscsi_err.c
+@@ -21,6 +21,8 @@
+ #include "iscsi_err.h"
+ #include "log.h"
+ 
++enum iscsi_error_list iscsi_err;
++
+ static char *iscsi_err_msgs[] = {
+ 	/* 0 */ "",
+ 	/* 1 */ "unknown error",
+diff --git a/usr/log.c b/usr/log.c
+index f29b54b3..6e16e7ce 100644
+--- a/usr/log.c
++++ b/usr/log.c
+@@ -33,6 +33,7 @@
+ 
+ char *log_name;
+ int log_level = 0;
++struct logarea *la = NULL;
+ 
+ static int log_stop_daemon = 0;
+ static void (*log_func)(int prio, void *priv, const char *fmt, va_list ap);
+diff --git a/usr/log.h b/usr/log.h
+index 486a08ea..c548791e 100644
+--- a/usr/log.h
++++ b/usr/log.h
+@@ -64,7 +64,7 @@ struct logarea {
+ 	union semun semarg;
+ };
+ 
+-struct logarea *la;
++extern struct logarea *la;
+ 
+ extern int log_init(char *program_name, int size,
+ 	void (*func)(int prio, void *priv, const char *fmt, va_list ap),
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.878.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.878-r1.ebuild
index a1f80e0a3472..a622e3b62f5b 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.878.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.878-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,6 +32,7 @@ REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0.876-Makefiles.patch"
+	"${FILESDIR}/${PN}-2.0.878-gcc10-fno-common.patch"
 )
 
 pkg_setup() {
diff --git a/sys-block/sas3flash/Manifest b/sys-block/sas3flash/Manifest
index 5a5ae4cc0cdb..f19d5f1bc3c2 100644
--- a/sys-block/sas3flash/Manifest
+++ b/sys-block/sas3flash/Manifest
@@ -6,5 +6,5 @@ DIST SAS3FLASH_P15.zip 5284358 BLAKE2B 8602db381d7ce7fbca7b55c0f7a9ec48681532646
 DIST sas3Flash_quickRefGuide_rev1-0.pdf 301289 BLAKE2B c52a00b7dd6abd14d2a476ed2fca9d56d59555c7f92b802cd37f9876c17d83a9919df6e9c64697eefd2195bec01a1eed14884c3f7daa82195f276032d37a146b SHA512 88129695ac971a28d472f3cea3af8a99fcff508b29b2c7c74994b6854515710239a6bbff766fc4fd31af8726784a3799b2a63a9dd8241e97b34d4e05638e088b
 EBUILD sas3flash-15-r1.ebuild 2891 BLAKE2B 5c687bd8ca7c03bf8f63881c1cd7a57f672f593e13d32742774dce6afe5cd91725dccb77cd02a30b2a0414632a1963c1f21d4ea514af990fb7710fa73a9dc09b SHA512 6c7203c972deb3a8cb8f888ee0b12560b77912e9cbde7bcb222d42efdc6dfbd38b52a030170d37c01bac8ff51c780d3afdb34b75ffc632b256a30217b5d02c0d
 EBUILD sas3flash-15.ebuild 2203 BLAKE2B 6fc020bfdeeb4bbd6c77b863ad47cb3c9f39d25c83b9b6b8f2386304564d78f319d7d77a00221058507fe2e3235818b516ad7ea571f32883fae6c0a67e51f070 SHA512 61738738efc9be7cdb247a9f1f5056783b7114bf1505b10e1d450c3f2fb13ff80282c27445ca2f825b2be2b9f5707175dcd1003710315b5ae0a0e88d95797656
-EBUILD sas3flash-16.ebuild 4092 BLAKE2B 078531dc1032bf28e64554bacb052c631193dee7b741d27a3b42494a9c8dad35881a1039a29bd8be2ec19eb4df77b556039738c3d144b238710029ac01acf152 SHA512 35308c7b62f13507f04c2379b1d6e25546b0799b2723c75a89829c83c4f0e507d68fe464bea3ce9b201ca2e3cc3c60ec56ab663340f7219256cf56c24c6ea8e8
+EBUILD sas3flash-16.ebuild 4009 BLAKE2B ee053483925454882f2d6f4aab50e63e510beef9f041b81380e5e0296225dec6326adc8b075ddb95820a83f286f0b39ff4da2282d271dfa5b96083ad07475db2 SHA512 c2661a3f6780b87715c91907f7d279df3f94897f127878f88763e119d6d0cef7c2408711efd5124e13e7822cd1c894945a96d89327be87c009db5009d5104142
 MISC metadata.xml 306 BLAKE2B db3bc70d010eab74af1f8c3e7a4813d1cf0613eaf68ec37b4c32773b7a0b58dcf4ae81c3b42d8a296f571aaa380401329e3cf3c5ec161de08c582080e609c438 SHA512 eaf88a3817a6749ed5239605d4de8cdfb1a219355be17e60b9fd3eae741b83ceef0269f79ac89896e78ddcea0d9dd8da186fd619965ee1fb7f0350c779f561ce
diff --git a/sys-block/sas3flash/sas3flash-16.ebuild b/sys-block/sas3flash/sas3flash-16.ebuild
index 9542c3b99a47..82f0191b6a4a 100644
--- a/sys-block/sas3flash/sas3flash-16.ebuild
+++ b/sys-block/sas3flash/sas3flash-16.ebuild
@@ -16,7 +16,7 @@ RESTRICT="strip fetch mirror"
 BDEPEND="app-arch/unzip"
 QA_PREBUILT="opt/lsi/sas3flash boot/efi/sas3flash.efi"
 
-SRC_URI_BASE="https://docs.broadcom.com/docs-and-downloads/host-bus-adapters/host-bus-adapters-common-files/sas_sata_12g_p${PV}_point_release"
+SRC_URI_BASE="https://docs.broadcom.com/docs-and-downloads"
 SRC_URI_PREFIX="${SRC_URI_BASE}/host-bus-adapters/host-bus-adapters-common-files/sas_sata_12g_p${PV}_point_release"
 
 SRC_URI_LINUX="${SRC_URI_PREFIX}/Installer_P${PV}_for_Linux.zip"
@@ -24,7 +24,7 @@ SRC_URI_FREEBSD="${SRC_URI_PREFIX}/Installer_P${PV}_for_FreeBSD.zip"
 SRC_URI_SOLARIS="${SRC_URI_PREFIX}/Installer_P${PV}_for_Solaris.zip"
 SRC_URI_UEFI="${SRC_URI_PREFIX}/Installer_P${PV}_for_UEFI.zip"
 
-DISTFILE_BINS=( "${SRC_URI_LINUX%%*/}" "${SRC_URI_FREEBSD%%*/}" "${SRC_URI_SOLARIS%%*/}" "${SRC_URI_UEFI%%*/}" )
+DISTFILE_BINS=( "${SRC_URI_LINUX##*/}" "${SRC_URI_FREEBSD##*/}" "${SRC_URI_SOLARIS##*/}" "${SRC_URI_UEFI##*/}" )
 DISTFILE_DOC=sas3Flash_quickRefGuide_rev1-0.pdf
 
 SRC_URI="
diff --git a/sys-block/smp_utils/Manifest b/sys-block/smp_utils/Manifest
index 88cffa250fcf..4f05e0853236 100644
--- a/sys-block/smp_utils/Manifest
+++ b/sys-block/smp_utils/Manifest
@@ -1,6 +1,3 @@
-AUX smp_utils-0.98-sysmacros.patch 1441 BLAKE2B fe219d09b873bc4eb318436188c56af45f50720fd3c5d02f0d67634a63512a999deea21fb01c5cc84e03832b5fe1a6b0a34638359c7400c062c6004ca2abb1ed SHA512 203c1ac85e84f37e9f404b74a7f37f832c775a933b96b0b3a678bcff46e96c48f2f46c9ba900f433477ff0c82621c3333439cd28a747e2391d98e0ee0b202063
 DIST smp_utils-0.99.tar.xz 344292 BLAKE2B 3652a4772ab887c5f29f083f35667630440ebfe564064b791b57f24cb99359d83cb8961b48c64f4bf132a1a67a164aaa05e87a30133176d4979a530ec4050d3d SHA512 6be07fb4948f46aed4499b52fdaba00b2651048c22b429b99c28c1a45cc221324e423e6411f65bd2542c06a0658e19e1798e1633c2a6d7f65cef7990d86ae34c
-DIST smp_utils-0.99b4r151.tar.xz 323076 BLAKE2B f9fad9dc7b371574ea70cbedf76dbe8684d21c3658b712f24b1ee3594adcc2814b15bb892c776ea37e772f22b9322c1ee923aa13e2c984c40a0f5ff6e7868cb0 SHA512 c68bfc931d8d1f2b4ec68a60038fec2ff08a5603cdad5b825d6c29a678873a68027d8d174922db11e197efc30fa6a7f04db173122058be79d95ee81ce8a51011
 EBUILD smp_utils-0.99.ebuild 685 BLAKE2B fc52ca21a840862026a8bc8a661788e19b886c8b8b30c83f31180cc5c360229a7caf79ead3854b4e25704721fc2c94b35adbb23ae7fe2b977d9b8e1b3596462c SHA512 67f0412fa38147389bd579c394f8e44329010d8b1e2af75397143c8a1ff48cef101eba369db27bd9a5b47dec7296edf9ee827d723244b56f5a3358cd7b7d6e92
-EBUILD smp_utils-0.99_beta4_p151.ebuild 600 BLAKE2B b4061af52c945049e8900cf4f7957a7572a396acfd8b6e00c7a1b25146f4f339ac62add7b03df37c6de3cf73b91da54e591c647f440eccb4de172599f714dfdd SHA512 644f6378a137e87a58016a3f91aa8b77b5ca53e12b9033b984c62299678442190916a9d3eefc38018cf5d6bbdbc8510065b6f03526278942a5352bc9b62a9e55
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/smp_utils/files/smp_utils-0.98-sysmacros.patch b/sys-block/smp_utils/files/smp_utils-0.98-sysmacros.patch
deleted file mode 100644
index 7eaa418f91cd..000000000000
--- a/sys-block/smp_utils/files/smp_utils-0.98-sysmacros.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://bugs.gentoo.org/580258
-
-From 6c6f341d84f1e4c2c67fed98f09debe086fe9a47 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 19 Apr 2016 02:19:20 -0400
-Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev
-
-These funcs are defined in that header, so include it to avoid errors:
-../lib/.libs/libsmputils1.so: undefined reference to 'minor'
----
- lib/smp_aac_io.c    | 1 +
- lib/smp_lin_bsg.c   | 1 +
- lib/smp_mptctl_io.c | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/lib/smp_aac_io.c b/lib/smp_aac_io.c
-index 442eadf..e3d9710 100644
---- a/lib/smp_aac_io.c
-+++ b/lib/smp_aac_io.c
-@@ -6,6 +6,7 @@
- #include <stddef.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
-diff --git a/lib/smp_lin_bsg.c b/lib/smp_lin_bsg.c
-index 0995ded..89a92cc 100644
---- a/lib/smp_lin_bsg.c
-+++ b/lib/smp_lin_bsg.c
-@@ -40,6 +40,7 @@
- #include <fcntl.h>
- //#include <curses.h>
- #include <unistd.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
-diff --git a/lib/smp_mptctl_io.c b/lib/smp_mptctl_io.c
-index 5512913..def386d 100644
---- a/lib/smp_mptctl_io.c
-+++ b/lib/smp_mptctl_io.c
-@@ -15,6 +15,7 @@
- #include <fcntl.h>
- //#include <curses.h>
- #include <unistd.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
--- 
-2.7.4
-
diff --git a/sys-block/smp_utils/smp_utils-0.99_beta4_p151.ebuild b/sys-block/smp_utils/smp_utils-0.99_beta4_p151.ebuild
deleted file mode 100644
index 8b71ee1ed81a..000000000000
--- a/sys-block/smp_utils/smp_utils-0.99_beta4_p151.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils
-
-DESCRIPTION="Utilities for SAS management protocol (SMP)"
-HOMEPAGE="http://sg.danny.cz/sg/smp_utils.html"
-MY_PV="${PV/_beta/b}"
-MY_PV="${MY_PV/_p/r}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="http://sg.danny.cz/sg/p/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static-libs"
-
-DOCS=( AUTHORS ChangeLog COVERAGE CREDITS README )
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.98-sysmacros.patch #580258
-)