From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- sys-apps/nvme-cli/Manifest | 7 ++---- sys-apps/nvme-cli/nvme-cli-1.5.ebuild | 26 ---------------------- sys-apps/nvme-cli/nvme-cli-1.6-r1.ebuild | 4 ++-- sys-apps/nvme-cli/nvme-cli-1.6.ebuild | 26 ---------------------- sys-apps/nvme-cli/nvme-cli-1.9-r3.ebuild | 37 ++++++++++++++++++++++++++++++++ sys-apps/nvme-cli/nvme-cli-1.9.ebuild | 32 --------------------------- 6 files changed, 41 insertions(+), 91 deletions(-) delete mode 100644 sys-apps/nvme-cli/nvme-cli-1.5.ebuild delete mode 100644 sys-apps/nvme-cli/nvme-cli-1.6.ebuild create mode 100644 sys-apps/nvme-cli/nvme-cli-1.9-r3.ebuild delete mode 100644 sys-apps/nvme-cli/nvme-cli-1.9.ebuild (limited to 'sys-apps/nvme-cli') diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest index 6ade4b52b057..a5438bd452fe 100644 --- a/sys-apps/nvme-cli/Manifest +++ b/sys-apps/nvme-cli/Manifest @@ -1,8 +1,5 @@ -DIST nvme-cli-1.5.tar.gz 282891 BLAKE2B 31eb9f4acda978977b7de222e1d973aac4ea18a34eaa0ffea73f2603cc2b8936aecd23248c764d05af161943db06533faf881711f2f22ad539b7e7607d5f8652 SHA512 0fc3dafeba8f67c8f3a3f25aac3b454d9e3ebfb1c20d67f96009a4490f269f0fe3642de781cd161896300f91a1cc37bd8a4e61c77f35422ab134c747702ffaca DIST nvme-cli-1.6.tar.gz 368461 BLAKE2B e40f4d76314860c966c3cb3de31e8d4a1bceab847b8950f0c99d47e00b8e8de077e91f6da9216ec10e939d37d34ab255b5cc3c641f3bbaf3ac8974f697051329 SHA512 05bcc539febd047f092a236ef2b2e9ad4e1df5d38bdc70416f80217425767f414e72294fda46868323cb7c77662d6000eaf16ebdaf74bdfad1baaed11b025d39 DIST nvme-cli-1.9.tar.gz 440675 BLAKE2B 19d9f4982e6bf4d37bbced02aadd0f58e496901c1463c96596b289e23c4e5849bfed9a4129447588c9c8104d5b49fd0bf97ee6495907bf022487407f02d7c4ae SHA512 3565b33bc39bde4480bbde5d46d75ea6907c0921884e8f39029b746f8383d3630942e405c61bcc3654bac5646bc86479b4b790e1b823ec83650649621bab6dac -EBUILD nvme-cli-1.5.ebuild 566 BLAKE2B e723786af2108253b54742b752ea755b84964e2155e68a3500c90a8900a2cf80de952c3a212c3e0809009518b274158aace3afa9c7f2bf16d2e2b31321581c2f SHA512 3fb2c2818a77fe647dc8216004bc817ebcdefff99e18abffc62883d98d0448972975651eae704b945324bd809aaa6215d9803145955a971a15ae19357ca647ee -EBUILD nvme-cli-1.6-r1.ebuild 637 BLAKE2B a8b970784c99af27bcd317bd4b246d97593eb6e9db69a35d7e5e5c12d1baeefa9fcbfc94c3055150d45bbd408714d8f756d82f92496512870ccc45e51b7582f2 SHA512 3fe25b46e5fb9135b15847def70cc9c41860e0f0ad9682f434229b2eaef5672a5416a6743fe2e351f3ed9244b33536e1555da4eb7f1b653ee0fc974c3df2b859 -EBUILD nvme-cli-1.6.ebuild 563 BLAKE2B 4494d38c8091d084bffc00ee18e1752cfc78f37f8b78684c738849aaadc93e9edc4cf8c1a3b13879dcc5bd86c9ed5053a72c6e7da367606605eadd7ea5c734fc SHA512 25a4590cc15ef4aff600cd0c18ec52e9bc7f043723ad569d7b1957b808e0d995abc5838f28b5af27350c38098c198274797b9eb6a059412ce86142b0ea18b75b -EBUILD nvme-cli-1.9.ebuild 690 BLAKE2B a26c6767332f9b392eef0af763ff15cd35a9b89380b25dc75ee97d444bafde2e8b7ce5efe23e7c5c14ecc9506b6a28b57a62ba5bf742dbe84f8d648ebb1ba0f7 SHA512 fc44875dacbfe58f30b8877663a2e05fdf3788472cbc4658c39ba8e72de7a998d545c63bd6fce5aa47f05aebd8f9bfb5694ed5ce3974406db1985baf2b5ef837 +EBUILD nvme-cli-1.6-r1.ebuild 664 BLAKE2B d0a5180d05af47aa3eb62a81de561cc5cc42fae37e1f93fa86a88b438dd0b3d967b86a9396124e70fb509fa74940377d855a5b00c77327562ccced4b376ee696 SHA512 6e922366a20a4ac14d52a0db689620e1140e9b146866adbf154e694e072fc8bf6f1840435ac133a64f42b91e5505fd62f0f21c0e0b9400e1c24e20d5ee77c199 +EBUILD nvme-cli-1.9-r3.ebuild 969 BLAKE2B f1a37b7e7b37aa1c5db5589ccf8f24b236f098de4493e3e11e27dcdb39499d920270a94d9c02fa48cbca6dd52033a48f469b7165d216338e4160413ec49b402d SHA512 3d427d5b6d948e33de7b099ff91349c829dc956e37a2006bfc45d0ffb3a26e336925c8446f39315d1d269150cbbdc7014cd45e4150cf13cbfce163afa3c4b0bf MISC metadata.xml 369 BLAKE2B 67a0c73fe0e2de97927a7c827bf4d216c7460c2ec4383c07e028c0b2d10e71a45559482bab635a6b9374fbec557ab83327baf041eb47bbc06c5e624bb29f6925 SHA512 d9439fc99f1bc5051b670e7d287185af8e7db4ba9045fd9a9aeb4c0f04a33716650d3a01f0ad8640e8b62db048a0f536fbd6145d5a7d79bb7aa524d63112db61 diff --git a/sys-apps/nvme-cli/nvme-cli-1.5.ebuild b/sys-apps/nvme-cli/nvme-cli-1.5.ebuild deleted file mode 100644 index 66b123fe5141..000000000000 --- a/sys-apps/nvme-cli/nvme-cli-1.5.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="NVM-Express user space tooling for Linux" -HOMEPAGE="https://github.com/linux-nvme/nvme-cli" -SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -RESTRICT="test" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="udev" - -RDEPEND="sys-libs/libcap:= - udev? ( virtual/libudev:= )" -DEPEND="${RDEPEND}" - -src_configure() { - tc-export CC - export PREFIX="${EPREFIX}/usr" - MAKEOPTS+=" LIBUDEV=$(usex udev 0 1)" -} diff --git a/sys-apps/nvme-cli/nvme-cli-1.6-r1.ebuild b/sys-apps/nvme-cli/nvme-cli-1.6-r1.ebuild index 76ed63bdc6ae..812b18c43f2d 100644 --- a/sys-apps/nvme-cli/nvme-cli-1.6-r1.ebuild +++ b/sys-apps/nvme-cli/nvme-cli-1.6-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=6 @@ -7,7 +7,7 @@ inherit toolchain-funcs DESCRIPTION="NVM-Express user space tooling for Linux" HOMEPAGE="https://github.com/linux-nvme/nvme-cli" -SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz" RESTRICT="test" LICENSE="GPL-2" diff --git a/sys-apps/nvme-cli/nvme-cli-1.6.ebuild b/sys-apps/nvme-cli/nvme-cli-1.6.ebuild deleted file mode 100644 index fcd1d034c4d0..000000000000 --- a/sys-apps/nvme-cli/nvme-cli-1.6.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="NVM-Express user space tooling for Linux" -HOMEPAGE="https://github.com/linux-nvme/nvme-cli" -SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -RESTRICT="test" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="udev" - -RDEPEND="sys-libs/libcap:= - udev? ( virtual/libudev:= )" -DEPEND="${RDEPEND}" - -src_configure() { - tc-export CC - export PREFIX="${EPREFIX}/usr" - MAKEOPTS+=" LIBUDEV=$(usex udev 0 1)" -} diff --git a/sys-apps/nvme-cli/nvme-cli-1.9-r3.ebuild b/sys-apps/nvme-cli/nvme-cli-1.9-r3.ebuild new file mode 100644 index 000000000000..9d9a923835b3 --- /dev/null +++ b/sys-apps/nvme-cli/nvme-cli-1.9-r3.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 ~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.9.ebuild b/sys-apps/nvme-cli/nvme-cli-1.9.ebuild deleted file mode 100644 index 3be939cd58b7..000000000000 --- a/sys-apps/nvme-cli/nvme-cli-1.9.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="NVM-Express user space tooling for Linux" -HOMEPAGE="https://github.com/linux-nvme/nvme-cli" -SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -RESTRICT="test" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~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 -} - -src_configure() { - tc-export CC - export PREFIX="${EPREFIX}/usr" - MAKEOPTS+=" LIBUUID=$(usex uuid 0 1)" -} -- cgit v1.2.3