From 0a8cce2edf5a98c571862f722a7717b79d26f3f3 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Sat, 7 May 2022 15:33:50 +0200
Subject: sys-libs/libblockdev: live ebuild adjustments

Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---
 sys-libs/libblockdev/libblockdev-9999.ebuild | 17 ++++++++---------
 sys-libs/libblockdev/metadata.xml            |  1 +
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'sys-libs')

diff --git a/sys-libs/libblockdev/libblockdev-9999.ebuild b/sys-libs/libblockdev/libblockdev-9999.ebuild
index 0682b4b778eb..caa2065daf93 100644
--- a/sys-libs/libblockdev/libblockdev-9999.ebuild
+++ b/sys-libs/libblockdev/libblockdev-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit autotools python-single-r1 xdg-utils
 
 DESCRIPTION="A library for manipulating block devices"
@@ -24,7 +24,7 @@ else
 fi
 LICENSE="LGPL-2+"
 SLOT="0"
-IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo"
+IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd +nvme test +tools"
 # Tests require root. In a future release, we may be able to run a smaller
 # subset with new run_tests.py arguments.
 RESTRICT="!test? ( test ) test"
@@ -51,7 +51,7 @@ RDEPEND="
 		sys-fs/lvm2
 		virtual/udev
 	)
-	vdo? ( dev-libs/libyaml )
+	nvme? ( sys-libs/libnvme )
 	${PYTHON_DEPS}
 "
 
@@ -88,6 +88,7 @@ src_configure() {
 		--with-btrfs
 		--with-fs
 		--with-part
+		--with-python3
 		--without-mpath
 		--without-nvdimm
 		$(use_enable introspection)
@@ -101,10 +102,8 @@ src_configure() {
 		$(use_with kbd)
 		$(use_with lvm lvm)
 		$(use_with lvm lvm-dbus)
+		$(use_with nvme)
 		$(use_with tools)
-		$(use_with vdo)
-		--without-python2
-		--with-python3
 	)
 	econf "${myeconfargs[@]}"
 }
@@ -121,7 +120,7 @@ src_install() {
 	find "${ED}" -type f -name "*.la" -delete || die
 	# This is installed even with USE=-lvm, but libbd_lvm are omitted so it
 	# doesn't work at all.
-	if ! use lvm; then
+	if ! use lvm ; then
 		rm -f "${ED}"/usr/bin/lvm-cache-stats || die
 	fi
 	python_optimize #718576
diff --git a/sys-libs/libblockdev/metadata.xml b/sys-libs/libblockdev/metadata.xml
index 981e2c38015b..5d09531b8a88 100644
--- a/sys-libs/libblockdev/metadata.xml
+++ b/sys-libs/libblockdev/metadata.xml
@@ -13,6 +13,7 @@
     <flag name="escrow">Support for building crypto plugin with escrow device support</flag>
     <flag name="kbd">Enable kernel block device support.</flag>
     <flag name="lvm">Enable support for Logical Volume Management via <pkg>sys-fs/lvm2</pkg>.</flag>
+    <flag name="nvme">Add nvme support via <pkg>sys-libs/libnvme</pkg></flag>
     <flag name="tools">Build tools</flag>
     <flag name="vdo">Enable Virtual Data Optimizer support.</flag>
   </use>
-- 
cgit v1.2.3-65-gdbad