13 files changed, 96 insertions, 252 deletions
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index a9d3a25a3016..13aa34a3d2dc 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/partimage/Manifest b/sys-block/partimage/Manifest
index 6928d0b9585e..13574b8b7c66 100644
--- a/sys-block/partimage/Manifest
+++ b/sys-block/partimage/Manifest
@@ -2,12 +2,9 @@ AUX partimage-0.6.9-minor-typo.patch 313 BLAKE2B c0d04a86e0d4c27ce8a1b097525c029
 AUX partimage-0.6.9-openssl-1.1-compatibility.patch 1445 BLAKE2B 086fa11a2dc3326b86cdfd43abda921fbf7a03c95adf7cba28675ed5c8334582feedd0e1adbe16e7750333fcf730d67fd02f3a9a49a8f4d08881964eff51dadb SHA512 96c398a3d536ed6dc54ef8d6012f1ecefe78fd8a27b74966ba8d6095e593cbcd33213dc485c6dc13ee45a517928de2bce639b5679e91ed2aea2adb1f5b3efba6
 AUX partimage-0.6.9-zlib-1.2.5.2.patch 975 BLAKE2B 0e7e1de1ef590f74b46d94aaaa6eaf2eb62f06c3f33432d0201c820ec4e218d746ee8964e8cdfa1fc31bf31da1fb18fdfe3cb798cbb3111c17194dadbf4d6707 SHA512 8f5310a65e77822f816bedca9281be7627246f111960fc4092c2e3d44fa1bfcea786c130899970ce35da8be536491ae46b0ac1825d85ab6ccb6b1332f2f1b4e2
 AUX partimaged.conf 307 BLAKE2B f1d0bc946a517f4896b55c749c0f244731d413119dfc15c22f5e0834ca87cdb37b278f8907bb18dade3a1ab48cbea3a4d7ef5b836af32260cbf1653627855a2f SHA512 1be320a8dceb3076e6aa2d8b1a8a4d01a380ad1209133997fd0d87cf1d0974fc4877c3c8b41c07fbb99249c8a00132f2c5fa7ffadf26f4e41cc2abfcd6b62116
-AUX partimaged.init 644 BLAKE2B 92bfc28cb2a093bc9a0d94bb5730ff6f402f28ed48f281f0fa392950de02b498fe7d31ab8a0d96f20ced8fd41b5b912319a0d8fceb9321529237c1d48a85f046 SHA512 1e85bcd3012897cb093e87667a4c937b390967317ceaa547484d4f56c760a746faeb4290996155505978eefb4bd1e84e4b11fcc31a59f1e322c83351227c96d5
 AUX partimaged.init.2 628 BLAKE2B 872f72a4407ca0f923220e2c313779a0e52b6179b753567e125edfa983856695a88b49af2dd005b6bce0e9951ad11177611d3029cd2e02d28ab26b1195847660 SHA512 48919e1be73d0aaeeaf0f8b510af05eda613aa7aa6773e0886ca2d46119521326f46d8503f23b2dcb133ec4c8bc5a89f92787275bba869c6990074825515278f
