gentoo resync : 08.06.2019

3 files changed, 2 insertions, 87 deletions

diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index 4a354fd4937c..4edffb388834 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -1,8 +1,6 @@
-DIST libblockdev-2.14-1.tar.gz 274241 BLAKE2B 64c4c2a298ed95ed24a79716ccef5930f4276faaca02acf883c386b85a662d3fa1dc6f30e00d99bd835832e3c65acb89b445eff6fb35f9090dc949efde737d1a SHA512 fb80e840ed2f247912da93a6cc0cb1846be73dcc16b917f5231f5d7a87eaa7b43d07d5b2110038dd783fefa7ef7df0893785a60079ed02567f1e08bfcbd82343
 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 1537 BLAKE2B a6ce9968bca2768d16271b6a5e9370a4e152b41fa9e0972514ee9d429b8f0f1892abac4ba3eb1b15e3124728a9b5202f4952f480d6c71a1de953ea6c3361e29b SHA512 e75550dbc8da06d286e0b20b7bd80105f8b49e315e6f91ac3bb83d54db49b3232ce15a849d268ba55f306ded63660ad6ca15509b0344a279f604c3b13f62d4db
-EBUILD libblockdev-2.20-r2.ebuild 1994 BLAKE2B 7e557e13b90501f90bcb91514742b670ddc7bd94361bdf591dc897153f001a4585c06caeb985d210478800ea73db193865624b7eefd7155b1a8f980899821c9f SHA512 2d7915d7e9b5f0fb8933b8201bac25d0816aae804575da9c166c81d11090ea1c13cfe773c67cbd8201983de5944a940e59c0a13c2c8536ef12ca0ef577111155
+EBUILD libblockdev-2.20-r2.ebuild 1993 BLAKE2B 379104c3a7fa7e3d01cb7906ee0928db4cd6c3d03a062c25c25a1c869f18bbd8ba77be3c2ae084a9018b2b42a2a96151bd697453c5d1c6aecebeb56a36b796f2 SHA512 fba4a4dfd56f6708bc08c9f6276353a48e07284ccfe762a15e54ee7984beb74e52561062cd5b7686578d5bfd8bdeefadda35643a33c58aaf155f1a677bb61084
 EBUILD libblockdev-2.21.ebuild 2029 BLAKE2B 52b4450eee896acef06c19b4ce5565739139ded79438b9a3ebbbe4c9e4d6cc37d02410b0d1c39533ff81427479efbdddb97855550a13e5aa8a5437163be3ad8b SHA512 d2b6dd2c454a83be8b2733ee215a24b4d21f200ef4c65aeb7bca293d47b92eb0ca4a69b520b623c1165b18287fefd5d9afdc37bebf75e0b994d91903285df4d8
 EBUILD libblockdev-9999.ebuild 2322 BLAKE2B 200f9a8add28b684a6ac4d8548da5e8887ea827d07bcf8ba3860bfdb2fbcd1ea7eaef1ad3d69b4265a06b051cd061515fef970330bdd3012b02a5aedc7697452 SHA512 27110783c35352612e9d26802ea5113a250ab11425e553099689351278fdd435a7ca22bdcd20423f791326c952ee34e4802e7924eeee1ab15d159c9c4ba4f849
 MISC metadata.xml 1079 BLAKE2B 927991dfdfefd599210651f76fa8bffbd5a54700791b57847a9ecf85cd1aa04a449eea84c4e1ee3e9eb50e541eab3d97a6218c814a018439aa6f520970a8acca SHA512 492cabe5b464c0bae48e8def1e771a27f28bcd03a47276be26a4351367bcd53e198358f8c0cbf25cd0c6c8e841ee67435b22fbe669bde1a6aa74668e70fa8fc9
diff --git a/sys-libs/libblockdev/libblockdev-2.14-r1.ebuild b/sys-libs/libblockdev/libblockdev-2.14-r1.ebuild
deleted file mode 100644
index 8fc7844782e0..000000000000
--- a/sys-libs/libblockdev/libblockdev-2.14-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{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/storaged-project/libblockdev"
-SRC_URI="https://github.com/storaged-project/${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/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
-	)
-	kbd? ( >=sys-apps/kmod-19 )
-	${PYTHON_DEPS}
-"
-
-DEPEND="
-	${CDEPEND}
-	>=dev-libs/gobject-introspection-1.3.0
-	sys-devel/autoconf-archive
-	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.20-r2.ebuild b/sys-libs/libblockdev/libblockdev-2.20-r2.ebuild
index c89adc247d3c..86f99e4dd7cd 100644
--- a/sys-libs/libblockdev/libblockdev-2.20-r2.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.20-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/storaged-project/libblockdev"
 SRC_URI="https://github.com/storaged-project/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE="bcache +cryptsetup device-mapper dmraid doc escrow lvm kbd test vdo"
 
 RDEPEND="