| 1 |
commit: 0a8cce2edf5a98c571862f722a7717b79d26f3f3 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 7 13:33:50 2022 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 7 13:42:56 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a8cce2e |
| 7 |
|
| 8 |
sys-libs/libblockdev: live ebuild adjustments |
| 9 |
|
| 10 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-libs/libblockdev/libblockdev-9999.ebuild | 17 ++++++++--------- |
| 13 |
sys-libs/libblockdev/metadata.xml | 1 + |
| 14 |
2 files changed, 9 insertions(+), 9 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-libs/libblockdev/libblockdev-9999.ebuild b/sys-libs/libblockdev/libblockdev-9999.ebuild |
| 17 |
index 0682b4b778eb..caa2065daf93 100644 |
| 18 |
--- a/sys-libs/libblockdev/libblockdev-9999.ebuild |
| 19 |
+++ b/sys-libs/libblockdev/libblockdev-9999.ebuild |
| 20 |
@@ -1,9 +1,9 @@ |
| 21 |
-# Copyright 1999-2021 Gentoo Authors |
| 22 |
+# Copyright 1999-2022 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
-EAPI=7 |
| 26 |
+EAPI=8 |
| 27 |
|
| 28 |
-PYTHON_COMPAT=( python3_{7..10} ) |
| 29 |
+PYTHON_COMPAT=( python3_{8..10} ) |
| 30 |
inherit autotools python-single-r1 xdg-utils |
| 31 |
|
| 32 |
DESCRIPTION="A library for manipulating block devices" |
| 33 |
@@ -24,7 +24,7 @@ else |
| 34 |
fi |
| 35 |
LICENSE="LGPL-2+" |
| 36 |
SLOT="0" |
| 37 |
-IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo" |
| 38 |
+IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd +nvme test +tools" |
| 39 |
# Tests require root. In a future release, we may be able to run a smaller |
| 40 |
# subset with new run_tests.py arguments. |
| 41 |
RESTRICT="!test? ( test ) test" |
| 42 |
@@ -51,7 +51,7 @@ RDEPEND=" |
| 43 |
sys-fs/lvm2 |
| 44 |
virtual/udev |
| 45 |
) |
| 46 |
- vdo? ( dev-libs/libyaml ) |
| 47 |
+ nvme? ( sys-libs/libnvme ) |
| 48 |
${PYTHON_DEPS} |
| 49 |
" |
| 50 |
|
| 51 |
@@ -88,6 +88,7 @@ src_configure() { |
| 52 |
--with-btrfs |
| 53 |
--with-fs |
| 54 |
--with-part |
| 55 |
+ --with-python3 |
| 56 |
--without-mpath |
| 57 |
--without-nvdimm |
| 58 |
$(use_enable introspection) |
| 59 |
@@ -101,10 +102,8 @@ src_configure() { |
| 60 |
$(use_with kbd) |
| 61 |
$(use_with lvm lvm) |
| 62 |
$(use_with lvm lvm-dbus) |
| 63 |
+ $(use_with nvme) |
| 64 |
$(use_with tools) |
| 65 |
- $(use_with vdo) |
| 66 |
- --without-python2 |
| 67 |
- --with-python3 |
| 68 |
) |
| 69 |
econf "${myeconfargs[@]}" |
| 70 |
} |
| 71 |
@@ -121,7 +120,7 @@ src_install() { |
| 72 |
find "${ED}" -type f -name "*.la" -delete || die |
| 73 |
# This is installed even with USE=-lvm, but libbd_lvm are omitted so it |
| 74 |
# doesn't work at all. |
| 75 |
- if ! use lvm; then |
| 76 |
+ if ! use lvm ; then |
| 77 |
rm -f "${ED}"/usr/bin/lvm-cache-stats || die |
| 78 |
fi |
| 79 |
python_optimize #718576 |
| 80 |
|
| 81 |
diff --git a/sys-libs/libblockdev/metadata.xml b/sys-libs/libblockdev/metadata.xml |
| 82 |
index 981e2c38015b..5d09531b8a88 100644 |
| 83 |
--- a/sys-libs/libblockdev/metadata.xml |
| 84 |
+++ b/sys-libs/libblockdev/metadata.xml |
| 85 |
@@ -13,6 +13,7 @@ |
| 86 |
<flag name="escrow">Support for building crypto plugin with escrow device support</flag> |
| 87 |
<flag name="kbd">Enable kernel block device support.</flag> |
| 88 |
<flag name="lvm">Enable support for Logical Volume Management via <pkg>sys-fs/lvm2</pkg>.</flag> |
| 89 |
+ <flag name="nvme">Add nvme support via <pkg>sys-libs/libnvme</pkg></flag> |
| 90 |
<flag name="tools">Build tools</flag> |
| 91 |
<flag name="vdo">Enable Virtual Data Optimizer support.</flag> |
| 92 |
</use> |
Archives