gentoo resync : 23.06.2018

4 files changed, 22 insertions, 101 deletions

diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index 27d45790c542..a1baf052b7bc 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -1,9 +1,7 @@
 DIST libblockdev-2.14-1.tar.gz 274241 BLAKE2B 64c4c2a298ed95ed24a79716ccef5930f4276faaca02acf883c386b85a662d3fa1dc6f30e00d99bd835832e3c65acb89b445eff6fb35f9090dc949efde737d1a SHA512 fb80e840ed2f247912da93a6cc0cb1846be73dcc16b917f5231f5d7a87eaa7b43d07d5b2110038dd783fefa7ef7df0893785a60079ed02567f1e08bfcbd82343
-DIST libblockdev-2.15-1.tar.gz 279744 BLAKE2B caabeffdc2ee27bec63f0e799c632eab4e02867b866a83b03613e84567dbb0a5a6d8a59b4a34b9130b55a546bfa4a76b439bf901247da2d4d87b88b66c386ed6 SHA512 a58ee6ca75c0ee8706796afb6bf26334cc1716bb3ba9230f35c485643faf4921e70ff3a86ebb2be41b2d0177e68fdc0f8011e198e46d66aca9e9712a228c4ea3
-DIST libblockdev-2.16-1.tar.gz 282247 BLAKE2B 0645ffe9f0cadc6e412de813b32f4e37ead67039a69f7e8938b41f5ea10983a18d31e29653eab50dc41889952b00658b91853908dff3e62b50c1e85a267b4a63 SHA512 d48d4b0e3174ad7b93558534d7f0285b398e47e2c9dce3cc60cbe0a32a78fef32601cca2508f30a882609ceb3cc59efe2761720af191e6394ca1b8c51878b535
 DIST libblockdev-2.17-1.tar.gz 300882 BLAKE2B a7300ecf59a3ea37c2bb3245dcb4c0434ed8292e8fca87634224557112183de5fab2e66428d9b769537eebde341a3858182f9e9b9cefa68654c1d580fe4b63b2 SHA512 e882642e124100abf578699272bf1f0a2618b5eeed3ded4582f8535173238f145f3d4a2ea7dbe4b3b464d646f6e98ef0a891e7dfa7dde7e8c3322c883f7264e6
+DIST libblockdev-2.18-1.tar.gz 310870 BLAKE2B afeb904938c9700917e3bf55665bfa5612677b963e4273378046edae15f94b90f2e85c31f12b196317fe26c4befe9ae514822d987fdc8003bc1b0cc49cd61dac SHA512 c7837b0abb7747baf8dc2a21a0a75bc5fb80693a1685ddb310bf7d606d44ea65fa4c934cff6c09c5069806dea3ee056eb53c64122ec43b5c0485cdf92fda58d5
 EBUILD libblockdev-2.14-r1.ebuild 1504 BLAKE2B 8da60dc425c0b83f6e75705815bc94275937bd1c1d5ace0798c850d04d561910a1f7086f32d131b7aaf0d785cbacfc9179909d0e8909646524f34638a38ae399 SHA512 6e19060b01e9b21f1969d35cfff4a58c20456d4594f22ec4e8ae961480302abb639816f97212956e067b0df921ed17d8c1298ef025598c56aab663cb430e0ad9
-EBUILD libblockdev-2.15-r1.ebuild 1502 BLAKE2B cb40718f826b061ec21624de515eaa213b84f358d98105370a37db5b7065083b14bee73ca8331faf50fd8bbe20284e9bcdaafca44554af510a833425201d0d04 SHA512 413343fcde87c99dddad2301b2cd70c18c986412d605b4105b19cc3e714e0a367132e33a9b5f08ece8884984c0dfc88f304eed2d208c057099b6d940e069fa9c
-EBUILD libblockdev-2.16.ebuild 1508 BLAKE2B 3c68ad36fbfeece628e6580e95c90b8221082f2e778697ab81fcd8205939a8948638439b9035f34f6d5e96b22ff4451273a9460f48d72ebf10dee949fd236db7 SHA512 8d07d63497ddbecdba40fb3a916cbab21a34eebaa611eb3f10b3421314b2b21e5a7faa8b91574e293dff8d9bcb6c700a9c9ea2ecc8c910e7a8901f56853eb92e
 EBUILD libblockdev-2.17.ebuild 1694 BLAKE2B 835076e88046dd4f21aefbc89245e66a2e6e5c318a437a36c2957cc46cc1264a4d04f3e3893c49e3f99f5beeb5ba6d4c8f33b078ca7dd6cb7e3ea575bfb92610 SHA512 9eff7dd1adbce9ea74230aa066ca2f4b0fe368371f666420b337443ebaef1373fc895dc6eba8b1276d0e35eb705117185ddcbd573d2052f3a0c8bd8272cb67b5