-AUX partimaged.pam 266 BLAKE2B d46ffadffba0635c4fce9612e4bdd187aa5e17b823d747d8ba518afeb5bc258e12a26a35f3a773c8fae799a9e25321f602292e07e337cd35c60419afbe86e485 SHA512 993bffc8ecabde1148ad75f559348ed4a8d5f9d13b326676dc6d217aa890e7ab35884dda4a71be8090e3aef05cd6711e2705e3190d1cdb8bfe23213453418e6e
 AUX partimaged.pam.2 249 BLAKE2B e40a15c5fe4dc394cbcf9c478c3c764e67ec317f31c039738c87b90fec79577a191ae85ad0b774e8b415b79bd29460c929f094e4e3210660989a7bdb9939fe8a SHA512 ad55a61e574dc44cdda723bb5a46349d15e50353dcdb99474b9acafd56c93bc6ffdd75f5b0d9e80849d9bebf5c7b9a2f84c7cefc5f0a86f54f9477a0962794cd
 AUX servercert.cnf 980 BLAKE2B 0660f9b92fe422754e36d6ce1889e8b8feb40954b36b3e00e58f5e534b85171ac42e66f74020a55dd1b14d56d7764c94427b8d1d112ca1a878dff388ac3ea787 SHA512 8aa0592ce0be3f08124880b823db59aa167e7d509ea1a9b48d9f895482f96e99a6e4df330c567b9ce331eed43cb4f1a70b1b7727878972a8b074265898b1e557
 DIST partimage-0.6.9.tar.bz2 666522 BLAKE2B d9a240f82a7b6ae73997df46c964fdddf8dddea9e3bd9548252d9409a526358714908316c52864b60bc9fcc1113a5e1c6cf294faff6845a183c7ffe1012475a6 SHA512 252885921b23933fdcdf0bb6efa4b82066b08ca95cc653296912d384ae875b421c1d39f347a90115315139176d4eab4a930c24919c2d38cf00ed29c764cd14d9
 EBUILD partimage-0.6.9-r1.ebuild 3551 BLAKE2B fcddc4f5f2609f4a14b3653de504dda5629ab184e4cfd07005c5edb94af65668012462a9c9b7422b1edf5f3cb96fdeb15fca2d2afa338cb4f8b0d4cd5cb7be90 SHA512 3c81ca4e3f2ceb9fb0b7243fdbfac3869552ec78a7c288d197a03369e40bad0e50af4020894431a4cf180d7f67e7a9421aa87abdada09ffb4a397deed3cb0042
-EBUILD partimage-0.6.9.ebuild 3445 BLAKE2B f90a263110eba0d69d7d21a643ba6eee353d49624ceeddd50b605ad7cee19a6fbcdfb2fc67ee3e41ce67685243f215df93221157e7e53d953cd6ea1a5a813e1b SHA512 c48ec114f05b868bf525234aa7ef9011efa4e61343123e56a8012cadf548968ad805bbe8658c4e02fa36201bbe3ce462e1ab550c4b5eb09cd071b7c2112c5563
 MISC metadata.xml 427 BLAKE2B 33870f2fc393bed75dcdbda1bb16d6cc947cfa4f7321e7f219338cab014be901eca6d3e2dc11c0ecd50be28922f0f1a746a8756c3d860d8f10549098c3479cad SHA512 e5e5377e9f6cf6337b93ea8609424ce4b9514b0b0d9628ef22999537af616f24e4882a915cf6249f8d0e721b5e25e0a50f5e046b8ac9991c130b4f5892298e67
