gentoo resync : 24.12.2018

31 files changed, 195 insertions, 415 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 639978f109c0..a14d35cff480 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/arcconf/Manifest b/sys-block/arcconf/Manifest
index a583aa87ca39..6bda30ba5159 100644
--- a/sys-block/arcconf/Manifest
+++ b/sys-block/arcconf/Manifest
@@ -1,5 +1,5 @@
 DIST arcconf_v2_01_22270.zip 47168976 BLAKE2B 95693a1408e5a4d0d638bbf265f2e1e64247dfec2b1078b56860c5fcd4b13ffa5967bfb9967abfd4b79c788aaeb20759b3a9070a84b083c1653e4868a96ac4cf SHA512 0f91a697c44ea0c0561bec9e432e7d4eba8eb8a2b0255a9867bdb183f81e745aee1dcc2b0017847803dbb27f55cad3e985f4bcd3a202c52f5b557fb724e94d9e
-DIST arcconf_v2_06_23167.zip 76911677 BLAKE2B a254121cf2358970beb6f8357d45859c5993daf709e270c0dba0225a6a3ba8f60cb6db215bd20282a1df6d6c76cf2fe5fa8edbc3907073445c50be454c8bc2a5 SHA512 0f9773f4e312e2ede53adf14bf013ae656337e1a13dc81e3409e4cb852d9651f1b6dff4cadad0c7bbae32b67ed8c5a3738e69f1f1870a39756d9a5716b9589ab
-EBUILD arcconf-2.01.22270.ebuild 1044 BLAKE2B 18c61adafd2758743f5c0f0d6767240e3decc7efb028de9a4363f4ad811ff1d8143e17e24cfa9809d4cb96cc8e1305f06fe445dcefa01cbcc89a81a8a8ce4cad SHA512 7324970ee512dedc7f2a668ef833155f7ad558de15fdd6a56ffddd0f894b061b0c2a752862c9258a9857830d6895be7b422d16f254cfe11314a36aaeb69b4d45
-EBUILD arcconf-2.06.23167.ebuild 978 BLAKE2B 8e6694e7ee5d3cc3df057b80c37caf2ec092bedd4ee7c3a0d7c82a672e2fe81ca03da18722333abc7317088cf67f0bed3fc744c873cd67ca9fc1912d785bc384 SHA512 fe68da992d76cfdf26e4101b50db1d98f97dc00566b42fe8dc42f041c18aac75950826d9490f3d2e2999d5d7fbf1e7fe45e2dd623c7261ac2d864fa09f596ea7
-MISC metadata.xml 1049 BLAKE2B 7d5cfcc6f805558c64091fd0e4335694f721aed1f9a89945d1bf8b7cf8e0201bb5c75ea7928d6305e3f89be84f001dbd434a8daaf346b37bd7be626a5ec5c69f SHA512 a7e33c5b1923cfdb3516bdd34cc6fa832aaea3b98494db3e4da984b78600b398136f68f27ced287536748c5b812c61c73eda1851d4be548a0f18b4abda9aff73
+DIST arcconf_v2_06_23168_h.zip 76933066 BLAKE2B a0bad8832bfc9a1d48de8738764dbf30148f344a855679c220ee40426bfee0b83c2ed82fd4c8ae32bc81df90c9c762c5a9ed0ee3466501eb60b605ea2e446c15 SHA512 668261fa6224a7d1bc18ddbf0d4610ee218f23217bfc600be6b3fe5c2fda929e43168d98120aa4942ae4e40a853fcc988e027ba90357f6e6f7960756e1e202dd
+EBUILD arcconf-2.01.22270-r1.ebuild 975 BLAKE2B 455ac695667eb1551e81c6f58411148ec14e883ee46b0788410828c2ee572da66a9b65e93bcb67f895daaae2b651da6baffb1e74609beba97712e6b42e5aac0b SHA512 bcd55a67efc9ded1102a4a09e7439b40123028df3e67b6d644dc0eeec2da381e79dfa23f286d826494fda9d507214ac1ff14c859058c9feaaf84f9aff39ace0a
+EBUILD arcconf-2.06.23168.ebuild 958 BLAKE2B eb7ca57d646511441d6814be267647e5f755278fa757cede8715f3c9ad7ed5e4a94b484c550aa2bb1b6a4299e62d547ec176ce2f9fa70ada86304674f0b2211e SHA512 b088a44d494d8fe4a82268e6c4627475bf115b0385232667837d15d3d6b341fc6b51e7df0f4b9ccb15ddf698c8a9907b72aca6f9de4808b8c58f7c21b600568a
+MISC metadata.xml 938 BLAKE2B 93135d11cb82ab2618fcc991f26c71e89d991d27947a734871d6eeecf50cc9b4c5508738e329774e5d2ad4954988bc501659476c37d964e9dac0c188641c3926 SHA512 93858d9f2d59413f53dc80c959edf2d6e176a5fd9a8e4eea51d51fe1ddf481722fc20920d330d63cd40e294c9ea17c2076bc3c4abb8ff5243631440a069826d4
diff --git a/sys-block/arcconf/arcconf-2.01.22270.ebuild b/sys-block/arcconf/arcconf-2.01.22270-r1.ebuild
index 0de9659e3736..a7ce727384d7 100644
--- a/sys-block/arcconf/arcconf-2.01.22270.ebuild
+++ b/sys-block/arcconf/arcconf-2.01.22270-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PV="v${PV//./_}"
 
@@ -16,7 +16,6 @@ LICENSE="Microsemi"
 SLOT="0"
 
 DEPEND="app-arch/unzip"
-RDEPEND="${RDEPEND}"
 
 RESTRICT="fetch mirror bindist"
 
@@ -39,9 +38,5 @@ pkg_setup() {
 }
 
 src_install() {
-	if use amd64; then
-		dobin linux_x64/cmdline/arcconf
-	else
-		dobin linux/cmdline/arcconf
-	fi
+	dobin linux$(usex amd64 '_x64')/cmdline/arcconf
 }
diff --git a/sys-block/arcconf/arcconf-2.06.23167.ebuild b/sys-block/arcconf/arcconf-2.06.23168.ebuild
index c928fa4f4135..f716df467d9f 100644
--- a/sys-block/arcconf/arcconf-2.06.23167.ebuild
+++ b/sys-block/arcconf/arcconf-2.06.23168.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,14 +9,13 @@ 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"
+SRC_URI="https://download.adaptec.com/raid/storage_manager/${PN}_${MY_PV}_h.zip"
 
 KEYWORDS="-* ~amd64"
 LICENSE="Microsemi"
 SLOT="0"
 
 DEPEND="app-arch/unzip"
-RDEPEND="${RDEPEND}"
 
 RESTRICT="fetch mirror bindist"
 
@@ -26,7 +25,7 @@ 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 "https://storage.microsemi.com/en-us/speed/raid/storage_manager/${PN}_${MY_PV}_h_zip.php"
 	elog "and place it in your DISTDIR directory."
 }
 
diff --git a/sys-block/arcconf/metadata.xml b/sys-block/arcconf/metadata.xml
index ebc6102883f7..18b8c5cf1f76 100644
--- a/sys-block/arcconf/metadata.xml
+++ b/sys-block/arcconf/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>dev-zero@gentoo.org</email>
-		<name>Tiziano Müller</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>ck+gentoo@bl4ckb0x.de</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index e2133a16eaa1..79d68993309d 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 2885 BLAKE2B 135cb06fa67eddc80d2aacfbc725d05e979505d5ba3097f46adeafff6feeed1e3608b5dff6dc09a5b025fa44cb371a78a52ffb13faadab37e9eec36213a08ebd SHA512 10dcb6e674afe017fa000b65a1d052b8ca6b16ab74da96f1b3c645d2c54fe966de4d7450f26bc0420bb0436523b1d85cc33bb3ee70fdc6e5840b1741b3c668f1
+EBUILD fio-3.7.ebuild 3026 BLAKE2B 89dacb26a029f821d58c5828912f7f0dd700e0cce3e7d364659ea7af31604440d2de77f6f7b7d8c60588180eab5ae6d5e8cbe6584a458d918993502e49c78d28 SHA512 780e82f2b8b303e61513be26cb838e122b7557b5df5dd588288b67ed24b9d4fe775675132e327525373338bee8fd9caff9d2c40d1cdddd6926fa3c3fdf938784
 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 dd2a2649eca2..b1d447a9098e 100644
