gentoo resync : 03.03.2019

4 files changed, 27 insertions, 13 deletions

diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index 3bb2e20b9d91..874dad8eb644 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -1,7 +1,7 @@
 DIST libblockdev-2.14-1.tar.gz 274241 BLAKE2B 64c4c2a298ed95ed24a79716ccef5930f4276faaca02acf883c386b85a662d3fa1dc6f30e00d99bd835832e3c65acb89b445eff6fb35f9090dc949efde737d1a SHA512 fb80e840ed2f247912da93a6cc0cb1846be73dcc16b917f5231f5d7a87eaa7b43d07d5b2110038dd783fefa7ef7df0893785a60079ed02567f1e08bfcbd82343
-DIST libblockdev-2.19-1.tar.gz 334391 BLAKE2B 1db31a5051822d4e6f4cc024f6eeee0c936430527614fc41b80ef36f08a2d77f24bd7a66b81d094c8f468d31561dd802754e9079565b3e177296f558a8b18fcb SHA512 945671600036c8d923a2af9a2044535c78d6e887c3a02b0f7ce782cf9deff7f962b7a96fd092cd408aa48717665afa1db7b8d3f7b33e572fd2beb13df98f5c7d
 DIST libblockdev-2.20-1.tar.gz 338039 BLAKE2B 77923e52b10e7853ae9433bf811d3a08f1c18da81d4f148b220d7e4101535f245612f0c82c96c6c3bc3e4c0631ada153c59c4587a86efdc5669a0b9f69e764be SHA512 4cb6b18d5de63461f35e0b6f6896599aa41da2c995839c2e88661dacdf07522842b612820fb1d83edbde72092cc62295d5411e8607f52c611db7f02aa16c9ab3
+DIST libblockdev-2.21-1.tar.gz 342121 BLAKE2B a0a1958303d38760a49eb2aca11ee84dfc16ebecac37d0b8322f88e078931737695e4a600efef42511bad4e027799ca38d0e3b42527a0b9189035f7a02a10f35 SHA512 9991e5b776b4fe62b7f703753630e8ec4769c043047452d63de08d93f823b778179e4568b8b78c3963daf6219422afc9eb82bcc5b07b7f0a422162037b569e41
 EBUILD libblockdev-2.14-r1.ebuild 1514 BLAKE2B 1d27d975055e90cd84a20d070bac7ea1ae91235c3512aae87e6341f2d286db97570b8790e587321f3608f33e3fd1f8e1c67c50588edc56dca879f79d527060a0 SHA512 f054ded1e078677718e35797d6cbd5cf920d79696cc60203cccd5181c675824a65fb8769ac2ed92d7da26a7e11d68a5ada315a68eaddd17db15b9baf5c6ee799
-EBUILD libblockdev-2.19.ebuild 1779 BLAKE2B 51df1c82895a3072df8bd11070d3c36dc696c8067dca880584ceb12b4ded13cf456d7b68c68c4f13bb20eb94c705b9565e2a4590b9da52b8e5e9e6ab0f10e38e SHA512 ceb321334280b88d0b9bad1a11b34897d07cca7248af18e3b5ce9a5bdf61406e90682f7da1bb1650c0a38478cc914b480af1445d9fe8f88da0941261d143ee4a
-EBUILD libblockdev-2.20-r1.ebuild 1839 BLAKE2B 62b65ecfa259e2795db762213d66536c80aa5658e9f37508fa9d3ea944830c208eb752cf2bd29f5590e4ead20240bf13c5c2ef5b54abfd39c4f2771c5e3212c2 SHA512 0e33955d00aad6587fd5e7875f23d4ea4972753ca37aa0d0003b03e6770cf095807983e62472904f928726563004e43e8741420881650b2a7af46364d65fcd23
-MISC metadata.xml 938 BLAKE2B 3527b371818b7b6ab3362ab4335098447dbc3541ebc95d1c8dc5487ae4a323e9d0bd5462201ce3432df95399b8acdb1f5735260000c967b4b786f2483507b110 SHA512 ccd9292fc8eabb982a3f016c15cf53b4d8d307109dbd5896d1190019a2f35032cc393454568c0a48223c0e9a2a8e42e8e015f16b9a52c758d55c904a308f6e66
+EBUILD libblockdev-2.20-r2.ebuild 1957 BLAKE2B dbaa9fac7c0843a1229cc04b3709b594f0f78e87d78a388325d27de2d5ea9e74955c8503a707b4ae6841c3c69572ff85a653b2cbd71d92299ebd0a0879a7ced5 SHA512 2aeec7ee012887345d81951718908a082bc7fa29b6aeb4a1ff9903c8c81ab062cae2b10dfbdf7e442a9085b3b2637f96376f5803b8d2abe3321eb7d8a7a87cbe
+EBUILD libblockdev-2.21.ebuild 1991 BLAKE2B 3a9f8b1c8838db043f83a37a5cf874e7a035fc4947add97b35b13743f7b52bce3d48a7519732648ada171f1f16deb1432513d5fe4c9ce31cda0f2297b969b770 SHA512 0c8addd53fea9af46ae598c3aa8e2b9e969d1e870fe8b6c3b570a868263f5dc7c88e72acd09e7fd7c1d2396bde695c7f7e502467f08af0ed09730f0434386fb0
+MISC metadata.xml 1079 BLAKE2B 927991dfdfefd599210651f76fa8bffbd5a54700791b57847a9ecf85cd1aa04a449eea84c4e1ee3e9eb50e541eab3d97a6218c814a018439aa6f520970a8acca SHA512 492cabe5b464c0bae48e8def1e771a27f28bcd03a47276be26a4351367bcd53e198358f8c0cbf25cd0c6c8e841ee67435b22fbe669bde1a6aa74668e70fa8fc9
diff --git a/sys-libs/libblockdev/libblockdev-2.20-r1.ebuild b/sys-libs/libblockdev/libblockdev-2.20-r2.ebuild
index 8e8cccf50dd0..61c34fcd500c 100644
--- 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
diff --git a/sys-libs/libblockdev/libblockdev-2.19.ebuild b/sys-libs/libblockdev/libblockdev-2.21.ebuild
index 65280b6a1025..8d96728862cc 100644
--- a/sys-libs/libblockdev/libblockdev-2.19.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.21.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 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 +tools 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,14 @@ 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 tools)
 		$(use_with vdo)
 	)
 	if python_is_python3 ; then
@@ -93,3 +97,8 @@ src_configure() {
 	fi
 	econf "${myeconfargs[@]}"
 }
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/sys-libs/libblockdev/metadata.xml b/sys-libs/libblockdev/metadata.xml
index 00d0c434c27c..f5d22ce82f4e 100644
--- a/sys-libs/libblockdev/metadata.xml
+++ b/sys-libs/libblockdev/metadata.xml
@@ -8,10 +8,12 @@
   <use>
     <flag name="bcache">Enable block device cache support.</flag>
     <flag name="cryptsetup">Enable <pkg>sys-fs/cryptsetup</pkg> support</flag>
-    <flag name="escrow">Support for building crypto plugin with escrow device support</flag>
+    <flag name="device-mapper">Enable support for device-mapper from <pkg>sys-fs/lvm2</pkg></flag>
     <flag name="dmraid">Support for dmraid devices, also known as ATA-RAID, or Fake RAID.</flag>
-    <flag name="lvm">Enable support for Logical Volume Management via <pkg>sys-fs/lvm2</pkg>.</flag>
+    <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="tools">Build tools</flag>
     <flag name="vdo">Enable Virtual Data Optimizer support.</flag>
   </use>
   <upstream>