diff --git a/sys-block/partimage/files/partimaged.init b/sys-block/partimage/files/partimaged.init
deleted file mode 100644
index 72891f97cf9b..000000000000
--- a/sys-block/partimage/files/partimaged.init
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-PARTIMAGED="/usr/sbin/partimaged"
-
-failed_startup() {
-	eerror "The PartImage daemon did not start up correctly."
-	eerror "Perhaps you compiled it with SSL support but forgot to run the ebuild config?"
-	return 1
-}
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting partimaged"
-	start-stop-daemon --start --quiet --exec ${PARTIMAGED} \
-	-- ${PARTIMAGED_OPTS} --daemon > /dev/null 2>&1
-	eend $? || failed_startup
-}
-
-stop() {
-	ebegin "Stopping partimaged"
-	start-stop-daemon --stop --exec ${PARTIMAGED}
-	eend $?
-}
diff --git a/sys-block/partimage/files/partimaged.pam b/sys-block/partimage/files/partimaged.pam
deleted file mode 100644
index 6ffb16fdf80b..000000000000
--- a/sys-block/partimage/files/partimaged.pam
+++ /dev/null
@@ -1,11 +0,0 @@
-# PAM config file for Partimaged
-
-auth required pam_unix.so
-auth required pam_warn.so
-auth required pam_listfile.so \
-	onerr=fail item=user sense=allow \
-	file=/etc/partimaged/partimagedusers
-
-account    include      system-auth
-session    include      system-auth
-
diff --git a/sys-block/partimage/partimage-0.6.9.ebuild b/sys-block/partimage/partimage-0.6.9.ebuild
deleted file mode 100644
index f0969dd38cbf..000000000000
--- a/sys-block/partimage/partimage-0.6.9.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils flag-o-matic pam user
-
-DESCRIPTION="Console-based application to efficiently save raw partition data to image file"
-HOMEPAGE="http://www.partimage.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="nls nologin pam ssl static"
-
-LIBS_DEPEND="app-arch/bzip2
-	>=dev-libs/newt-0.52
-	>=sys-libs/slang-2
-	sys-libs/zlib
-	ssl? ( dev-libs/openssl )"
-PAM_DEPEND="!static? ( pam? ( virtual/pam ) )"
-RDEPEND="${PAM_DEPEND}
-	!static? ( ${LIBS_DEPEND} )"
-DEPEND="${PAM_DEPEND}
-	${LIBS_DEPEND}
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	enewgroup partimag 91
-	enewuser partimag 91 -1 /var/lib/partimage partimag
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-zlib-1.2.5.2.patch #405323
-	epatch "${FILESDIR}"/${P}-minor-typo.patch #580290
-}
-
-src_configure() {
-	# XXX: Do we still need these?
-	filter-flags -fno-exceptions
-	use ppc && append-flags -fsigned-char
-
-	local myconf
-
-	use nologin && myconf="${myconf} --disable-login"
-
-	if use pam && ! use static; then
-		myconf="${myconf} --enable-pam"
-	fi
-
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--sysconfdir="${EPREFIX}"/etc \
-		$(use_enable nls) \
-		$(use_enable ssl) \
-		--disable-pam \
-		$(use_enable static all-static) \
-		--with-log-dir="${EPREFIX}"/var/log/partimage \
-		${myconf}
-}
-
-src_install() {
-	default
-
-	keepdir /var/lib/partimage
-	keepdir /var/log/partimage
-
-	newinitd "${FILESDIR}"/partimaged.init.2 partimaged
-	newconfd "${FILESDIR}"/partimaged.conf partimaged
-
-	if use ssl; then
-		insinto /etc/partimaged
-		doins "${FILESDIR}"/servercert.cnf
-	fi
-
-	if use pam; then
-		newpamd "${FILESDIR}"/partimaged.pam.2 partimaged
-	fi
-}
-
-confdir=${EROOT}/etc/partimaged
-privkey=${confdir}/partimaged.key
-cnf=${confdir}/servercert.cnf
-csr=${confdir}/partimaged.csr
-cert=${confdir}/partimaged.cert
-
-pkg_config() {
-	if use ssl; then
-		ewarn "Please customize /etc/partimaged/servercert.cnf before you continue!"
-		ewarn "Press Ctrl-C to break now for it, or press enter to continue."
-		read
-		if [ ! -f ${privkey} ]; then
-			einfo "Generating unencrypted private key: ${privkey}"
-			openssl genrsa -out ${privkey} 1024 || die
-		else
-			einfo "Private key already exists: ${privkey}"
-		fi
-		if [ ! -f ${csr} ]; then
-			einfo "Generating certificate request: ${csr}"
-			openssl req -new -x509 -outform PEM -out ${csr} -key ${privkey} -config ${cnf} || die
-		else
-			einfo "Certificate request already exists: ${csr}"
-		fi
-		if [ ! -f ${cert} ]; then
-			einfo "Generating self-signed certificate: ${cert}"
-			openssl x509 -in ${csr} -out ${cert} -signkey ${privkey} || die
-		else
-			einfo "Self-signed certifcate already exists: ${cert}"
-		fi
-		einfo "Setting permissions"
-		partimagesslperms || die
-		einfo "Done"
-	else
-		einfo "SSL is disabled, not building certificates"
-	fi
-}
-
-partimagesslperms() {
-	local ret=0
-	chmod 600 ${privkey} 2>/dev/null
-	ret=$((${ret}+$?))
-	chown partimag:0 ${privkey} 2>/dev/null
-	ret=$((${ret}+$?))
-	chmod 644 ${cert} ${csr} 2>/dev/null
-	ret=$((${ret}+$?))
-	chown root:0 ${cert} ${csr} 2>/dev/null
-	ret=$((${ret}+$?))
-	return $ret
-}
-
-pkg_postinst() {
-	if use ssl; then
-		einfo "To create the required SSL certificates, please do:"
-		einfo "emerge  --config =${PF}"
-		partimagesslperms
-		return 0
-	fi
-	chown partimag:0 "${EROOT}"/etc/partimaged/partimagedusers || die
-}
diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest
index 40d6a71d526f..d359332aa56b 100644
--- a/sys-block/tgt/Manifest
+++ b/sys-block/tgt/Manifest
@@ -9,5 +9,5 @@ EBUILD tgt-1.0.74.ebuild 1511 BLAKE2B 4deca6da9f562fe1d25269d7513d6dc66c6f94cd94
 EBUILD tgt-1.0.75.ebuild 1511 BLAKE2B c13d8c0f3d029a51fc0715039e6e4dbbe68e9ccee82ee8e8b65b03ec886613d1e5fafed8d715f72ff69071fdc6edd024c215a994fde51e82122951f27a58fde3 SHA512 24982df2fe02801733108453122096048974534314aef9c034a988ed0d8a1d8c08e1bc98f295773d278e99e07e489bbf1c38f96191089e8eda73f727c7fae39c
 EBUILD tgt-1.0.76.ebuild 1511 BLAKE2B 92111f2f2ba394c243898b48a2e08925323c2b2b4fd8c89cb6bd7f3a0791d3c752bdaeb70c3daa225c3e4684955e8ce77455a52d31368df7a4a3fc17c294e0fd SHA512 0522174785a977933513c6ab71741928806b4b113cfed918fed68051c12ebb458b8cf94361ad356e264e4ec3563f7940e2b78fd7babac76c1d519e55c40d53a0
 EBUILD tgt-1.0.77.ebuild 1511 BLAKE2B 4617ed3355872a200db6b3f0436a383368936f187797de30fb895a01f89a9a3c1fb5efa6848f3d2475760f425e374c1a281cb9943e4fa9dc6fd4576c035dbb9f SHA512 7c45a432e8a250d7ebf20c441e44b662520db2884079c51e4abf88c3b45882a9df0cefb34355e669b317e25f312bff41c220c46c929ea6e91a880c9b564b48de