--- a/sys-block/fio/fio-3.7.ebuild
+++ b/sys-block/fio/fio-3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -87,6 +87,10 @@ src_install() {
 	emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
 
 	if use gnuplot ; then
+		sed -i 's:python2.7:python:g' \
+			"${ED}/usr/bin/fio2gnuplot" \
+			"${ED}/usr/bin/fiologparser_hist.py" \
+			"${ED}/usr/bin/fiologparser.py"
 		python_replicate_script \
 			"${ED}/usr/bin/fio2gnuplot" \
 			"${ED}/usr/bin/fiologparser_hist.py" \
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index 2f857c37dc3c..b7f1e1a7f8f0 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1,9 +1,7 @@
 AUX gparted-pkexec 42 BLAKE2B 493ae574b402064745186d9574a9ba9a6dd3a7330248b2ac71a306d060166c08e60cec7dc94ec168167ddef8997c5c5641b66367fe592bc205ffd45b00b4eaf4 SHA512 ecc34719a6fdf3739f87d3d2174a56b02c33c69e77d9811f4a043024d2f0479d077214e36fa6081d9717dc55d51dc3b8e0b51f86d95162422438841af24f7b35
 AUX org.gentoo.pkexec.gparted.policy 815 BLAKE2B d7c3ce48986488ebbb71bcdfe21d18c33598c03c5c5fd67fafe55556bf093784bc9f73cfc703ef3012c92998fcd918ca26595dd016e8df00fb21de5ebe6c8a71 SHA512 56a4c6906c721322a2530de4832f422f1a6dda2a049b8fbbf7536cfd798e0f1557148130af8f489c12687cd301b11563667150e3a703e8e3b01a4e0135ced845
-DIST gparted-0.27.0.tar.gz 3377303 BLAKE2B 3da7f8713609bacba535745fc2655302826404b9f6fe61edac9db161bad8c40b23e107168674b2e3b6b5153329538ab3cd1d04e0ec69d3402017ad771a1af125 SHA512 0a44697e6d34d1ca3d3fc65fb90ec945ff3807cd208bf18fb118b73980e018b6d69fa515f4f1b199974eabb36b977c541f141790fe640e083ff14c2bbd578e5f
-DIST gparted-0.28.1.tar.gz 3444521 BLAKE2B da7c8fe221284be60671b37fcd639b128d0d349239ee5d0c518ec9b64a52e3430bc8c0e23686ef0e54e6c585a6f83a1bd1b17dc010bb858675094c8e33606e60 SHA512 533adc9c2896063532f109ee6ee5fd1e1f510f47aad4ed2b673fc74ba2406f1f8d86db8096965920608028ce255385e04a60926bbf771f7df96100c3e0546a67
 DIST gparted-0.29.0.tar.gz 3751292 BLAKE2B 3feeb5abe01cdef5a14efb1bbe229d1ae167a087a5488eacd00577eb16f4038563e21144e15b38113b1cdca0b53455a036f9f5ac594b2633d579ecdfdf7b1d8e SHA512 ea01a5b98f8a70d229eb81b58e46b5f0037e909cf72043e7364812ca77b32ee4bad0d215699a08f1b6fcacc31cece3a3058b6178e7bf2df6ba63b11ee64e2f8f
-EBUILD gparted-0.27.0.ebuild 2046 BLAKE2B 48ca4dcc8634bbee70165ed9550ff5baa234168572fa8353edb4933994c6a741746ea5760e5cea9754287be5e3b804f6090a7645bc800230d5f7944e009e09a3 SHA512 c9dfa3bf4642f350acb95e24e3a807d4ff5912318977d6c891a922b083298e84815c5fa762ec29eed6425057e899f8b041b5ab3a8c920c6a0706469cd0328d57
-EBUILD gparted-0.28.1.ebuild 2104 BLAKE2B 5d7d16743d5e3ddeb3e7b087fedad920c75add0f5ab92826578dfc6eed503fb2f69829f7225ec884b4b22ac1840e2f47dc4bf4b7c299899b9d5973e9018be1f1 SHA512 4bbd41acdbc645aff307a68fdbfa15e9659a3a6ef0e12d616ae89c3d45d40dd5bdab99ac58684f3a24c0a3cbe82b264ba5c7ffbae91d8251891346fc52e9f65b
+DIST gparted-0.32.0.tar.gz 3880559 BLAKE2B bdd3dd636fd651af06623cdaca828f199a42048d270674c5d5c29a1b99f34fb3a903fa9499bd141ef58a3455d0b861af01b9ed44d9cdba10629e20e5b5114715 SHA512 ea05c387031d0e5ac7f8fa582d9b15881336d72ed2e04a8515217bedccea763491e8d093f9ed3f47fc6c648412a2dca7fff1735e70d897beb065e6b3e698ad43
 EBUILD gparted-0.29.0.ebuild 2139 BLAKE2B 3b5d9d14868f42922ec19d812f089ea26d2f2a71f58d89e89b7010491026a29b330edea700e90f0982029973d62305da2d1aa92a4ede55335b7315123e8f3eb4 SHA512 83dc056344f795f4d22e56369a1e3d53fc20fec201b193bf0881d8e43983387489dedeac708b954229d21d365a49a886e0c0626069c37c3225fe731e825c12f2
-MISC metadata.xml 1906 BLAKE2B 418f37339f5e47903d0af0f73d9676ac9984bff38d4b26f0668ddce0e121b7f5da5a3f0c447be940518b03c35d297f902617873297732d2fd03068ee9a32d977 SHA512 bf2c02576b610ab149f5be05f7117f0cdec91311fb5c8108a46f9676214997dce46338e9b007c666237aecbe8821351122aa3243fc1d21e58a4805635da9be6e
+EBUILD gparted-0.32.0.ebuild 2114 BLAKE2B df808a4b22b7666d1ede78a1b899e5b6d582e4003596f14066b408871408e46db2ee5eac52692cc393423be64b7fab558dde56db42c89ab17928591fdef7791b SHA512 346eef4045ac985eb9112d0700defac7906afd2bcee0712080ba029118c95cd103307f802204a17488266de3f63cf7d70dbdba4e678c3edaa4023d51dac7136c
+MISC metadata.xml 2078 BLAKE2B f510df9b38e36b2110141a6c7939bff842a8b16521db3ae2df10782137686e071e5124a39c3145e95a1cdec3501d2a37e954ed9d722f0999bdbf261e1fc5b594 SHA512 7371d9bed469149fa8d72d56a238ebb4294330f97df87054c44b5f496f836f3ccfdebf9b841c043471d6a537446ebf17395f0359c62c43082488c2831adcdf16
diff --git a/sys-block/gparted/gparted-0.27.0.ebuild b/sys-block/gparted/gparted-0.27.0.ebuild
deleted file mode 100644
index e55999468ed3..000000000000
--- a/sys-block/gparted/gparted-0.27.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Gnome Partition Editor"
-HOMEPAGE="http://gparted.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="btrfs dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 xfs"
-
-COMMON_DEPEND="
-	>=dev-cpp/glibmm-2.14:2
-	>=dev-cpp/gtkmm-2.22:2.4
-	>=dev-libs/glib-2:2
-	>=sys-block/parted-3.2:=
-"
-RDEPEND="${COMMON_DEPEND}
-	!policykit? (
-		kde? ( kde-plasma/kde-cli-tools[kdesu] ) )
-	policykit? ( sys-auth/polkit )
-
-	>=sys-apps/util-linux-2.20
-	>=sys-fs/e2fsprogs-1.41
-	btrfs? ( sys-fs/btrfs-progs )
-	dmraid? (
-		>=sys-fs/lvm2-2.02.45
-		sys-fs/dmraid
-		sys-fs/multipath-tools )
-	f2fs? ( sys-fs/f2fs-tools )
-	fat? (
-		sys-fs/dosfstools
-		sys-fs/mtools )
-	hfs? (
-		sys-fs/diskdev_cmds
-		virtual/udev
-		sys-fs/hfsutils )
-	jfs? ( sys-fs/jfsutils )
-	mdadm? ( sys-fs/mdadm )
-	ntfs? ( >=sys-fs/ntfs3g-2011.4.12[ntfsprogs] )
-	reiserfs? ( sys-fs/reiserfsprogs )
-	reiser4? ( sys-fs/reiser4progs )
-	xfs? ( sys-fs/xfsprogs sys-fs/xfsdump )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/gnome-doc-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	sed -i -e 's:Exec=@gksuprog@ :Exec=:' gparted.desktop.in.in || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-doc \
-		--enable-online-resize \
-		GKSUPROG=$(type -P true)
-}
-
-src_install() {
-	gnome2_src_install
-
-	local _ddir="${D}"/usr/share/applications
-
-	if use policykit; then
-		sed -i -e 's:/usr/sbin/gparted %f:gparted-pkexec:' "${_ddir}"/gparted.desktop
-		insinto /usr/share/polkit-1/actions/
-		doins "${FILESDIR}"/org.gentoo.pkexec.gparted.policy
-		dobin "${FILESDIR}"/gparted-pkexec
-	else
-		if use kde; then
-			cp "${_ddir}"/gparted{,-kde}.desktop
-			sed -i -e 's:Exec=:Exec=kdesu5 :' "${_ddir}"/gparted-kde.desktop
-			echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop
-		fi
-	fi
-}
diff --git a/sys-block/gparted/gparted-0.28.1.ebuild b/sys-block/gparted/gparted-0.32.0.ebuild
index 77807ab932d0..ae34b4d6f991 100644
--- a/sys-block/gparted/gparted-0.28.1.ebuild
+++ b/sys-block/gparted/gparted-0.32.0.ebuild
@@ -1,29 +1,29 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit gnome2
 
 DESCRIPTION="Gnome Partition Editor"
