gentoo resync : 28.04.2019

29 files changed, 153 insertions, 340 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 0c5fe4996f4e..60a9e6b99480 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/blocks/Manifest b/sys-block/blocks/Manifest
index a53681c294ec..c3b835237a65 100644
--- a/sys-block/blocks/Manifest
+++ b/sys-block/blocks/Manifest
@@ -1,4 +1,4 @@
 DIST blocks-0.1.4_pre131210.tar.xz 33684 BLAKE2B 4f41747cb589c90770eeb80a648fafe8c7463659a2b1fbed94fdebdc00ef0a595f4d14df0e2284a0e3889eecc0fccd69d92839e5aaaaf29d1d378224d5708030 SHA512 05ad49f2ece5cdb92097f60b5f69cfbb7d409ac5e1ffb98488f26b51ad07ed7dad8eeb3fd302a06b3e199e816e45c2c69daecc13a19627252b8245372f324a58
-EBUILD blocks-0.1.4_pre131210-r1.ebuild 1321 BLAKE2B dbe0ad00fb711838e057950b314b46ab00014c5aafdcf75370275a99a7e247b641a16856d2241a936c00e3087643f2393432e1caba6fcdd0c7ab3cf2bcfb988a SHA512 ec1487ebd6ff28871e2d9805c1b405412162b9087c17f0df094fd2b5ac7d3bf2d63e477509b116c64c1adff48a0bd0ba5e62600ea8d687f3e72a95d3f55760ac
-EBUILD blocks-9999.ebuild 1293 BLAKE2B 1c593878c1c6bc6723dd8d14fe628ec9d89216f16262a14e45889483c7172feb2bbd2f03b58f0e2e29bd8b36b1486b853602dac8e2f8f18fed9b52bda3dd6d17 SHA512 855ed177996efc83f98413ab863b2d16a2ee0e92b8839299857202637467472b8109a6b89d69df6c629ffee31169048e24366be6352fe44ab393f1aaf2574926
+EBUILD blocks-0.1.4_pre131210-r1.ebuild 1316 BLAKE2B 96c58e6680ad471b898819878efab64364c54c61094f498dd1402396609ace76a37e785abe8188557089e7c3b658208eb77fd233435f5c4333fe14851e4797d2 SHA512 6ce872f461c5bbd1e5a1a085504c56a4df8b85ecc40db5548ee741df56b1286f9aa4bbf34ff9962cbc4310d766890e1b56c19c7f3b295c61a66368c28ee3ef2d
+EBUILD blocks-9999.ebuild 1288 BLAKE2B 54176719d421976e6acba3c6c0d5925a4f4d4f68811ec7376d70bcc3bef1d59ebf30c48dc95d800c12ea6d67035aeec3af89a0168dba3f8e04c617b23d793ffa SHA512 3bff7b12f1539909380e2e09dd0ccc54abbd5c062dea16232bc1d5f810676d291917d6e1c4a2ae9575c769dc47e614e767253aa7b46ca78618c3accc0eb69715
 MISC metadata.xml 475 BLAKE2B 592b39aa9f5554e849d866a8fa4de1cbc2b6769aaf16f2a63b8835f5571f0a4280fc4e77963d9cf32a4f55567b55c9b58ac501e2a6917f13a58d929a81fdd796 SHA512 acb1345d5edd42ded851e80dfe07f0c97093ec09e4b2308cff57cae64041da052cac25282a22146107348e72366601031deb830fa55975c219f71963cae9e406
diff --git a/sys-block/blocks/blocks-0.1.4_pre131210-r1.ebuild b/sys-block/blocks/blocks-0.1.4_pre131210-r1.ebuild
index a54686995aa0..7ca03a85670f 100644
--- a/sys-block/blocks/blocks-0.1.4_pre131210-r1.ebuild
+++ b/sys-block/blocks/blocks-0.1.4_pre131210-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/sys-block/blocks/blocks-9999.ebuild b/sys-block/blocks/blocks-9999.ebuild
index 0010d74c9f1e..00c64d935ed5 100644
--- a/sys-block/blocks/blocks-9999.ebuild
+++ b/sys-block/blocks/blocks-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1 git-r3
 
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index 79d68993309d..5ffbdc7603b4 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -7,5 +7,5 @@ DIST fio-3.7.tar.bz2 629354 BLAKE2B 99a1c88481c7a693e31b1a0bc23bc80e85df92385f9d
 EBUILD fio-2.15.ebuild 2693 BLAKE2B 302c54d0b33a6b4a14e1a19ff8cb1848438d87a2732860bfe947f50105eff2a59abb457cb2aefa5cac302a81c0146c3f6858ed91caceaeb54da44864e2c49b60 SHA512 5052d1f15e6250f0802a6a9786aef3ea95fa61a54cb1c7a58c29e80a8b79ed3170096b51fe20f3e8cf4b7ba264fcc4beb25a8e32f222ef7619af6324d73b7a91
 EBUILD fio-2.16.ebuild 2907 BLAKE2B b524791f0ecea03ae3a17994295224963fb9eb10b2b339f4dbdcbb546fbafd24cf905777817878cecd22df2158f84ed1ddfc6d311909ca569bd5ef91da0f1218 SHA512 ae8bd404cddedd37a41729e1ec570df997dd9b4484daa9e77a75c4887ee0bb26d5cffbb015fd1e154103d276f2db11486bb49d09b8dbc897f3d5ba5865fb1559
 EBUILD fio-3.2.ebuild 2855 BLAKE2B 9496bc95ff5ad4511285897285904b352e8e5e1ba547f8eed4932bece1b98f229c7677405c3f6af7e6948ab710e13d79612b94d9442f8371f63cd2a15003b9c6 SHA512 72db1a54e4e876142a7e4c1b16fa467fc0024a1d67eda20a77c97a9685833a03d5a0acaa54b07e0e62e3e12ebd128d2e49ccd58e36758f70c62ca9df25d09bd1
-EBUILD fio-3.7.ebuild 3026 BLAKE2B 89dacb26a029f821d58c5828912f7f0dd700e0cce3e7d364659ea7af31604440d2de77f6f7b7d8c60588180eab5ae6d5e8cbe6584a458d918993502e49c78d28 SHA512 780e82f2b8b303e61513be26cb838e122b7557b5df5dd588288b67ed24b9d4fe775675132e327525373338bee8fd9caff9d2c40d1cdddd6926fa3c3fdf938784
+EBUILD fio-3.7.ebuild 3016 BLAKE2B ce0efa6db051517641f759d5422954937c529b7dc6467deb584f261dae79b2ff567822963065fda944c152648b1db36c7b477c4093ce63f6d36cb8225bcd910e SHA512 e2b5c497e3d11bc6ebd8ed6a9709be3a3b88fcbd93591648bcbba48e38204dbf6de0a8622726f18d58bf39c65f5f574161f1f17cc596e1c3e07964c9ce40a6fc
 MISC metadata.xml 761 BLAKE2B 196d8933527b9a6ca6731e173a00543723452f972edf59f44273a33259ffd77d9bed0bd8652d718608f741d49338e69a4e6eddc77e65478749aef8a76f4871cd SHA512 b5f10abbb437a0833b0a02e870b91b56c49c264d190e65e2a88fe45f4d19f40040c300e91dc11d8055118a30a7f334cc2283b9f55852f5baf985eae44cb26e01
