sys-libs/libblockdev: Revbump to backport two fixes.

- Reset xdg environment
- Added "device-mapper" USE flag

Closes: https://bugs.gentoo.org/623992
Closes: https://bugs.gentoo.org/677534
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

diff --git a/sys-libs/libblockdev/libblockdev-2.20-r1.ebuild b/sys-libs/libblockdev/libblockdev-2.20-r2.ebuild
similarity index 89%
rename from sys-libs/libblockdev/libblockdev-2.20-r1.ebuild
rename to sys-libs/libblockdev/libblockdev-2.20-r2.ebuild
index 8e8cccf50dd05c025cfdcd9e053f24dbd5fa5033..61c34fcd500cd34a049af055836c63357a13c427 100644 (file)
--- a/sys-libs/libblockdev/libblockdev-2.20-r1.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.20-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
-inherit autotools python-single-r1
+inherit autotools python-single-r1 xdg-utils
 
 MY_PV="${PV}-1"
 MY_P="${PN}-${MY_PV}"
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/storaged-project/${PN}/archive/${MY_PV}.tar.gz -> ${
 LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="bcache +cryptsetup dmraid doc escrow lvm kbd test vdo"
+IUSE="bcache +cryptsetup device-mapper dmraid doc escrow lvm kbd test vdo"
 
 RDEPEND="
        >=dev-libs/glib-2.42.2
@@ -30,6 +30,7 @@ RDEPEND="
                )
                >=sys-fs/cryptsetup-1.6.7:=
        )
+       device-mapper? ( sys-fs/lvm2 )
        dmraid? (
                sys-fs/dmraid
                sys-fs/lvm2
@@ -58,6 +59,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+       xdg_environment_reset #623992
        default
        eautoreconf
 }
@@ -72,12 +74,13 @@ src_configure() {
                $(use_enable test tests)
                $(use_with bcache)
                $(use_with cryptsetup crypto)
+               $(use_with device-mapper dm)
                $(use_with dmraid)
                $(use_with doc gtk-doc)
                $(use_with escrow)
+               $(use_with kbd)
                $(use_with lvm lvm)
                $(use_with lvm lvm-dbus)
-               $(use_with kbd)
                $(use_with vdo)
        )
        if python_is_python3 ; then