-HOMEPAGE="http://gparted.sourceforge.net/"
+HOMEPAGE="https://gparted.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ FDL-1.2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="btrfs cryptsetup dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 xfs"
+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="
-	>=dev-cpp/glibmm-2.14:2
+	!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.22:2.4
 	>=dev-libs/glib-2:2
 	>=sys-block/parted-3.2:=
+	>=dev-libs/libsigc++-2.5.1:2
 "
 RDEPEND="${COMMON_DEPEND}
-	!policykit? (
-		kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1[kdesu] ) )
-	policykit? ( sys-auth/polkit )
-
 	>=sys-apps/util-linux-2.20
 	>=sys-fs/e2fsprogs-1.41
 	btrfs? ( sys-fs/btrfs-progs )
@@ -45,43 +45,41 @@ RDEPEND="${COMMON_DEPEND}
 	ntfs? ( >=sys-fs/ntfs3g-2011.4.12[ntfsprogs] )
 	reiserfs? ( sys-fs/reiserfsprogs )
 	reiser4? ( sys-fs/reiser4progs )
+	udf? ( sys-fs/udftools )
+	wayland? ( x11-apps/xhost )
 	xfs? ( sys-fs/xfsprogs sys-fs/xfsdump )
 "
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/gnome-doc-utils
-	dev-util/intltool
+	>=dev-util/intltool-0.36.0
 	sys-devel/gettext
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	sed -i -e 's:Exec=@gksuprog@ :Exec=:' gparted.desktop.in.in || die
-	gnome2_src_prepare
-}
-
 src_configure() {
 	gnome2_src_configure \
 		--enable-doc \
 		--enable-online-resize \
-		GKSUPROG=$(type -P true)
+		$(use_enable wayland xhost-root) \
+		GKSUPROG=kdesu \
+		ac_cv_prog_have_scrollkeeper_update=no
 }
 
 src_install() {
 	gnome2_src_install
 
 	local _ddir="${D}"/usr/share/applications
+	local _bdir="${D}"/usr/bin
 
-	if use policykit; then
-		sed -i -e 's:/usr/sbin/gparted %f:gparted-pkexec:' "${_ddir}"/gparted.desktop
-		insinto /usr/share/polkit-1/actions/
-		doins "${FILESDIR}"/org.gentoo.pkexec.gparted.policy
-		dobin "${FILESDIR}"/gparted-pkexec
-	else
+	if ! use policykit; then
 		if use kde; then
-			cp "${_ddir}"/gparted{,-kde}.desktop
-			sed -i -e 's:Exec=:Exec=kdesu :' "${_ddir}"/gparted-kde.desktop
-			echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop
+			cp "${_ddir}"/gparted{,-kde}.desktop || die
+			cp "${_bdir}"/gparted{,-kde} || die
+			sed -i -e '/Exec/ s:gparted:gparted-kde:' "${_ddir}"/gparted-kde.desktop || die
+			echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop || die
 		fi
+	else
+		sed -i -e 's:kdesu::' "${_bdir}"/gparted || die
 	fi
 }
diff --git a/sys-block/gparted/metadata.xml b/sys-block/gparted/metadata.xml
index 2fb14814df55..ade662b4afee 100644
--- a/sys-block/gparted/metadata.xml
+++ b/sys-block/gparted/metadata.xml
@@ -34,6 +34,8 @@
 		<flag name="reiserfs">Include ReiserFS support
 		(<pkg>sys-fs/reiserfsprogs</pkg>)</flag>
 		<flag name="udf">Include UDF support (<pkg>sys-fs/udftools</pkg>)</flag>
+		<flag name="wayland">Enable interim workaround to allow running GParted under
+		Wayland by granting permission to the X11 display using <pkg>x11-apps/xhost</pkg>.</flag>
 		<flag name="xfs">Include XFS support
 		(<pkg>sys-fs/xfsprogs</pkg>, <pkg>sys-fs/xfsdump</pkg>)</flag>
 	</use>
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index 87124efa10aa..5e98e11d1154 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -4,14 +4,8 @@ AUX mbuffer-20171011-sysconfdir.patch 916 BLAKE2B bd9443187e68fc6c67afef232904bd
 AUX mbuffer-20180410-sysconfdir.patch 897 BLAKE2B 1fc57be6f5ce11f483d43dc69c9e4120b09a4c59caaee90deefd5500058ea0c8b9cd6b9b3dea1a2f21733acf4eb8a922171d791e57d658275997ca951f73559e SHA512 36964604338a0bfd0e9cb55d17b307f32dfe09d280019e8083e5909b81e091887bb8f360ef9aebf21eb8448a3d9ba305a6f7a7bc35ea4884418bb7d67e9fadb0
 DIST mbuffer-20150412.tgz 122935 BLAKE2B c57708861a9fc049fd4f3aa9c1229798a82e866a503e9ab78b1581fca7d60d0fd5cf2d80e8a8bcbb7fc6b000c9a38fb0bfd0d5184cd6bc2b7dca486bd87fb2b1 SHA512 cef64f1229872e2207e678aa77dc95e0c24f54e4a88a57a0e797d10b07a16d1f5fa96c8cfa3876ff65dd97c114eff87b683917fa1d39cdb4f08c864325e4223c
 DIST mbuffer-20171011.tgz 136630 BLAKE2B ba69435684b8c844701a51c5a77d0f5ecbf8bef3ca9b9739a63309524b14d0cbbeba422cee1c5d69f1029a42c18d089cea0bcc46dbeba7f51767df3a815f7de7 SHA512 398d7545388a94b4f8961193192cd5e1139b84f31c7699c2b7f66b84a40488a2e70c88a2a70578bd95375e11efc87978a5f6fec805dbbc5f1fea460b3a9c68c4