-EBUILD tgt-1.0.78.ebuild 1513 BLAKE2B 6efe11c81889f519bae8a04a59162c3d0d533dfca11b4cba234ee42c10b0c80a1092da0105c55117779c0ea9f642d3a4e08e9f86968042b60a098b7b9eb37faa SHA512 e720c050f0ad4d3605f04881b37b822053e74bc3d92d75bf119ecb0e70dee64194ce764b00a7184151bd2c46d97a2a7c798f1c6910086974717dbdd94c4b96f0
+EBUILD tgt-1.0.78.ebuild 1513 BLAKE2B 7755f2e49b5da14fc5dc92822415b9513baf7ba99d069eb68a59d39671bb97d5faa4fb03d13e009784e8bdb9a3fd2cb3e72c5f82ff3ced2373baede9955aa64c SHA512 139575d1fa99bad1158da69ce19668b301acd9877451a2b86a44a6ded37b6aa7b41768b43a984a8ec1597692355bc2151fd988f5b003620772e962da0c07123f
 MISC metadata.xml 825 BLAKE2B 89a6844eade4098443db47dcd5b3350c1bd6f4c0ffbdb6277df5714fdfd248d056f770f05e1392d64b573a28ca9db140dc7130e0109075c7fd398677ca251af9 SHA512 0c75be2e830ff683c8cae93175504a1e6508131d704c48d31b9fe98baa6b3a1e491661fda6180c0c1e35ef7e9bd57309d05e07b41160a7cc090934913e186f9f