diff --git a/sys-block/fio/fio-3.7.ebuild b/sys-block/fio/fio-3.7.ebuild
index b1d447a9098e..1e4ab6617364 100644
--- a/sys-block/fio/fio-3.7.ebuild
+++ b/sys-block/fio/fio-3.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
 
 inherit eutils python-r1 toolchain-funcs
 
diff --git a/sys-block/io-scheduler-udev-rules/Manifest b/sys-block/io-scheduler-udev-rules/Manifest
new file mode 100644
index 000000000000..88f21db384b5
--- /dev/null
+++ b/sys-block/io-scheduler-udev-rules/Manifest
@@ -0,0 +1,3 @@
+DIST io-scheduler-udev-rules-1.tar.bz2 7503 BLAKE2B ef1c8f1cf1a94018e82a3c430860af9e7d6c31b12318b5b672ee3b9f0c51c24c69566f764c0a6c0bdfcc1342160a801d7849c0cd0e783715b2b36be1ba285a05 SHA512 7da4ec700bc508c790da916df030164da39bed223677ebc3633e1bf4ad085a9d401a3ed64dc7b07a5e90f4a60933a25a6c4584544c9022ac70e5b1b33cde0e2f
+EBUILD io-scheduler-udev-rules-1.ebuild 610 BLAKE2B 3aa316af370301a9735c506116dd83e6c5ae574a8cc50baff063fbe84ec78339633d1927f210039f2be9d163e77204296f010b36fb09e65d9ba9f20b1476eebb SHA512 4dc375a50c355d53b2f30b0f25db6778960a024a7d4e2acb6693d03494a6e87583794c0ef9dacf7bbe843ad1f00aae50fb709cbd8720c307fe578756018da7fa
+MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/sys-block/io-scheduler-udev-rules/io-scheduler-udev-rules-1.ebuild b/sys-block/io-scheduler-udev-rules/io-scheduler-udev-rules-1.ebuild
new file mode 100644
index 000000000000..d6a94d739beb
--- /dev/null
+++ b/sys-block/io-scheduler-udev-rules/io-scheduler-udev-rules-1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit udev
+
+DESCRIPTION="Udev rules to allow easier customization of kernel I/O schedulers"
+HOMEPAGE="https://gitlab.com/pachoramos/io-scheduler-udev-rules"
+SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="virtual/udev"
+BDEPEND=""
+
+src_install() {
+	insinto /etc/default
+	doins etc/default/io-scheduler
+	udev_dorules udev/rules.d/60-io-scheduler.rules
+	einstalldocs
+}
+
+pkg_postinst() {
+	udev_reload
+}
diff --git a/sys-block/io-scheduler-udev-rules/metadata.xml b/sys-block/io-scheduler-udev-rules/metadata.xml
new file mode 100644
index 000000000000..020b40648ee8
--- /dev/null
+++ b/sys-block/io-scheduler-udev-rules/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index 585a3cacce13..84389c2edb94 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -7,5 +7,5 @@ DIST parted_3.2-20.debian.tar.xz 87496 BLAKE2B 4409826b35b42093f16f80b1ab2f41b4c
 DIST parted_3.2-23.debian.tar.xz 88152 BLAKE2B 5e69a5799cc909bf54d1dcd1c7a8f7fe5dd7ce46b03957406f4a6118480d5acca3a165cc16b720fd03a89339fcfb46844d470079c4e10a4683e270c9e804c245 SHA512 7f449a24d1ea75a185b5fd589fea73a2f0944f1276288ece2790c5889de6adf8354f94388046a25b2dbf5735759f6010397f140607320a4de348cf77f8c75b09
 EBUILD parted-3.2-r1.ebuild 1503 BLAKE2B c2f7caec38f0d237e93a137a66ad433cb92dd23eeddb398625de2c5c114340136da270229d9e1ac6d9d58e64989481aa14caace6167cafea593c00d9d9801503 SHA512 32f77e24f7b4b986aac5508780121cf32525d2412fb84202a1385a14b453e72661b26cf8700be4d32555d143d9a23284daf3bac0dbba7038047f290d11a68a81
 EBUILD parted-3.2_p20-r1.ebuild 1740 BLAKE2B fb283538a1fb4bff9efc65fc1fdbad622288dbec7f18c0b5c81ec05a96c7c321fed34d1f6fc3aa3d306638c55cb6167e590875e68c74b0c63b3866d02722f3f5 SHA512 90378164b7d0d4d4b7f0cb71c589860d592fcbc7cc4199914287c00d0ebd36b9bdc7d3a8e1e0782ec29962df4f9993c050347b4a3c3dd8aa7ba21a48d4c13b2e
-EBUILD parted-3.2_p23.ebuild 1709 BLAKE2B 3fd7151f26bfaaa97cfab4227fef7990a84e73bda333fe974ea5dafd75105062eb78565d0b6bc198dc612c6b68d9bb5a930b38e385ce095b903273c455a152a5 SHA512 63e845feb6c9095b10d4bca9b9e61e530b6cb365420d7c9debe85de28d0d58fd1cace23f79f27724c89e60d17479e76f623d943551ea4d97a593f536b9f9aff7
+EBUILD parted-3.2_p23.ebuild 1708 BLAKE2B 0e7fe667d2a5abf26d22c5565eab5d844ba5ee88c33fb3a114e1b53374b070c917c02f3a3559eca3fac48455075cec394a4cdb9ba3c856c3a038be1a1a81fb64 SHA512 8359721e7f4fc1df27168f596d3101910fbad078d43a4c8139d318d5630f451a8a96c229241f312b7465385b5bf34e46f16ef0626d6122f8678ab347c08f831f
 MISC metadata.xml 754 BLAKE2B 6bf44d26295c82c00691f9ba11e114f43c2674e98b1a0f332280e2753c08aeeb5b5a402c2288e9f0c654d4d91be1ed20810eb4b19cf277b76d326423ee6b19a8 SHA512 b5ced0310e8a606de46a5a2a690d7a549c5528eb843616621486db93a9fc45266eafbcbacc90d38d8005cd0366fee671705fc98c54c79bf0b3519d182d15c184
diff --git a/sys-block/parted/parted-3.2_p23.ebuild b/sys-block/parted/parted-3.2_p23.ebuild
index b4a1e19a9f36..be811be69cf4 100644
--- a/sys-block/parted/parted-3.2_p23.ebuild
+++ b/sys-block/parted/parted-3.2_p23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="+debug device-mapper nls readline selinux static-libs"
 RESTRICT="test"
 