-DIST mbuffer-20180318.tgz 137259 BLAKE2B bec1f6acc68c3c9cf617dd7a752644628d088541c20816737ea1533eb0e9c92b76ef2dd037912501c29056994443e3ad66b1e7f4456e0f40687b32e4c6a12cf1 SHA512 ac71876aa0bea3acce8ea00c3848783b752991a0e60ebc4245277fd435c2c9e08c79cc5f47c996e590e711ca1bd652ded075c24ca820efe845f578b106c43594
-DIST mbuffer-20180410.tgz 140026 BLAKE2B d271b4c744d5c54aebaea9a68a674df184ac460f879ac4788afaca732466c95dd958145ffcb42155ed998cab771a5b0e70a57a6b479d244156afe6232c37b154 SHA512 88fdad5b767bc4dabdbe3300cf3de99a56d137ac991aa5be7ba383fc2447ec01cb43853f31ec88be3bf0cfa736753afe8bd5ef0a5abb386521f2d3316b781d74
-DIST mbuffer-20180505.tgz 140183 BLAKE2B 4c575c9654f15b4f81357fff21f41170627f6747313a462a76abbb8f5125a2e97549a9975aa67a59b402af6651b4e27b17e4ac7ea72b45620b43542ebccf9107 SHA512 b2f541332afadb42bbd2452d2079373f9d8ad44f0fe5eab2934cf4c46c6b2e4ec18c862ed385ba10e5b820efeab28c982bcf4ffa37a9cf70c5c92b5aabde7f4f
-DIST mbuffer-20180625.tgz 140946 BLAKE2B b52bf77acc142be418479a4ce878bd8a1e368aaaca44dc13b2b58a2e82c2f0e172ab04dc9d6e1a7664f353af5b005063da942441baa026caa5519ffe2b04575e SHA512 01d712f51ac0b206d6ee91fbbd4cea4873784aaca02daa9b3d72cfcc0a63696b20c15ca4b6e834924f02f2878ac90192110df584c55fb1a65620ae8b0f7ec87e
+DIST mbuffer-20181119.tgz 141445 BLAKE2B 8900b71af77b42ac6901285391bb571744bdcfd9fea307758b17be48f8ba3fa921c0e4752817d4feb8b139753440af25a8a8162f867e793d00e1baf8f1977e9e SHA512 0a30fa1c16f519a2ce82ae1f0f467dc9672e16affaff17f16cbec7bd3a28aea565e80ab4274ec24e60dd78560c692b8f852c7cba794a3715242f0d2385259347
 EBUILD mbuffer-20150412.ebuild 795 BLAKE2B 92d4c504fb558dafd340c80c814240c3dc266a8f1a28bddc8621004269da216a16b2630a637963c0478208c0e5761a6ee99570dbf1a96fd84058a377190c04ce SHA512 b4b9c424ccc4da361b00a173c4d18f0bd55994242f962c35c79dcd6edaec7c4f7e3ab29a18314b2dc047ea4916171dafaca57de7bf49ad18ae18a6989a93f32b
 EBUILD mbuffer-20171011.ebuild 1419 BLAKE2B b623eea89a7b8d913c885b818d94b83ca4883df2d44d2c36463d2e62d9240affed87290989359c51a380e56a763d31f98440de4a011a05692aa2ec686b890d07 SHA512 94da802069d9c9336d85fc837ab8debbd5441aa69530714b3f90690ff13b7e9ef42a86448ba1e443b60b3cacf7ac9646397b5c3f5f71256b5dd631490439539c
-EBUILD mbuffer-20180318.ebuild 1422 BLAKE2B 7743ea686f29752e4168b3932ceadd3393b5334b550121848c4b65196a005f270a90013bbe69596d623959930c77e4e625178382eb878c1d7bf49663fe0a9422 SHA512 c7e2e07b7130a13dea4080303024ba4f127d6b63f62c882d5073b602b942fc07991f27eb73afe7e35fe79b91ddd3115b9a58c94d5dee3535a014e0af0fc2fe6c
-EBUILD mbuffer-20180410.ebuild 1462 BLAKE2B 20f10be9d294edba49618c493b8001292c73a6a5a43e5633ea169b1f920f6463d728a368acad3c6506ad425cb0a2dc042c67488b363f318eae2bde7b9cf7a171 SHA512 ea7ba8e7e0981208c8f8a0f41467f4fd55e4fe99280fdb5d022a54d285ee66a06fe11ccf028e46556ced87760a9e838128af0fa0113a8727c4131eb01e53667d
-EBUILD mbuffer-20180505.ebuild 1462 BLAKE2B 20f10be9d294edba49618c493b8001292c73a6a5a43e5633ea169b1f920f6463d728a368acad3c6506ad425cb0a2dc042c67488b363f318eae2bde7b9cf7a171 SHA512 ea7ba8e7e0981208c8f8a0f41467f4fd55e4fe99280fdb5d022a54d285ee66a06fe11ccf028e46556ced87760a9e838128af0fa0113a8727c4131eb01e53667d
-EBUILD mbuffer-20180625.ebuild 1462 BLAKE2B 20f10be9d294edba49618c493b8001292c73a6a5a43e5633ea169b1f920f6463d728a368acad3c6506ad425cb0a2dc042c67488b363f318eae2bde7b9cf7a171 SHA512 ea7ba8e7e0981208c8f8a0f41467f4fd55e4fe99280fdb5d022a54d285ee66a06fe11ccf028e46556ced87760a9e838128af0fa0113a8727c4131eb01e53667d
+EBUILD mbuffer-20181119.ebuild 1456 BLAKE2B cf6f4a9db384e77059cb01cf4e2e0c94331e59a17a66e1a4734d85edc591b616f59884fe68ec055238b66e464a655314a1121fe2ee11124ea7417a964b9f1fd9 SHA512 12c54c5a023a249722715250565fc04a398cf113e1719c47e5c0efd29f7f9638a9527fa25cf98d887d50f1a11acff00f652caf001887a3125994c2b14fdd421a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/mbuffer/mbuffer-20180318.ebuild b/sys-block/mbuffer/mbuffer-20180318.ebuild
deleted file mode 100644
index b98af0bb4ca8..000000000000
--- a/sys-block/mbuffer/mbuffer-20180318.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
-
-DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
-HOMEPAGE="http://www.maier-komor.de/mbuffer.html"
-SRC_URI="http://www.maier-komor.de/software/mbuffer/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug ssl test"
-
-RDEPEND="ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/openssl:0 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20171011-resolv-multi-order-issue.patch"
-	"${FILESDIR}/${PN}-20171011-sysconfdir.patch"
-)
-
-src_prepare() {
-	ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
-
-	# Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
-	# using same port and src_install may have problems (with /etc folder)
-	export MAKEOPTS=-j1
-
-	default
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable ssl md5)
-		$(use_enable debug)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	if has usersandbox ${FEATURES} || has network-sandbox ${FEATURES}; then
-		ewarn "Some tests may fail with FEATURES=usersandbox or"
-		ewarn "FEATURES=network-sandbox; Skipping tests because"
-		ewarn "test suite would hang forever in such environments!"
-		return 0;
-	fi
-
-	default
-}
-
-pkg_postinst() {
-	if ! has_version "app-arch/mt-st"; then
-		elog ""
-		elog "If you want autoloader support you need to install \"app-arch/mt-st\" in addition!"
-	fi
-}
diff --git a/sys-block/mbuffer/mbuffer-20180410.ebuild b/sys-block/mbuffer/mbuffer-20180410.ebuild
deleted file mode 100644
index 3b1fd2aa6a99..000000000000
--- a/sys-block/mbuffer/mbuffer-20180410.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
-HOMEPAGE="http://www.maier-komor.de/mbuffer.html"
-SRC_URI="http://www.maier-komor.de/software/mbuffer/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug ssl test"
-
-RDEPEND="ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/openssl:0 )"
-
-REQUIRED_USE="test? ( ssl )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20180410-sysconfdir.patch"
-)
-
-src_prepare() {
-	ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
-
-	# Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
-	# using same port and src_install may have problems (with /etc folder)
-	export MAKEOPTS=-j1
-
-	default
-
-	mv configure.in configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable ssl md5)
-		$(use_enable debug)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	if has usersandbox ${FEATURES} || has network-sandbox ${FEATURES}; then
-		ewarn "Some tests may fail with FEATURES=usersandbox or"
-		ewarn "FEATURES=network-sandbox; Skipping tests because"
-		ewarn "test suite would hang forever in such environments!"
-		return 0;
-	fi
-
-	default
-}
-
-pkg_postinst() {
-	if ! has_version "app-arch/mt-st"; then
-		elog ""
-		elog "If you want autoloader support you need to install \"app-arch/mt-st\" in addition!"
-	fi
-}
diff --git a/sys-block/mbuffer/mbuffer-20180505.ebuild b/sys-block/mbuffer/mbuffer-20180505.ebuild
deleted file mode 100644
index 3b1fd2aa6a99..000000000000
--- a/sys-block/mbuffer/mbuffer-20180505.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
-HOMEPAGE="http://www.maier-komor.de/mbuffer.html"
-SRC_URI="http://www.maier-komor.de/software/mbuffer/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug ssl test"
-
-RDEPEND="ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/openssl:0 )"
-
-REQUIRED_USE="test? ( ssl )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20180410-sysconfdir.patch"
-)
-
-src_prepare() {
-	ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
-
-	# Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
-	# using same port and src_install may have problems (with /etc folder)
-	export MAKEOPTS=-j1
-
-	default
-
-	mv configure.in configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable ssl md5)
-		$(use_enable debug)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	if has usersandbox ${FEATURES} || has network-sandbox ${FEATURES}; then
-		ewarn "Some tests may fail with FEATURES=usersandbox or"
-		ewarn "FEATURES=network-sandbox; Skipping tests because"
-		ewarn "test suite would hang forever in such environments!"
-		return 0;
-	fi
-
-	default
-}
-
-pkg_postinst() {
-	if ! has_version "app-arch/mt-st"; then
-		elog ""
-		elog "If you want autoloader support you need to install \"app-arch/mt-st\" in addition!"
-	fi
-}
diff --git a/sys-block/mbuffer/mbuffer-20180625.ebuild b/sys-block/mbuffer/mbuffer-20181119.ebuild
index 3b1fd2aa6a99..22c1ed552fe6 100644
--- a/sys-block/mbuffer/mbuffer-20180625.ebuild
+++ b/sys-block/mbuffer/mbuffer-20181119.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.maier-komor.de/software/mbuffer/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug ssl test"
 
 RDEPEND="ssl? ( dev-libs/openssl:0= )"