diff --git a/sys-block/tgt/tgt-1.0.78.ebuild b/sys-block/tgt/tgt-1.0.78.ebuild
index 92920604e245..4c99c173bf49 100644
--- a/sys-block/tgt/tgt-1.0.78.ebuild
+++ b/sys-block/tgt/tgt-1.0.78.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 inherit flag-o-matic toolchain-funcs
 
-MY_TREE="355a4fa"
+MY_TREE="159138e"
 
 DESCRIPTION="Linux SCSI target framework (tgt)"
 HOMEPAGE="http://stgt.sourceforge.net"
diff --git a/sys-block/thin-provisioning-tools/Manifest b/sys-block/thin-provisioning-tools/Manifest
index 6ee14444b78a..cef6ea6449ba 100644
--- a/sys-block/thin-provisioning-tools/Manifest
+++ b/sys-block/thin-provisioning-tools/Manifest
@@ -1,13 +1,12 @@
 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
+AUX thin-provisioning-tools-0.8.5-libaio-0.3.112.patch 2516 BLAKE2B 22c2293a00838a1207a0892e93985c8350b5d8f75d1e1eecab4d74346780be57d82f40a44f3cee49e14fbc7bb5d50f62b110c7a34295a0fa76f98374003e3feb SHA512 a53dab2e755221daf3c38602a537f32fc60128cffef60ad309711c8c4e528c5ea888f8904c5f34597f1df023b4ad0b82b609c944095f8e628d66519178a1ab52
 DIST thin-provisioning-tools-0.7.0.tar.gz 230595 BLAKE2B 00238a682f80600e3a5bb6d0d2a9662bd0fd3ae5404d5895427f169640b469780f554c22c6a93187058e6399c76ba14a6fa8d73f2bb09aa79927dd458b58ffa9 SHA512 cb6c44c7215aadd72292d73e2374d8c0c28566adcb10c7a3de83576dbd28649ebba6e2cc59945a28921e423540969cb21f648c37e375d68f48e56a8be4a4c7b8
 DIST thin-provisioning-tools-0.7.6.tar.gz 285428 BLAKE2B af74eff6d435f00e347872786fee8627f02844af122a9f1bf9ffd00234ce5275d3a61d9b4204313a19813cadbc0197bbeb9a1bd92d55992c6d9a03a299579e29 SHA512 395035b6f59fafb1c0f3e68750611e04f10223bc8d57b257e25c28c928647d1d2c6e94014b64ed90eeae1151fc7e5d23cf1aa428716e343338cb3c8fe55ed704