diff --git a/sys-block/rts_pstor/Manifest b/sys-block/rts_pstor/Manifest
index 7d1480cadce2..febfd9a3b073 100644
--- a/sys-block/rts_pstor/Manifest
+++ b/sys-block/rts_pstor/Manifest
@@ -1,4 +1,5 @@
+AUX fix-compile-kernel-5.0.0.patch 716 BLAKE2B ecb1bbdaf80d7e801f6e316308f559f29b4f0a5a431dc74aea82fd771e4ba31945ed77b5041398c0bee144f7912e89c91b55f29158e866dbde3687c50425c1c0 SHA512 5eeb472b97ca4742358e6002afc3d7839b1d25d0e08e72badf0447b0d951b2950c195a9120288b377a45ea118af754b5418a7ff251b463df457a1c201cc5d107
 AUX rts_pstor-makefile.patch 319 BLAKE2B afb25a7184c13b90fd9babf975cfc7710d4e643aad97994ff5d2f4f9bf77fc9928a1a2391890723e10c51107ad0cf4a5919418a9cb0787885d57de5e9cb08b03 SHA512 ae6b3890edef023d9b965d765baf7aefa75b0b44d51296f4997b0bb20a41c6a0d6ee19381a3d9194c23198b59da2a4523a1547363e3c82ba27c3625009f8d8ca
 DIST rts_pstor-1.10_p20160103.tar.gz 108102 BLAKE2B 9cbca345211f7c99c6d9cf71b0ed207a4c911569eee6c63bfbe15c094be08f64c4550f04d9df688969f43564b2ff6a91d5cc72b8ab281cfdffb6884688b354de SHA512 d802a52b1e2da447a218472e77ca6ecc56e3b3767e3eb8daf634152675171c79c86e3b5ca9654b67cf32f63740c347bf7ecee5a1d20eb1c15a3a2ad3e9774311
-EBUILD rts_pstor-1.10_p20160103.ebuild 1342 BLAKE2B b649f3ac801ab6fb1711fc13c8660a3ced1aba39d29c362487d9b1dd8b2efea8af04900ce1fdeef44c9a82f44f99e25228cb6a4643ba27396ae35f0877fdf111 SHA512 e6d936d860a7934e20cfc6fc85a3602649d98683d83c4b2fd303dcee084d0ad4e006377d0e1ff279a5a1411c030f72510fd5a6664cb7bf2486a2c26a7c757bf8
+EBUILD rts_pstor-1.10_p20160103.ebuild 1388 BLAKE2B d4b8ed4a1a796283a275ebc152f5ab24423cf2739194853684f0797f355815003ed5b2a31b4c63c347fd8a41255dc866d15d8debd7f8d596c55c7126f7627a29 SHA512 7281a71816d36acf67f2a70275a49956b8f555c61eb411576caee572a3e7c18c5ab2da2d54cf0fd5fa27f55ed54b2373a282ef82e5a8a8f62c52f473dacfad6e
 MISC metadata.xml 433 BLAKE2B 68ad81664e636facb6f248effc7c3ef58ea0c3cc86cc306b0862113665a296bcffe4df996861367eb98e26589c6124282a75d193fe1b84e90cbce12819b9279f SHA512 ef139e88440c4ad838b50a762373588a832dd4230596034399cb1b2fbb246a1fe957c8af86d98d80918fa747f2a0abad960af8a5144acbcd808dc956a833515b
diff --git a/sys-block/rts_pstor/files/fix-compile-kernel-5.0.0.patch b/sys-block/rts_pstor/files/fix-compile-kernel-5.0.0.patch
new file mode 100644
index 000000000000..7ea6ba6fd26b
--- /dev/null
+++ b/sys-block/rts_pstor/files/fix-compile-kernel-5.0.0.patch
@@ -0,0 +1,36 @@
+--- a/rtsx.h
++++ b/rtsx.h
+@@ -81,6 +81,17 @@
+ 	pci_get_domain_bus_and_slot(0, (bus), (devfn))
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
++static void do_gettimeofday(struct timeval *tv)
++{
++	struct timespec64 now;
++
++	ktime_get_real_ts64(&now);
++	tv->tv_sec = now.tv_sec;
++	tv->tv_usec = now.tv_nsec / 1000;
++}
++#endif
++
+ /*
+  * macros for easy use
+  */
+--- a/rtsx.c
++++ b/rtsx.c
+@@ -300,11 +300,13 @@
+ 	
+ 	.max_sectors =                  240,
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
+ 	/* merge commands... this seems to help performance, but
+ 	 * periodically someone should test to see which setting is more
+ 	 * optimal.
+ 	 */
+ 	.use_clustering =		1,
++#endif
+ 
+ 	
+ 	.emulated =			1,
diff --git a/sys-block/rts_pstor/rts_pstor-1.10_p20160103.ebuild b/sys-block/rts_pstor/rts_pstor-1.10_p20160103.ebuild
index 73c7c69315d7..e9b31fc3584d 100644
--- a/sys-block/rts_pstor/rts_pstor-1.10_p20160103.ebuild
+++ b/sys-block/rts_pstor/rts_pstor-1.10_p20160103.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018 Gentoo Authors
+# Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,6 +18,7 @@ KEYWORDS="~amd64 ~x86"
 DEPEND="virtual/linux-sources"
 PATCHES=(
 	"${FILESDIR}/rts_pstor-makefile.patch"
+	"${FILESDIR}/fix-compile-kernel-5.0.0.patch"
 )
 S="${WORKDIR}/RTS5209-linux-driver-${GIT_COMMIT}"
 
diff --git a/sys-block/scsiadd/Manifest b/sys-block/scsiadd/Manifest
index 56ed9443d1cf..bd17a7f64035 100644
--- a/sys-block/scsiadd/Manifest
+++ b/sys-block/scsiadd/Manifest
@@ -1,4 +1,3 @@
 DIST scsiadd-1.97.tar.gz 43574 BLAKE2B 13f0875165f7d5ea2c87e4931d0d09104a971eaa126969ee5274ade5b337d2ba3edd920293ae2cc962fb841c0449523f68b4ce6b467835a1797174fe30b2eaa9 SHA512 16ffd700d09b27d50f2cb04ba913eb6c4e7f40779ff8037ef1bb24cc593ddb4465733006449c903f6b0f31e0fb8c14e043fba70ed98975f8e07751e0316faa7b
 EBUILD scsiadd-1.97-r1.ebuild 1299 BLAKE2B bac52ca0c2e8c7401ec326a81155cf00004d1a95e27c10ef6bb5e05c6d8f8b270ada6e3893d7815ab440fb0ef2799d81e75d1292186bc208e4d106bfe18f32fb SHA512 3fceb5c5c7e93ca98ab1059ef4dc8db6581aa612e81cd9a73bb895b58d1f3a00528ab4cfb61f88346b380a1a89a9025174fa1e3cbc57760992d6adc8ecec7fb2
