From aa52076a52cfffc5d1718472596938f3e4bdd6e7 Mon Sep 17 00:00:00 2001
From: Sayan Chowdhury <sayan.chowdhury2012@gmail.com>
Date: Fri, 26 Feb 2021 13:22:48 +0000
Subject: [PATCH 1/3] eclass/vcs-snapshot: Sync with Gentoo upstream

Signed-off-by: Sayan Chowdhury <sayan.chowdhury2012@gmail.com>
---
 .../portage-stable/eclass/vcs-snapshot.eclass | 69 +++++++++++++------
 1 file changed, 49 insertions(+), 20 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/vcs-snapshot.eclass b/sdk_container/src/third_party/portage-stable/eclass/vcs-snapshot.eclass
index 316a37773d..05d963917e 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/vcs-snapshot.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/vcs-snapshot.eclass
@@ -1,46 +1,49 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: vcs-snapshot.eclass
 # @MAINTAINER:
 # mgorny@gentoo.org
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6
+# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7
 # @BLURB: support eclass for unpacking VCS snapshot tarballs
 # @DESCRIPTION:
+# THIS ECLASS IS NOT NECESSARY FOR MODERN GITHUB AND GITLAB SNAPSHOTS.
+# THEIR DIRECTORY STRUCTURE IS ENTIRELY PREDICTABLE, SO UPDATE YOUR
+# EBUILD TO USE /ARCHIVE/ URI AND SET S IF NECESSARY.
+#
 # This eclass provides a convenience src_unpack() which does unpack all
 # the tarballs in SRC_URI to locations matching their (local) names,
 # discarding the original parent directory.
 #
-# The typical use case are VCS snapshots, coming from bitbucket
-# and similar services. They have hash appended to the directory name
-# which makes extracting them a painful experience. But if you just use
-# a SRC_URI arrow to rename it (which you're likely have to do anyway),
-# vcs-snapshot will just extract it into a matching directory.
+# The typical use case are VCS tag snapshots coming from BitBucket
+# (but not GitHub or GitLab).  They have hash appended to the directory
+# name which makes extracting them a painful experience.  But if you are
+# using a SRC_URI arrow to rename them (which quite likely you have to
+# do anyway), vcs-snapshot will just extract them into matching
+# directories.
 #
 # Please note that this eclass handles only tarballs (.tar, .tar.gz,
-# .tar.bz2 & .tar.xz). For any other file format (or suffix) it will
-# fall back to regular unpack. Support for additional formats may be
-# added at some point so please keep your SRC_URIs clean.
-#
-# Note: this eclass is no longer needed with the new-style 'archive'
-# GitHub URLs. They have sane directory names and stable contents,
-# so you should really prefer them.
+# .tar.bz2 & .tar.xz).  For any other file format (or suffix) it will
+# fall back to regular unpack.  Support for additional formats may be
+# added in the future if necessary.
 #
 # @EXAMPLE:
 #
 # @CODE
-# EAPI=6
+# EAPI=7
 # inherit vcs-snapshot
 #
-# SRC_URI="https://github.com/example/${PN}/tarball/v${PV} -> ${P}.tar.gz
-# 	https://github.com/example/${PN}-otherstuff/tarball/v${PV} -> ${P}-otherstuff.tar.gz"
+# SRC_URI="
+#    https://bitbucket.org/foo/bar/get/${PV}.tar.bz2 -> ${P}.tar.bz2
+#    https://bitbucket.org/foo/bar-otherstuff/get/${PV}.tar.bz2
+#        -> ${P}-otherstuff.tar.bz2"
 # @CODE
 #
 # and however the tarballs were originally packed, all files will appear
 # in ${WORKDIR}/${P} and ${WORKDIR}/${P}-otherstuff respectively.
 
 case ${EAPI:-0} in
-	0|1|2|3|4|5|6) ;;
+	0|1|2|3|4|5|6|7) ;;
 	*) die "vcs-snapshot.eclass API in EAPI ${EAPI} not yet established."
 esac
 
@@ -55,6 +58,7 @@ EXPORT_FUNCTIONS src_unpack
 vcs-snapshot_src_unpack() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	local renamed_any=
 	local f
 
 	for f in ${A}
