Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/nvme-cli/
Date: Tue, 31 Dec 2019 23:11:50
Message-Id: 1577833878.f6ee38095605592f04aee5c351057afa0bbd8e35.floppym@gentoo
1 commit: f6ee38095605592f04aee5c351057afa0bbd8e35
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 31 23:11:18 2019 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 31 23:11:18 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6ee3809
7
8 sys-apps/nvme-cli: trim "/system" from SYSTEMDDIR
9
10 Bug: https://bugs.gentoo.org/704406
11 Package-Manager: Portage-2.3.84_p2, Repoman-2.3.20_p24
12 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
13
14 sys-apps/nvme-cli/{nvme-cli-1.9-r1.ebuild => nvme-cli-1.9-r2.ebuild} | 3 ++-
15 1 file changed, 2 insertions(+), 1 deletion(-)
16
17 diff --git a/sys-apps/nvme-cli/nvme-cli-1.9-r1.ebuild b/sys-apps/nvme-cli/nvme-cli-1.9-r2.ebuild
18 similarity index 89%
19 rename from sys-apps/nvme-cli/nvme-cli-1.9-r1.ebuild
20 rename to sys-apps/nvme-cli/nvme-cli-1.9-r2.ebuild
21 index 885116b4ac7..ab7d6ab7125 100644
22 --- a/sys-apps/nvme-cli/nvme-cli-1.9-r1.ebuild
23 +++ b/sys-apps/nvme-cli/nvme-cli-1.9-r2.ebuild
24 @@ -28,7 +28,8 @@ src_prepare() {
25 src_configure() {
26 tc-export CC
27 export PREFIX="${EPREFIX}/usr"
28 - export SYSTEMDDIR="$(systemd_get_systemunitdir)"
29 + local unitdir="$(systemd_get_systemunitdir)"
30 + export SYSTEMDDIR="${unitdir%/system}"
31 export UDEVDIR="${EPREFIX}$(get_udevdir)"
32 MAKEOPTS+=" LIBUUID=$(usex uuid 0 1)"
33 }