gentoo resync : 05.02.2020

17 files changed, 232 insertions, 30 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 41eb3a3a7647..256c859d4c9c 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/arcconf/Manifest b/sys-block/arcconf/Manifest
index 885d7aa9ec15..c9a92c995111 100644
--- a/sys-block/arcconf/Manifest
+++ b/sys-block/arcconf/Manifest
@@ -1,5 +1,7 @@
 DIST arcconf_v2_01_22270.zip 47168976 BLAKE2B 95693a1408e5a4d0d638bbf265f2e1e64247dfec2b1078b56860c5fcd4b13ffa5967bfb9967abfd4b79c788aaeb20759b3a9070a84b083c1653e4868a96ac4cf SHA512 0f91a697c44ea0c0561bec9e432e7d4eba8eb8a2b0255a9867bdb183f81e745aee1dcc2b0017847803dbb27f55cad3e985f4bcd3a202c52f5b557fb724e94d9e
 DIST arcconf_v3_01_23531.zip 76188493 BLAKE2B bb939262e89a76fe28cca60ce647df53bd66625d8273cf80ad0b9daa31de8ac33d181a5ad864e52ce5b599d9631a503d2e4a132ec3369b67f0e12887a4bccc0c SHA512 93ab1b5f3f35ad403ac52456ffb16b5b57c4851dbaa3d4922194b29b72957944a0a3e02346362f62b3f6ba5f73394a3720a1f5a371b34e9a03f31bd793348822
+DIST arcconf_v3_03_23668.zip 83570233 BLAKE2B 938c7c7dcc3cd6d4a0cb85b3240be5b61397b57c9bd3fdc2fd2541d5cae543f1a31613e1fa0281c1ab3be3f37e794ce16820b0e0d63a8e6671599352a79eb80f SHA512 5b1f173784f4d08a929fb71371baf4340e23c1cb9eb7ba9728a44e32a23ca268ec3f984f44e13b6ce235ee07e49a5befb1eebc67fc6f23736425ce79501a373c
 EBUILD arcconf-2.01.22270-r1.ebuild 976 BLAKE2B 0a01569201cfc356bf515ba378b473231ea071f5d158e75fc54f471bb4a30720045fb5efc5704e36095d948f6d4c0eac57992dcb46754ffd0e3bfe66c8eb0d9e SHA512 e47138663ccd6f0e1f89dc9481bbd0a866fb179aa6a06e12102931ca617c5d76c3103a421e161bbce23f01d372f09ad30cbdb3d4ea8e65590caa45ea4358f80b
 EBUILD arcconf-3.01.23531.ebuild 945 BLAKE2B 8558110c3399589ecb2d57d964b3a2bbe8fa7b0b170d01dbf779b8baccf26a1a01c9b2fd1d7f7da740b2cf4809565c055ef5092dd1e93df358cb0b963e7786f7 SHA512 3d762d943fecc99eb952789f246a51dacec22cf036fa2c601e291230a70ab2ff146c604977e3f58182e0500e25db5fa0fdfc99d6d49f92dd1e6870d1524446c5
+EBUILD arcconf-3.03.23668.ebuild 946 BLAKE2B e1a27185c17d2dac58d4fa740bb0d8a9cc8f15d6b387cb46e1ae9303356bb82afdfc5679ff4e8334b3e21069f3e1c058631473e473c2d074aa5b079eedbd7892 SHA512 4d0069bfde1a2cc946c3f9b4dc86d439b525624db8cc91befcd37e9efd500912b94d667543fb2c1772eb5c9e587485471743e105365f1fc76d8f6a6448daa305
 MISC metadata.xml 819 BLAKE2B db0209c49563799b6e71389de7f139c9590406e24272bacd67f667fd544d66aedbf0869d4dc09ca1590601ab0f1a5393a618c408d66e3a447854f0f47df5f99a SHA512 a8e9ba3d80eb67f5ece7d1e1ef4dd7c77da021000daad99fdb191ec59aba378421c6a313a43c13560909fa08e1edbb68baeb700c5a8e012be0f60439a12c6182