diff --git a/sys-block/megactl/Manifest b/sys-block/megactl/Manifest
index 16cbe986daf5..e78e940a7066 100644
--- a/sys-block/megactl/Manifest
+++ b/sys-block/megactl/Manifest
@@ -4,4 +4,5 @@ AUX megactl-0.4.1-tracefix.patch 6650 BLAKE2B cc35fb5a0bb7091b3fbeb9e31d2dec9a7d
 AUX megactl-0.4.1.patch 1297 BLAKE2B ca70718318e464f0731f6de8227d6dda394b28053794aa20d4445a78c862a30e297f05a17be2b804d1abdbfde5cb1975998371e9e13617feb6012dcdffd50f55 SHA512 6992e585bc3a8528d45aea9f57de296c67323489d74b48f2365b6052e51a525ac5a118d652f1c2ed924cf92424ef16de8f08ff146930f25a3acd14941cab3faf
 DIST megactl-0.4.1.tar.gz 179173 BLAKE2B 778e0ef67226ca74aeaf47afa76c0842764bc95c05ef9fe7bfc57ae1d1e6395a3098301bc09dee8fdd0a5d29e8f2dcf511e0a8920538bb76824cea496de6a619 SHA512 65a97f03fbe1c76375d2e16016c1e57c7e4544bfd7185b13a330560819caf48ecad8e9f1feb1d448b45d4f862abf2799868bd357d120019a709088c90b58ac92
 EBUILD megactl-0.4.1-r2.ebuild 810 BLAKE2B 4da2467b2d69ad11941314e354543a107dba3b99361f286ae70079e86dc43cf8f69fdd7e190021b1d61ee9c7540ba497170c814a31fba425d6379d0a60109481 SHA512 a481f82731c2ce3a860bd4939048d6e3798a6c4fa6bd7c3fd10a12813868fa60c6321fc7d50cba8079a33891bb2a8e45dec8452acd3aca40b53d7825fc7747b3
+EBUILD megactl-0.4.1-r3.ebuild 779 BLAKE2B ca66f3151a610c2f046646fed0a0d0b08de9ee2dd9eea94fb4442fcb86af1e05cec9655cb6ed145f4599b3d3e29c472776ed163a01adf433ed26a346a7474a6a SHA512 e39f33c482f8d17e899f684be0deff033182590e7539faa6f5972792520ec15a419f15b73875cd6831a875a39c64a7c3b6df3f4401f1d329311e2bf19471b4ed
 MISC metadata.xml 611 BLAKE2B ad2c97fac2b022d2e3081c8915ae3c69d7789da9e9aa899f54f8ada84f1d638f6ceaa35ff0c0f6c99e7f4c79d5d55f9cf5d84de94ac880b3314839d98f4b1ac2 SHA512 e059a6046f58afda93e50dea7b16cbcddb65baba7555ce56ce59131fd54030edfb385f0defb715b15b0a1f1855d3886417c13df38d00cd3cff44fd0bf133937f
diff --git a/sys-block/megactl/megactl-0.4.1-r3.ebuild b/sys-block/megactl/megactl-0.4.1-r3.ebuild
new file mode 100644
index 000000000000..e5546968b342
--- /dev/null
+++ b/sys-block/megactl/megactl-0.4.1-r3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="LSI MegaRAID control utility"
+HOMEPAGE="https://sourceforge.net/projects/megactl/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=( "${FILESDIR}"/${P}.patch
+	"${FILESDIR}"/${P}-Makefile.patch
+	"${FILESDIR}"/${P}-gcc-fixes.patch
+	"${FILESDIR}"/${P}-tracefix.patch )
+
+src_compile() {
+	use x86 && MY_MAKEOPTS="ARCH=-m32"
+	use amd64 && MY_MAKEOPTS="ARCH=-m64"
+	emake -C src CC=$(tc-getCC) ${MY_MAKEOPTS}
+}
+
+src_install() {
+	cd src || die
+	dosbin megactl megasasctl megarpt megasasrpt
+	# it's not quite fixed yet
+	[ -x megatrace ] && dosbin megatrace
+	dodoc ../README
+}
diff --git a/sys-block/megamgr/Manifest b/sys-block/megamgr/Manifest
index e3bcf56d083d..053a135bd8dd 100644
--- a/sys-block/megamgr/Manifest
+++ b/sys-block/megamgr/Manifest
@@ -1,3 +1,3 @@
 DIST ut_linux_mgr_5.20.zip 253549 BLAKE2B eb173d349e5399229f55ec073246993068caea01dcc707ec11d34a418cd42368eb80028e4363cad7e1bb707558e6eb8b629a2071387bff40471daa98d1d14c94 SHA512 3f942ab3d7a192bc1a945945d20545ffdbbbdd9c4af238701cf7357fe5b3f405c2e777da7c42908e1acb676499ee87aec261bcad729a4d787f8e098af132bda6