-MISC metadata.xml 871 BLAKE2B 2647bb2461cb50f75c8069c924a0b488f37dcf8fc72eb56cb5611acc66adaaf59a159d93d39e333b2c04ad2b977893c7e69d149a1afe9f341c8d875f2455d17b SHA512 f5f3fbe8ae05d8c822275e43f76ab194bad069e94d82302395583098fb95324b5d1230273e8392eb5555f41ac0f260c5533d0530760f47a2d0d678068d00762f
+EBUILD libblockdev-2.18-r1.ebuild 1715 BLAKE2B dfa7ba8585a51fbfe9d42126c6eb18dca2c8b798cf1cadc143da7de1b6fbeb04f189d290b6581ac4fa286ab982b31e7a0bfdff68af785daf2a1d8244dffae510 SHA512 964120a29175090ffee4a9b69213d486f3f99a92bdf808116d0baae84cd03113a5f7bf400028867d2bc516c61ea742b15d11ef4615c501f89d170b2119c43f42
+MISC metadata.xml 938 BLAKE2B 3527b371818b7b6ab3362ab4335098447dbc3541ebc95d1c8dc5487ae4a323e9d0bd5462201ce3432df95399b8acdb1f5735260000c967b4b786f2483507b110 SHA512 ccd9292fc8eabb982a3f016c15cf53b4d8d307109dbd5896d1190019a2f35032cc393454568c0a48223c0e9a2a8e42e8e015f16b9a52c758d55c904a308f6e66
diff --git a/sys-libs/libblockdev/libblockdev-2.15-r1.ebuild b/sys-libs/libblockdev/libblockdev-2.15-r1.ebuild
deleted file mode 100644
index 11885ae1c964..000000000000
--- a/sys-libs/libblockdev/libblockdev-2.15-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit autotools python-single-r1
-
-MY_PV="${PV}-1"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A library for manipulating block devices"
-HOMEPAGE="https://github.com/rhinstaller/libblockdev"
-SRC_URI="https://github.com/rhinstaller/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bcache +cryptsetup dmraid doc lvm kbd test"
-
-CDEPEND="
-	>=dev-libs/glib-2.42.2
-	dev-libs/libbytesize
-	>=sys-apps/kmod-19
-	>=sys-apps/util-linux-2.27
-	>=sys-block/parted-3.1
-	cryptsetup? (
-		>=dev-libs/nss-3.18.0
-		dev-libs/volume_key
-		>=sys-fs/cryptsetup-1.6.7:=
-	)
-	dmraid? (
-		sys-fs/dmraid
-		sys-fs/lvm2
-	)
-	lvm? (
-		sys-fs/lvm2
-		virtual/udev
-	)
-	${PYTHON_DEPS}
-"
-
-DEPEND="
-	${CDEPEND}
-	>=dev-libs/gobject-introspection-1.3.0
-	doc? ( dev-util/gtk-doc )
-"
-
-RDEPEND="
-	${CDEPEND}
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-btrfs
-		--with-fs
-		--with-part
-		--with-python3
-		--without-mpath
-		$(use_enable test tests)
-		$(use_with bcache)
-		$(use_with cryptsetup crypto)
-		$(use_with dmraid dm)
-		$(use_with doc gtk-doc)
-		$(use_with lvm lvm)
-		$(use_with lvm lvm-dbus)
-		$(use_with kbd)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-libs/libblockdev/libblockdev-2.16.ebuild b/sys-libs/libblockdev/libblockdev-2.18-r1.ebuild
index 9cf4560ec988..839822874e03 100644
--- a/sys-libs/libblockdev/libblockdev-2.16.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.18-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 inherit autotools python-single-r1
 
 MY_PV="${PV}-1"
@@ -15,17 +15,19 @@ SRC_URI="https://github.com/rhinstaller/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}
 LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bcache +cryptsetup dmraid doc lvm kbd test"
+IUSE="bcache +cryptsetup dmraid doc escrow lvm kbd test vdo"
 
-CDEPEND="
+RDEPEND="
 	>=dev-libs/glib-2.42.2
 	dev-libs/libbytesize
 	>=sys-apps/kmod-19
 	>=sys-apps/util-linux-2.27
 	>=sys-block/parted-3.1
 	cryptsetup? (
-		>=dev-libs/nss-3.18.0
-		dev-libs/volume_key
+		escrow? (
+			>=dev-libs/nss-3.18.0
+			dev-libs/volume_key
+		)
 		>=sys-fs/cryptsetup-1.6.7:=
 	)
 	dmraid? (
@@ -36,20 +38,18 @@ CDEPEND="
 		sys-fs/lvm2
 		virtual/udev
 	)
+	vdo? ( dev-libs/libyaml )
 	${PYTHON_DEPS}
 "
 
 DEPEND="
-	${CDEPEND}
+	${RDEPEND}
 	>=dev-libs/gobject-introspection-1.3.0
 	doc? ( dev-util/gtk-doc )
 "
 
-RDEPEND="
-	${CDEPEND}
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+		escrow? ( cryptsetup )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -67,16 +67,20 @@ src_configure() {
 		--with-btrfs
 		--with-fs
 		--with-part
-		--with-python3
 		--without-mpath
+		--without-nvdimm
 		$(use_enable test tests)
 		$(use_with bcache)
 		$(use_with cryptsetup crypto)
-		$(use_with dmraid dm)
+		$(use_with dmraid)
 		$(use_with doc gtk-doc)
+		$(use_with escrow)
 		$(use_with lvm lvm)
 		$(use_with lvm lvm-dbus)
 		$(use_with kbd)
+		$(use_with python_single_target_python2_7 python2)
+		$(use_with !python_single_target_python2_7 python3)
+		$(use_with vdo)
 	)
 	econf "${myeconfargs[@]}"
 }
diff --git a/sys-libs/libblockdev/metadata.xml b/sys-libs/libblockdev/metadata.xml
index 4f133ca27fa9..00d0c434c27c 100644
--- a/sys-libs/libblockdev/metadata.xml
+++ b/sys-libs/libblockdev/metadata.xml
@@ -12,6 +12,7 @@
     <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="kbd">Enable kernel block device support.</flag>
+    <flag name="vdo">Enable Virtual Data Optimizer support.</flag>
   </use>
   <upstream>
     <remote-id type="github">storaged-project/libblockdev</remote-id>