-DIST thin-provisioning-tools-0.8.1.tar.gz 305013 BLAKE2B 647942c6b882ea12ff0429157b72c3fa2ef0d20abae003be4823383dff20b18bc7c447805cbea023c33698f3b00aaed0b5560b08844e2d3a35199b78a9acb871 SHA512 8f1edb7e50b897a070c6c04ea9c43725db3d725d6afcb5349bdedba59fce29faa680cd79bb47f255700054ee89e80f7063cde4c8abaa172e560f22459e004ce6
-DIST thin-provisioning-tools-0.8.2.tar.gz 305022 BLAKE2B ad4f7c088d890e111679a8de041ef0e05c30c5f4a46e96f7d0e1ca8034426d047dc9d2bbad624ba5e9371a5ebdd5be55ebc9486ed38c18c6fb764f8339806f3d SHA512 3aeaef4e720a14605181b700200ce6283e0e230034e5e787164a28043ae622f932e4fe8c166bc982e5e2e987cb2530027af08cc84443b2519cfbfc607c2b4681
-EBUILD thin-provisioning-tools-0.4.1.ebuild 1295 BLAKE2B d41882d0b24f3641e6de64f115918ea9d90ba4f1bcdde9d710e12fd2d2352157119e5ac9816386cdfd7816b1b9f1e7a3b1467518b9aa0373ba7541082a035523 SHA512 c4360645c8cdcb3a1d85590630b077aa3ff0c658a4ee3a42c51c7ab807bdb535abc6ea12a4ec7a953cffa75a3a77b50a04fb40142da817543ee00e2a36fd55e9
-EBUILD thin-provisioning-tools-0.7.0.ebuild 1306 BLAKE2B 30c35547bef9b7df248dd86d85d3a39868ae3573c4b6b9f81d5b85dfed98524ff64c17c54727f131eb479c1fcd54ff8bd9029026e799842da9e1cf9c651fe0da SHA512 67f0ee4b13d52bb480733ed5a94e1300918b518687ea511e604cff921712c93da478a305ef9ee3b82972ee085d9d5498b611bc7050b64e43fe11ad8a4f29b5be
+DIST thin-provisioning-tools-0.8.3.tar.gz 305338 BLAKE2B 619f73ef7bd802eb72649d0bdaa8ce1d6afb4d7ae442ac7d2d709764aaa5058bf77b12710a332cf5f8215cfb94e1d63c189951058e2373467ca88c847e32cd8d SHA512 a69645d45fd62a487903a07f922fd622b5fb9c7858e656b9468903005ab7daa3098aa89ae356f2458fcf95e3c0672bf486b424553d82ffae54b83c0b71599541
+DIST thin-provisioning-tools-0.8.5.tar.gz 305585 BLAKE2B 7e4bde537535db79e97ddab3cba775c89854362dac7da491c040badf5e3546d2e6ac4b8da8462edb59f50a2ecd95fe9c5e3349fca5e9acd588efaaf990617ca4 SHA512 1f9a1b6b9059f0b23ec3a00ddef223599292d447894316525f13b9c1e4f29d0371cb901d199cb503be4342555e016e5e6eb2d6e0e10c44b08e6c9478c573e1d4
+EBUILD thin-provisioning-tools-0.7.0.ebuild 1305 BLAKE2B 0a7ff0dc3d9051262d35ecd614043e43244b3b53038e56d18cae2933b839ea2f148aa0cad5e775dbc88b432dfe9695c764f8e43deb542934079443a4cf78f920 SHA512 8eb3e578dc7810e70b79d6476e3cf814e0838d6e03644cc507240dcc14cc240b387460389443718fbadc87c1a79e63f4a5ee15de3f27400c8f9aa6ca1e173cc1
 EBUILD thin-provisioning-tools-0.7.6.ebuild 1320 BLAKE2B 9e6308a4d050c42ef84b12d60fb11a0fdd122060127a8e5b44b1e48fa2e75bfd2186bec24fcab46afe104408b76b8655685db4b34850eab748928b27b2edd9e9 SHA512 72e4fb319e715afc5af130fc4d2cfb5d80992bbb9e803b4d8d8a63c46da9df66997f4862ce6d39c7b4895c6a8cec7260e3b4baca09500acf1bb9b2e9cccf91e8