diff --git a/sys-block/arcconf/arcconf-3.03.23668.ebuild b/sys-block/arcconf/arcconf-3.03.23668.ebuild
new file mode 100644
index 000000000000..1595e76bab6f
--- /dev/null
+++ b/sys-block/arcconf/arcconf-3.03.23668.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="v${PV//./_}"
+
+inherit linux-info
+
+DESCRIPTION="Microsemi Adaptec RAID Controller Command Line Utility"
+HOMEPAGE="https://www.microsemi.com/"
+SRC_URI="https://download.adaptec.com/raid/storage_manager/${PN}_${MY_PV}.zip"
+
+LICENSE="Microsemi"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="fetch mirror bindist"
+
+S="${WORKDIR}/linux_x64"
+
+QA_PREBUILT="usr/bin/arcconf"
+
+pkg_nofetch() {
+	elog "Please download ${A} from"
+	elog "https://storage.microsemi.com/en-us/speed/raid/storage_manager/${PN}_${MY_PV}_zip.php"
+	elog "and place it in your DISTDIR directory."
+}
+
+pkg_setup() {
+	# CONFIG_HARDENED_USERCOPY_PAGESPAN makes ARCCONF segault
+	if linux-info_get_any_version && linux_config_src_exists ; then
+		CONFIG_CHECK="!HARDENED_USERCOPY_PAGESPAN"
+		check_extra_config
+	fi
+}
+
+src_install() {
+	dobin arcconf
+}
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index b9a592337a33..8a11fee5c57c 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -12,6 +12,7 @@ EBUILD fio-2.15.ebuild 2693 BLAKE2B 302c54d0b33a6b4a14e1a19ff8cb1848438d87a27328
 EBUILD fio-2.16.ebuild 2907 BLAKE2B b524791f0ecea03ae3a17994295224963fb9eb10b2b339f4dbdcbb546fbafd24cf905777817878cecd22df2158f84ed1ddfc6d311909ca569bd5ef91da0f1218 SHA512 ae8bd404cddedd37a41729e1ec570df997dd9b4484daa9e77a75c4887ee0bb26d5cffbb015fd1e154103d276f2db11486bb49d09b8dbc897f3d5ba5865fb1559
 EBUILD fio-3.16-r1.ebuild 3597 BLAKE2B bf428d5695302fc3014dc0708b17c1457ec5f2bc54785f66acd54c7737ce9678fc98d96fb18784a4c8934b7a5964342493e24c98f2df116412e4acefe0658180 SHA512 b1ce7d1e31dcd2f1f2368d76459870ff1b157c3e311adfab62553105209cbea16a898b4e5ba53216eb97dedfa7b72409e072252d1931c702cc5d9ad255745aec
 EBUILD fio-3.16.ebuild 3546 BLAKE2B 95eb92a3c0e390bd9a1b4c7e02a0025031d1d3f203df1a03813e40db7f4a9550847ca36bd6b11c9aaa82b9e29afd3368ec039d1d96f1017611f965abb3462d3a SHA512 090fa98cad51a50de4120a9c61bba262fe26564dae5075d010b18d1a72f722db0a3c7630c212a2c54f5d07c8d2bb21d380268796b98e1054ca1721c2c7a5b9a7
+EBUILD fio-3.17-r1.ebuild 3954 BLAKE2B 07679b26b26d69613f78e30f26675cbfc55a96afb4091df1805828d3622cc5635332d7eb47c71ee0d8aa2d43197f333c0bb4d58a85eaf55061f7512e91bd42ec SHA512 2ab44da6d7c1fea4360ee4688302a5e3f823e0f1341168fbd35ba1942b7d225e1bfc745e09bfe8a0bd9ecd34dc340e23a2cf3fe7233872ea1c4d940af5aefba0
 EBUILD fio-3.17.ebuild 3558 BLAKE2B f99a7063106935000160b8402bdd6eb5ce06235364b68ffb05aa344fcfc73f695fdb4e5d305babb0899e1416f74703f3eb5f5efc8d75553305be0d2f0547429a SHA512 2219b427895295e6c4c5914c3eaf6c2fe71f2f1330196fc0debeef598d4d88006011172227d24a8798544ec41561ef8919663431746f05f782d115ebfbb9132b
 EBUILD fio-3.2.ebuild 2855 BLAKE2B 9496bc95ff5ad4511285897285904b352e8e5e1ba547f8eed4932bece1b98f229c7677405c3f6af7e6948ab710e13d79612b94d9442f8371f63cd2a15003b9c6 SHA512 72db1a54e4e876142a7e4c1b16fa467fc0024a1d67eda20a77c97a9685833a03d5a0acaa54b07e0e62e3e12ebd128d2e49ccd58e36758f70c62ca9df25d09bd1
 EBUILD fio-3.7.ebuild 3006 BLAKE2B 0803b0f384761f77702d0e844767152c2f23f76291a3685bc2364d2a7dd2b781ea2170ec0da781ed4017c4821953b6d7a5ff7abfd1beac65687de2487a240724 SHA512 bc261cda042724608ec4e89e5b16bd96799d3ca72e87e19d32f3d95e30f6ca36f7d5e1ece54a125aaea7ddad49a59ae96b7ef52e5177fd158b5f934a15590b91