-EBUILD megamgr-5.20-r2.ebuild 914 BLAKE2B 476d1dac1eecced221946e970d79aeba39e72f7c910973179554fae68db82965c951552fe412094761ac376b7c82db53481226852c48cb1ef11ffc25d2f283a0 SHA512 23a8829725629eab170ddc438759980ea5a5e0d7ea9a308a12acb18e00066f4abe707e454aadd0f6a58a58937ed520823613ef0c743f4b53c0fbbffeb587852f
+EBUILD megamgr-5.20-r2.ebuild 923 BLAKE2B 770e46c6c599797b3f98aefc4d67fb398ce34d8ccf89fd0dec47e9f7dd83e4fa6c194cd42c9b6855d056c205a2552365ca687a4ef6069761ec4fcd7337b64dc8 SHA512 b55035e19b2d988f53555f8dfa69b5f1aa93fab4046bd180d38beef54f73b99a20af5607d2dd8c5ae3df21c331c72d08ecba3ffd1eda2d629cc8dd2c4c7b0b59
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/sys-block/megamgr/megamgr-5.20-r2.ebuild b/sys-block/megamgr/megamgr-5.20-r2.ebuild
index 1ebc56400d12..7688cadd9b6c 100644
--- a/sys-block/megamgr/megamgr-5.20-r2.ebuild
+++ b/sys-block/megamgr/megamgr-5.20-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ QA_PRESTRIPPED="/opt/bin/megamgr"
 pkg_nofetch() {
 	einfo "Upstream has implement a mandatory clickthrough EULA for distfile download"
 	einfo "Please visit ${SRC_URI}"
-	einfo "And place ${A} in ${DISTDIR}"
+	einfo "And place ${A} in your DISTDIR directory"
 }
 
 src_install() {
diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index f6b18b8406fa..585a3cacce13 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -3,10 +3,9 @@ AUX parted-3.2-fix-resizing-FAT16.patch 2383 BLAKE2B d680374c1949a1f4f118e67ad5f
 AUX parted-3.2-po4a-mandir.patch 275 BLAKE2B 5342cc776f557c9ef95604eb2c15ad484c4dbf102d4093dcb1d4005f2f6d4f90db2ff0fc3ceae59fd22c3442604b2abbdac48594f860ba810dc4d8dce89d6fc0 SHA512 5ef686f56d8c3939da3f24fdb6196d8858c2f980805f1cb06020d6f6996158f62b8372a233ec3ec98aae30b41034046d615e415b3abf2648db7be88e3b45a872
 AUX parted-3.2-sysmacros.patch 804 BLAKE2B 294094fd79a799d577c2db00569f4be218713b71659654603a299f039939a7b3901ab80aab6cf969fd503712da8a7039e8fd7dac007b164a1f3b7ead4c5596ed SHA512 97c141d623bc52387b3726a164c5191c094cef1b2aa000dbd8e505aab418210d27ad07a59e0433faf001bf12ee1e3729838186fc2bae69ed7a66941364e3b468
 DIST parted-3.2.tar.xz 1655244 BLAKE2B 56608590b26a9b5266dacf3698d990b730bdb35d9374d1da57103fbef3ef5037e40dd2fe0f523ca8e0e75401a3b25cf543e5ca5c94cf410bbaa62ea15d6f0ba3 SHA512 4e37dbdd6f5032c9ebfec43704f6882379597d038167b9c4d04053efa083c68a705196713864451fa9e11d32777e16c68982877945c5efd9ea5f8252cb20e1c4
-DIST parted_3.2-19.debian.tar.xz 87288 BLAKE2B f0cef2978ead9edca3e952849deb36526eea0a050d45ab480b2aa62d02ba0a1750c28e93c28a714df6629f02ccf5a1e4fbb33a6e42b82bf6685c05aeaad1756c SHA512 de3e55545d7d94668eb608c8c31440f550baaf7b664836d199f73f7a8c75bba4ff59b4c06a23459c7d522250d7c03d29fa7f727f7d1a2b1e5a0366e83a2d871a
 DIST parted_3.2-20.debian.tar.xz 87496 BLAKE2B 4409826b35b42093f16f80b1ab2f41b4caf2264c9dcfe9572fa1ddf5f51eeffa2208fc187bd7a98290ee2df92604928eae84fd2fdee78d688ec19e81f8b9efac SHA512 83f14befdd7d048976572b3e2eebfaa42649458cbcfd659db704737dce991980ddb2bc65013c5b31b04a17fc17fb756da0dda76edbcba93708afca34c56e0d22
+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-r2.ebuild 1514 BLAKE2B d7144fc4a68de8e12059a1dc3a771bb633af41c46dee8cb99b38b480fe90d144dd33f090d383b70b8956abf09b4de8fc5853d44ff74f17e8a883a4f22050152f SHA512 cf2898a4c373c4597cbb99cc511527af7382f548a0b7c8b8f3bc3cd6afea6ab3344cf58c37312d5d5eeacdcb937430f27bf20627aeb9e441950c055f0266eabd
-EBUILD parted-3.2_p19-r1.ebuild 1740 BLAKE2B fb283538a1fb4bff9efc65fc1fdbad622288dbec7f18c0b5c81ec05a96c7c321fed34d1f6fc3aa3d306638c55cb6167e590875e68c74b0c63b3866d02722f3f5 SHA512 90378164b7d0d4d4b7f0cb71c589860d592fcbc7cc4199914287c00d0ebd36b9bdc7d3a8e1e0782ec29962df4f9993c050347b4a3c3dd8aa7ba21a48d4c13b2e
 EBUILD parted-3.2_p20-r1.ebuild 1740 BLAKE2B fb283538a1fb4bff9efc65fc1fdbad622288dbec7f18c0b5c81ec05a96c7c321fed34d1f6fc3aa3d306638c55cb6167e590875e68c74b0c63b3866d02722f3f5 SHA512 90378164b7d0d4d4b7f0cb71c589860d592fcbc7cc4199914287c00d0ebd36b9bdc7d3a8e1e0782ec29962df4f9993c050347b4a3c3dd8aa7ba21a48d4c13b2e
+EBUILD parted-3.2_p23.ebuild 1709 BLAKE2B 3fd7151f26bfaaa97cfab4227fef7990a84e73bda333fe974ea5dafd75105062eb78565d0b6bc198dc612c6b68d9bb5a930b38e385ce095b903273c455a152a5 SHA512 63e845feb6c9095b10d4bca9b9e61e530b6cb365420d7c9debe85de28d0d58fd1cace23f79f27724c89e60d17479e76f623d943551ea4d97a593f536b9f9aff7
 MISC metadata.xml 754 BLAKE2B 6bf44d26295c82c00691f9ba11e114f43c2674e98b1a0f332280e2753c08aeeb5b5a402c2288e9f0c654d4d91be1ed20810eb4b19cf277b76d326423ee6b19a8 SHA512 b5ced0310e8a606de46a5a2a690d7a549c5528eb843616621486db93a9fc45266eafbcbacc90d38d8005cd0366fee671705fc98c54c79bf0b3519d182d15c184
diff --git a/sys-block/parted/parted-3.2-r2.ebuild b/sys-block/parted/parted-3.2-r2.ebuild
deleted file mode 100644
index b4561cfee286..000000000000
--- a/sys-block/parted/parted-3.2-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
-HOMEPAGE="https://www.gnu.org/software/parted"
-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"
-IUSE="+debug device-mapper nls readline selinux static-libs"
-RESTRICT="test"
-
-# specific version for gettext needed
-# to fix bug 85999
-RDEPEND="
-	>=sys-fs/e2fsprogs-1.27
-	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-	readline? ( >=sys-libs/readline-5.2:0= >=sys-libs/ncurses-5.7-r7:0= )
-	selinux? ( sys-libs/libselinux )
-	elibc_uclibc? ( dev-libs/libiconv )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.12.1-r2 )
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2-devmapper.patch
-	"${FILESDIR}"/${PN}-3.2-po4a-mandir.patch
-	"${FILESDIR}"/${PN}-3.2-fix-resizing-FAT16.patch
-	"${FILESDIR}"/${PN}-3.2-sysmacros.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	use elibc_uclibc && append-libs -liconv
-	econf \
-		$(use_enable debug) \
-		$(use_enable device-mapper) \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
-		--disable-rpath \
-		--disable-silent-rules
-}
-
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
-
-src_install() {
-	default
-
-	prune_libtool_files
-}
diff --git a/sys-block/parted/parted-3.2_p19-r1.ebuild b/sys-block/parted/parted-3.2_p23.ebuild
index 8547e2cb78ea..b4a1e19a9f36 100644
--- a/sys-block/parted/parted-3.2_p19-r1.ebuild
+++ b/sys-block/parted/parted-3.2_p23.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils flag-o-matic
+EAPI=7
+inherit autotools flag-o-matic
 
 DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
 HOMEPAGE="https://www.gnu.org/software/parted"
@@ -34,7 +34,6 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.2-devmapper.patch
 	"${FILESDIR}"/${PN}-3.2-po4a-mandir.patch
-	"${FILESDIR}"/${PN}-3.2-sysmacros.patch
 )
 S=${WORKDIR}/${P/_p*/}
 