-EBUILD thin-provisioning-tools-0.8.1.ebuild 1494 BLAKE2B bf3e6d902de15d0d15069b16a4f9cda59d67613c9686d07d389d32a7a69772a590ad2fa49977373cc22714d76d2e45af92a143577d89aa1ea85f58525b70ca0c SHA512 dd917a0dddb1846c65a5c7e394c81df1b4ec4e584c3c18aa49633e2084c17c8b0716c23fd54c0e96e9bf9a93ccff63788e258c6f2d54cce159d3191e86f73dab
-EBUILD thin-provisioning-tools-0.8.2.ebuild 1492 BLAKE2B df177df671080545e68ef381dea34b0a64a03f3c57ed88c184d1b893dd5a6f0a688b02c171f840bfb166eacb27f905c65f982fa26d56cbba7a7b3685d1081ff4 SHA512 41942199c194f92521cc2476502ac7405dc3c1f23a8f5a232ffb2edaa5a5407a27ad6a690991414b768c5277ead1f148e02236fe9f195c61eaae4b9d84d2bf61
+EBUILD thin-provisioning-tools-0.8.3.ebuild 1492 BLAKE2B df177df671080545e68ef381dea34b0a64a03f3c57ed88c184d1b893dd5a6f0a688b02c171f840bfb166eacb27f905c65f982fa26d56cbba7a7b3685d1081ff4 SHA512 41942199c194f92521cc2476502ac7405dc3c1f23a8f5a232ffb2edaa5a5407a27ad6a690991414b768c5277ead1f148e02236fe9f195c61eaae4b9d84d2bf61
+EBUILD thin-provisioning-tools-0.8.5.ebuild 1540 BLAKE2B a8f83d0cec08c5418020093c521e3576170369bfa1365478d4d5e4b697b99c546d9c253efd958d0cb0bbdb2b169cdd1a8e97989fd7da69573bd1e90bd3f1223f SHA512 9cea7b24cd3249834bf38c4377bddd219e8df5f4b1f593d5d1793730fbbdc528fde68f8ee68f2f3bef7114aaf11ada86b3162908e9a179fbc1c95e7fb6324bda
 EBUILD thin-provisioning-tools-9999.ebuild 1492 BLAKE2B df177df671080545e68ef381dea34b0a64a03f3c57ed88c184d1b893dd5a6f0a688b02c171f840bfb166eacb27f905c65f982fa26d56cbba7a7b3685d1081ff4 SHA512 41942199c194f92521cc2476502ac7405dc3c1f23a8f5a232ffb2edaa5a5407a27ad6a690991414b768c5277ead1f148e02236fe9f195c61eaae4b9d84d2bf61
 MISC metadata.xml 531 BLAKE2B 37dbd49f21f2816fec9f5b620dae0e5d95f4233bedfcdcdd54d573899fc3aaf48ff6c82b62ceeb36f400924889ca52f3f826ed62c8333bc2723c40e1fe697117 SHA512 80fde34da9de5b2436c096bc9051ccb55124c330dc82ac538f66a100225623aa7cb0869041179999608cc52613e40ba464b46630cff52423c13d1a374eb98ed0