@@ -65,10 +69,25 @@ vcs-snapshot_src_unpack() {
 
 				debug-print "${FUNCNAME}: unpacking ${f} to ${destdir}"
 
-				# XXX: check whether the directory structure inside is
-				# fine? i.e. if the tarball has actually a parent dir.
+				local l topdirs=()
+				while read -r l; do
+					topdirs+=( "${l}" )
+				done < <(tar -t -f "${DISTDIR}/${f}" | cut -d/ -f1 | sort -u)
+				if [[ ${#topdirs[@]} -gt 1 ]]; then
+					eerror "The archive ${f} contains multiple or no top directory."
+					eerror "It is impossible for vcs-snapshot to unpack this correctly."
+					eerror "Top directories found:"
+					local d
+					for d in "${topdirs[@]}"; do
+						eerror "    ${d}"
+					done
+					die "${FUNCNAME}: Invalid directory structure in archive ${f}"
+				fi
+				[[ ${topdirs[0]} != ${f%.tar*} ]] && renamed_any=1
+
 				mkdir "${destdir}" || die
 				# -o (--no-same-owner) to avoid restoring original owner
+				einfo "Unpacking ${f}"
 				tar -C "${destdir}" -x -o --strip-components 1 \
 					-f "${DISTDIR}/${f}" || die
 				;;
@@ -80,4 +99,14 @@ vcs-snapshot_src_unpack() {
 				;;
 		esac
 	done
+
+	if [[ ! ${renamed_any} ]]; then
+		local w=eerror
+		[[ ${EAPI} == [0123456] ]] && w=eqawarn
+		"${w}" "${FUNCNAME} did not find any archives that needed renaming."
+		"${w}" "Please verify that its usage is really necessary, and remove"
+		"${w}" "the inherit if it is not."
+
+		[[ ${w} == eerror ]] && die "${FUNCNAME}: Unnecessary usage detected"
+	fi
 }

From 13d0a92571ced394973071048378706e19dac114 Mon Sep 17 00:00:00 2001
From: Sayan Chowdhury <sayan.chowdhury2012@gmail.com>
Date: Fri, 26 Feb 2021 13:23:22 +0000
Subject: [PATCH 2/3] virtual/libudev: Sync with Gentoo upstream

Signed-off-by: Sayan Chowdhury <sayan.chowdhury2012@gmail.com>
---
 .../virtual/libudev/libudev-215-r1.ebuild     |  4 ++--
 .../virtual/libudev/libudev-232-r1.ebuild     | 15 ++++++++++++
 .../virtual/libudev/libudev-232-r2.ebuild     | 18 ++++++++++++++
 .../virtual/libudev/libudev-232-r3.ebuild     | 18 ++++++++++++++
 .../virtual/libudev/libudev-232.ebuild        | 24 -------------------
 5 files changed, 53 insertions(+), 26 deletions(-)
 create mode 100644 sdk_container/src/third_party/portage-stable/virtual/libudev/libudev-232-r1.ebuild
 create mode 100644 sdk_container/src/third_party/portage-stable/virtual/libudev/libudev-232-r2.ebuild
 create mode 100644 sdk_container/src/third_party/portage-stable/virtual/libudev/libudev-232-r3.ebuild
 delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/libudev/libudev-232.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/virtual/libudev/libudev-215-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libudev/libudev-215-r1.ebuild
index dac1458fb0..e85f06c93c 100644
--- a/sdk_container/src/third_party/portage-stable/virtual/libudev/libudev-215-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/virtual/libudev/libudev-215-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for libudev providers"
 SLOT="0/1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="static-libs systemd"
 REQUIRED_USE="systemd? ( !static-libs )"
 
diff --git a/sdk_container/src/third_party/portage-stable/virtual/libudev/libudev-232-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libudev/libudev-232-r1.ebuild
new file mode 100644
index 0000000000..68cec0b50c
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/virtual/libudev/libudev-232-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-build
+
+DESCRIPTION="Virtual for libudev providers"
+SLOT="0/1"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+IUSE="systemd"
+
+RDEPEND="
+	!systemd? ( >=sys-fs/udev-232:0/0[${MULTILIB_USEDEP}] )
+	systemd? ( >=sys-apps/systemd-232:0/2[${MULTILIB_USEDEP}] )
+"
diff --git a/sdk_container/src/third_party/portage-stable/virtual/libudev/libudev-232-r2.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libudev/libudev-232-r2.ebuild
new file mode 100644
index 0000000000..9456f927db
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/virtual/libudev/libudev-232-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-build
+
+DESCRIPTION="Virtual for libudev providers"
+SLOT="0/1"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+IUSE="static-libs systemd"
+
+RDEPEND="
+	!systemd? ( || (
+		>=sys-fs/eudev-3.2.9:0/0[${MULTILIB_USEDEP}]
+		>=sys-fs/udev-232:0/0[${MULTILIB_USEDEP}]
+	) )
+	systemd? ( >=sys-apps/systemd-232:0/2[${MULTILIB_USEDEP}] )
+"
diff --git a/sdk_container/src/third_party/portage-stable/virtual/libudev/libudev-232-r3.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libudev/libudev-232-r3.ebuild
new file mode 100644
index 0000000000..75050714b7
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/virtual/libudev/libudev-232-r3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-build
+
+DESCRIPTION="Virtual for libudev providers"
+SLOT="0/1"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+IUSE="static-libs systemd"
+
+RDEPEND="
+	!systemd? ( || (
+		>=sys-fs/eudev-3.2.9:0/0[${MULTILIB_USEDEP},static-libs(-)?]
+		>=sys-fs/udev-232:0/0[${MULTILIB_USEDEP},static-libs(-)?]
+	) )
+	systemd? ( >=sys-apps/systemd-232:0/2[${MULTILIB_USEDEP},static-libs(-)?] )
+"
diff --git a/sdk_container/src/third_party/portage-stable/virtual/libudev/libudev-232.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libudev/libudev-232.ebuild
deleted file mode 100644
index ac3ace2d99..0000000000
--- a/sdk_container/src/third_party/portage-stable/virtual/libudev/libudev-232.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib-build
-
-DESCRIPTION="Virtual for libudev providers"
-SLOT="0/1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="static-libs systemd"
-REQUIRED_USE="systemd? ( !static-libs )"
-
-RDEPEND="
-	!systemd? (
-		static-libs? (
-			>=sys-fs/eudev-1.3:0/0[${MULTILIB_USEDEP},static-libs(-)]
-		)
-		!static-libs? ( || (
-			>=sys-fs/eudev-1.3:0/0[${MULTILIB_USEDEP}]
-			>=sys-fs/udev-232:0/0[${MULTILIB_USEDEP}]
-		) )
-	)
-	systemd? ( >=sys-apps/systemd-212-r5:0/2[${MULTILIB_USEDEP}] )
-"

From 429ab16b0d7e510662acd7b00d36aa9096c127b1 Mon Sep 17 00:00:00 2001
From: Sayan Chowdhury <sayan.chowdhury2012@gmail.com>
Date: Fri, 26 Feb 2021 13:24:10 +0000
Subject: [PATCH 3/3] sys-fs/multipath-tools: Sync with Gentoo upstream

Signed-off-by: Sayan Chowdhury <sayan.chowdhury2012@gmail.com>
---
 .../sys-fs/multipath-tools/Manifest           |   9 +-
 .../multipath-tools-0.5.0-makefile.patch      | 200 ------------------
 ...tipath-tools-0.5.0-systemd-pkgconfig.patch |  24 ---
 ...tools-0.6.2-ignore-modprobe-failures.patch |  25 ---
 .../multipath-tools-0.6.4-sysmacros.patch     |  60 ------
 ...ools-0.7.3-fix-build-without-systemd.patch |  39 ----
 ...multipath-tools-0.7.5-respect-flags.patch} |  12 +-
 ...tools-0.8.3-fix-gcc-10-compatibility.patch |  11 +
 .../multipath-tools-0.8.3-json-c-0.14.patch   |  28 +++
 ...multipath-tools-0.8.3-no-gziped-docs.patch | 175 +++++++++++++++
 ...tipath-tools-0.8.4-parallel_make_fix.patch |  85 ++++++++
 .../multipath-tools-0.8.4-respect-flags.patch |  19 ++
 .../multipath-tools-0.8.5-respect-flags.patch |  12 ++
 .../multipath-tools/files/multipathd-r1.rc    |  12 ++
 .../multipath-tools/files/rc-multipathd       |  20 --
 .../multipath-tools-0.5.0-r1.ebuild           |  65 ------
 .../multipath-tools-0.6.4-r1.ebuild           |  99 ---------
 .../multipath-tools-0.7.3.ebuild              |  96 ---------
 ...ebuild => multipath-tools-0.8.3-r2.ebuild} |  57 +++--
 ....2.ebuild => multipath-tools-0.8.4.ebuild} |  61 +++---
 ....1.ebuild => multipath-tools-0.8.5.ebuild} |  59 +++---
 21 files changed, 437 insertions(+), 731 deletions(-)
 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.5.0-makefile.patch
 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.5.0-systemd-pkgconfig.patch
 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.6.2-ignore-modprobe-failures.patch
 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch
 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.7.3-fix-build-without-systemd.patch
 rename sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/{multipath-tools-0.7.4-respect-flags.patch => multipath-tools-0.7.5-respect-flags.patch} (52%)
 create mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.3-fix-gcc-10-compatibility.patch
 create mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.3-json-c-0.14.patch
 create mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.3-no-gziped-docs.patch
 create mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.4-parallel_make_fix.patch
 create mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.4-respect-flags.patch
 create mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.5-respect-flags.patch
 create mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipathd-r1.rc
 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/rc-multipathd
 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild
 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild
 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.3.ebuild
 rename sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/{multipath-tools-0.7.4.ebuild => multipath-tools-0.8.3-r2.ebuild} (65%)
 rename sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/{multipath-tools-0.7.2.ebuild => multipath-tools-0.8.4.ebuild} (60%)
 rename sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/{multipath-tools-0.7.1.ebuild => multipath-tools-0.8.5.ebuild} (60%)

diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/Manifest b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/Manifest
index ebd40ad948..3791f6de0f 100644
--- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/Manifest
@@ -1,6 +1,3 @@
-DIST multipath-tools-0.5.0.tar.bz2 184024 SHA256 f13cf1eb84e94e83b2019e68f7965526903c13e94246db43965d181668a0a6f9 SHA512 dfad21c45d0f69e39041d30d203a582c8ee8329bf390c51cde10155b3de379e7ad8fead2ac4beb268a924fd7e7dc8e1cf538ea3c70d41479fd8786fa30ba22a9 WHIRLPOOL bc8a365d66d1c5f584de04304125949926d4a1576cba4a00acca0f1333eb13d83318da36d9d88c5dc92691a331d427ad6b99eb1f2983fbc387303dbfdbae11ff
-DIST multipath-tools-0.6.4.tar.gz 285448 SHA256 1e2747883320f7db854201e5bfb97216e7518468f03503985382ce2c69e5558b SHA512 ec35c6c26c3b233ebece7136ea99dd4c0dff2927e7b543e7091219dc7065fe87e609a1eda9ab6d08399d44fe882d70c8dbe6be9ab175d154c5dd2d12ee1d86ea WHIRLPOOL 6138ba1cbb814bbf53e7a5113f50325d7a7d7088ff2b0f83f1e574f0644241e368cc6b5223eca039b414a0a459a52413d396ea214ff3eaa57f0681e8322b2d9d
-DIST multipath-tools-0.7.1.tar.gz 329008 SHA256 d788aaf3ea862b44b5aa07eaa0e5696061f972a1a46d0f469c4a4f4c477c1970 SHA512 81ceb3887250a691b94cb49b7141ace4fc1f69d7f8381e517560dfc7c51ee4c5a1f4f4e40a0b368cf5f7381697fa746b856cbade8990c1608cbcd77248946a82 WHIRLPOOL 2bcc7cc2f425ca3f3f634807cafb7817b54b83d82987a09c9dd530dca1375175a7d52f1854bdd6d5f37c3b1fcf7bc34d67fc2dcae5809dfae968b313c8c86cba
-DIST multipath-tools-0.7.2.tar.gz 335187 SHA256 e4273527b8a8e31d596221dd74fdeb9f2b7558d59e514bc7eb040d077bddf24b SHA512 9637e6c69ecfe8dbfb55794569017051961dbe39fa1019000e4be9c2c888a5b6d13ae360af8738bb1fb89a8d27ec833ff0075b1d066b8b3ca21cd9832f477046 WHIRLPOOL 051956ab5c899ce98833925f84245f7450c7c01012edafdb6fff39762cf87908f53413c42f2ccb6059fd2717d29bf55ded260ade027b37ef0227a46b8266d8c7
-DIST multipath-tools-0.7.3.tar.gz 344030 SHA256 b59712c3068b9b33c2fc769eb499c637a0ddff7b46ae9d2cc411c4d61e233ffb SHA512 fbcd5609bcb4f80a91410cec86882e9f39ee056edb314382f25db8e1e1ed5c084e14849a67502be2b11a2e980dc2cb5d34235885476ae5ce62809a175bee9ace WHIRLPOOL 03b99202d2831513ba1fcc3e504ba3554b970c5bc366288a50e62e2225028dff972c102b7ae93d026026bea6614b5305a605122c91e0b8deeb91f9c98a68119f
-DIST multipath-tools-0.7.4.tar.gz 350361 BLAKE2B a55a5912f040913b2db8a6fe28727dd52fd4be9ceb8544f1b45384e12112775caa6159da3ce774dd529377796a2b9033490ee655f3caac864919708bdc5070ec SHA512 0a00b79920251b685265ab731e5418538f32d6392b101082c71a6c7345ef7d008bcdcf466ee1317e8bf658d0fb01fc9a2e4ec6658fc565129c1bb5949ac91254
+DIST multipath-tools-0.8.3.tar.gz 465248 BLAKE2B 21a7a18c70150b4422bdd0ae02f26f491845eb06928ab74e631df8c6b3c110d10f43f75b9f8289a7134826c923b7ba58ce54c40497c3b7e6211e53902c8a1b5f SHA512 d9fdc2763f5a1efa15ee07c5d863008c9694623935f62a0e0b56f941df4e0d0ca3f86056fefc9b5ca828b47782127e3d55f2f925b1ed957e02b675bef36f4cae
+DIST multipath-tools-0.8.4.tar.gz 480994 BLAKE2B be8368df049218e2eaa1749e7b1c7a930da15f0311ab549b1bbba9c019dcfe39f90a05fd621e0703301ef1d55c98ac8cc74231d82950d9066f19d8764421704b SHA512 720823188c053c1c50269a30e34a9d69099098495bfd607076bcfa2c079565e3f0580c91783f19d42ed82290c0db98e4e19ef620eca4ee5ec7885c49c72d2307
+DIST multipath-tools-0.8.5.tar.gz 494750 BLAKE2B a42d17a47631107433a1d0a9da69a0bb10d2125cb242d2125d67da18f6bc6231c9233b163dc1d07d88dcba9f912830c047fdee5b42435f59ea2976598a72fd75 SHA512 f62a09107ccb18ffab97139fe2dba3dc22450836d8669c4381a8bce4072672a027a3a1e687f33e374429bffa49b3ba4a54d1e52294044d7bc1f82ed5d5aaf760
diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.5.0-makefile.patch b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.5.0-makefile.patch
deleted file mode 100644
index 691b138731..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.5.0-makefile.patch
+++ /dev/null
@@ -1,200 +0,0 @@
---- multipath-tools-0.5.0/kpartx/Makefile
-+++ multipath-tools-0.5.0/kpartx/Makefile
-@@ -12,7 +12,7 @@
- 	CFLAGS += -DLIBDM_API_COOKIE
- endif
- 
--LDFLAGS = -ldevmapper
-+LIBS = -ldevmapper
- OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \
-        gpt.o mac.o ps3.o crc32.o lopart.o xstrncpy.o devmapper.o
- EXEC = kpartx
-@@ -20,8 +20,7 @@
- all: $(EXEC)
- 
- $(EXEC): $(OBJS)
--	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
- 
- install: $(EXEC) $(EXEC).8
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
-@@ -29,14 +28,15 @@
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir)
- 	$(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d
--	$(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/
-+	$(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
- 
- uninstall:
- 	rm -f $(DESTDIR)$(bindir)/$(EXEC)
--	rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz
-+	rm -f $(DESTDIR)$(mandir)/$(EXEC).8
- 	rm -f $(DESTDIR)$(libudevdir)/kpartx_id
-+	rm -f $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules
- 
- clean:
--	rm -f core *.o $(EXEC) *.gz
-+	rm -f core *.o $(EXEC)
---- multipath-tools-0.5.0/libmpathpersist/Makefile
-+++ multipath-tools-0.5.0/libmpathpersist/Makefile
-@@ -22,8 +22,6 @@
- 	$(CC) -Wall -fPIC -c $(CFLAGS) *.c 
- 	$(CC)  -shared $(LIBDEPS) -Wl,-soname=$@ $(CFLAGS) -o $@ $(OBJS)
- 	ln -s $(LIBS) $(DEVLIB)
--	$(GZIP) mpath_persistent_reserve_in.3 > mpath_persistent_reserve_in.3.gz	
--	$(GZIP) mpath_persistent_reserve_out.3 > mpath_persistent_reserve_out.3.gz	
- 
- install: $(LIBS)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir)
-@@ -31,19 +29,17 @@
- 	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(syslibdir)
- 	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(man3dir)
- 	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)/usr/include/
--	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)/usr/share/doc/mpathpersist/
--	ln -sf $(DESTDIR)$(syslibdir)/$(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB)
--	install -m 644 mpath_persistent_reserve_in.3.gz $(DESTDIR)$(man3dir)	
--	install -m 644 mpath_persistent_reserve_out.3.gz $(DESTDIR)$(man3dir)	
--	install -m 644 mpath_persist.h $(DESTDIR)/usr/include/
-+	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3 $(DESTDIR)$(man3dir)
-+	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3 $(DESTDIR)$(man3dir)
-+	$(INSTALL_PROGRAM) -m 644 mpath_persist.h $(DESTDIR)/usr/include/
- 
- uninstall:
- 	rm -f $(DESTDIR)$(syslibdir)/$(LIBS)
--	rm $(DESTDIR)$(mandir)/mpath_persistent_reserve_in.3.gz	
--	rm $(DESTDIR)$(mandir)/mpath_persistent_reserve_out.3.gz	
-+	rm $(DESTDIR)$(mandir)/mpath_persistent_reserve_in.3	
-+	rm $(DESTDIR)$(mandir)/mpath_persistent_reserve_out.3	
- 
- clean:
- 	rm -f core *.a *.o 
- 	rm -f libmpathpersist.so.0
- 	rm -f libmpathpersist.so
--	rm -f mpath_persistent_reserve_in.3.gz mpath_persistent_reserve_out.3.gz
-+	rm -f mpath_persistent_reserve_in.3 mpath_persistent_reserve_out.3
---- multipath-tools-0.5.0/Makefile.inc
-+++ multipath-tools-0.5.0/Makefile.inc
-@@ -48,8 +48,8 @@
- 	RPM_OPT_FLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4
- endif
- 
--OPTFLAGS     = $(RPM_OPT_FLAGS) -Wunused -Wstrict-prototypes
--CFLAGS	     = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\"
-+OPTFLAGS     = -Wall -Wunused -Wstrict-prototypes
-+CFLAGS	    += $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\"
- SHARED_FLAGS = -shared
- 
- %.o:	%.c
---- multipath-tools-0.5.0/mpathpersist/Makefile
-+++ multipath-tools-0.5.0/mpathpersist/Makefile
-@@ -13,18 +13,17 @@
- 
- $(EXEC): $(OBJS)
- 	$(CC) -g $(OBJS) -o $(EXEC) $(LDFLAGS) $(CFLAGS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
- 	
- install:
- 	install -d $(DESTDIR)$(bindir)
- 	install -m 755 $(EXEC) $(DESTDIR)$(bindir)/
- 	install -d $(DESTDIR)$(mandir)
--	install -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
-+	install -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
- 	
- clean:
- 	rm -f *.o $(EXEC)
--	rm -f mpathpersist.8.gz
-+	rm -f mpathpersist.8
- 
- uninstall:
- 	rm $(DESTDIR)$(bindir)/$(EXEC)
--	rm $(DESTDIR)$(mandir)/$(EXEC).8.gz
-+	rm $(DESTDIR)$(mandir)/$(EXEC).8
---- multipath-tools-0.5.0/multipath/Makefile
-+++ multipath-tools-0.5.0/multipath/Makefile
-@@ -7,29 +7,27 @@
- OBJS = main.o
- 
- CFLAGS += -I$(multipathdir)
--LDFLAGS += -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath -ludev
-+LIBS += -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath -ludev
- 
- EXEC = multipath
- 
- all: $(EXEC)
- 
- $(EXEC): $(OBJS)
--	$(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
--	$(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
- 
- install:
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
- 	$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir)
- 
- uninstall:
- 	rm $(DESTDIR)$(bindir)/$(EXEC)
--	rm $(DESTDIR)$(mandir)/$(EXEC).8.gz
--	rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz
-+	rm $(DESTDIR)$(mandir)/$(EXEC).8
-+	rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5
- 
- clean:
--	rm -f core *.o $(EXEC) *.gz
-+	rm -f core *.o $(EXEC)
---- multipath-tools-0.5.0/multipathd/Makefile
-+++ multipath-tools-0.5.0/multipathd/Makefile
-@@ -9,11 +9,11 @@
- ifdef SYSTEMD
- 	CFLAGS += -DUSE_SYSTEMD=$(SYSTEMD)
- endif
--LDFLAGS += -lpthread -ldevmapper -lreadline
-+LIBS += -lpthread -ldevmapper -lreadline
- ifdef SYSTEMD
--	LDFLAGS += -lsystemd-daemon
-+	LIBS += -lsystemd-daemon
- endif
--LDFLAGS += -ludev -ldl \
-+LIBS += -ludev -ldl \
- 	-L$(multipathdir) -lmultipath -L$(mpathpersistdir) -lmpathpersist
- 
- #
-@@ -35,8 +35,7 @@
- all : $(EXEC)
- 
- $(EXEC): $(OBJS)
--	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $(EXEC)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
- 
- install:
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
-@@ -48,15 +47,15 @@
- 	$(INSTALL_PROGRAM) -m 644 $(EXEC).socket $(DESTDIR)$(unitdir)
- endif
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
- 
- uninstall:
- 	rm -f $(DESTDIR)$(bindir)/$(EXEC)
- 	rm -f $(DESTDIR)$(rcdir)/$(EXEC)
--	rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz
-+	rm -f $(DESTDIR)$(mandir)/$(EXEC).8
- 	rm -f $(DESTDIR)$(unitdir)/$(EXEC).service
- 	rm -f $(DESTDIR)$(unitdir)/$(EXEC).socket
- 
- clean:
--	rm -f core *.o $(EXEC) *.gz
-+	rm -f core *.o $(EXEC)
- 
diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.5.0-systemd-pkgconfig.patch b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.5.0-systemd-pkgconfig.patch
deleted file mode 100644
index d75f841361..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.5.0-systemd-pkgconfig.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru multipath-tools-0.5.0/libmultipath/Makefile multipath-tools-0.5.0-modified/libmultipath/Makefile
---- multipath-tools-0.5.0/libmultipath/Makefile	2013-12-17 22:40:41.000000000 +0100
-+++ multipath-tools-0.5.0-modified/libmultipath/Makefile	2014-03-07 04:03:45.963309627 +0100
-@@ -9,7 +9,7 @@
- LIBS = $(DEVLIB).$(SONAME)
- LIBDEPS = -lpthread -ldl -ldevmapper -ludev
- ifdef SYSTEMD
--	LIBDEPS += -lsystemd-daemon
-+	LIBDEPS += $(shell pkg-config --libs libsystemd 2>/dev/null || pkg-config --libs libsystemd-daemon 2>/dev/null)
- endif
- 
- OBJS = memory.o parser.o vector.o devmapper.o callout.o \
-diff -ru multipath-tools-0.5.0/multipathd/Makefile multipath-tools-0.5.0-modified/multipathd/Makefile
---- multipath-tools-0.5.0/multipathd/Makefile	2014-03-07 04:05:09.340307633 +0100
-+++ multipath-tools-0.5.0-modified/multipathd/Makefile	2014-03-07 04:04:03.555309206 +0100
-@@ -11,7 +11,7 @@
- endif
- LIBS += -lpthread -ldevmapper -lreadline
- ifdef SYSTEMD
--	LIBS += -lsystemd-daemon
-+	LIBS += $(shell pkg-config --libs libsystemd 2>/dev/null || pkg-config --libs libsystemd-daemon 2>/dev/null)
- endif
- LIBS += -ludev -ldl \
- 	-L$(multipathdir) -lmultipath -L$(mpathpersistdir) -lmpathpersist
diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.6.2-ignore-modprobe-failures.patch b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.6.2-ignore-modprobe-failures.patch
deleted file mode 100644
index cb785899c2..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.6.2-ignore-modprobe-failures.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 100588046ad59176b9779c73212aea63be5aace4 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Mon, 12 Sep 2016 17:26:38 -0400
-Subject: [PATCH] multipathd.service: ignore modprobe failures
-
----
- multipathd/multipathd.service | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/multipathd/multipathd.service b/multipathd/multipathd.service
-index e3d6f91..d26577f 100644
---- a/multipathd/multipathd.service
-+++ b/multipathd/multipathd.service
-@@ -11,7 +11,7 @@ Conflicts=shutdown.target
- Type=notify
- NotifyAccess=main
- LimitCORE=infinity
--ExecStartPre=/sbin/modprobe -a scsi_dh_alua scsi_dh_emc scsi_dh_rdac dm-multipath
-+ExecStartPre=-/sbin/modprobe -a scsi_dh_alua scsi_dh_emc scsi_dh_rdac dm-multipath
- ExecStart=/sbin/multipathd -d -s
- ExecReload=/sbin/multipathd reconfigure
- 
--- 
-2.10.0
-
diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch
deleted file mode 100644
index 99a12fc7b7..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/kpartx/dasd.c b/kpartx/dasd.c
-index 1206e45..f50c1bd 100644
---- a/kpartx/dasd.c
-+++ b/kpartx/dasd.c
-@@ -28,6 +28,7 @@
- #include <inttypes.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/ioctl.h>
- #include <linux/hdreg.h>
- #include <errno.h>
-diff --git a/kpartx/kpartx.c b/kpartx/kpartx.c
-index d31fea8..3452787 100644
---- a/kpartx/kpartx.c
-+++ b/kpartx/kpartx.c
-@@ -28,6 +28,7 @@
- #include <stdint.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <ctype.h>
- #include <libdevmapper.h>
-diff --git a/libmultipath/checkers/tur.c b/libmultipath/checkers/tur.c
-index 4d6c3c2..d9a9e67 100644
---- a/libmultipath/checkers/tur.c
-+++ b/libmultipath/checkers/tur.c
-@@ -11,6 +11,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
-+#include <sys/sysmacros.h>
- #include <errno.h>
- #include <sys/time.h>
- #include <pthread.h>
-diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c
-index 4f8ef13..9c0b240 100644
---- a/libmultipath/devmapper.c
-+++ b/libmultipath/devmapper.c
-@@ -12,6 +12,7 @@
- #include <ctype.h>
- #include <unistd.h>
- #include <errno.h>
-+#include <sys/sysmacros.h>
- 
- #include "checkers.h"
- #include "vector.h"
-diff --git a/libmultipath/util.c b/libmultipath/util.c
-index 03a5738..1841f35 100644
---- a/libmultipath/util.c
-+++ b/libmultipath/util.c
-@@ -4,6 +4,7 @@
- #include <pthread.h>
- #include <string.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <unistd.h>
- 
diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.7.3-fix-build-without-systemd.patch b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.7.3-fix-build-without-systemd.patch
deleted file mode 100644
index d92e5c05c7..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.7.3-fix-build-without-systemd.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From f0a874f9bd86504840a7bdbf0a0c07bcd0ea8c29 Mon Sep 17 00:00:00 2001
-From: Michael Lass <bevan@bi-co.net>
-Date: Wed, 20 Sep 2017 21:54:32 +0200
-Subject: [PATCH] multipathd: fix build without systemd
-
-do_sd_notify contains a call to sd_notify which is unknown if USE_SYSTEMD is
-undefined. In this case, do_sd_notify is never called anyway, so embed the
-entire function into an #ifdef USE_SYSTEMD.
-
-This fixes a regression introduced in 88ddca5.
-
-Signed-off-by: Michael Lass <bevan@bi-co.net>
----
- multipathd/main.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/multipathd/main.c b/multipathd/main.c
-index 8049da22..bbe14771 100644
---- a/multipathd/main.c
-+++ b/multipathd/main.c
-@@ -169,6 +169,7 @@ sd_notify_status(void)
- 	return NULL;
- }
- 
-+#ifdef USE_SYSTEMD
- static void do_sd_notify(enum daemon_status old_state)
- {
- 	/*
-@@ -181,6 +182,7 @@ static void do_sd_notify(enum daemon_status old_state)
- 		return;
- 	sd_notify(0, sd_notify_status());
- }
-+#endif
- 
- static void config_cleanup(void *arg)
- {
--- 
-2.14.1
-
diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.7.4-respect-flags.patch b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.7.5-respect-flags.patch
similarity index 52%
rename from sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.7.4-respect-flags.patch
rename to sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.7.5-respect-flags.patch
index 19573fe6ee..fef55ce31e 100644
--- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.7.4-respect-flags.patch
+++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.7.5-respect-flags.patch
@@ -1,12 +1,14 @@
---- a/Makefile.inc
-+++ b/Makefile.inc
-@@ -90,11 +90,12 @@ OPTFLAGS	= -O2 -g -pipe -Wall -Wextra -Wformat=2 -Werror=implicit-int \
+--- multipath-tools-0.7.5/Makefile.inc
++++ multipath-tools-0.7.5/Makefile.inc
+@@ -91,12 +91,13 @@
  		  -Wp,-D_FORTIFY_SOURCE=2 $(STACKPROT) \
  		  --param=ssp-buffer-size=4
  
--CFLAGS		= $(OPTFLAGS) -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\"
+-CFLAGS		:= $(OPTFLAGS) -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \
+-		   -MMD -MP $(CFLAGS)
 +CFLAGS		?= $(OPTFLAGS)
-+CFLAGS		+= -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\"
++CFLAGS		+= -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \
++		   -MMD -MP
  BIN_CFLAGS	= -fPIE -DPIE
  LIB_CFLAGS	= -fPIC
  SHARED_FLAGS	= -shared
diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.3-fix-gcc-10-compatibility.patch b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.3-fix-gcc-10-compatibility.patch
new file mode 100644
index 0000000000..18ed8d65e0
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.3-fix-gcc-10-compatibility.patch
@@ -0,0 +1,11 @@
+--- a/libmultipath/structs.h
++++ b/libmultipath/structs.h
+@@ -106,7 +106,7 @@ enum yes_no_undef_states {
+  * _FIND_MULTIPATHS_F must have the same value as YNU_YES.
+  * Generate a compile time error if that isn't the case.
+  */
+-char ___error1___[-(_FIND_MULTIPATHS_F != YNU_YES)];
++extern char ___error1___[-(_FIND_MULTIPATHS_F != YNU_YES)];
+ 
+ #define find_multipaths_on(conf) \
+ 	(!!((conf)->find_multipaths & _FIND_MULTIPATHS_F))
diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.3-json-c-0.14.patch b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.3-json-c-0.14.patch
new file mode 100644
index 0000000000..34d02f7b5d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.3-json-c-0.14.patch
@@ -0,0 +1,28 @@
+From 8438a9cd8d7ed88645fa8e6a8f19c0fd9ae872a7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
+Date: Mon, 13 Apr 2020 19:22:02 +0200
+Subject: [PATCH] Add support for upcoming json-c 0.14.0.
+
+TRUE/FALSE are not defined anymore.  1 and 0 are used instead.
+This is backwards compatible, as earlier versions of json-c are
+using the same integer values in their present definitions.
+---
+ libdmmp/libdmmp_private.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libdmmp/libdmmp_private.h b/libdmmp/libdmmp_private.h
+index ac85b63f..4378962b 100644
+--- a/libdmmp/libdmmp_private.h
++++ b/libdmmp/libdmmp_private.h
+@@ -82,7 +82,7 @@ static out_type func_name(struct dmmp_context *ctx, const char *var_name) { \
+ do { \
+ 	json_type j_type = json_type_null; \
+ 	json_object *j_obj_tmp = NULL; \
+-	if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != TRUE) { \
++	if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != 1) { \
+ 		_error(ctx, "Invalid JSON output from multipathd IPC: " \
+ 		       "key '%s' not found", key); \
+ 		rc = DMMP_ERR_IPC_ERROR; \
+-- 
+2.26.0
+
diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.3-no-gziped-docs.patch b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.3-no-gziped-docs.patch
new file mode 100644
index 0000000000..534a8d33df
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.3-no-gziped-docs.patch
@@ -0,0 +1,175 @@
+Do not gzip docs
+
+--- a/kpartx/Makefile
++++ b/kpartx/Makefile
+@@ -21,7 +21,6 @@ all: $(EXEC)
+ 
+ $(EXEC): $(OBJS)
+ 	$(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) $(LIBDEPS)
+-	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
+ 
+ install: $(EXEC) $(EXEC).8
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
+@@ -33,11 +32,11 @@ install: $(EXEC) $(EXEC).8
+ 	$(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules
+ 	$(INSTALL_PROGRAM) -m 644 del-part-nodes.rules $(DESTDIR)$(libudevdir)/rules.d/68-del-part-nodes.rules
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
+-	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
++	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
+ 
+ uninstall:
+ 	$(RM) $(DESTDIR)$(bindir)/$(EXEC)
+-	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
++	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
+ 	$(RM) $(DESTDIR)$(libudevdir)/kpartx_id
+ 	$(RM) $(DESTDIR)$(libudevdir)/rules.d/11-dm-parts.rules
+ 	$(RM) $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules
+--- a/libdmmp/Makefile
++++ b/libdmmp/Makefile
+@@ -40,7 +40,7 @@ install:
+ 		$(DESTDIR)$(pkgconfdir)/$(PKGFILE)
+ 	perl -i -pe 's|__INCLUDEDIR__|$(includedir)|g' \
+ 		$(DESTDIR)$(pkgconfdir)/$(PKGFILE)
+-	@for file in docs/man/*.3.gz; do \
++	@for file in docs/man/*.3; do \
+ 		$(INSTALL_PROGRAM) -m 644 -D \
+ 			$$file \
+ 			$(DESTDIR)$(man3dir)/ || exit $?; \
+@@ -69,11 +69,11 @@ check: all
+ speed_test: all
+ 	$(MAKE) -C test speed_test
+ 
+-doc: docs/man/$(EXTRA_MAN_FILES).gz
++doc: docs/man/$(EXTRA_MAN_FILES)
+ 
+ TEMPFILE := $(shell mktemp)
+ 
+-docs/man/$(EXTRA_MAN_FILES).gz: $(HEADERS)
++docs/man/$(EXTRA_MAN_FILES): $(HEADERS)
+ 	@for file in $(EXTRA_MAN_FILES); do \
+ 		$(INSTALL_PROGRAM) -v -m 644 -D docs/$$file docs/man/$$file; \
+ 	done
+@@ -82,10 +82,7 @@ docs/man/$(EXTRA_MAN_FILES).gz: $(HEADERS)
+ 	perl docs/kernel-doc -man "$(TEMPFILE)" | \
+ 	    perl docs/split-man.pl docs/man
+ 	-rm -f "$(TEMPFILE)"
+-	@for file in docs/man/*.3; do \
+-		gzip -f $$file; \
+-	done
+-	find docs/man -type f -name \*[0-9].gz
++	find docs/man -type f -name \*.[0-9]
+ 
+ dep_clean:
+ 	$(RM) $(OBJS:.o=.d)
+--- a/libmpathpersist/Makefile
++++ b/libmpathpersist/Makefile
+@@ -16,8 +16,6 @@ all: $(LIBS)
+ $(LIBS): $(OBJS)
+ 	$(CC) $(LDFLAGS) $(SHARED_FLAGS) $(LIBDEPS) -Wl,-soname=$@ -o $@ $(OBJS)
+ 	$(LN) $(LIBS) $(DEVLIB)
+-	$(GZIP) mpath_persistent_reserve_in.3 > mpath_persistent_reserve_in.3.gz
+-	$(GZIP) mpath_persistent_reserve_out.3 > mpath_persistent_reserve_out.3.gz
+ 
+ install: $(LIBS)
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir)
+@@ -26,14 +24,14 @@ install: $(LIBS)
+ 	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(man3dir)
+ 	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(includedir)
+ 	$(LN) $(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB)
+-	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3.gz $(DESTDIR)$(man3dir)
+-	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3.gz $(DESTDIR)$(man3dir)
++	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3 $(DESTDIR)$(man3dir)
++	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3 $(DESTDIR)$(man3dir)
+ 	$(INSTALL_PROGRAM) -m 644 mpath_persist.h $(DESTDIR)$(includedir)
+ 
+ uninstall:
+ 	$(RM) $(DESTDIR)$(syslibdir)/$(LIBS)
+-	$(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_in.3.gz
+-	$(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_out.3.gz
++	$(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_in.3
++	$(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_out.3
+ 	$(RM) $(DESTDIR)$(includedir)/mpath_persist.h
+ 	$(RM) $(DESTDIR)$(syslibdir)/$(DEVLIB)
+ 
+--- a/mpathpersist/Makefile
++++ b/mpathpersist/Makefile
+@@ -14,13 +14,12 @@ all: $(EXEC)
+ 
+ $(EXEC): $(OBJS)
+ 	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS) $(CFLAGS) $(LIBDEPS)
+-	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
+ 
+ install:
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
+ 	$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
+-	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
++	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
+ 
+ clean: dep_clean
+ 	$(RM) core *.o $(EXEC) *.gz
+@@ -29,7 +28,7 @@ include $(wildcard $(OBJS:.o=.d))
+ 
+ uninstall:
+ 	$(RM) $(DESTDIR)$(bindir)/$(EXEC)
+-	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
++	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
+ 
+ dep_clean:
+ 	$(RM) $(OBJS:.o=.d)
+--- a/multipath/Makefile
++++ b/multipath/Makefile
+@@ -16,8 +16,6 @@ all: $(EXEC)
+ 
+ $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so
+ 	$(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) $(LIBDEPS)
+-	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
+-	$(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz
+ 
+ install:
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
+@@ -26,16 +24,16 @@ install:
+ 	$(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir)
+ 	$(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
+-	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
++	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
+-	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir)
++	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir)
+ 
+ uninstall:
+ 	$(RM) $(DESTDIR)$(bindir)/$(EXEC)
+ 	$(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules
+ 	$(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules
+-	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
+-	$(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz
++	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
++	$(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5
+ 
+ clean: dep_clean
+ 	$(RM) core *.o $(EXEC) *.gz
+--- a/multipathd/Makefile
++++ b/multipathd/Makefile
+@@ -34,7 +34,6 @@ all : $(EXEC)
+ 
+ $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so
+ 	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $(EXEC) $(LIBDEPS)
+-	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
+ 
+ install:
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
+@@ -45,11 +44,11 @@ ifdef SYSTEMD
+ 	$(INSTALL_PROGRAM) -m 644 $(EXEC).socket $(DESTDIR)$(unitdir)
+ endif
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
+-	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
++	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
+ 
+ uninstall:
+ 	$(RM) $(DESTDIR)$(bindir)/$(EXEC)
+-	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
++	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
+ 	$(RM) $(DESTDIR)$(unitdir)/$(EXEC).service
+ 	$(RM) $(DESTDIR)$(unitdir)/$(EXEC).socket
+ 
diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.4-parallel_make_fix.patch b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.4-parallel_make_fix.patch
new file mode 100644
index 0000000000..651cd04f59
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.4-parallel_make_fix.patch
@@ -0,0 +1,85 @@
+From 041472afebd1e621be1143f2bfb4c5650df171cc Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Mon, 11 May 2020 11:49:58 +0200
+Subject: [PATCH] multipath-tools: Fix parallel make issues
+
+build is broken like this (tested with -j16):
+
+  x86_64-pc-linux-gnu-gcc -Wl,-O1 -Wl,--hash-style=gnu -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now -shared -lpthread -ldevmapper -ldl -L../libmultipath -lmultipath -L../libmpathcmd -lmpathcmd -Wl,-soname=libmpathpersist.so.0 -o libmpathpersist.so.0 mpath_persist.o mpath_updatepr.o mpath_pr_ioctl.o
+  building defaults.o because of defaults.c
+  ...
+  /usr/lib/gcc/x86_64-pc-linux-gnu/9.3.0/../../../../x86_64-pc-linux-gnu/bin/ld: cannot find -lmultipath
+  collect2: error: ld returned 1 exit status
+  make[1]: *** [Makefile:17: libmpathpersist.so.0] Error 1
+  make: *** [Makefile:29: libmpathpersist] Error 2
+  make: *** Waiting for unfinished jobs....
+
+install is broken like this:
+
+  install -m 755 libprio*.so /var/tmp/portage/sys-fs/multipath-tools-0.8.4/image/lib64/multipath
+  install -m 755 libcheckcciss_tur.so libcheckreadsector0.so libchecktur.so libcheckdirectio.so libcheckemc_clariion.so libcheckhp_sw.so libcheckrdac.so /var/tmp/portage/sys-fs/multipath-tools-0.8.4/image/lib64/multipath
+  ...
+  /usr/bin/install: target '/var/tmp/portage/sys-fs/multipath-tools-0.8.4/image/lib64/multipath' is not a directory
+  /usr/bin/install: target '/var/tmp/portage/sys-fs/multipath-tools-0.8.4/image/lib64/multipath' is not a directory
+  make[1]: *** [Makefile:28: install] Error 1
+  make[1]: *** [Makefile:38: install] Error 1
+---
+ Makefile                           | 3 ++-
+ libmultipath/checkers/Makefile     | 1 +
+ libmultipath/foreign/Makefile      | 1 +
+ libmultipath/prioritizers/Makefile | 1 +
+ 4 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 1dee3680..a9ade94f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -29,7 +29,8 @@ $(BUILDDIRS):
+ 	$(MAKE) -C $@
+ 
+ multipath multipathd mpathpersist: libmultipath
+-mpathpersist:  libmpathpersist
++libmpathpersist: libmultipath
++mpathpersist:  libmultipath libmpathpersist
+ 
+ $(BUILDDIRS.clean):
+ 	$(MAKE) -C ${@:.clean=} clean
+diff --git a/libmultipath/checkers/Makefile b/libmultipath/checkers/Makefile
+index 02caea64..f201ca4c 100644
+--- a/libmultipath/checkers/Makefile
++++ b/libmultipath/checkers/Makefile
+@@ -24,6 +24,7 @@ libcheck%.so: libsg.o %.o
+ 	$(CC) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $^
+ 
+ install:
++	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(libdir)
+ 	$(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(libdir)
+ 
+ uninstall:
+diff --git a/libmultipath/foreign/Makefile b/libmultipath/foreign/Makefile
+index fae58a0d..567deebd 100644
+--- a/libmultipath/foreign/Makefile
++++ b/libmultipath/foreign/Makefile
+@@ -14,6 +14,7 @@ libforeign-%.so: %.o
+ 	$(CC) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $^
+ 
+ install:
++	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(libdir)
+ 	$(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(libdir)
+ 
+ uninstall:
+diff --git a/libmultipath/prioritizers/Makefile b/libmultipath/prioritizers/Makefile
+index 9d0fe03c..b0b0b522 100644
+--- a/libmultipath/prioritizers/Makefile
++++ b/libmultipath/prioritizers/Makefile
+@@ -35,6 +35,7 @@ libprio%.so: %.o
+ 	$(CC) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $^
+ 
+ install: $(LIBS)
++	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(libdir)
+ 	$(INSTALL_PROGRAM) -m 755 libprio*.so $(DESTDIR)$(libdir)
+ 
+ uninstall:
+-- 
+2.26.2
+
diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.4-respect-flags.patch b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.4-respect-flags.patch
new file mode 100644
index 0000000000..5e5258405b
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.4-respect-flags.patch
@@ -0,0 +1,19 @@
+--- multipath-tools-0.8.4-d491591/Makefile.inc
++++ multipath-tools-0.8.4-d491591/Makefile.inc
+@@ -99,12 +99,13 @@
+ 		  -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) \
+ 		  $(STACKPROT) --param=ssp-buffer-size=4
+ CPPFLAGS	:= -Wp,-D_FORTIFY_SOURCE=2 
+-CFLAGS		:= $(OPTFLAGS) -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \
+-		   -MMD -MP $(CFLAGS)
++CFLAGS		?= $(OPTFLAGS)
++CFLAGS		+= -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \
++		   -MMD -MP
+ BIN_CFLAGS	= -fPIE -DPIE
+ LIB_CFLAGS	= -fPIC
+ SHARED_FLAGS	= -shared
+-LDFLAGS		= -Wl,-z,relro -Wl,-z,now
++LDFLAGS		+= -Wl,-z,relro -Wl,-z,now
+ BIN_LDFLAGS	= -pie
+ 
+ # Check whether a function with name $1 has been declared in header file $2.
diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.5-respect-flags.patch b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.5-respect-flags.patch
new file mode 100644
index 0000000000..20d9fef6f3
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.5-respect-flags.patch
@@ -0,0 +1,12 @@
+--- multipath-tools-0.8.5-eecfcba/Makefile.inc
++++ multipath-tools-0.8.5-eecfcba/Makefile.inc
+@@ -98,7 +98,8 @@
+ 		  -Werror=implicit-function-declaration -Werror=format-security \
+ 		  $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS)
+ CPPFLAGS	:= -Wp,-D_FORTIFY_SOURCE=2 
+-CFLAGS		:= --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe \
++CFLAGS		?= $(OPTFLAGS) $(WARNFLAGS) -pipe
++CFLAGS		+= --std=gnu99 \
+ 		   -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \
+ 		   -MMD -MP
+ BIN_CFLAGS	= -fPIE -DPIE
diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipathd-r1.rc b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipathd-r1.rc
new file mode 100644
index 0000000000..59de1e6f71
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipathd-r1.rc
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/sbin/multipathd"
+pidfile="/run/multipathd.pid"
+start_stop_daemon_args="--wait 1000"
+
+depend() {
+	need localmount
+	after modules
+}
diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/rc-multipathd b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/rc-multipathd
deleted file mode 100644
index d4d440f2c9..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/rc-multipathd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-	after modules
-}
-
-start() {
-	ebegin "Starting multipathd"
-	start-stop-daemon --start --quiet --exec /sbin/multipathd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping multipathd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/multipathd.pid
-	eend $?
-}
diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild
deleted file mode 100644
index 0edaad0c28..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils systemd toolchain-funcs udev
-
-DESCRIPTION="Device mapper target autoconfig"
-HOMEPAGE="http://christophe.varoqui.free.fr/"
-SRC_URI="http://christophe.varoqui.free.fr/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
-IUSE="systemd"
-
-RDEPEND=">=sys-fs/lvm2-2.02.45
-	>=virtual/udev-171
-	dev-libs/libaio
-	sys-libs/readline
-	systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${P}-systemd-pkgconfig.patch
-	epatch_user
-}
-
-src_compile() {
-	# LIBDM_API_FLUSH involves grepping files in /usr/include,
-	# so force the test to go the way we want #411337.
-	emake LIBDM_API_FLUSH=1 CC="$(tc-getCC)" SYSTEMD=$(usex systemd 1 "")
-}
-
-src_install() {
-	local udevdir="$(get_udevdir)"
-
-	dodir /sbin /usr/share/man/man8
-	emake \
-		DESTDIR="${D}" \
-		SYSTEMD=$(usex systemd 1 "") \
-		unitdir="$(systemd_get_unitdir)" \
-		libudevdir='${prefix}'/"${udevdir}" \
-		install
-
-	insinto /etc
-	newins "${S}"/multipath.conf.annotated multipath.conf
-	# /etc/udev is reserved for user modified rules!
-	mv "${D}"/etc/udev/rules.d "${D}/${udevdir}"/ || die
-	fperms 644 "${udevdir}"/rules.d/66-kpartx.rules
-	newinitd "${FILESDIR}"/rc-multipathd multipathd
-	newinitd "${FILESDIR}"/multipath.rc multipath
-
-	dodoc multipath.conf.* AUTHOR ChangeLog FAQ
-	docinto kpartx
-	dodoc kpartx/ChangeLog kpartx/README
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "If you need multipath on your system, you must"
-		elog "add 'multipath' into your boot runlevel!"
-	fi
-}
diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild
deleted file mode 100644
index 145cbda2b6..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
-
-DESCRIPTION="Device mapper target autoconfig"
-HOMEPAGE="http://christophe.varoqui.free.fr/"
-SRC_URI="http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
-IUSE="systemd rbd"
-
-RDEPEND=">=sys-fs/lvm2-2.02.45
-	>=virtual/udev-171
-	dev-libs/libaio
-	dev-libs/userspace-rcu
-	sys-libs/readline:0=
-	rbd? ( sys-cluster/ceph )
-	systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-CONFIG_CHECK="~DM_MULTIPATH"
-
-PATCHES=(
-	# modprobe fails when modules are compiled statically into the kernel
-	# https://www.redhat.com/archives/dm-devel/2017-January/msg00043.html
-	"${FILESDIR}"/${PN}-0.6.2-ignore-modprobe-failures.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=604228
-	# https://www.redhat.com/archives/dm-devel/2017-January/msg00022.html
-	"${FILESDIR}"/${P}-sysmacros.patch
-)
-
-get_systemd_pv() {
-	use systemd && \
-		$(tc-getPKG_CONFIG) --modversion systemd
-}
-
-pkg_pretend() {
-	linux-info_pkg_setup
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Fix for bug #624884
-	if grep -qF DM_TABLE_STATE kpartx/kpartx.rules ; then
-		sed '/DM_TABLE_STATE/d' -i kpartx/kpartx.rules || die
-	else
-		elog "DM_TABLE_STATE sed hack is no longer necessary."
-	fi
-
-	# The upstream lacks any way to configure the build at present
-	# and ceph is a huge dependency, so we're using sed to make it
-	# optional until the upstream has a proer configure system
-	if ! use rbd ; then
-		sed -i -e "s/libcheckrbd.so/# libcheckrbd.so/" libmultipath/checkers/Makefile
-		sed -i -e "s/-lrados//" libmultipath/checkers/Makefile
-	fi
-}
-
-src_compile() {
-	# LIBDM_API_FLUSH involves grepping files in /usr/include,
-	# so force the test to go the way we want #411337.
-	emake \
-		CC="$(tc-getCC)" \
-		LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
-}
-
-src_install() {
-	dodir /sbin /usr/share/man/man{5,8}
-	emake \
-		DESTDIR="${D}" \
-		SYSTEMD=$(get_systemd_pv) \
-		unitdir="$(systemd_get_systemunitdir)" \
-		libudevdir='${prefix}'/"$(get_udevdir)" \
-		install
-
-	newinitd "${FILESDIR}"/rc-multipathd multipathd
-	newinitd "${FILESDIR}"/multipath.rc multipath
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "If you need multipath on your system, you must"
-		elog "add 'multipath' into your boot runlevel!"
-	fi
-}
diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.3.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.3.ebuild
deleted file mode 100644
index 577cbe8db1..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
-
-DESCRIPTION="Device mapper target autoconfig"
-HOMEPAGE="http://christophe.varoqui.free.fr/"
-SRC_URI="http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="systemd rbd"
-
-RDEPEND="
-	dev-libs/json-c
-	dev-libs/libaio
-	dev-libs/userspace-rcu
-	>=sys-fs/lvm2-2.02.45
-	>=virtual/udev-171
-	sys-libs/readline:0=
-	rbd? ( sys-cluster/ceph )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-CONFIG_CHECK="~DM_MULTIPATH"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.7.3-fix-build-without-systemd.patch )
-
-get_systemd_pv() {
-	use systemd && \
-		$(tc-getPKG_CONFIG) --modversion systemd
-}
-
-pkg_pretend() {
-	linux-info_pkg_setup
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Fix for bug #624884
-	if grep -qF DM_TABLE_STATE kpartx/kpartx.rules ; then
-		sed '/DM_TABLE_STATE/d' -i kpartx/kpartx.rules || die
-	else
-		elog "DM_TABLE_STATE sed hack is no longer necessary."
-	fi
-
-	# The upstream lacks any way to configure the build at present
-	# and ceph is a huge dependency, so we're using sed to make it
-	# optional until the upstream has a proer configure system
-	if ! use rbd ; then
-		sed -i -e "s/libcheckrbd.so/# libcheckrbd.so/" libmultipath/checkers/Makefile
-		sed -i -e "s/-lrados//" libmultipath/checkers/Makefile
-	fi
-}
-
-src_compile() {
-	# LIBDM_API_FLUSH involves grepping files in /usr/include,
-	# so force the test to go the way we want #411337.
-	emake \
-		CC="$(tc-getCC)" \
-		LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
-}
-
-src_install() {
-	dodir /sbin /usr/share/man/man{5,8}
-	emake \
-		DESTDIR="${D}" \
-		SYSTEMD=$(get_systemd_pv) \
-		unitdir="$(systemd_get_systemunitdir)" \
-		libudevdir='${prefix}'/"$(get_udevdir)" \
-		install
-
-	newinitd "${FILESDIR}"/rc-multipathd multipathd
-	newinitd "${FILESDIR}"/multipath.rc multipath
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "If you need multipath on your system, you must"
-		elog "add 'multipath' into your boot runlevel!"
-	fi
-}
diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.4.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild
similarity index 65%
rename from sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.4.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild
index b114189a86..ab5b8e5272 100644
--- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.4.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
 
@@ -11,57 +11,52 @@ SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 x86"
 IUSE="systemd rbd"
 
+BDEPEND="virtual/pkgconfig"
+
 RDEPEND="
-	dev-libs/json-c
+	dev-libs/json-c:=
 	dev-libs/libaio
-	dev-libs/userspace-rcu
+	dev-libs/userspace-rcu:=
 	>=sys-fs/lvm2-2.02.45
-	>=virtual/udev-171
+	>=virtual/libudev-232-r3
 	sys-libs/readline:0=
 	rbd? ( sys-cluster/ceph )
 	systemd? ( sys-apps/systemd )
 "
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+
+DEPEND="${RDEPEND}"
 
 CONFIG_CHECK="~DM_MULTIPATH"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.7.4-respect-flags.patch )
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.5-respect-flags.patch
+	"${FILESDIR}"/${PN}-0.8.3-no-gziped-docs.patch
+	"${FILESDIR}"/${PN}-0.8.3-json-c-0.14.patch
+	"${FILESDIR}"/${PN}-0.8.3-fix-gcc-10-compatibility.patch
+)
 
 get_systemd_pv() {
 	use systemd && \
 		$(tc-getPKG_CONFIG) --modversion systemd
 }
 
-pkg_pretend() {
-	linux-info_pkg_setup
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
 src_prepare() {
 	default
 
-	# Fix for bug #624884
-	if grep -qF DM_TABLE_STATE kpartx/kpartx.rules ; then
-		sed '/DM_TABLE_STATE/d' -i kpartx/kpartx.rules || die
-	else
-		elog "DM_TABLE_STATE sed hack is no longer necessary."
-	fi
-
 	# The upstream lacks any way to configure the build at present
 	# and ceph is a huge dependency, so we're using sed to make it
-	# optional until the upstream has a proer configure system
+	# optional until the upstream has a proper configure system
 	if ! use rbd ; then
-		sed -i -e "s/libcheckrbd.so/# libcheckrbd.so/" libmultipath/checkers/Makefile
-		sed -i -e "s/-lrados//" libmultipath/checkers/Makefile
+		sed \
+			-e "s/libcheckrbd.so/# libcheckrbd.so/" \
+			-e "s/-lrados//" \
+			-i libmultipath/checkers/Makefile \
+			|| die
 	fi
 }
 
@@ -77,12 +72,14 @@ src_install() {
 	dodir /sbin /usr/share/man/man{5,8}
 	emake \
 		DESTDIR="${D}" \
+		RUN=run \
 		SYSTEMD=$(get_systemd_pv) \
 		unitdir="$(systemd_get_systemunitdir)" \
 		libudevdir='${prefix}'/"$(get_udevdir)" \
+		pkgconfdir='${prefix}'/usr/'${LIB}'/pkgconfig \
 		install
 
-	newinitd "${FILESDIR}"/rc-multipathd multipathd
+	newinitd "${FILESDIR}"/multipathd-r1.rc multipathd
 	newinitd "${FILESDIR}"/multipath.rc multipath
 
 	einstalldocs
diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.8.4.ebuild
similarity index 60%
rename from sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.2.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.8.4.ebuild
index fdc2ed3abb..ab4f6f9cd3 100644
--- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.8.4.ebuild
@@ -1,65 +1,62 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="7"
 
 inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
 
 DESCRIPTION="Device mapper target autoconfig"
 HOMEPAGE="http://christophe.varoqui.free.fr/"
-SRC_URI="http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
+SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="systemd rbd"
 
+BDEPEND="virtual/pkgconfig"
+
 RDEPEND="
-	dev-libs/json-c
+	dev-libs/json-c:=
 	dev-libs/libaio
-	dev-libs/userspace-rcu
+	dev-libs/userspace-rcu:=
 	>=sys-fs/lvm2-2.02.45
-	>=virtual/udev-171
+	>=virtual/libudev-232-r3
 	sys-libs/readline:0=
 	rbd? ( sys-cluster/ceph )
 	systemd? ( sys-apps/systemd )
 "
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+
+DEPEND="${RDEPEND}"
 
 CONFIG_CHECK="~DM_MULTIPATH"
 
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.4-respect-flags.patch
+	"${FILESDIR}"/${PN}-0.8.3-no-gziped-docs.patch
+	"${FILESDIR}"/${PN}-0.8.3-json-c-0.14.patch
+	"${FILESDIR}"/${PN}-0.8.4-parallel_make_fix.patch
+)
+
 get_systemd_pv() {
 	use systemd && \
 		$(tc-getPKG_CONFIG) --modversion systemd
 }
 
-pkg_pretend() {
-	linux-info_pkg_setup
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
 src_prepare() {
 	default
 
-	# Fix for bug #624884
-	if grep -qF DM_TABLE_STATE kpartx/kpartx.rules ; then
-		sed '/DM_TABLE_STATE/d' -i kpartx/kpartx.rules || die
-	else
-		elog "DM_TABLE_STATE sed hack is no longer necessary."
-	fi
-
 	# The upstream lacks any way to configure the build at present
 	# and ceph is a huge dependency, so we're using sed to make it
-	# optional until the upstream has a proer configure system
+	# optional until the upstream has a proper configure system
 	if ! use rbd ; then
-		sed -i -e "s/libcheckrbd.so/# libcheckrbd.so/" libmultipath/checkers/Makefile
-		sed -i -e "s/-lrados//" libmultipath/checkers/Makefile
+		sed \
+			-e "s/libcheckrbd.so/# libcheckrbd.so/" \
+			-e "s/-lrados//" \
+			-i libmultipath/checkers/Makefile \
+			|| die
 	fi
 }
 
@@ -72,15 +69,17 @@ src_compile() {
 }
 
 src_install() {
-	dodir /sbin /usr/share/man/man{5,8}
+	dodir /sbin /usr/share/man/man{3,5,8}
 	emake \
 		DESTDIR="${D}" \
+		RUN=run \
 		SYSTEMD=$(get_systemd_pv) \
 		unitdir="$(systemd_get_systemunitdir)" \
 		libudevdir='${prefix}'/"$(get_udevdir)" \
+		pkgconfdir='${prefix}'/usr/'${LIB}'/pkgconfig \
 		install
 
-	newinitd "${FILESDIR}"/rc-multipathd multipathd
+	newinitd "${FILESDIR}"/multipathd-r1.rc multipathd
 	newinitd "${FILESDIR}"/multipath.rc multipath
 
 	einstalldocs
diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild
similarity index 60%
rename from sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.1.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild
index fdc2ed3abb..cd850ca74a 100644
--- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild
@@ -1,65 +1,60 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="7"
 
 inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
 
 DESCRIPTION="Device mapper target autoconfig"
 HOMEPAGE="http://christophe.varoqui.free.fr/"
-SRC_URI="http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
+SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="systemd rbd"
 
+BDEPEND="virtual/pkgconfig"
+
 RDEPEND="
-	dev-libs/json-c
+	dev-libs/json-c:=
 	dev-libs/libaio
-	dev-libs/userspace-rcu
+	dev-libs/userspace-rcu:=
 	>=sys-fs/lvm2-2.02.45
-	>=virtual/udev-171
+	>=virtual/libudev-232-r3
 	sys-libs/readline:0=
 	rbd? ( sys-cluster/ceph )
 	systemd? ( sys-apps/systemd )
 "
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+
+DEPEND="${RDEPEND}"
 
 CONFIG_CHECK="~DM_MULTIPATH"
 
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.5-respect-flags.patch
+	"${FILESDIR}"/${PN}-0.8.3-no-gziped-docs.patch
+)
+
 get_systemd_pv() {
 	use systemd && \
 		$(tc-getPKG_CONFIG) --modversion systemd
 }
 
-pkg_pretend() {
-	linux-info_pkg_setup
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
 src_prepare() {
 	default
 
-	# Fix for bug #624884
-	if grep -qF DM_TABLE_STATE kpartx/kpartx.rules ; then
-		sed '/DM_TABLE_STATE/d' -i kpartx/kpartx.rules || die
-	else
-		elog "DM_TABLE_STATE sed hack is no longer necessary."
-	fi
-
 	# The upstream lacks any way to configure the build at present
 	# and ceph is a huge dependency, so we're using sed to make it
-	# optional until the upstream has a proer configure system
+	# optional until the upstream has a proper configure system
 	if ! use rbd ; then
-		sed -i -e "s/libcheckrbd.so/# libcheckrbd.so/" libmultipath/checkers/Makefile
-		sed -i -e "s/-lrados//" libmultipath/checkers/Makefile
+		sed \
+			-e "s/libcheckrbd.so/# libcheckrbd.so/" \
+			-e "s/-lrados//" \
+			-i libmultipath/checkers/Makefile \
+			|| die
 	fi
 }
 
@@ -72,15 +67,17 @@ src_compile() {
 }
 
 src_install() {
-	dodir /sbin /usr/share/man/man{5,8}
+	dodir /sbin /usr/share/man/man{3,5,8}
 	emake \
 		DESTDIR="${D}" \
+		RUN=run \
 		SYSTEMD=$(get_systemd_pv) \
 		unitdir="$(systemd_get_systemunitdir)" \
 		libudevdir='${prefix}'/"$(get_udevdir)" \
+		pkgconfdir='${prefix}'/usr/'${LIB}'/pkgconfig \
 		install
 
-	newinitd "${FILESDIR}"/rc-multipathd multipathd
+	newinitd "${FILESDIR}"/multipathd-r1.rc multipathd
 	newinitd "${FILESDIR}"/multipath.rc multipath
 
 	einstalldocs