gentoo resync : 14.05.2020

3 files changed, 50 insertions, 6 deletions

diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index b54cf10316fb..217d305cc329 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -1,5 +1,7 @@
-DIST nvme-cli-1.6.tar.gz 368461 BLAKE2B e40f4d76314860c966c3cb3de31e8d4a1bceab847b8950f0c99d47e00b8e8de077e91f6da9216ec10e939d37d34ab255b5cc3c641f3bbaf3ac8974f697051329 SHA512 05bcc539febd047f092a236ef2b2e9ad4e1df5d38bdc70416f80217425767f414e72294fda46868323cb7c77662d6000eaf16ebdaf74bdfad1baaed11b025d39
+DIST nvme-cli-1.10.1.tar.gz 463826 BLAKE2B d92702e3cb7c761dbf12dbd56dee44248d49ebdb5b57636ff00a74728e14b44caa6f1500ed90e7fa63d4b1f2de28624a70f37e27a060dbc138f303e46e224dcf SHA512 92bef073205b357f4b14ba929b7f261d0c18b343e5e244cefc24521dfc581dec4b941a13dc00f9a3b4d938ccd026c847d58ccfd75f813cc3c4f484f8316269dc
+DIST nvme-cli-1.11.1.tar.gz 478664 BLAKE2B 74c1ffae32da7605afa02fbbf73878477e04669331c8971d4cc596088c42619abac65a1cfe54b62bd62f253328309f8bbd61c232a200816aa1090ebdf3f7ea76 SHA512 467e327f45500d80cebd6e5e55d4e6d3731a754423e71180efa9d4f5e98f0774f7a31393fefc2794250b487446005dad8e7002a27aff1f2b285983d55ec0d0b3
 DIST nvme-cli-1.9.tar.gz 440675 BLAKE2B 19d9f4982e6bf4d37bbced02aadd0f58e496901c1463c96596b289e23c4e5849bfed9a4129447588c9c8104d5b49fd0bf97ee6495907bf022487407f02d7c4ae SHA512 3565b33bc39bde4480bbde5d46d75ea6907c0921884e8f39029b746f8383d3630942e405c61bcc3654bac5646bc86479b4b790e1b823ec83650649621bab6dac
-EBUILD nvme-cli-1.6-r1.ebuild 664 BLAKE2B d0a5180d05af47aa3eb62a81de561cc5cc42fae37e1f93fa86a88b438dd0b3d967b86a9396124e70fb509fa74940377d855a5b00c77327562ccced4b376ee696 SHA512 6e922366a20a4ac14d52a0db689620e1140e9b146866adbf154e694e072fc8bf6f1840435ac133a64f42b91e5505fd62f0f21c0e0b9400e1c24e20d5ee77c199
+EBUILD nvme-cli-1.10.1.ebuild 977 BLAKE2B e971e0666096f3508d8db3d899e592f630edd1c56a84675d49c4d9df897d86317bf481d885ce211cc081692b53bf1bf76cd806e041956ffbbe9bb901d2179e9b SHA512 0c5327273daa6fd181ac3b04ba197d47c5ba0e43182a84e37cc3f6133313dcd6b6d781e0d00761f23fcda9e627f0928b84282cfc5c4ddcfd4d3f7c68fff9648b
+EBUILD nvme-cli-1.11.1.ebuild 841 BLAKE2B d9b6316b4d9a1c5d9d11e77ef45562dff8277d71f8f1180f71ed0bfaea8335d6b9b009e712c84ad91ac8eccfc3eda7d9aa5a7fa46c2705bd00e999b85167ced8 SHA512 3b00b5d217da4325fc1627b695968de0c0c621208cb0a95c06dd04a1c1ca991bbc2fb8971b16da309b8ae8e5c19a8b1b3aae572fd1149238451fa6afbf4818b8
 EBUILD nvme-cli-1.9-r3.ebuild 976 BLAKE2B b500757c242990e42c523da5d69675c0ee15fc5528923c6bd03d11b513cd3518986e866ac5a0e1503b55ffaa5748ebbef14ade322c731efcd6901ca1a55e084e SHA512 5868e20533d4b7c6c51bacc88c8ccf5a2ce37717e6e05ceb5a26de17192f548f72ede949002af9d86b03da91a45533809f188267925faae68e4b70afc9954d61
 MISC metadata.xml 369 BLAKE2B 67a0c73fe0e2de97927a7c827bf4d216c7460c2ec4383c07e028c0b2d10e71a45559482bab635a6b9374fbec557ab83327baf041eb47bbc06c5e624bb29f6925 SHA512 d9439fc99f1bc5051b670e7d287185af8e7db4ba9045fd9a9aeb4c0f04a33716650d3a01f0ad8640e8b62db048a0f536fbd6145d5a7d79bb7aa524d63112db61
diff --git a/sys-apps/nvme-cli/nvme-cli-1.10.1.ebuild b/sys-apps/nvme-cli/nvme-cli-1.10.1.ebuild
new file mode 100644
index 000000000000..e02310e80337
--- /dev/null
+++ b/sys-apps/nvme-cli/nvme-cli-1.10.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs udev
+
+DESCRIPTION="NVM-Express user space tooling for Linux"
+HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
+SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="test"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+uuid"
+
+RDEPEND="uuid? ( sys-apps/util-linux:= )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -e 's|^LIBUUID =|LIBUUID ?=|' \
+		-e 's|^install-hostparams:$|\0 install-etc|' \
+		-i Makefile || die
+	sed -e "s|/usr/lib/udev|$(get_udevdir)|" \
+		-i nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf || die
+}
+
+src_configure() {
+	tc-export CC
+	export PREFIX="${EPREFIX}/usr"
+	local unitdir="$(systemd_get_systemunitdir)"
+	export SYSTEMDDIR="${unitdir%/system}"
+	export UDEVDIR="${EPREFIX}$(get_udevdir)"
+	MAKEOPTS+=" LIBUUID=$(usex uuid 0 1)"
+}
diff --git a/sys-apps/nvme-cli/nvme-cli-1.6-r1.ebuild b/sys-apps/nvme-cli/nvme-cli-1.11.1.ebuild
index 812b18c43f2d..b0a6d9edd317 100644
--- a/sys-apps/nvme-cli/nvme-cli-1.6-r1.ebuild
+++ b/sys-apps/nvme-cli/nvme-cli-1.11.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit toolchain-funcs
+inherit systemd toolchain-funcs udev
 
 DESCRIPTION="NVM-Express user space tooling for Linux"
 HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
@@ -12,7 +12,7 @@ RESTRICT="test"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+uuid"
 
 RDEPEND="uuid? ( sys-apps/util-linux:= )"
@@ -20,11 +20,16 @@ DEPEND="${RDEPEND}"
 
 src_prepare() {
 	default
-	sed -i 's:^LIBUUID =:LIBUUID ?=:' -i Makefile || die
+	sed -e 's|^LIBUUID =|LIBUUID ?=|' \
+		-e '/DESTDIROLD/d' \
+		-i Makefile || die
 }
 
 src_configure() {
 	tc-export CC
 	export PREFIX="${EPREFIX}/usr"
+	local unitdir="$(systemd_get_systemunitdir)"
+	export SYSTEMDDIR="${unitdir%/system}"
+	export UDEVDIR="${EPREFIX}$(get_udevdir)"
 	MAKEOPTS+=" LIBUUID=$(usex uuid 0 1)"
 }