-EBUILD scsiadd-1.97.ebuild 1328 BLAKE2B f3b4005c645f51da4801e78dd8fd9e1a4d4fd6a130f27fe0b18acc5aa97a33b8f99e0514ce35ac6bf3ae92530eeaacbaf1bf49856f3564271b981e7e1f5990e2 SHA512 6ccb7a8bc03924f7bbaa7d7bcf6a390b0673623beb2076314eba983a2c1645a90322d59b320f95eaef7f1d54a106cd0ee58f2dc34dda0ad8cdae0d68c31a83e0
 MISC metadata.xml 374 BLAKE2B 7edbe16375cf5b8401055290ccc1711f8d7b616a13b9c2952fbf45925e0939602c41259b58126fd8bf2ec7b6f1558a54881543033d03a0d2eeba62e41612a4b8 SHA512 a24d00fd29179c54fc61081c35898e7414af891b3b25cbf0d9bbf0a15a8dd030672995488181f48886fa41b28debcf8735c6363300c8658094efbba497648ebb
diff --git a/sys-block/scsiadd/scsiadd-1.97.ebuild b/sys-block/scsiadd/scsiadd-1.97.ebuild
deleted file mode 100644
index 0ba638443227..000000000000
--- a/sys-block/scsiadd/scsiadd-1.97.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit user toolchain-funcs flag-o-matic
-
-DESCRIPTION="Add and remove SCSI devices from your Linux system during runtime"
-HOMEPAGE="https://llg.cubic.org/tools/"
-SRC_URI="https://llg.cubic.org/tools/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="suid"
-DEPEND=""
-
-pkg_setup() {
-	use suid && enewgroup scsi
-}
-
-src_prepare() {
-	# remove 'strip' command
-	sed -i -e "s:^\(.*strip.*\):#\1:g" Makefile.in
-
-	# convert docs to utf-8
-	if [ -x "$(type -p iconv)" ]; then
-		for X in NEWS README; do
-			iconv -f LATIN1 -t UTF8 -o "${X}~" "${X}" && mv -f "${X}~" "${X}" || rm -f "${X}~"
-		done
-	fi
-}
-
-src_compile() {
-	# extra safety for suid
-	append-ldflags -Wl,-z,now
-
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	dosbin scsiadd || die "install failed"
-	if use suid; then
-		fowners root:scsi /usr/sbin/scsiadd
-		fperms  4710      /usr/sbin/scsiadd
-	fi
-	dodoc NEWS README TODO
-	doman scsiadd.8
-}
-
-pkg_postinst() {
-	if use suid; then
-		ewarn
-		ewarn "You have chosen to install ${PN} with the binary setuid root. This"
-		ewarn "means that if there any undetected vulnerabilities in the binary,"
-		ewarn "then local users may be able to gain root access on your machine."
-		ewarn
-	fi
-}
diff --git a/sys-block/targetcli-fb/Manifest b/sys-block/targetcli-fb/Manifest
index 548686094370..8e939f38a662 100644
--- a/sys-block/targetcli-fb/Manifest
+++ b/sys-block/targetcli-fb/Manifest
@@ -1,8 +1,6 @@
 AUX targetcli-fb-2.1.48-python3.patch 908 BLAKE2B 9407a1c6b576507479fe06f8f5c942c718b53d15a399f50b074e29df59376bad8ddca2b4394acf052c49df863d049d1518eccc89f611e3dee5612615da02f041 SHA512 742e1ccf3ab911b06d9881f19f552e003729616f69d9ca70e56d74df6dd58267667fa30fa5fa69bec4f3e9ccc21684254a691ab67aca10b58945ceb3a0bc0e6a
-DIST targetcli-fb-2.1.45.tar.gz 32919 BLAKE2B 55b902e438cf379784aa503f72eaee51c17e90f1743fcbc69ec53f06ac4694621a40853f11c16ec11bbf0efe276198592023c908e86d4f529f20560579c3a6b6 SHA512 b9e9e2018b14df5d8fc50a9623d5c5e195088d1062c87629dbc1ab1ca9d53300c76d50a55377bed0d79c1b8dd63224b9423537eb89f63da770661cc5f9294e07
 DIST targetcli-fb-2.1.48.tar.gz 33777 BLAKE2B f24661777509a1e125cccaa12ca03eff9564e08bc3b5b3b1798b69a07bd7587b0089bcccbfa6c0166db51ec9f55fa663833e412ecab1614be43bcddf0521b1af SHA512 97351b29d8428e797f0cf7a7bab588f20368121d29fd8ed2afe2bf63aaf10aa7761e355e033772f6cbaf7aec2a1540cffae7dccad872a7e5885f200fa07dd420