diff --git a/sys-block/fio/fio-3.17-r1.ebuild b/sys-block/fio/fio-3.17-r1.ebuild
new file mode 100644
index 000000000000..87a629536db1
--- /dev/null
+++ b/sys-block/fio/fio-3.17-r1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python2_7 python3_6 )
+
+inherit python-r1 toolchain-funcs
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Jens Axboe's Flexible IO tester"
+HOMEPAGE="https://brick.kernel.dk/snaps/"
+SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="aio curl glusterfs gnuplot gtk libressl numa python rbd rdma static tcmalloc zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	libressl? ( curl )
+	gnuplot? ( python )"
+
+BDEPEND="virtual/pkgconfig"
+
+# GTK+:2 does not offer static libaries.
+LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
+	curl? (
+		net-misc/curl:=[static-libs(+)]
+		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	)
+	glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
+	gtk? ( dev-libs/glib:2[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	rbd? ( sys-cluster/ceph[static-libs(+)] )
+	rdma? (
+		sys-fabric/libibverbs[static-libs(+)]
+		sys-fabric/librdmacm[static-libs(+)]
+	)
+	tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] )
+	zlib? ( sys-libs/zlib[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	gtk? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+RDEPEND+="
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]')
+	)
+	gnuplot? ( sci-visualization/gnuplot )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/fio-2.2.13-libmtd.patch
+	"${FILESDIR}"/fio-3.16-verify_only_numberio.patch
+)
+
+python_check_deps() {
+	has_version "dev-python/pandas[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+
+	sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
+
+	# Many checks don't have configure flags.
+	sed -i \
+		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
+		-e '/if compile_prog "" "-lz" "zlib" *; *then/  '"s::if $(usex zlib true false) ; then:" \
+		-e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
+		configure || die
+}
+
+src_configure() {
+	chmod g-w "${T}"
+	# not a real configure script
+	# TODO: pmem
+	set -- \
+	./configure \
+		--disable-optimizations \
+		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
+		--cc="$(tc-getCC)" \
+		--disable-pmem \
+		$(usex curl '' '--disable-http') \
+		$(usex glusterfs '' '--disable-gfapi') \
+		$(usex gtk '--enable-gfio' '') \
+		$(usex numa '' '--disable-numa') \
+		$(usex rbd '' '--disable-rbd') \
+		$(usex rdma '' '--disable-rdma') \
+		$(usex static '--build-static' '') \
+		$(usex tcmalloc '' '--disable-tcmalloc')
+	echo "$@"
+	"$@" || die 'configure failed'
+}
+
+src_compile() {
+	emake V=1 OPTFLAGS=
+}
+
+src_install() {
+	emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
+
+	local python2_7_files=(
+		"${ED}"/usr/bin/fiologparser_hist.py
+		"${ED}"/usr/bin/fiologparser.py
+	)
+	local python_files=(
+		"${python2_7_files[@]}"
+		"${ED}"/usr/bin/fio_jsonplus_clat2csv
+	)
+	if use python ; then
+		sed -i 's:python2.7:python:g' "${python2_7_files[@]}" || die
+		python_replicate_script "${python2_7_files[@]}"
+	else
+		rm "${python_files[@]}" || die
+	fi
+
+	local gnuplot_python2_7_files=(
+		"${ED}"/usr/bin/fio2gnuplot
+	)
+	local gnuplot_files=(
+		"${gnuplot_python2_7_files[@]}"
+		"${ED}"/usr/bin/fio_generate_plots
+		"${ED}"/usr/share/man/man1/fio_generate_plots.1
+		"${ED}"/usr/share/man/man1/fio2gnuplot.1
+		"${ED}"/usr/share/fio/*.gpm
+	)
+	if use gnuplot ; then
+		sed -i 's:python2.7:python:g' "${gnuplot_python2_7_files[@]}" || die
+		python_replicate_script "${gnuplot_python2_7_files[@]}"
+	else
+		rm "${gnuplot_files[@]}" || die
+		rmdir "${ED}"/usr/share/fio/ || die
+	fi
+
+	# This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
+	rm "${ED}"/usr/bin/genfio || die
+
+	dodoc README REPORTING-BUGS HOWTO
+	docinto examples
+	dodoc examples/*
+}
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index 7295fb75bf88..cdc530f1b3b5 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1,5 +1,5 @@
-DIST gparted-0.33.0.tar.gz 3917056 BLAKE2B 7d5eed87701f8c1f8125103a1b25fd58378aadee7faf3bba05f19ea94a6670687b190eb070cee792a205245dc7e5828caca7358cc59792adc8372c9907341772 SHA512 07b3f8ef355ce6c3302ed4747b9f542f1e231555c5ef39e758ee9a658bb14c9db2742af7f472a866bd122eb1ad9b2d45fd921484abb4ee319df1f15a74829f32
 DIST gparted-1.0.0.tar.gz 3980258 BLAKE2B 4c0e7c36e2cd4dde68ee27b67e11a529c27fd22f0d93f6a8d1c6932b3728eead9c8aa282ff7e26c7e9922f0f7991ab3c5d72a7bd968708aac2c6b1e7f59bb5a5 SHA512 88eef4e4fbd51d9a9a3bdfb0a9738f6957ec5cbc21c2f93febf0d4cfe927e0ae3cb8cb1a9b2ca956a55dc62b9228ec76107e3e4701623be6474c99678c9197be
-EBUILD gparted-0.33.0.ebuild 2110 BLAKE2B 6c2533f90b6ac8538c8913d0eec0713b0ce6d46e70919a166ce064f650bd96a4500d2d2f845cf43b47554101363401ec6327c2f1638c957571b30caefd6edc1e SHA512 074f2039ae46794b848e536269ba3dc958ab38bf2c6236260933a54cae3b005526c4566ee6b4fa594beae86890965d24772b2b81f92ed07bb121456bfe206ebc
-EBUILD gparted-1.0.0.ebuild 2125 BLAKE2B 00c3dc40b21a4ffed69721ac6d3b9cd42aaa1644ad3b205f68b1ebcbec427635d59f2f83e9a1cb33f5400036f6e111a684dd6b0f88cfc5288b96bdb574650208 SHA512 d6557d732b7d8bc0a020fea56ce801447872aa47d50e054aff0b91b38f2017ca1e585561e3701c1189483766387505a175541e97166a5f451a9fae35f65c7e87
+DIST gparted-1.1.0.tar.gz 4032829 BLAKE2B d47d45e77a3d9dc29e9fa0428aaa7c12bb863cb70ac11f4055cbcc0a0fde8019fbb20266b7f810d6a47c5239248486049c8e9813ead8e88081dd16f445da036a SHA512 afaad690fccbec7385b078a299b78bf4f0f83999e2661f89cb97f9e8f2b30ee41f0535450075e3a7174967e77c75024df78863d0d90d5e8dc726a487b4ae0bae
+EBUILD gparted-1.0.0.ebuild 2121 BLAKE2B 372a5500afb8252587dc60586b4cd9c4b42e1f29fc02905f994f1123498a7e76336a0e00037f5cd9b84cc1d9e77ca86b79adb1c5f7233b4d768c291797b020d0 SHA512 3e23f1a9f9ae949003150289d85d140ed6743d9d2894678a1d5346cd9200ddb9426c94e6645c000b82de71c87e8130bbd637833d49417315d30d33b38783cf3b
+EBUILD gparted-1.1.0.ebuild 2169 BLAKE2B 85ceb59f7af5047b0e3e96ab7ee812ece15673067936c360adbd5ff8e638b73f9254e2c2b84d9817a4266e6b2298a1b4c6b19d51907f044062df06c0e2041831 SHA512 df10e1dcc85941d9b8d8b8bd2602940b1073043585e98b409ba6426bba7684988d10d27fd02577cee961366a8e07593eb70e33d77508cfaa35774a409197f88c
 MISC metadata.xml 2003 BLAKE2B c1568f7b030ae6d3f0ddc3724424bac3701fd470a535c5cedb8c5fb01f2c7f4f20476075be0033dacaf59bc9797f155c7fecc7ea4ef19ac4545454c275b82010 SHA512 03814c5741c01c342ebaa7b4923253f8efeb7beeb5026866dbc8a28ce1b3c3562c06eff108a15f2365070d389a84fe6d498bde39ed0632a63cf1eef412b3b97b
diff --git a/sys-block/gparted/gparted-1.0.0.ebuild b/sys-block/gparted/gparted-1.0.0.ebuild
index 7bd74943e764..5ba55bc8b202 100644
--- a/sys-block/gparted/gparted-1.0.0.ebuild
+++ b/sys-block/gparted/gparted-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ FDL-1.2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="btrfs cryptsetup dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 udf wayland xfs"
 
 COMMON_DEPEND="
diff --git a/sys-block/gparted/gparted-0.33.0.ebuild b/sys-block/gparted/gparted-1.1.0.ebuild
index 96c8af26ebda..e7d5c990cc61 100644
--- a/sys-block/gparted/gparted-0.33.0.ebuild
+++ b/sys-block/gparted/gparted-1.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit gnome2
+inherit gnome2 virtualx
 
 DESCRIPTION="Gnome Partition Editor"
 HOMEPAGE="https://gparted.org/"
@@ -10,26 +10,26 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ FDL-1.2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="btrfs cryptsetup dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 udf wayland xfs"
 
 COMMON_DEPEND="
 	!policykit? (
 		kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1[kdesu] ) )
 	policykit? ( >=sys-auth/polkit-0.102 )
-	>=dev-cpp/glibmm-2.45.40:2
-	>=dev-cpp/gtkmm-2.24:2.4
-	>=dev-libs/glib-2:2
+	>=dev-cpp/glibmm-2.56.1:2
+	>=dev-cpp/gtkmm-3.24:3.0
+	>=dev-libs/glib-2.58.3-r1:2
 	>=sys-block/parted-3.2:=
-	>=dev-libs/libsigc++-2.5.1:2
+	>=dev-libs/libsigc++-2.10.1:2
 "
 RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.20
-	>=sys-fs/e2fsprogs-1.41
+	>=sys-apps/util-linux-2.33.2
+	>=sys-fs/e2fsprogs-1.44.5
 	btrfs? ( sys-fs/btrfs-progs )
 	cryptsetup? ( sys-fs/cryptsetup )
 	dmraid? (
-		>=sys-fs/lvm2-2.02.45
+		>=sys-fs/lvm2-2.02.116
 		sys-fs/dmraid
 		sys-fs/multipath-tools )
 	f2fs? ( sys-fs/f2fs-tools )
@@ -42,7 +42,7 @@ RDEPEND="${COMMON_DEPEND}
 		sys-fs/hfsutils )
 	jfs? ( sys-fs/jfsutils )
 	mdadm? ( sys-fs/mdadm )
-	ntfs? ( >=sys-fs/ntfs3g-2011.4.12[ntfsprogs] )
+	ntfs? ( >=sys-fs/ntfs3g-2016.2.22-r2[ntfsprogs] )
 	reiserfs? ( sys-fs/reiserfsprogs )
 	reiser4? ( sys-fs/reiser4progs )
 	udf? ( sys-fs/udftools )
@@ -51,8 +51,8 @@ RDEPEND="${COMMON_DEPEND}
 "
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
-	app-text/gnome-doc-utils
-	>=dev-util/intltool-0.36.0
+	>=dev-util/intltool-0.51.0-r2
+	dev-util/itstool
 	sys-devel/gettext
 	virtual/pkgconfig
 "
@@ -83,3 +83,7 @@ src_install() {
 		sed -i -e 's:kdesu::' "${_bdir}"/gparted || die
 	fi
 }
+
+src_test() {
+	virtx emake check
+}
diff --git a/sys-block/mtx/Manifest b/sys-block/mtx/Manifest
index 3d9e16ed1ee3..572d3b5baf38 100644
--- a/sys-block/mtx/Manifest
+++ b/sys-block/mtx/Manifest
@@ -1,4 +1,4 @@
 AUX mtx-1.3.12-fix-buildsystem.patch 574 BLAKE2B 13a6b5005ee59b2ac0dd0e6b7f6e3fd3569e7d364ab83e0b861b41f7c68583220ea269d01667504f02cbd0cb3ebd5dc8eb6ae9296ea8e45668f8f8ca65d4a685 SHA512 61a7e259ea97fa24399db95f503dabde9cfa5ecbdc479ab681bd2c64a94a18bbed6368b536f5388c3d00d68043413962f268faa2893006f7481ee0e537a39e8b
 DIST mtx-1.3.12.tar.gz 235214 BLAKE2B af5d0dd35ecf4fca75af700c4eddd48775187c6015c00048204774a87d2905a016a8c36fcfce07535d093a3f16b1a31b9e455e3e3e605cc0a7db49bd76da088d SHA512 d54c360608a2c25bd4d31af3e659de0557ed355fbe45d2dbf1341cfc7e468515eb07eb89200b77ee1fe2618139295ba3c3f4340cc43a7c506ced26aab2652028
-EBUILD mtx-1.3.12.ebuild 492 BLAKE2B 07c17df7c02ef19dfe8587af46d90ad552b2dfaa68ae630721cd71b0db96e764be402ef7f28dcfc3da946586c9172edadb83b99fa5171c295436dba9dc2670f8 SHA512 8bb3489238fbb66157c567a8e2d7c7a22de1306296f865c1d67c619a815500e0508467c2d5bbd3fe645db9046e0a0103efc636deb50fb1bf47a1f8c108eed246
+EBUILD mtx-1.3.12.ebuild 493 BLAKE2B 530f6a88c5dd38f78475bcd89f93efe99379d5df27fc11c5c80f57a1e3eb092c4742ba747b6ca21340752aaf86e6358d64f021ac6c9e719f4e2218be3a84a84d SHA512 0f293cb8d9dd0161c9bbc66b082e38183583493231bb96454a47c575cd97727d01410be6d03bb571f37a6b55641719f001aa68c0a6931d028d230e330648f0e8
 MISC metadata.xml 323 BLAKE2B d0c394421bd8dca2c1595f979dae3db3dfd8f08d7471cba729a9e7dc6503cc3f8053d2c6fde8293c2ab6c616285d753a772fe5fe9ecd8a2df8659f589468c25b SHA512 2988c2031af8998f902e82b0e5a703a71030d079dfa28f6f3c433e7fa6d8797b1bf31c8bdfcb7057a78f33eaaa390f0bc9b60d1c5c8d675ac3d21af8c880425f
diff --git a/sys-block/mtx/mtx-1.3.12.ebuild b/sys-block/mtx/mtx-1.3.12.ebuild
index 593c08791e97..ad5ebf117848 100644
--- a/sys-block/mtx/mtx-1.3.12.ebuild
+++ b/sys-block/mtx/mtx-1.3.12.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mtx/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
 
 PATCHES=( "${FILESDIR}"/${P}-fix-buildsystem.patch )
 
diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index 549ce896e5a8..1a178f27b2e0 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -7,7 +7,7 @@ DIST parted-3.2.tar.xz 1655244 BLAKE2B 56608590b26a9b5266dacf3698d990b730bdb35d9
 DIST parted-3.3.tar.xz 1757432 BLAKE2B d1e248cd8fdce22d4957055d65f9f93333505229f92174f343897422a31a43f3d35ea06f8f1bdafd254e4629c5890ec38d6b75d3b499c39a9ada4a8d5f9d9d8f SHA512 d1384694a491aa53bab6206fdeccd1d192de2ed379fe25aa865dd6aa06ed945a728e85b2ccc2fb23f5aa9dfee4a8bd8f0f2be1dd386cb8e8861b73382c6a07e4
 DIST parted_3.2-23.debian.tar.xz 88152 BLAKE2B 5e69a5799cc909bf54d1dcd1c7a8f7fe5dd7ce46b03957406f4a6118480d5acca3a165cc16b720fd03a89339fcfb46844d470079c4e10a4683e270c9e804c245 SHA512 7f449a24d1ea75a185b5fd589fea73a2f0944f1276288ece2790c5889de6adf8354f94388046a25b2dbf5735759f6010397f140607320a4de348cf77f8c75b09
 DIST parted_3.2-25.debian.tar.xz 88524 BLAKE2B e994ca8a68f700773e0a67657d59793ea130a5c7e9eca31688fa48e7133a0c350446b8c0a175ac2f59aca8c2fe1ef419a94f3f6f0547b0b25cca329c6f569571 SHA512 2d4e52513b016ef67b203db577641cd56b4d2d013e1bc186b665ab47d0f6c673321b108f81d36caaa0fd14c555d8336a2556a60cccbeccb9d2cf98a85872d949
-EBUILD parted-3.2-r1.ebuild 1503 BLAKE2B c2f7caec38f0d237e93a137a66ad433cb92dd23eeddb398625de2c5c114340136da270229d9e1ac6d9d58e64989481aa14caace6167cafea593c00d9d9801503 SHA512 32f77e24f7b4b986aac5508780121cf32525d2412fb84202a1385a14b453e72661b26cf8700be4d32555d143d9a23284daf3bac0dbba7038047f290d11a68a81
+EBUILD parted-3.2-r1.ebuild 1504 BLAKE2B ee7dba16968f307a82fce75e338bbf20529c08274cfe018e937bf329e5d828287bed36656e2715f235e9eab3cf5d7d1a0d780c042d42646ac40c7183f6cf5366 SHA512 e0cf403c24a22c6826d8b4fae2b540f3b4cdd9f729a1568e33cc91c9ed564c0f46fccd2d6ae6490e654faf9301a2634f01beefa6f075c6eed62f39c6189935ea
 EBUILD parted-3.2_p23.ebuild 1708 BLAKE2B 0e7fe667d2a5abf26d22c5565eab5d844ba5ee88c33fb3a114e1b53374b070c917c02f3a3559eca3fac48455075cec394a4cdb9ba3c856c3a038be1a1a81fb64 SHA512 8359721e7f4fc1df27168f596d3101910fbad078d43a4c8139d318d5630f451a8a96c229241f312b7465385b5bf34e46f16ef0626d6122f8678ab347c08f831f
 EBUILD parted-3.2_p25.ebuild 1709 BLAKE2B 99b89316a52c01528ddc7e51b9cd3415945c1e4a79bd6669b5c3abb161d7edb3607db4d6814d8f1d81894eef364ce6d71105c009dc6c1231c49ddf1a3ec5b0c2 SHA512 afd60957fe6cf5d5cd9900128fcded9c7910b2288beb14129d0a4987950ce926b5506ecdec8502d8c906b2e66539d1563aa551a7b3e4c0da86f771c258b48972
 EBUILD parted-3.3-r1.ebuild 1423 BLAKE2B 0ed0bfbce7a6c4fc4044ada8794d79e9adeb4e0f7aaf2ca3c373f8811163eb46893bd42bf7355516c398a422ddf15c2500e5efa455aeb12c5c817a764eb0af26 SHA512 88d5c7bf0e9c136f791b4809dd3422f82955acf7ef685953e0dfbbca3785cedfbf11c87ce4f0f7c66509619038af242aa43667f39bae1233f3ef80447edbe008
diff --git a/sys-block/parted/parted-3.2-r1.ebuild b/sys-block/parted/parted-3.2-r1.ebuild
index 2faa8cf2fa48..8144a237c841 100644
--- a/sys-block/parted/parted-3.2-r1.ebuild
+++ b/sys-block/parted/parted-3.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 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/seekwatcher/Manifest b/sys-block/seekwatcher/Manifest
index d7bbd8a38ab4..57204c7a6370 100644
--- a/sys-block/seekwatcher/Manifest
+++ b/sys-block/seekwatcher/Manifest
@@ -1,6 +1,6 @@
 AUX seekwatcher-0.12_p20091015-dash-fix.patch 949 BLAKE2B 4f3983feda97063c8a191b90032f13eee62a1bab6f6cf741874b7527cce84d1b08b060ef2028954a48a628b2e52088f586d171fd0c77273c5a3f32d53a0252b8 SHA512 ff2e92adaacd5b4636bcfa626df079c021cbf92cd13fbc7c736a933d64d2cc3d568156582e0f99f736a60c1764c94511ca511fcff591107006c4a172bf29283a
 DIST seekwatcher-0.12_p20091015.tar.gz 105328 BLAKE2B 6ce83dc7655ad9b070b09c745ebff881e30f352955264c3cf18902293466896a2b8ca1454d00848777aa46e1026d9c44cdf2979c0a8cc1758d794efc3f5f8fb7 SHA512 fc35399900fac83bf2921a137059f1af23e65a778aad105a9cbb8bb869328723f7e2b3bb19b28e7eed04eca65a39cb637ba5932ee4f5f3a882a7b52715a9aded
 DIST seekwatcher-0.13.tar.gz 25811 BLAKE2B 72c574e239a346620eb5a1c574365f18dc745e926bfb4f191dd9997ff73b26e716ded9679481be34149c3e5e424077a23a264e7dabe9423eafb396f687085dbd SHA512 687c1190a4d62ee4d7237c6930358d69d2045a7fd5af19caf9fdde8dfae8fcc64ba2d382445af2b038bc31f77c356f31b8dbff2d52cdaf4320881d1b1340dd17
-EBUILD seekwatcher-0.12_p20091015-r1.ebuild 778 BLAKE2B 95148ce26551c5feee73c5e76d07ddb6bddd00460b5bf1bd34acccc944b014b44e9d888d927a85c830b98f5d8ebf56ca08482ec7bd95140decfef58df1bef2e3 SHA512 476d3ef18711a94af22f028c3fa55567566d8a71eb6afcea21f7fd6c0175cd927bbf46d84541aa81f5b8bc95e77dcfad8fbd014e5926022d6ce75f91d116ad12
-EBUILD seekwatcher-0.13.ebuild 654 BLAKE2B ab0e3ea2b80bc4236c56e2d86d2c5722a56a1b55dbab7f1eda0c46cb9a94327b699dda68fbef310da561f749eb6080dff568f4004f180e8e77cc21428cb2e098 SHA512 e550ff9d42599a21510fc02fc3d0ce2b87950a1a8c82e4fb30cfce6cfa211b4bf953c8d4e318aa2f157af60e5348208b13742746d6b7c70f515a1be041a32e84
+EBUILD seekwatcher-0.12_p20091015-r1.ebuild 890 BLAKE2B 112d6c398422343be868afc9afdc2c766aed6fd0ec46108335a06d72175686596ce45633dccd2f66f53a8483f59b7cd39874a06c9b745ec710b143ae5f94d96a SHA512 64ad60fa4f3551a35e138cc3aeb31febf1978374fec806a094472ca8cfccbea6af7c23698a5ebdceb1469098c400ea24355d08261c0f3685f14287e1ad70d613
+EBUILD seekwatcher-0.13.ebuild 648 BLAKE2B 4057dcc162f44872b17e2ba40ff92a5d14d5c79be38e531a7c6368ec5c8874f255eab4baef556d576e24962948a033608c57c0ebf6be981c89b5b51487644cf7 SHA512 a25f46a938f26a0bdbbeadd5a425abfc3a5ac2456162972aca63f54c2f760e427f6b9ca9d21e8b0da8bc1b8222a0974054be31460425c9dfeb888648d9c3b2a2
 MISC metadata.xml 326 BLAKE2B 21768c11bcab92a1bb978e7ed1be16b1b76525a957955894a1ca18ae5e5fd0103dc312c8dc09b586ed4b3d46f471ccf039a4180ba000b0f4e410b05d34f7f335 SHA512 0a77e934710066157e808d2848283a9d25d9db5c1ccd03292ddb35b812b996918c8ae731b75eb1d60518cf1d6ece5ee9db51ae4e8a964357cb66e77fcd1c3b06
diff --git a/sys-block/seekwatcher/seekwatcher-0.12_p20091015-r1.ebuild b/sys-block/seekwatcher/seekwatcher-0.12_p20091015-r1.ebuild
index 27f43ceb58af..c845c1122a2d 100644
--- a/sys-block/seekwatcher/seekwatcher-0.12_p20091015-r1.ebuild
+++ b/sys-block/seekwatcher/seekwatcher-0.12_p20091015-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,8 +18,14 @@ IUSE=""
 
 DEPEND="dev-python/pyrex"
 RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
+	|| (
+		dev-python/matplotlib-python2[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+	)
+	|| (
+		dev-python/numpy-python2[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
 	>=sys-block/blktrace-0.0.20070730162628
 "
 
diff --git a/sys-block/seekwatcher/seekwatcher-0.13.ebuild b/sys-block/seekwatcher/seekwatcher-0.13.ebuild
index 8b69e1eacdb8..9fb2f9625e50 100644
--- a/sys-block/seekwatcher/seekwatcher-0.13.ebuild
+++ b/sys-block/seekwatcher/seekwatcher-0.13.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/sys-block/thin-provisioning-tools/Manifest b/sys-block/thin-provisioning-tools/Manifest
index 56aa045d3359..eca534df7ee8 100644
--- a/sys-block/thin-provisioning-tools/Manifest
+++ b/sys-block/thin-provisioning-tools/Manifest
@@ -4,7 +4,7 @@ DIST thin-provisioning-tools-0.7.0.tar.gz 230595 BLAKE2B 00238a682f80600e3a5bb6d
 DIST thin-provisioning-tools-0.7.6.tar.gz 285428 BLAKE2B af74eff6d435f00e347872786fee8627f02844af122a9f1bf9ffd00234ce5275d3a61d9b4204313a19813cadbc0197bbeb9a1bd92d55992c6d9a03a299579e29 SHA512 395035b6f59fafb1c0f3e68750611e04f10223bc8d57b257e25c28c928647d1d2c6e94014b64ed90eeae1151fc7e5d23cf1aa428716e343338cb3c8fe55ed704
 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 1314 BLAKE2B e96bee39b4ba574d08490ae3ee1c977fcec5d784cd170004d3f2c9f3495c3af9aea92d15413e5a750821b23e4d895f382afd83ede7d9eb5caf7d3d1fb071c544 SHA512 5b7ee81312678984b61d30ccc58a4429f32b05caa6c6d3e50cef0132b3db87652ff8462a16b0c54f992dffd22892ad629d42a61c660dc2c8831342e7a9e537ed
+EBUILD thin-provisioning-tools-0.7.0.ebuild 1315 BLAKE2B b52c8b47db28d04a6ac76c1e97d73f430adb0be723b8045e9fadb1eb0d4b919970cab4668fb63e2bcbf6b890283d7c44ec8df6148d3afde145548cead3237ceb SHA512 f3e45488d160496fbb74c4c66928b720c5dbbdf0e8dbfc840c882bd4b256a22e51f8a0f7fdaaef2bdccc57b6171cb55d1eaf81f6c1ddfd8aeacf41009eee49f3
 EBUILD thin-provisioning-tools-0.7.6.ebuild 1326 BLAKE2B 462e5596834ea37a95fe96997b0f0c9f0c1841a831de7a038144f5a7ef77081657640c61d81480f04879bba44dd19f7579fe93add656328a58fd248c83d13040 SHA512 ff35d77e219c810bee387c375601355793dcaca3a65b75ab5444e774adc91073e0600318c3fb22da07cb84081fd603cca24d6bd05bbf8d9f7dfdf0963ad77866
 EBUILD thin-provisioning-tools-0.8.3.ebuild 1519 BLAKE2B 1a52e440bdd6a5495f2c3d169d2033de761e4dc49c3dbce2538e9620d291cc8dc9a89b5668bf51a3ac498a671d57cc79bcd511b9820fe24dab90fac59e6ac7c7 SHA512 08bd6a7aee12590887d68028ea3489e28f344dcb74b20c7ebac60a236b66c11b189a05c891306730238f81f78e6bd0bd4e93b9fcf5b9005143cda2fca897e903
 EBUILD thin-provisioning-tools-0.8.5.ebuild 1567 BLAKE2B d92a9d00704f0d41be38c7a3482e6b5afcfca741200d5a1ebe70171595689fd1eb5032aa5320753078b03e7ad3eba7f7a6aad5737f9b64b5e1a9f9f619f9034b SHA512 591cb11e927b8b93bde740fc85bbb3c48630eac92bc79a8726a3c39ebdc377dd822745c621b4441b07c4549adec0209079165099d2ed14981125648c25571159
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 c62c58ce5883..0e2e771a73b0 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"
 RESTRICT="!test? ( test )"