@@ -66,5 +65,5 @@ DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
 src_install() {
 	default
 
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/sys-block/perccli/Manifest b/sys-block/perccli/Manifest
index bced8fe347ea..82f92f65a95d 100644
--- a/sys-block/perccli/Manifest
+++ b/sys-block/perccli/Manifest
@@ -1,4 +1,7 @@
+DIST dell-sas-hba-12gbps_reference-guide_en-us.pdf 450398 BLAKE2B b97ef640b53fb631ac4d9478f621709d7dad1d19786b8fcd96adcaef3ae8a13ca449f0b5d63b29e36c0a10a30b187164cc2a538836f95c6c0c669f31c9443b2f SHA512 17be31c01d350ca28434ded58599f1de8ca93770fcc52da107d8639d93145397ba5b43931c86020093de9eaec092f8bb6a4c401a2d98bdc7ec465e947b462a3d
 DIST perccli_7.1-007.0127_linux.tar.gz 6560698 BLAKE2B b8195633f5a20e1a99b9761148c9e478989a44beaf02a9aceabb4007183363c9c0d4b76617148c7610de82daff7fe05d1a2ee7274a2aadc1f631142d66107fd4 SHA512 904d9662dee76d70110381d96547abf54cc5823fcc8c995bd6ccb0122a84303e0dfe081c5e56efe94aa6972b21335e54ec4b69c37d88f66b1d2e1e461e8c3032
+DIST perccli_linux_NF8G9_A07_7.529.00.tar.gz 6624840 BLAKE2B 29b67d8807bc12b2c4d3df880176209ba9c44f48d74367172d1d673070ece435537158c5998fc79eb68c33ec3eb2009e55e333f88419c23f911af091e6ccf371 SHA512 71e44772d291fa2d9529ab10917a3841395fe16daa66a2d64d1e120d5c3d43ce34479a5217fc1fbe7f4772b92fccc673fe387cb2e9a7683c9b5a3e26a348713c
 DIST poweredge-rc-h730_reference%20guide_en-us.pdf 1056352 BLAKE2B a68489ffa6a2e941c4d3613264a8249df76de73f476172f38a351e0fa1430f25de71deebc1abadc4be6e329438e74b9d976e1aa42dca5e8f5307359347fe3c92 SHA512 150c792eb62f0fbe7a311acf0f6f8199d91eff19441502f18a8880809d4659030ecc71867927a3cc62a765104832e850855bd25eb83d8b3ad7534e8a70b4f80c
 EBUILD perccli-7.1.007.0127.ebuild 1094 BLAKE2B 490979100e03c431bc26e59b9489457cc82fda585cba7f599c44b5fc837cf74a0bfc616f34fa459e5f25b9a62e9f8bff94abd2a51a74184da9851e8e0e8b7e10 SHA512 8092a2232d6166e711a4a7a8a108905b1f68c6d56a080c55f9e4f27abe92fc3825d17aac30d9bc54922e4e1ca0e47fa8c99077901d16feea7a8fae2b33b7a9b5
+EBUILD perccli-7.5.007.0529.ebuild 1168 BLAKE2B b0cebb10629de2ebfc45d76841b4e6ea6363b6213f0facb2cd70cf077d964677054fe506aaeb1f2cb19f60f17e61287365ff289cd1c05674e15ac3e5425de8fe SHA512 198b8a162fd220113146aaf23716cbfd2180ec9b4f5ae98b3ea9c8a409f34417fb6a30f03f2a60927e8c71da3a5fb1e7ab5a160d29161556ecce7364f4df060a
 MISC metadata.xml 306 BLAKE2B db3bc70d010eab74af1f8c3e7a4813d1cf0613eaf68ec37b4c32773b7a0b58dcf4ae81c3b42d8a296f571aaa380401329e3cf3c5ec161de08c582080e609c438 SHA512 eaf88a3817a6749ed5239605d4de8cdfb1a219355be17e60b9fd3eae741b83ceef0269f79ac89896e78ddcea0d9dd8da186fd619965ee1fb7f0350c779f561ce
diff --git a/sys-block/perccli/perccli-7.5.007.0529.ebuild b/sys-block/perccli/perccli-7.5.007.0529.ebuild
new file mode 100644
index 000000000000..78027af98eff
--- /dev/null
+++ b/sys-block/perccli/perccli-7.5.007.0529.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit mount-boot rpm
+
+DESCRIPTION="LINUX PERCCLI Utility For All Dell HBA/PERC Controllers"
+HOMEPAGE="https://www.dell.com/support/home/us/en/19/drivers/driversdetails?driverId=NF8G9"
+LICENSE="Avago BSD"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="doc efi"
+RESTRICT="strip"
+DEPEND=""
+RDEPEND=""
+QA_PREBUILT="opt/MegaRAID/perccli/perccli* boot/efi/perccli.efi"
+
+DISTFILE_DOC=dell-sas-hba-12gbps_reference-guide_en-us.pdf
+
+SRC_URI="https://downloads.dell.com/FOLDER05235308M/1/perccli_linux_NF8G9_A07_7.529.00.tar.gz
+	doc? ( https://topics-cdn.dell.com/pdf/${DISTFILE_DOC} )"
+
+S="${WORKDIR}"/perccli_7.5-007.0529_linux
+
+src_unpack() {
+	default
+	cd "${S}"
+	rpm_unpack ./Linux/perccli-*.rpm
+}
+
+src_install() {
+	exeinto /opt/MegaRAID/perccli/
+	use amd64 && doexe opt/MegaRAID/perccli/perccli64 && \
+		dosym perccli64 /opt/MegaRAID/perccli/perccli
+	use x86 && doexe opt/MegaRAID/perccli/perccli
+	dosym ../MegaRAID/perccli/perccli /opt/bin/perccli
+	if use efi; then
+		exeinto /boot/efi/
+		doexe EFI/perccli.efi
+	fi
+	use doc && dodoc "${DISTDIR}"/${DISTFILE_DOC}
+}
diff --git a/sys-block/rts_pstor/Manifest b/sys-block/rts_pstor/Manifest
index 4831bdbe72aa..a585bcabe668 100644
--- a/sys-block/rts_pstor/Manifest
+++ b/sys-block/rts_pstor/Manifest
@@ -1,6 +1,9 @@
 AUX rts_pstor-linux-3.10.patch 1268 BLAKE2B 110165baca81dce2c176cf26852665f666826cdf6d962086d69a59f954e0f800ec555e951cc6829890fa88353f782c04db74b3c9326f2fb6495d26114d38861e SHA512 51eb565d7498e7f8a3805b2142dae013224ee9161bf988a9f34b11fa2dd57499a4bd603e7cff1e9960e92a235f023bc89ff97c28fb8fc586a9598683388183b3
 AUX rts_pstor-linux-3.8.patch 829 BLAKE2B 8cdd7c26c905156cd1cdd8e1a4c2ab5c1a0c82d77cf46cb158f226d3dd7f0f7bcaafaa52b6c70ac500a624beb8fbe2cdfa353c3046ee3f1c5d82ee2e586d50ff SHA512 8ee281925ebbd45d857614a8bcd5d0f92ba8df3e360646d0ffb5288765638e93dde7e92996b55f8c11bcdc2b7e12ae22230a1ea394eb6b2a5c00913570075753
+AUX rts_pstor-makefile.patch 319 BLAKE2B afb25a7184c13b90fd9babf975cfc7710d4e643aad97994ff5d2f4f9bf77fc9928a1a2391890723e10c51107ad0cf4a5919418a9cb0787885d57de5e9cb08b03 SHA512 ae6b3890edef023d9b965d765baf7aefa75b0b44d51296f4997b0bb20a41c6a0d6ee19381a3d9194c23198b59da2a4523a1547363e3c82ba27c3625009f8d8ca
 AUX rts_pstor-vmalloc.patch 1403 BLAKE2B 3421a93ef3af630538aa22dbbbfaaddf5629f6a647a60c48d3fa66584021e8b84da105ac20590ee73335ffdaf130de7700fad84ae0a56f5c218e376f8c24b2bb SHA512 4d6f73129b3df94ff9de5e486811a9a771988b0fd4b1452f703c513921750a99b81a1c4bb66e761a021f5da7614f7dde430ebd8fd0593da08500ebfdbc7fdd8c
 DIST rts_pstor-1.10.tar.bz2 79549 BLAKE2B 6ed1a31c46920f30b16c3cd4bda9978bffe40c2f88fdd2d63ef128d3a4ce22a6850846e4f5f1bf55200ed03a227a61bfcaefec4abdf598a43c8a7d8ca2991280 SHA512 26d29ccda55672adab8b96a8318e240d0c9d50ebf614853284cf218058c5788cc83b818ce118ac313c0ce6a67aef8ad13d93ed26212db7e05db51b8a7860b48d
+DIST rts_pstor-1.10_p20160103.tar.gz 108102 BLAKE2B 9cbca345211f7c99c6d9cf71b0ed207a4c911569eee6c63bfbe15c094be08f64c4550f04d9df688969f43564b2ff6a91d5cc72b8ab281cfdffb6884688b354de SHA512 d802a52b1e2da447a218472e77ca6ecc56e3b3767e3eb8daf634152675171c79c86e3b5ca9654b67cf32f63740c347bf7ecee5a1d20eb1c15a3a2ad3e9774311
 EBUILD rts_pstor-1.10-r5.ebuild 1050 BLAKE2B 812cd16868a170c297e8b76f5e0f58c68665b7108f8cd8c1c2a1892d436583eced16475372c4af521672045ca39629f02ac7c270cd5df68c43f644c07082cc99 SHA512 d625c0e31adfbfb4761f61a21f5075b5d029eb32011e04cb75cad13d84bdb87fa86e1fa2dd426dd82c18d6379b4f4d2928b9e3c9584b5ddce33f409fa5fcb072
-MISC metadata.xml 259 BLAKE2B 42221f4bc166ada2e6e96075feab3a0c487087cf04c695857361e93738e4d58af78b6f4064d5c7850e66d8553c953a165e109ad8c58e6d5e6625cb27892d9682 SHA512 7fa21b6ff9a7425d4f4077173e937a6f3eab5988c23832afbdea432ce25ae5152df356de2190d18202788fc490d2bc642456b42dce029e3c6d7e53d3ea509941
+EBUILD rts_pstor-1.10_p20160103.ebuild 1342 BLAKE2B b649f3ac801ab6fb1711fc13c8660a3ced1aba39d29c362487d9b1dd8b2efea8af04900ce1fdeef44c9a82f44f99e25228cb6a4643ba27396ae35f0877fdf111 SHA512 e6d936d860a7934e20cfc6fc85a3602649d98683d83c4b2fd303dcee084d0ad4e006377d0e1ff279a5a1411c030f72510fd5a6664cb7bf2486a2c26a7c757bf8
+MISC metadata.xml 433 BLAKE2B 68ad81664e636facb6f248effc7c3ef58ea0c3cc86cc306b0862113665a296bcffe4df996861367eb98e26589c6124282a75d193fe1b84e90cbce12819b9279f SHA512 ef139e88440c4ad838b50a762373588a832dd4230596034399cb1b2fbb246a1fe957c8af86d98d80918fa747f2a0abad960af8a5144acbcd808dc956a833515b
diff --git a/sys-block/rts_pstor/files/rts_pstor-makefile.patch b/sys-block/rts_pstor/files/rts_pstor-makefile.patch
new file mode 100644
index 000000000000..dc12cd68f52b
--- /dev/null
+++ b/sys-block/rts_pstor/files/rts_pstor-makefile.patch
@@ -0,0 +1,8 @@
+diff -N -a -u1 a/Makefile b/Makefile
+--- a/Makefile	2016-01-03 14:41:40.000000000 +0100
++++ b/Makefile	2018-12-11 23:47:44.942218496 +0100
+@@ -36,3 +36,3 @@
+ 	cp -f ./define.release ./define.h
+-	make -C /lib/modules/$(shell uname -r)/build/ SUBDIRS=$(PWD) modules
++	+make -C $(KERNELDIR) SUBDIRS=$(PWD) modules
+ debug:
diff --git a/sys-block/rts_pstor/metadata.xml b/sys-block/rts_pstor/metadata.xml
index 854729740725..ab7993355b87 100644
--- a/sys-block/rts_pstor/metadata.xml
+++ b/sys-block/rts_pstor/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>martin.dummer@gmx.net</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
-		PCIE RTS5209 card reader driver for Linux.
+		PCI-E RTS5209 card reader driver for Linux.
 	</longdescription>
 </pkgmetadata>
diff --git a/sys-block/rts_pstor/rts_pstor-1.10_p20160103.ebuild b/sys-block/rts_pstor/rts_pstor-1.10_p20160103.ebuild
new file mode 100644
index 000000000000..73c7c69315d7
--- /dev/null
+++ b/sys-block/rts_pstor/rts_pstor-1.10_p20160103.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod
+
+GIT_COMMIT="c8313abffe083ac63bf76d2cc90d3edf5b2d1188"
+
+DESCRIPTION="PCI-E RTS5209 card reader driver for Linux"
+HOMEPAGE="https://github.com/gexplorer/RTS5209-linux-driver"
+SRC_URI="https://github.com/gexplorer/RTS5209-linux-driver/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="virtual/linux-sources"
+PATCHES=(
+	"${FILESDIR}/rts_pstor-makefile.patch"
+)
+S="${WORKDIR}/RTS5209-linux-driver-${GIT_COMMIT}"
+
+MODULE_NAMES="rts_pstor(misc/drivers/scsi)"
+MODULESD_RTS_PSTOR_ADDITIONS=(
+	"# when rts_pstor is installed, blacklist in-kernel driver rtsx_pci"
+	"blacklist rtsx_pci"
+)
+BUILD_TARGETS="default"
+BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
+CONFIG_CHECK="~!MISC_RTSX_PCI"
+ERROR_MISC_RTSX_PCI="CONFIG_MISC_RTSX_PCI: The in-kernel driver rtsx_pci is configured, which may have the same functionality than this driver. To make sure that your kernel loads only rts_pstor, the rtsx_pci module will be blacklisted."
+
+pkg_postinst() {
+	elog "This driver is based on code published by Realtek. There is a driver in the kernel named rtsx_pci which"
+	elog "should be preferred over this driver - but on some hardware only this driver is functional and rtsx_pci is not."
+}
diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest
index de9ff8029eb2..51589782aa84 100644
--- a/sys-block/tgt/Manifest
+++ b/sys-block/tgt/Manifest
@@ -6,5 +6,5 @@ DIST tgt-1.0.73.tar.gz 296814 BLAKE2B a3c81c00f716678aa9388f6a4562bd0b6fe0e2c705
 DIST tgt-1.0.74.tar.gz 297109 BLAKE2B 8ad439a1df437b87a6bf94a8c0403c4ae26a6b77ddc3b44758134199efa5b55dafd09cd2ac3f1b12abc3a77077dffdcab1e9b2aa0a97fcd2e2c19ba24a5cd9cf SHA512 aa905b44a3495275549d4abe8542e2b6b086bbab79b83d2902cba1e6124889a8873d479d1111128416b23c7681433fbe37c1772e8578bb12bf80b96267f65c0a
 EBUILD tgt-1.0.72.ebuild 1563 BLAKE2B 7364870afeaca18d51b156690ca59f0db9637c78c6e1dc61cce3df8861be244d6b43fdc0bf8d2dd689f8ff879b87e6b395f8434fed0495ae763e702759aa4173 SHA512 f4a1bffcae7471dbdf4bad933c5b7ff82b6656da570c739aaec192389a1ae888ed8083cdb34340407a3eda692eb147aa177e5a8b59077ad22467332980c755a1
 EBUILD tgt-1.0.73.ebuild 1514 BLAKE2B c64c89359f7054020fa130ae559a7da2f14b76368e88bc6a642a99c5ca085bc27b23f650a5b148db65595acb4132a200c43f9af82ce2c1d423d3cd674a979737 SHA512 10d945d72aaa099a6d29a669ae0e80f31056946c62947ae180d9fac446cd1d842dd52d908c7fc2db88764d5672187571bb11795851dfc3444e5aa96f3ae909cb
-EBUILD tgt-1.0.74.ebuild 1513 BLAKE2B f06f888d9954f29953bf8c82a47562c4fa96d63f4605ee1b97f0b3cec2cac389cf2289bce8c2ead1840b342c9b052ea36df235532819588b8a1548cf5d5cfdf1 SHA512 0ba464498acd2e6c78a8f39a65978909abe550c420362a0bf96fee74a37ff720f72a12f56873212abfc0f45ce678e7ccc673f31eb817f5af4f80c01a917e3067
+EBUILD tgt-1.0.74.ebuild 1511 BLAKE2B 4deca6da9f562fe1d25269d7513d6dc66c6f94cd94dbfb71bc38c4e77833eb311d6302fa5f309602f4ac2e7022299cd9d19241105195d4e0c83409577956458a SHA512 2e04cba7dcaaf6c287714e2866803c7f64b8a50b7b513ec5c23a7fd5227d4571e0cb93e941cdef60a8778005d903d5b767640ecfbbc15a4f843da9dfae06f164
 MISC metadata.xml 825 BLAKE2B 89a6844eade4098443db47dcd5b3350c1bd6f4c0ffbdb6277df5714fdfd248d056f770f05e1392d64b573a28ca9db140dc7130e0109075c7fd398677ca251af9 SHA512 0c75be2e830ff683c8cae93175504a1e6508131d704c48d31b9fe98baa6b3a1e491661fda6180c0c1e35ef7e9bd57309d05e07b41160a7cc090934913e186f9f
diff --git a/sys-block/tgt/tgt-1.0.74.ebuild b/sys-block/tgt/tgt-1.0.74.ebuild
index 694e0af3cf3b..c36e23d5c168 100644
--- a/sys-block/tgt/tgt-1.0.74.ebuild
+++ b/sys-block/tgt/tgt-1.0.74.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="fcoe fcp ibmvio infiniband rbd"
 
 CDEPEND="dev-perl/Config-General