-EBUILD targetcli-fb-2.1.45.ebuild 891 BLAKE2B ad9ebba431aa4ff24c03de06fe49acd8d46b5db68a57857b60f710bc158d3c2acb6ca33982faa11d4122b84c740decfa47b05decd9b111269963e906d090539a SHA512 66d6888ff69a365cbb46c3302e34177b13b1b5eb7a4976aff1e7ac90582b52494cc8b40c8d5ac083af4c08a88ae364b2395027543a6e1805e4162f9d9fe8034c
-EBUILD targetcli-fb-2.1.48-r1.ebuild 891 BLAKE2B 1718057cc0d0eae3e857e35ee4064bebfde7ed1e208fe33ed0f5e3bd26805be621a30c8d4dd461aa2705078c646e703b4e35f43d8643f2db2da3a7e2db080641 SHA512 a15caf5fbdad2da3ce3fc7700de1c85ca369db1ff96d578bff7602406c4d84647cf3515e186e674d4e1a062c37bac2bad6cb3a8249441b121157c747af2a6246
-EBUILD targetcli-fb-2.1.48-r2.ebuild 937 BLAKE2B ed91e71d9e59dcc449273b14c13752a921d3c43ad56fb554102b5ff6471234dacd84993fc8e65ce01a3310f18833cb8cd87ea7bd7c6dd60b20dae24a9e230361 SHA512 b3bebc1aba7d4d087a82fcaf25466387d868d202420c5581e9a89ca50a9bba8853b5ff5c95cb007429d77dee283b1817579c19c39069fb9232ad97a078a58986
-EBUILD targetcli-fb-2.1.48.ebuild 889 BLAKE2B 45f45e3f299595164c68e86c5e62cf03c56fc4434704f07cd3a00a49ad3b81b33962c0989b628d623ad8c1d6dd386a4169128d6634d2ad4819f31eb6a502ea34 SHA512 6b47037d5035ae47460411bc74f92581a523f0d8cd2459f1710f02a85b4b44e2ee2e97a14a5055baaf601d973ffc0585db9b623eadb2f140f666355aeada7dfa
-MISC metadata.xml 753 BLAKE2B 95e698cf4414c33f040327e427f8fb554d5f2a6aa48b47629d32cfc4a0228d636ea9c90f12b0d540d1be7a8de9b5c91be5b8188aced8b7bc30faa61ee5f70d9d SHA512 0bbe917fcc75a97f8f1956a734c34ef5abb709c50f1968e9beb83f54d95e3652526a0e651080b9c46cf60806505068b84c7139a91df4db4a7d85797e6b03b6d1
+DIST targetcli-fb-2.1.49.tar.gz 34147 BLAKE2B 49ed4a610282af30308373cdf806832a3441dcab9a52cddb3f59bacdecb79f7308f316cc65f526d6ea1f9bb875d05e049e6cd7d99eb243f25546395ba6aaa38c SHA512 05fb6f638f808bf09089bdd110592b3ed3be49fc70cc1a71680de7bff40dc88425e69e9a99fdfcab712646cf131f78071edae46f214fdfee4b7090f47933c93a
+EBUILD targetcli-fb-2.1.48-r2.ebuild 932 BLAKE2B 2049b95271b4a46594f9322ac9c73c27d40577fadf539a2e8d97ba9413b53e6006806bc3fb01a2dafe618b90120f2563112ec18a8238b88109a12531b180952d SHA512 971ebfe876cc5e524c153e51adbadf4287ad301dd18cee2e32191810da7ca7b9a7d91d00a1972034060336f880c56f209ae96a7c0f0eddea7aa20419bbb707eb
+EBUILD targetcli-fb-2.1.49.ebuild 831 BLAKE2B 07f022dfcfe05e5cfe7709be3390e7c4e8c626f740a92fe73a4aeb460706ab76587a2942450708d8780ce7dccb296c1d43b358e15a4da62d481c60a4638993a5 SHA512 ee442c8daab713f273911be649b1201848960f258b7f03645bb2e1e62c417e87628e766dee4b3638d965371dd35f46fa0d5f173a9a3724b0ce3767ff24bb5256
+MISC metadata.xml 852 BLAKE2B 375f8bd771785bd8d928dc5975b5e7157355693b743fca1e28bca06a75bf6425f49a1df304962aeabb0ae9fd85fa84cd7db3ed23309dcb93e946da8417afe173 SHA512 af99e8996b35debdc6780b95d36201e701e93c2be464dc737d5eb018a1c2e907ee94a53a9901173d8a76d0d0f2948556e7be8e2b8d3cf8c3c8cdcf7de69d1749
diff --git a/sys-block/targetcli-fb/metadata.xml b/sys-block/targetcli-fb/metadata.xml
index 3fb345140c07..d73e87ae50fd 100644
--- a/sys-block/targetcli-fb/metadata.xml
+++ b/sys-block/targetcli-fb/metadata.xml
@@ -15,6 +15,10 @@
 </longdescription>
 <upstream>
 	<maintainer status="active">
+		<email>mlombard@redhat.com</email>
+		<name>Maurizio Lombardi</name>
+	</maintainer>
+	<maintainer>
 		<email>agrover@redhat.com</email>
 		<name>Andy Grover</name>
 	</maintainer>