diff --git a/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.8.5-libaio-0.3.112.patch b/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.8.5-libaio-0.3.112.patch
new file mode 100644
index 000000000000..af31b90a40b7
--- /dev/null
+++ b/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.8.5-libaio-0.3.112.patch
@@ -0,0 +1,84 @@
+From 6332962ee866f5289de87ab70cd3db863298982c Mon Sep 17 00:00:00 2001
+From: Joe Thornber <ejt@redhat.com>
+Date: Wed, 5 Jun 2019 15:02:05 +0100
+Subject: [PATCH] [ft-lib/bcache] rename raise() -> raise_()
+
+Name clash with signal.h on Debian and Gentoo.
+---
+ ft-lib/bcache.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/ft-lib/bcache.c b/ft-lib/bcache.c
+index 0dca5031..ee5b6c59 100644
+--- a/ft-lib/bcache.c
++++ b/ft-lib/bcache.c
+@@ -31,7 +31,7 @@ static void warn(const char *fmt, ...)
+ }
+ 
+ // FIXME: raise a condition somehow?
+-static void raise(const char *fmt, ...)
++static void raise_(const char *fmt, ...)
+ {
+ 	va_list ap;
+ 
+@@ -51,7 +51,7 @@ static inline struct list_head *list_pop(struct list_head *head)
+ 	struct list_head *l;
+ 
+ 	if (head->next == head)
+-		raise("list is empty\n");
++		raise_("list is empty\n");
+ 
+ 	l = head->next;
+ 	list_del(l);
+@@ -98,7 +98,7 @@ static struct cb_set *cb_set_create(unsigned nr)
+ static void cb_set_destroy(struct cb_set *cbs)
+ {
+ 	if (!list_empty(&cbs->allocated))
+-		raise("async io still in flight");
++		raise_("async io still in flight");
+ 
+ 	free(cbs->vec);
+ 	free(cbs);
+@@ -713,13 +713,13 @@ struct bcache *bcache_simple(const char *path, unsigned nr_cache_blocks)
+ 	uint64_t s;
+ 
+ 	if (fd < 0) {
+-		raise("couldn't open cache file");
++		raise_("couldn't open cache file");
+ 		return NULL;
+ 	}
+ 
+ 	r = fstat(fd, &info);
+ 	if (r < 0) {
+-		raise("couldn't stat cache file");
++		raise_("couldn't stat cache file");
+ 		return NULL;
+ 	}
+ 
+@@ -751,7 +751,7 @@ void bcache_destroy(struct bcache *cache)
+ static void check_index(struct bcache *cache, block_address index)
+ {
+ 	if (index >= cache->nr_data_blocks)
+-		raise("block out of bounds (%llu >= %llu)",
++		raise_("block out of bounds (%llu >= %llu)",
+ 		      (unsigned long long) index,
+ 		      (unsigned long long) cache->nr_data_blocks);
+ }
+@@ -802,7 +802,7 @@ static struct block *lookup_or_read_block(struct bcache *cache,
+ 		// FIXME: this is insufficient.  We need to also catch a read
+ 		// lock of a write locked block.  Ref count needs to distinguish.
+ 		if (b->ref_count && (flags & (GF_DIRTY | GF_ZERO)))
+-			raise("concurrent write lock attempt");
++			raise_("concurrent write lock attempt");
+ 
+ 		if (test_flags(b, BF_IO_PENDING)) {
+ 			miss(cache, flags);
+@@ -858,7 +858,7 @@ struct block *get_block(struct bcache *cache, block_address index, unsigned flag
+ 		return b;
+ 	}
+ 
+-	raise("couldn't get block");
++	raise_("couldn't get block");
+ 	return NULL;
+ }
+ 
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.4.1.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.4.1.ebuild
deleted file mode 100644
index 5466c28be1cd..000000000000
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.4.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="A suite of tools for thin provisioning on Linux"
-HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
-EXT=.tar.gz
-BASE_A=${P}${EXT}
-SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}${EXT} -> ${BASE_A}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-libs/expat
-	dev-libs/libaio"
-DEPEND="${RDEPEND}
-	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"
-
-src_prepare() {
-	sed -i -e '/^INSTALL_PROGRAM/s:-s::' Makefile.in || die
-	sed -i \
-		-e '/^unit-tests\/unit_tests:/s:lib/libgmock.a::' \
-		-e '/-lgmock/s:$: -lgtest:' \
-		unit-tests/Makefile.in || die #493440
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--prefix="${EPREFIX}"/ \
-		--bindir="${EPREFIX}"/sbin \
-		--with-optimisation='' \
-		$(use_enable test testing)
-}
-
-src_compile() {
-	MAKEOPTS+=" V="
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" MANPATH="${D}"/usr/share/man install
-	dodoc README.md TODO.org
-}
-
-src_test() {
-	emake unit-test
-}
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild
index 018fa6001355..b945b92a8b9a 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild
@@ -11,7 +11,7 @@ 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"
+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(+)]
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.2.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.3.ebuild
index f230773175a1..f230773175a1 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.2.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.3.ebuild
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.1.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.5.ebuild
index 8b0eb97b2165..037f7951d172 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.1.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools flag-o-matic
 
@@ -39,6 +39,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.7.0-build-fixes.patch
+	"${FILESDIR}"/${PN}-0.8.5-libaio-0.3.112.patch
 )
 
 src_prepare() {
@@ -67,6 +68,6 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" DATADIR="${D%/}/usr/share" install
+	emake DESTDIR="${D}" DATADIR="${D}/usr/share" install
 	dodoc README.md TODO.org
 }