diff --git a/sys-block/targetcli-fb/targetcli-fb-2.1.45.ebuild b/sys-block/targetcli-fb/targetcli-fb-2.1.45.ebuild
deleted file mode 100644
index 41ff992e4cc5..000000000000
--- a/sys-block/targetcli-fb/targetcli-fb-2.1.45.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1 versionator
-
-MY_PV=$(replace_version_separator 2 '.fb' ${PV})
-
-DESCRIPTION="Command shell for managing Linux LIO kernel target"
-HOMEPAGE="https://github.com/open-iscsi/targetcli-fb"
-SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/configshell-fb[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.62[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	!sys-block/targetcli"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_install() {
-	distutils-r1_src_install
-
-	keepdir /etc/target /etc/target/backup
-	doman targetcli.8
-}
diff --git a/sys-block/targetcli-fb/targetcli-fb-2.1.48-r1.ebuild b/sys-block/targetcli-fb/targetcli-fb-2.1.48-r1.ebuild
deleted file mode 100644
index c1dfd9ed51b1..000000000000
--- a/sys-block/targetcli-fb/targetcli-fb-2.1.48-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 versionator
-
-MY_PV=$(replace_version_separator 2 '.fb' ${PV})
-
-DESCRIPTION="Command shell for managing Linux LIO kernel target"
-HOMEPAGE="https://github.com/open-iscsi/targetcli-fb"
-SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/configshell-fb[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.62[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	!sys-block/targetcli"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_install() {
-	distutils-r1_src_install
-
-	keepdir /etc/target /etc/target/backup
-	doman targetcli.8
-}
diff --git a/sys-block/targetcli-fb/targetcli-fb-2.1.48-r2.ebuild b/sys-block/targetcli-fb/targetcli-fb-2.1.48-r2.ebuild
index b5191e416491..c5777fccd2e4 100644
--- a/sys-block/targetcli-fb/targetcli-fb-2.1.48-r2.ebuild
+++ b/sys-block/targetcli-fb/targetcli-fb-2.1.48-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1 versionator
 
diff --git a/sys-block/targetcli-fb/targetcli-fb-2.1.48.ebuild b/sys-block/targetcli-fb/targetcli-fb-2.1.49.ebuild
index 525248d50006..fb39a7770d3c 100644
--- a/sys-block/targetcli-fb/targetcli-fb-2.1.48.ebuild
+++ b/sys-block/targetcli-fb/targetcli-fb-2.1.49.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+inherit distutils-r1
 
-inherit distutils-r1 versionator
-
-MY_PV=$(replace_version_separator 2 '.fb' ${PV})
+MY_PV=$(ver_rs 2 .fb)
 
 DESCRIPTION="Command shell for managing Linux LIO kernel target"
 HOMEPAGE="https://github.com/open-iscsi/targetcli-fb"
@@ -17,12 +16,12 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/configshell-fb[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.62[${PYTHON_USEDEP}]
+	dev-python/rtslib-fb[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	!sys-block/targetcli"
+	sys-apps/dbus"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest
index 390ea0797ac7..27515906f936 100644
--- a/sys-block/tgt/Manifest
+++ b/sys-block/tgt/Manifest
@@ -1,4 +1,3 @@
-AUX tgt-1.0.69-sysmacros.patch 1128 BLAKE2B d3e14b57ad16ccdc47def33de8da9c6dedb4f280919fc30fcd76a700a218c60843f8c0371bf728438ffc10d21eda5b1dd0af3a7a1bb5ce38a9676968022c6fe3 SHA512 37d74d52c2a29fbbdd482b7e583d9d6e1fa175f5824b32c635b49b46a05cbe7632bab06e6850c03e47789851b88a48f43078cfc29db8ee3f7beaad3ddb87d5b8
 AUX tgtd.confd 108 BLAKE2B 74e5f66f6fb193541853e562cd1de5e99806f1f324db6efb5f9a5217935044dd61237171b368dc1747017fbd9094d8c3acae4dfde0d5dfff69957c3f8800d63c SHA512 2153e99e3f6a2178bbbb2bda1d6af9a67d6080b36e7c5cbb4f951b10324c80a24fa224a7003c26b3b51d40a77bba97856bc009bbb0e664e93625face723edc91
 AUX tgtd.initd 3435 BLAKE2B d2441a515c7a270472efd0c4ef5e928827bde54b248d09bb47f4fcc53c46e4678acf049c16ee761f29eb8e928f0713f38a9f73bd13db1e0408da56f42f64b337 SHA512 1e6d114dbb89c7a26e65546b6c775bcabc3c9508e0757e118a4272fbf4299a185b4679bc510d9cc3da7db25b96343ddc8e45de044543ebe26d952132eba4de30
 DIST tgt-1.0.74.tar.gz 297109 BLAKE2B 8ad439a1df437b87a6bf94a8c0403c4ae26a6b77ddc3b44758134199efa5b55dafd09cd2ac3f1b12abc3a77077dffdcab1e9b2aa0a97fcd2e2c19ba24a5cd9cf SHA512 aa905b44a3495275549d4abe8542e2b6b086bbab79b83d2902cba1e6124889a8873d479d1111128416b23c7681433fbe37c1772e8578bb12bf80b96267f65c0a
diff --git a/sys-block/tgt/files/tgt-1.0.69-sysmacros.patch b/sys-block/tgt/files/tgt-1.0.69-sysmacros.patch
deleted file mode 100644
index 0b28f02e2821..000000000000
--- a/sys-block/tgt/files/tgt-1.0.69-sysmacros.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://bugs.gentoo.org/580594
-https://github.com/fujita/tgt/pull/25
-
-From b092c6fe330a2eacf4b1d4eb093fad8e2fbcaed9 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 27 Nov 2016 18:47:24 -0500
-Subject: [PATCH] fix build w/newer glibc
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Building with newer glibc versions fails like so:
-bs_sg.c: In function ‘chk_sg_device’:
-bs_sg.c:354:6: error: implicit declaration of function ‘major’ [-Werror=implicit-function-declaration]
-  if (major(st.st_rdev) == SCSI_GENERIC_MAJOR)
-
-This is because glibc is dropping the implicit sys/sysmacros.h include
-from sys/types.h and making the few projects that need it include it
-explicitly.
----
- usr/bs_sg.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/usr/bs_sg.c b/usr/bs_sg.c
-index 66f4a3b22a18..fb544056f258 100644
---- a/usr/bs_sg.c
-+++ b/usr/bs_sg.c
-@@ -32,6 +32,7 @@
- #include <linux/fs.h>
- #include <linux/major.h>
- #include <sys/ioctl.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/epoll.h>
--- 
-2.11.0.rc2
-
diff --git a/sys-block/thin-provisioning-tools/Manifest b/sys-block/thin-provisioning-tools/Manifest
index df320136a26b..9d67d5bafa79 100644
--- a/sys-block/thin-provisioning-tools/Manifest
+++ b/sys-block/thin-provisioning-tools/Manifest
@@ -1,14 +1,11 @@
-AUX thin-provisioning-tools-0.6.3-build-fixes.patch 2206 BLAKE2B 7bed8f8a3eb9411674bca8a283ebe69bd241f6f2650928dfe6473c5d80a14b2e4ce20b35dba58280ece8c38253a24717e212e41fae3e8a8e292d275f8cc9f0f2 SHA512 1a9fee83de23f67a9b8051c3ccef47de212dedbc4dff585137628b7069fc204c7fbb116d3528db2e39c8fd8a104442ded83f303742b63a1981b06fd85a434353
 AUX thin-provisioning-tools-0.7.0-build-fixes.patch 1077 BLAKE2B 540efcaff8a0f826f132aa06b5d63728d5b7e0de2da81ff65480537c10b4a769330f0e557496f1ce6116cce51b834057ffb6c967fb527deb419aee4d1f3d2ec5 SHA512 fbdf778774bca2e608bbab7696b6646c64ee740c40c743f40f28e7e360fc2a6c6c3752992d9d5f7bbb624a9240ba480a6e58a7c5956ba6d2b772ece18502afe7
 DIST thin-provisioning-tools-0.4.1.tar.gz 186979 BLAKE2B d7e60b67f716c1398c4fa7230b3e0b57f62aa47cf6253806e4e3b932b0a71a489cf367ec9eb1e0a620dfab5a7ef0f4c2049a8ee5f5da0d94855fc3618dd03feb SHA512 e148296b55f7ff4ab85dc3b4679c7eab0ee8d56e61415397fc2e46f17bcc16a6a582c17343381320f8582bc4f12311af622d43aabe60e7abb25a882446016b7e
-DIST thin-provisioning-tools-0.6.3.tar.gz 198697 BLAKE2B 0bc9ae1ee650f4f2c553ca72e0569bcf2590174cde2b89084ff4347d78f0dbd08c29bbc9629498f2b8fe2149fb27eeee2e0b5928890224b9ead224fd1a3161d1 SHA512 ccebf5bb1ac2da56a3dab5b7ce8d61f6a71f84b5168c2680618d724340bbf8cf97c935c1bce966a296331d9dc048a855d81775d2a39f10b4096ab3ee835286d9
 DIST thin-provisioning-tools-0.7.0.tar.gz 230595 BLAKE2B 00238a682f80600e3a5bb6d0d2a9662bd0fd3ae5404d5895427f169640b469780f554c22c6a93187058e6399c76ba14a6fa8d73f2bb09aa79927dd458b58ffa9 SHA512 cb6c44c7215aadd72292d73e2374d8c0c28566adcb10c7a3de83576dbd28649ebba6e2cc59945a28921e423540969cb21f648c37e375d68f48e56a8be4a4c7b8
-DIST thin-provisioning-tools-0.7.5.tar.gz 278856 BLAKE2B f554a9001bc9dde3510e3702f184d48cd77ddfc04f16c7e054fea8a3a47fdce7796ca4fcdb8d155e3d22526535ae965e344b3c2735f6275a7702044536dff923 SHA512 65268cc0c68428fa89f039c097794f574ef79b1862de3208715b9180ba73b197f37d879b386b110c52d9f2d3e80fb069a8d48ee2939aa1fd2b88f2513babc763
 DIST thin-provisioning-tools-0.7.6.tar.gz 285428 BLAKE2B af74eff6d435f00e347872786fee8627f02844af122a9f1bf9ffd00234ce5275d3a61d9b4204313a19813cadbc0197bbeb9a1bd92d55992c6d9a03a299579e29 SHA512 395035b6f59fafb1c0f3e68750611e04f10223bc8d57b257e25c28c928647d1d2c6e94014b64ed90eeae1151fc7e5d23cf1aa428716e343338cb3c8fe55ed704
+DIST thin-provisioning-tools-0.8.0.tar.gz 305009 BLAKE2B 1002916cd7b455be21091007f68d12455476efc234a3892607152085adab37db03cea9959cf76d6903dad680b209d87ec62745b268daa02ff11667d0e070da8c SHA512 b95f320f8da94b52327d7afece98020de65c7a3eccf9e6d8e8f89600b9f984e3d4ae928b52c04dd973d0d87885354567f6d392e9551e0e7394158406bae79891
 EBUILD thin-provisioning-tools-0.4.1.ebuild 1295 BLAKE2B d41882d0b24f3641e6de64f115918ea9d90ba4f1bcdde9d710e12fd2d2352157119e5ac9816386cdfd7816b1b9f1e7a3b1467518b9aa0373ba7541082a035523 SHA512 c4360645c8cdcb3a1d85590630b077aa3ff0c658a4ee3a42c51c7ab807bdb535abc6ea12a4ec7a953cffa75a3a77b50a04fb40142da817543ee00e2a36fd55e9
-EBUILD thin-provisioning-tools-0.6.3.ebuild 1310 BLAKE2B f82450f18643858269b441a9dcc0d0cc6b2e80d3b17ce27dd5418d78225b1600e1748bbaeb9ebc9c826dca8b6c42f11247ae222676d979c368f47ea87235582a SHA512 7c00e74e0f4eb92a1a54df434ccd4e7d55d7c3808ce85de03f9942974d44697ab18d644c6910afe6959c5ec3d0aed029c5248ba656421221ee1c0877da342065
 EBUILD thin-provisioning-tools-0.7.0.ebuild 1306 BLAKE2B 30c35547bef9b7df248dd86d85d3a39868ae3573c4b6b9f81d5b85dfed98524ff64c17c54727f131eb479c1fcd54ff8bd9029026e799842da9e1cf9c651fe0da SHA512 67f0ee4b13d52bb480733ed5a94e1300918b518687ea511e604cff921712c93da478a305ef9ee3b82972ee085d9d5498b611bc7050b64e43fe11ad8a4f29b5be
-EBUILD thin-provisioning-tools-0.7.5.ebuild 1320 BLAKE2B 9e6308a4d050c42ef84b12d60fb11a0fdd122060127a8e5b44b1e48fa2e75bfd2186bec24fcab46afe104408b76b8655685db4b34850eab748928b27b2edd9e9 SHA512 72e4fb319e715afc5af130fc4d2cfb5d80992bbb9e803b4d8d8a63c46da9df66997f4862ce6d39c7b4895c6a8cec7260e3b4baca09500acf1bb9b2e9cccf91e8
 EBUILD thin-provisioning-tools-0.7.6.ebuild 1320 BLAKE2B 9e6308a4d050c42ef84b12d60fb11a0fdd122060127a8e5b44b1e48fa2e75bfd2186bec24fcab46afe104408b76b8655685db4b34850eab748928b27b2edd9e9 SHA512 72e4fb319e715afc5af130fc4d2cfb5d80992bbb9e803b4d8d8a63c46da9df66997f4862ce6d39c7b4895c6a8cec7260e3b4baca09500acf1bb9b2e9cccf91e8
-EBUILD thin-provisioning-tools-9999.ebuild 1470 BLAKE2B 3c023e493161cfa78a33f987406e55afe163581252a768f22767bb8fafe190e613664987d9c8e145711d85c159e6500ba14e5ac9493d1670c891f9a44a5ad4f8 SHA512 d1749913aca43f22a0d2cf7cfa3a56af612c4deafb03bcae826220f99421e03ccba2ce1249a6994f600e3bc881a4be30d7ccfe7a4f3729354e452b3447d5c282
+EBUILD thin-provisioning-tools-0.8.0.ebuild 1494 BLAKE2B bf3e6d902de15d0d15069b16a4f9cda59d67613c9686d07d389d32a7a69772a590ad2fa49977373cc22714d76d2e45af92a143577d89aa1ea85f58525b70ca0c SHA512 dd917a0dddb1846c65a5c7e394c81df1b4ec4e584c3c18aa49633e2084c17c8b0716c23fd54c0e96e9bf9a93ccff63788e258c6f2d54cce159d3191e86f73dab
+EBUILD thin-provisioning-tools-9999.ebuild 1494 BLAKE2B bf3e6d902de15d0d15069b16a4f9cda59d67613c9686d07d389d32a7a69772a590ad2fa49977373cc22714d76d2e45af92a143577d89aa1ea85f58525b70ca0c SHA512 dd917a0dddb1846c65a5c7e394c81df1b4ec4e584c3c18aa49633e2084c17c8b0716c23fd54c0e96e9bf9a93ccff63788e258c6f2d54cce159d3191e86f73dab
 MISC metadata.xml 531 BLAKE2B 37dbd49f21f2816fec9f5b620dae0e5d95f4233bedfcdcdd54d573899fc3aaf48ff6c82b62ceeb36f400924889ca52f3f826ed62c8333bc2723c40e1fe697117 SHA512 80fde34da9de5b2436c096bc9051ccb55124c330dc82ac538f66a100225623aa7cb0869041179999608cc52613e40ba464b46630cff52423c13d1a374eb98ed0
diff --git a/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.6.3-build-fixes.patch b/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.6.3-build-fixes.patch
deleted file mode 100644
index ae1148a1626f..000000000000
--- a/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.6.3-build-fixes.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -purN a/Makefile.in b/Makefile.in
---- a/Makefile.in	2016-07-21 15:42:52.000000000 +0100
-+++ b/Makefile.in	2016-10-28 22:45:54.292931031 +0100
-@@ -108,7 +108,7 @@ CFLAGS?=@CFLAGS@
- CFLAGS+=-Wall
- CFLAGS+=@LFS_FLAGS@
- CXXFLAGS?=@CXXFLAGS@
--CXXFLAGS+=-Wall -fno-strict-aliasing -std=gnu++98
-+CXXFLAGS+=-Wall -fno-strict-aliasing
- CXXFLAGS+=@CXXOPTIMISE_FLAG@
- CXXFLAGS+=@CXXDEBUG_FLAG@
- CXXFLAGS+=@CXX_STRERROR_FLAG@
-diff -purN a/thin-provisioning/restore_emitter.cc b/thin-provisioning/restore_emitter.cc
---- a/thin-provisioning/restore_emitter.cc	2016-07-21 15:42:52.000000000 +0100
-+++ b/thin-provisioning/restore_emitter.cc	2016-10-28 22:49:32.662189111 +0100
-@@ -142,7 +142,7 @@ namespace {
- 		bool device_exists(thin_dev_t dev) const {
- 			uint64_t key[1] = {dev};
- 			device_tree::maybe_value v = md_->details_->lookup(key);
--			return v;
-+			return v.is_initialized();
- 		}
- 
- 		metadata::ptr md_;
-diff -purN a/thin-provisioning/thin_pool.cc b/thin-provisioning/thin_pool.cc
---- a/thin-provisioning/thin_pool.cc	2016-07-21 15:42:52.000000000 +0100
-+++ b/thin-provisioning/thin_pool.cc	2016-10-28 22:50:26.999256645 +0100
-@@ -232,7 +232,7 @@ bool
- thin_pool::device_exists(thin_dev_t dev) const
- {
- 	uint64_t key[1] = {dev};
--	return md_->details_->lookup(key);
-+	return md_->details_->lookup(key).is_initialized();
- }
- 
- //----------------------------------------------------------------
-diff -purN a/unit-tests/Makefile.in b/unit-tests/Makefile.in
---- a/unit-tests/Makefile.in	2016-07-21 15:42:52.000000000 +0100
-+++ b/unit-tests/Makefile.in	2016-10-28 22:45:20.985893955 +0100
-@@ -25,7 +25,7 @@ GMOCK_FLAGS=\
- 	-Wno-unused-local-typedefs
- 
- GMOCK_LIBS=\
--	-Llib -lpdata -lgmock -lpthread -laio
-+	-Llib -lpdata -lgmock -lpthread -laio -lgtest
- 
- GMOCK_DEPS=\
- 	$(wildcard $(GMOCK_DIR)/include/*.h) \
-@@ -80,7 +80,7 @@ TEST_OBJECTS=$(subst .cc,.gmo,$(TEST_SOU
- 	sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo $* : Makefile ,g' < $*.$$$$ > $*.d; \
- 	$(RM) $*.$$$$
- 
--unit-tests/unit_tests: $(TEST_OBJECTS) lib/libgmock.a lib/libpdata.a
-+unit-tests/unit_tests: $(TEST_OBJECTS)  lib/libpdata.a
- 	@echo "    [LD]  $<"
- 	$(V)g++ $(CXXFLAGS) $(LDFLAGS) -o $@ $(TEST_OBJECTS) $(LIBS) $(GMOCK_LIBS) $(LIBEXPAT)
- 
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.6.3.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.6.3.ebuild
deleted file mode 100644
index fdca9783f125..000000000000
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.6.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="A suite of tools for thin provisioning on Linux"
-HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
-SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static test"
-
-LIB_DEPEND="dev-libs/expat[static-libs(+)]
-	dev-libs/libaio[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	test? (
-		|| ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 )
-		>=dev-cpp/gtest-1.8.0
-		dev-util/cucumber
-		dev-util/aruba
-	)
-	dev-libs/boost"
-
-PATCHES=( "${FILESDIR}"/${P}-build-fixes.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	STRIP=true econf \
-		--prefix="${EPREFIX}"/ \
-		--bindir="${EPREFIX}"/sbin \
-		--with-optimisation='' \
-		$(use_enable test testing)
-}
-
-src_compile() {
-	MAKEOPTS+=" V="
-	default
-}
-
-src_test() {
-	emake unit-test
-}
-
-src_install() {
-	emake DESTDIR="${D}" DATADIR="${ED}/usr/share" install
-	dodoc README.md TODO.org
-}
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.5.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.0.ebuild
index 22a1164fc489..8b0eb97b2165 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.5.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,11 +7,17 @@ inherit autotools flag-o-matic
 
 DESCRIPTION="A suite of tools for thin provisioning on Linux"
 HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
-SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+else
+	inherit git-r3
+	EGIT_REPO_URI='https://github.com/jthornber/thin-provisioning-tools.git'
+fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static test"
 
 LIB_DEPEND="dev-libs/expat[static-libs(+)]
@@ -20,7 +26,11 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 	test? (
-		|| ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 )
+		|| (
+			dev-lang/ruby:2.6
+			dev-lang/ruby:2.5
+			dev-lang/ruby:2.4
+		)
 		>=dev-cpp/gtest-1.8.0
 		dev-util/cucumber
 		dev-util/aruba
@@ -38,11 +48,13 @@ src_prepare() {
 
 src_configure() {
 	use static && append-ldflags -static
-	STRIP=true econf \
-		--prefix="${EPREFIX}"/ \
-		--bindir="${EPREFIX}"/sbin \
-		--with-optimisation='' \
+	local myeconfargs=(
+		--prefix="${EPREFIX}"/
+		--bindir="${EPREFIX}"/sbin
+		--with-optimisation=''
 		$(use_enable test testing)
+	)
+	STRIP=true econf "${myeconfargs[@]}"
 }
 
 src_compile() {
@@ -55,6 +67,6 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" DATADIR="${ED%/}/usr/share" install
+	emake DESTDIR="${D}" DATADIR="${D%/}/usr/share" install
 	dodoc README.md TODO.org
 }
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
index 96d1cf0b494d..8b0eb97b2165 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-EGIT_REPO_URI='https://github.com/jthornber/thin-provisioning-tools.git'
-inherit autotools flag-o-matic $SCM
+inherit autotools flag-o-matic
 
 DESCRIPTION="A suite of tools for thin provisioning on Linux"
 HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
@@ -13,6 +11,9 @@ HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+else
+	inherit git-r3
+	EGIT_REPO_URI='https://github.com/jthornber/thin-provisioning-tools.git'
 fi
 
 LICENSE="GPL-3"
@@ -25,14 +26,20 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 	test? (
-		|| ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 )
+		|| (
+			dev-lang/ruby:2.6
+			dev-lang/ruby:2.5
+			dev-lang/ruby:2.4
+		)
 		>=dev-cpp/gtest-1.8.0
 		dev-util/cucumber
 		dev-util/aruba
 	)
 	dev-libs/boost"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.7.0-build-fixes.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.0-build-fixes.patch
+)
 
 src_prepare() {
 	default
@@ -41,11 +48,13 @@ src_prepare() {
 
 src_configure() {
 	use static && append-ldflags -static
-	STRIP=true econf \
-		--prefix="${EPREFIX}"/ \
-		--bindir="${EPREFIX}"/sbin \
-		--with-optimisation='' \
+	local myeconfargs=(
+		--prefix="${EPREFIX}"/
+		--bindir="${EPREFIX}"/sbin
+		--with-optimisation=''
 		$(use_enable test testing)
+	)
+	STRIP=true econf "${myeconfargs[@]}"
 }
 
 src_compile() {
@@ -58,6 +67,6 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" DATADIR="${ED%/}/usr/share" install
+	emake DESTDIR="${D}" DATADIR="${D%/}/usr/share" install
 	dodoc README.md TODO.org
 }