gentoo resync : 13.10.2019

42 files changed, 69 insertions, 330 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 9a34d055f5e1..748425318680 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/di/Manifest b/sys-block/di/Manifest
index 9aed0a318e92..99e01b385cb9 100644
--- a/sys-block/di/Manifest
+++ b/sys-block/di/Manifest
@@ -2,6 +2,6 @@ AUX di-4.33-build.patch 1041 BLAKE2B 971d2cdcab457ede532c490d2a584ea76d7c7181587
 AUX di-4.47-no_echo-n.patch 658 BLAKE2B cfd3df4c24333dd168ceef279c7cfcad2194e7fd7b3f1b2722cc9e54ae51abf963971666458455117ae990613ffc920541e3db4d603948c1a2dcdbd9f9912331 SHA512 2184eb38daa2eb67d3f61d337ee1d95188f66a1e63838916305aa72ef16c50e93147a5cee7388785bf96088479acc4ddddf7f2a1a4bb6e0c2de47abca4bbb071
 DIST di-4.47.1.tar.gz 221051 BLAKE2B d1012ab500f808363ce445b6c0bb80f3e91f85560faff1d31bbed4f3d44f894dadb5d59d417a16335fce45659861b483dc82b53a59718ee1c8a1b6b21265d4d9 SHA512 3312634617b5614d36d7ce9c0725a4d03e55e694b9588db88bb1c2bfab05373516cadbab8a23db3328f4944b99ae07dacabb98d56cc909f0502d58ccc6f5301c
 DIST di-4.47.tar.gz 250479 BLAKE2B 64156867ab31c448dfc428331a54900a54df4689f851f86f6b8e33403b2f0b785aadd8140576bc75f03ed675cf31fffe15d577b477e5d07a4e678bf625f46f49 SHA512 6bb004a9230dd59174c59b823a80ccc9b237a08947ac15502a805cf95e8803c05ac4e8c2282164130db2e23e8f521bf16c30f2c0996c96a9612d139d66df89f5
-EBUILD di-4.47.1.ebuild 710 BLAKE2B 613195ec309e0f696eab066bbd854cabd388c3b72ae462e0886afeb7cf2f2bcc6a01cb7e496e71a2662f6994067bf0c974cbf7af3ceefad3aac14284086aaea1 SHA512 409ad6ef98284cbbc884ac473dd4190065dc90416da90ec1f925cdb9f98214d223009007e275fe3e46979b9c7fe7d5ef62a460531d0149a0bd8ec42ee720111b
-EBUILD di-4.47.ebuild 753 BLAKE2B 9d542c55df57e11af0d0d6728fc59173987dc27ce59a965b3901d4b3cd7a06da28fea200ebfd66c32b093f5ddc4d2124005847263af6fec411a5ee0f418d7ced SHA512 1dac2dff1d0666d1838ca192888cb0024a0db65db7001b47038bdfeaad10d4d341732e69323cf804c91c291d18c9aa94646d89ee3e6c2620ebf4bd7fd6776159
+EBUILD di-4.47.1.ebuild 700 BLAKE2B 0c6ab6ca5429781cad6c6b62a80de4302b463158caf34b2650f909cabb78e023ddc1080b28fda86a38f9416046926e4d4bfda4b3688c12a738ca91b7e8ec1f1a SHA512 f267a60c98c7a034da5c33f9a43de42ba8eb6cb51a8c79c40287eb441a8fbf5396a833742e24c3c1ce3fc54aa862e226d6278aecd9b829d8c152a62b220a31d5
+EBUILD di-4.47.ebuild 743 BLAKE2B 8a644ab2b1abcdc310880db519d0a0c1f97e15e762f19187af4924944926bd975d2900795a82374c55bed75562342f86d32393b2a5bffd9dcc74360efa9df56e SHA512 5fe91ae237a483bfae9ab1a91bb0a60fdfa3a3825e194d7f474641cca8b4534af6fa9c4cab360832b556d9274da7eb426682e1e13ba66d9c88b3caab2deceda9
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/di/di-4.47.1.ebuild b/sys-block/di/di-4.47.1.ebuild
index 5a54e3014059..64adf3b98685 100644
--- a/sys-block/di/di-4.47.1.ebuild
+++ b/sys-block/di/di-4.47.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://gentoo.com/di/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="nls"
 
 RESTRICT="test" #405205, #405471
diff --git a/sys-block/di/di-4.47.ebuild b/sys-block/di/di-4.47.ebuild
index adbd0e355f31..98e0af6b69fe 100644
--- a/sys-block/di/di-4.47.ebuild
+++ b/sys-block/di/di-4.47.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.gentoo.com/di/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="nls"
 
 RESTRICT="test" #405205, #405471
diff --git a/sys-block/eject-bsd/Manifest b/sys-block/eject-bsd/Manifest
index 810df7dedb0c..6847e17c7cd9 100644
--- a/sys-block/eject-bsd/Manifest
+++ b/sys-block/eject-bsd/Manifest
@@ -1,5 +1,5 @@
 AUX eject-bsd-1.5-devname.patch 330 BLAKE2B 9dd4e72b9c4b40c9af386d2d87643c34ef4b89265d026ee3d6f1268b953059bf507e18755f230b5af40a86bfaf7a9598d9acf149e8a114c961e8c3f2629405bd SHA512 0397fbeaed4b62ef1d76cabf768aa9f38d91abedcb4a26b34b98dae58a3c34172cfe742841e7de5aa236ffbbec455e7b5b9cf349441b2087e81ee8d0ef70dbf0
 AUX eject-bsd-1.5-manpage.patch 292 BLAKE2B 526e185b5eb24565d7d1885fa0f54202c6a0ab08b759c64c76298af0fd4d19e9256fb7356b7376acef78315d321c389865e670dee04217e5fd2da304447d5bdd SHA512 46de6a9ccb16da90e4a9879468cf1162854c68918567f62ff233e2d1766ea730e3b871b523c4aef1e90e0373e4f8b8cf9e2bd95c91d84c5acd453f8e6d3699f0
 DIST eject-1.5.tar.gz 4928 BLAKE2B 9b10622d758f31670d360f7ffbcdca3bacb3f24e9adc602ab60a25a3bac843fef702c7d66d587e4b820ee6b7c65c0735925cdfafa9846704e0484b4fb2b5063c SHA512 d116aa1119cddb82b3b2ef3202ebdf6f02d1184746e1fe5f00fa9819bab4b90386bf9cbcb3b3796b03299c13c1730a020cf917f2c071982d10124d82cdda5ac3
-EBUILD eject-bsd-1.5.ebuild 855 BLAKE2B e81df58f8a818f75cec1fbfc33c7bda28c2794d469c5f4dcaa19e5282ea3d11be8ccb4ca910746fd633bb1bcf3565df78b200f3f64f1ddc6428c65b01dc21f94 SHA512 beebb7c528681978d3eec6e44932d012b5e782440093e2939d97fbebf6e66e39aeb22a636e64104b1d33c4c70c67815eafff8b3c09a27439193d87d25a84fb36
-MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
+EBUILD eject-bsd-1.5.ebuild 834 BLAKE2B fce4afe7ed3b709903cb36c3fdbc7fe29cb7e8f932f1442f7543765f5551344522766af3dc8206d8d20148dcdea250b83b14acb1b2cdd3b8efec29ccaf490edf SHA512 93a50bb3cc8ad84f85f07ff41a0d51a1b42ba273eb602be2fbd093796890975ccc2945137fbdf44ce211efe089e3b81b3b2aa38e148b82375f64909002ecafbe
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-block/eject-bsd/eject-bsd-1.5.ebuild b/sys-block/eject-bsd/eject-bsd-1.5.ebuild
index f64583860f86..cff35822469e 100644
--- a/sys-block/eject-bsd/eject-bsd-1.5.ebuild
+++ b/sys-block/eject-bsd/eject-bsd-1.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="ftp://ports.jp.FreeBSD.org/pub/FreeBSD-jp/OD/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~x86-fbsd"
+KEYWORDS=""
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/sys-block/eject-bsd/metadata.xml b/sys-block/eject-bsd/metadata.xml
index a00f3aeb1f81..6f49eba8f496 100644
--- a/sys-block/eject-bsd/metadata.xml
+++ b/sys-block/eject-bsd/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>bsd@gentoo.org</email>
-	<name>BSD Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sys-block/gpart/Manifest b/sys-block/gpart/Manifest
index 2bb44f32f877..40771753ed2a 100644
--- a/sys-block/gpart/Manifest
+++ b/sys-block/gpart/Manifest
@@ -1,12 +1,5 @@
 AUX gpart-0.1h-errno.patch 384 BLAKE2B 75bf8f7698a635bd3b17eaf423cb536ac74da4027a22b391a77a1675ff72fb9b909bacf12a958bc68b4b210f4b971e90e2a42661f53d1052a6e6329e40a8e41b SHA512 0b81a8a3edecb4f44907afba9364010f2920a71d7f38626e2cf5f2bf5025b27f021ee762c039718dfb6f1119956c03219b1ffd4373f9f6b3157662dfca553618
-AUX gpart-0.1h-l64seek.patch 1352 BLAKE2B b46e1f3db8124a006b817d7adb46243e9bf0a4b759adefc506bf8908f422f618f42459831fb20275249e5e9f438f3dec7e3450bcda3c43f0589072ecee05d9be SHA512 320600b849a77631a6885bd9c4f6d412c1654e3617098531d6c449a186d0cfb3b703a95f3d5a77d9c71cc33ce867e89eddb2cf5acc33ac0cedfd0cf1afcfadf4
-AUX gpart-0.1h-ntfs.patch 2430 BLAKE2B 5a7c7b7c43e9d2dc6f1c74b4bb2d00f28b5c7870e812f878059a0af66f1cda8faee020e1658c3c517eae13853ec3d093f20e1e91a8b7938c47adee5067f4b46d SHA512 d622f4429baab567d34155a45d72e88d16c26f571d6a20dd294ae8fd1d0db2a05d6b4edfaaeb804d0dc32d12086f1331e794fe719dbcb14867a998cbb316cb04
-AUX gpart-0.1h-openmode.patch 404 BLAKE2B 69d6d109d04651ec050356f9bc6dee7988f19dec45e96d1ea73640fcb98f97b0e930f58def690faeecb0df483ac3d8ae4d932e9022907b7be20fbe9a175d294a SHA512 3b7f46db58c90b0fc43b225f267250d8759b47b6b0c07457f46f549a86d322a1458f0421e1da8a481f6f486c5265caa50cb45d3c9682e91cd684fd2744f299dc
-AUX gpart-0.1h-vfat.patch 515 BLAKE2B 0003791d54d8890e53902f2b231dc274dd714d69469ad08a015f040d49844fd8eed64709920eb4c50d385866dbe09fef7324282abc6176315aebd3c3dd6b1769 SHA512 80dc8eb5e7ee2d3d413adebec63a8dcae868774a42cc27f27fb2be98ca299c4fe744f5188207e5c53a86e06e213e1a18b8f7d40b5fdf8cf6378f14d25794cb8d
 AUX gpart-0.3-build.patch 259 BLAKE2B b0c1119b4799628104672f3ce219c560374600fe9c0a9e4163d4454546a158439bb5252205808bbb4a14f0c948115b7be3ad11a6e279021ebf6d01deee851616 SHA512 05cb685691a59bdb60af306c01c3f619e88cdbf3db0d4b48c23ac740b241b80d44a03dd90e89255180c6e0c6f4cc7bb428345734da4f4ad709659aefac66a772
-DIST gpart-0.1h-reiserfs-3.6.patch.gz 3658 BLAKE2B b0c9232b54efbf61d5c7fa9ed9cfb611fdfe7266c2da2066747368f978d43bae3f88748c9034705c33361ec22b0115da49b69e6ac1f937665a1ff573be5c2da6 SHA512 c39433e1d6dc0a995322f9985cb1735e89e3c3c7230193609ab2c82fa4cc3fc921d8743b37f6fba18cdda71d29cd83afcb36870fceb88d2a26f7113022226a60
-DIST gpart-0.1h.tar.gz 52352 BLAKE2B 59e719dd62cd84ba31e89f7cd9b1e6cbb4fc2432e50059d77a95beca27143552ac100da1b3f72b0e5b3d0c88e9968eb19bad75a6470f3416de4d5f1f13b53b11 SHA512 673cc99ccc2342c18be3f6395bf7258ab1d8e2ffeac6fd68a4bd75c89825031cb9d7ae628c51bad4da47a8d0625f1608cf4c78345aae5205fd98a9a908a3d45c
 DIST gpart-0.3.tar.gz 53589 BLAKE2B fd479f05219cc3b65ac91318c294728c115dfbab684269d7b5d6dbfa7575902094d3c7e611d296214170713aa23d6909814179208c2599219e94f4bae56d0ccd SHA512 5ee8bc551050d26dc71898d3232549d2b96e0806071571b120cbf819282da0ec2246147a0dfc44576e62d68092bb0183c1a9bb71db7ddca12c0922da60aeea35
-EBUILD gpart-0.1h-r2.ebuild 951 BLAKE2B e6985ea9170e7ecbc71e7955843c49ed1d886809200eaffdffbec1462171d6c0e8f6c127dc6ae24a45db200dcc9cd50415d10c47f86ecac37deb5833f50fbd14 SHA512 78c543921ead06858b819ec30ec64c9ff3a612505037ee752768142bd3468c7a567742f873181c958bd62b13c799b7f098d385c443376a4bbfd209fd91720cb7
-EBUILD gpart-0.3.ebuild 728 BLAKE2B 8efbfed86ea5799f74429f56ee7d70c2e3a3f4223f15d3c82c0ef49a68567634637f2546599f5a45dcf6cbdb0a5c62805f4b329504132d008d236968e1938e56 SHA512 270c2f7bfac1610dac00d0df5716b24983b78d5ca26718ab0472a226f482782b6824c47d4b2d4ab7780862e6537c02c8c6204a04889a2adc6acdf8c556fe76ab
+EBUILD gpart-0.3.ebuild 722 BLAKE2B 27a5846037102a6a8cb78a6e7c0a5408faf44ecd916086b9e0916bfbc3701477dee3b24a8299ff371c503593ba8cf774573caf2ed547ed6a6a4f80c5dea996d5 SHA512 08f42fe4eed2d53fae0ced2c68a95a36c878806996330b1f1fcbb23dbd4fbd7bdea4d08f1cc3c31326d038928d8fd1868c630d77ba65279be6abc6096967ee19
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/gpart/files/gpart-0.1h-l64seek.patch b/sys-block/gpart/files/gpart-0.1h-l64seek.patch
deleted file mode 100644
index 8a14411a5ccc..000000000000
--- a/sys-block/gpart/files/gpart-0.1h-l64seek.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- gpart-0.1h.orig/src/l64seek.c
-+++ gpart-0.1h/src/l64seek.c
-@@ -25,30 +25,11 @@
- } ostck[OSTACKLEN];
- static int		osptr = -1;
- 
--#if defined(__linux__) && defined(__i386__)
--_syscall5(int,_llseek,uint,fd,ulong,hi,ulong,lo,loff_t *,res,uint,wh)
--#endif
--
--
--
- off64_t l64seek(int fd,off64_t offset,int whence)
- {
- 	off64_t		ret = (off64_t)-1;
- 
--#if defined(__linux__) && defined(__i386__)
--	int		iret;
--	unsigned long	ohi, olo;
--
--	ohi = (unsigned long)((offset >> 32) & 0xFFFFFFFF);
--	olo = (unsigned long)(offset & 0xFFFFFFFF);
--	iret = _llseek(fd,ohi,olo,&ret,whence);
--	if (iret == -1)
--		ret = (off64_t)-1;
--#endif
--
--#if defined(__FreeBSD__) || (defined(__linux__) && defined(__alpha__))
- 	ret = lseek(fd,offset,whence);
--#endif
- 
- 	return (ret);
- }
---- gpart-0.1h.orig/src/l64seek.h
-+++ gpart-0.1h/src/l64seek.h
-@@ -17,6 +17,8 @@
- #ifndef _L64SEEK_H
- #define _L64SEEK_H
- 
-+#include <sys/stat.h>
-+#include <sys/types.h>
- #include <unistd.h>
- 
- /*
-@@ -25,19 +27,7 @@
-  * offsets.
-  */
- 
--
--#if defined(__linux__)
--#	include <linux/unistd.h>
--#	include <sys/types.h>
--	typedef int64_t off64_t;
--#endif
--
--
--#if defined(__FreeBSD__)
--	typedef off_t off64_t;
--#endif
--
--
-+typedef loff_t off64_t;
- typedef off64_t s64_t;
- 
- off64_t l64seek(int fd, off64_t offset, int whence);
-@@ -45,5 +35,4 @@
- int l64opush(int);
- s64_t l64opop(int);
- 
--
- #endif
diff --git a/sys-block/gpart/files/gpart-0.1h-ntfs.patch b/sys-block/gpart/files/gpart-0.1h-ntfs.patch
deleted file mode 100644
index 1f887ac47135..000000000000
--- a/sys-block/gpart/files/gpart-0.1h-ntfs.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Ripped out of debian
-
---- gpart-0.1h.orig/src/gm_ntfs.h
-+++ gpart-0.1h/src/gm_ntfs.h
-@@ -14,6 +14,9 @@
-  *
-  */
- 
-+#include <stdint.h>
-+#include <asm/byteorder.h>
-+
- #ifndef _GM_NTFS_H
- #define _GM_NTFS_H
- 
-@@ -29,32 +32,38 @@
- /* 'NTFS' in little endian */
- #define NTFS_SUPER_MAGIC	0x5346544E
- 
--#if defined(i386) || defined(__i386__) || defined(__alpha__)
--
- /* unsigned integral types */
- #ifndef NTFS_INTEGRAL_TYPES
- #define NTFS_INTEGRAL_TYPES
--typedef unsigned char		ntfs_u8;
--typedef unsigned short		ntfs_u16;
--typedef unsigned int		ntfs_u32;
--typedef s64_t			ntfs_u64;
-+typedef uint8_t			ntfs_u8;
-+typedef uint16_t		ntfs_u16;
-+typedef uint32_t		ntfs_u32;
-+typedef uint64_t		ntfs_u64;
-+typedef int8_t			ntfs_s8;
-+typedef int16_t			ntfs_s16;
- #endif /* NTFS_INTEGRAL_TYPES */
--#endif /* defined(i386) || defined(__i386__) || defined(__alpha__) */
--
--
--/* Macros reading unsigned integers from a byte pointer */
--/* these should work for all little endian machines */
--#define NTFS_GETU8(p)		(*(ntfs_u8*)(p))
--#define NTFS_GETU16(p)		(*(ntfs_u16*)(p))
--#define NTFS_GETU24(p)		(NTFS_GETU32(p) & 0xFFFFFF)
--#define NTFS_GETU32(p)		(*(ntfs_u32*)(p))
--#define NTFS_GETU64(p)		(*(ntfs_u64*)(p))
--
--/* Macros reading signed integers, returning int */
--#define NTFS_GETS8(p)		((int)(*(char*)(p)))
--#define NTFS_GETS16(p)		((int)(*(short*)(p)))
--#define NTFS_GETS24(p)		(NTFS_GETU24(p) < 0x800000 ? (int)NTFS_GETU24(p) :
--
- 
-+#define CPU_TO_LE16(a) __cpu_to_le16(a)
-+#define CPU_TO_LE32(a) __cpu_to_le32(a)
-+#define CPU_TO_LE64(a) __cpu_to_le64(a)
-+
-+#define LE16_TO_CPU(a) __cpu_to_le16(a)
-+#define LE32_TO_CPU(a) __cpu_to_le32(a)
-+#define LE64_TO_CPU(a) __cpu_to_le64(a)
-+
-+/* Macros reading unsigned integers */
-+#define NTFS_GETU8(p)      (*(ntfs_u8*)(p))
-+#define NTFS_GETU16(p)     ((ntfs_u16)LE16_TO_CPU(*(ntfs_u16*)(p)))
-+#define NTFS_GETU24(p)     ((ntfs_u32)NTFS_GETU16(p) | \
-+		           ((ntfs_u32)NTFS_GETU8(((char*)(p)) + 2) << 16))
-+#define NTFS_GETU32(p)     ((ntfs_u32)LE32_TO_CPU(*(ntfs_u32*)(p)))
-+#define NTFS_GETU64(p)     ((ntfs_u64)LE64_TO_CPU(*(ntfs_u64*)(p)))
-+
-+/* Macros reading signed integers */
-+#define NTFS_GETS8(p)        ((*(ntfs_s8*)(p)))
-+#define NTFS_GETS16(p)       ((ntfs_s16)LE16_TO_CPU(*(short*)(p)))
-+#define NTFS_GETS24(p)       (NTFS_GETU24(p) < 0x800000 ? \
-+	                                (int)NTFS_GETU24(p) : \
-+					(int)(NTFS_GETU24(p) - 0x1000000))
- 
- #endif /* _GM_NTFS_H */
diff --git a/sys-block/gpart/files/gpart-0.1h-openmode.patch b/sys-block/gpart/files/gpart-0.1h-openmode.patch
deleted file mode 100644
index ca13cc9420e6..000000000000
--- a/sys-block/gpart/files/gpart-0.1h-openmode.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpart.orig/src/gpart.c	2008-10-19 15:06:06.000000000 +0000
-+++ gpart/src/gpart.c	2008-11-25 07:34:47.000000000 +0000
-@@ -1221,7 +1221,7 @@ static int make_mbr_backup(disk_desc *d,
- {
- 	int		fd, ret = 0;
- 
--	if ((fd = open(bfile,O_WRONLY|O_CREAT)) < 0)
-+	if ((fd = open(bfile,O_WRONLY|O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) < 0)
- 		return (ret);
- 
- 	if (write(fd,d->d_pt.t_boot,512) == 512)
diff --git a/sys-block/gpart/files/gpart-0.1h-vfat.patch b/sys-block/gpart/files/gpart-0.1h-vfat.patch
deleted file mode 100644
index 7234ac689831..000000000000
--- a/sys-block/gpart/files/gpart-0.1h-vfat.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Ripped out of debian
-
---- gpart-0.1h.orig/src/gm_fat.h
-+++ gpart-0.1h/src/gm_fat.h
-@@ -60,6 +60,10 @@
- 	__u16	info_sector;	/* filesystem info sector */
- 	__u16	backup_boot;	/* backup boot sector */
- 	__u16	reserved2[6];	/* Unused */
--};
--
-+} __attribute__ ((packed));
-+/*  "__attribute__ ((packed))" 
-+    added by davidc@debian.org,
-+    as suggested by falk@zxmjz18.extern.uni-tuebingen.de 
-+    Fri Jul 07 18:04:15 2000
-+    in debian bug report #66893 "FAT detection broken on Alpha" */
- #endif /* _GM_FAT_H */
diff --git a/sys-block/gpart/gpart-0.1h-r2.ebuild b/sys-block/gpart/gpart-0.1h-r2.ebuild
deleted file mode 100644
index ef944c939f1a..000000000000
--- a/sys-block/gpart/gpart-0.1h-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Partition table rescue/guessing tool"
-HOMEPAGE="http://www.stud.uni-hannover.de/user/76201/gpart/"
-SRC_URI="http://www.stud.uni-hannover.de/user/76201/gpart/${P}.tar.gz
-	ftp://ftp.namesys.com/pub/misc-patches/gpart-0.1h-reiserfs-3.6.patch.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE=""
-
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-errno.patch
-	epatch "${FILESDIR}"/${P}-vfat.patch
-	epatch "${FILESDIR}"/${P}-ntfs.patch
-	epatch "${WORKDIR}"/gpart-0.1h-reiserfs-3.6.patch
-	epatch "${FILESDIR}"/${P}-l64seek.patch
-	epatch "${FILESDIR}"/${P}-openmode.patch
-	sed -i -e "/^CFLAGS/s: -O2 : ${CFLAGS} :" make.defs
-	sed -i -e "/^LDFLAGS/s:=:=${LDFLAGS} :" make.defs
-}
-
-src_install() {
-	dobin src/gpart || die
-	doman man/gpart.8
-	dodoc README Changes INSTALL LSM
-}
diff --git a/sys-block/gpart/gpart-0.3.ebuild b/sys-block/gpart/gpart-0.3.ebuild
index 7b56760641f2..fdd4b6afe204 100644
--- a/sys-block/gpart/gpart-0.3.ebuild
+++ b/sys-block/gpart/gpart-0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/baruch/gpart/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 hppa x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/sys-block/megacli/Manifest b/sys-block/megacli/Manifest
index adbe517dcf56..95d915b9d520 100644
--- a/sys-block/megacli/Manifest
+++ b/sys-block/megacli/Manifest
@@ -2,7 +2,7 @@ AUX megacli-wrapper 102 BLAKE2B 15b4c1bcc7102e7c757527e4f8fbb30b4d6eb14773da3690
 DIST 8-07-14_MegaCLI.zip 7939395 BLAKE2B 3b4151724fab8b9fd2a5797d11919c52cdd5c96fefb6074fad6637a9a82a6d9291dd43e5480669779dbce18f3cb0c56fe119e868a6d6a7c9d05779eb6fccb154 SHA512 ee2b66b69dc41bb678e54f5ccf4908a51e6fde147b2118844ff6248127aa51f12af0e7562c74461d52ea8e9b4345877b21c87fc89210208d80cf2fd3402a93e3
 DIST 8.07.10_MegaCLI_Linux.zip 1543709 BLAKE2B 6b42195d105faa5ce6469d6a36c37a1d84b9a814bbc0e85ba45d8d29914232868db40fef0572c281a2716041e98222923547d7c7f25a71217bd4468ac3031fbd SHA512 ee83910dac54b653f5c33703555c51d37b33e1672c6de6473950ca21ff19518b7de921cfa07a50e1c7f26054c7075c6bc241b52f89757cc1e0e0f4251a07bcd7
 DIST 8.07.14_MegaCLI.zip 7939395 BLAKE2B 3b4151724fab8b9fd2a5797d11919c52cdd5c96fefb6074fad6637a9a82a6d9291dd43e5480669779dbce18f3cb0c56fe119e868a6d6a7c9d05779eb6fccb154 SHA512 ee2b66b69dc41bb678e54f5ccf4908a51e6fde147b2118844ff6248127aa51f12af0e7562c74461d52ea8e9b4345877b21c87fc89210208d80cf2fd3402a93e3
-EBUILD megacli-8.07.10.ebuild 2088 BLAKE2B cdcecba6b8df7793bb36d47bec23b2c93584405b66ef09a97c555a636ae2dac1d665de6f6a4e4a0fdf4915cf122a7539d1f69992e15ca79a569ae88f6950890d SHA512 f5f614b1dd25fe2d32069c46cf09bb2daed92cdaeefde08b2e006cd48405ed831a7460f7ca9be29d400c9538ec0e886f7eb84689a88020b0609205d53cfa703f
-EBUILD megacli-8.07.14-r1.ebuild 2499 BLAKE2B 42e2157a16393f99aa0d4869a50b922ebcdf9f36076d6d43b6754ea18a38de5f5ae3725459c417e14860f6066de9f2e76d3bcb02c92f153dd15ae95415bf2da6 SHA512 094cca6b06b46c701dd186c2cf5c8f4395ad0d63c0a955e2eb7f04d118ff2c43be2371d36af20b1bbe8dbb8c9199ed7d28d24f594f9d476d580e9cbf302d285e
-EBUILD megacli-8.07.14.ebuild 2048 BLAKE2B ef86af1f72f89278330c509d7c865ec228d8c987ab0d3c62c9d629b7c33b4762cc8a99e2f35cb29f2c9c22bd703a1913f4c8a34a25b765d3e464581345b2426b SHA512 7a7032e2b91b4dbff632a4321d340eb5ad7c2842cbad2b6d8543df99e2b3386a4406d6f1bc4185f422e8225eefd6722ba62eb23dc852302cfbb0efbeffc5eb97
+EBUILD megacli-8.07.10.ebuild 2095 BLAKE2B db73b68bfb37be536e2254d29cdb0b71cd8bdbe9bf59ef0fd7c15ca7865993f0a962d533b2d24ea38783998bdb1cc420143bb286f03bf764df3d4523c562b41d SHA512 9c7eb12c22c7a82249419c04e9436f2eeec3e83b53fbb53c99bfdc6dd44a2d929539e6bb3839bef1514949999129214b7b396b400cf9a0acbc8beb89adee0b12
+EBUILD megacli-8.07.14-r1.ebuild 2503 BLAKE2B 9d622084adb012d468c002ffd5556501fffeaa491c5e1a570be28a60606e01565f35e7dd3bbe5ec0376a32e3fa05989d2a641262f76dc313f37ca2c4403cf0d4 SHA512 a15d74ce1007e4d2399ff101374e81dba943114c959e68421a1c0ba8efe62630fb7d92050b239c8fe8561b18959c5ab376de780234e5dee2b9790d75b396d311
+EBUILD megacli-8.07.14.ebuild 2055 BLAKE2B 9a630e8908e6f1b120944e0feac9ab4e0b9dba1195fc969ae1686c8a27f28a405953b12ee5f6bef09ae877db81472fd3efe96637cb64f9f872e4d19c076f2aa4 SHA512 ee9885306d50b1c74efc4dfedc275fd03c5472ccbf008202674a3a9e62e2ccf970a36c7e72b5c9e44b2a0ac06e46e445617e93362680f227afe3fd7d5314c91f
 MISC metadata.xml 318 BLAKE2B 98c2744d890564a2aee5a9541954654e57d97c3a30ca9d2470afb2d0d63935eadf02d7745b617bb9f0d076bc449ed5f10fbf4610226d3f701077d6e4c3929ab9 SHA512 d2c34bba25ecc086ba1e3e009fbcf56d40efa3522cbc8d1fd4e273a58d21d82c2fd159c25e9295939f713e1ed845d361645915060fef9bc71be9be3d4ef043ee
diff --git a/sys-block/megacli/megacli-8.07.10.ebuild b/sys-block/megacli/megacli-8.07.10.ebuild
index 1e136f4e3158..d7705715e388 100644
--- a/sys-block/megacli/megacli-8.07.10.ebuild
+++ b/sys-block/megacli/megacli-8.07.10.ebuild
@@ -19,7 +19,7 @@ IUSE=""
 
 DEPEND="app-arch/unzip
 	app-admin/chrpath"
-RDEPEND="sys-libs/ncurses:5"
+RDEPEND="sys-libs/ncurses-compat:5"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/sys-block/megacli/megacli-8.07.14-r1.ebuild b/sys-block/megacli/megacli-8.07.14-r1.ebuild
index 92d6aa9dc7d3..718d3ec37f96 100644
--- a/sys-block/megacli/megacli-8.07.14-r1.ebuild
+++ b/sys-block/megacli/megacli-8.07.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,7 +22,7 @@ IUSE=""
 
 DEPEND="app-arch/unzip
 	app-admin/chrpath"
-RDEPEND="sys-libs/ncurses:5"
+RDEPEND="sys-libs/ncurses-compat:5"
 
 S=${WORKDIR}
 
diff --git a/sys-block/megacli/megacli-8.07.14.ebuild b/sys-block/megacli/megacli-8.07.14.ebuild
index cb55e6adb147..968ffeb5764e 100644
--- a/sys-block/megacli/megacli-8.07.14.ebuild
+++ b/sys-block/megacli/megacli-8.07.14.ebuild
@@ -19,7 +19,7 @@ IUSE=""
 
 DEPEND="app-arch/unzip
 	app-admin/chrpath"
-RDEPEND="sys-libs/ncurses:5"
+RDEPEND="sys-libs/ncurses-compat:5"
 
 S=${WORKDIR}
 
diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest
index dbb3ba831a0d..753209f843e1 100644
--- a/sys-block/nbd/Manifest
+++ b/sys-block/nbd/Manifest
@@ -2,11 +2,7 @@ DIST nbd-3.18.tar.xz 527436 BLAKE2B 6f87f013ff00b3cb478a038f07a83fba44b41c257a68
 DIST nbd-3.19.tar.xz 524412 BLAKE2B 21669bfe3d34789725895511b1b65be83f85c315992d973db6737cb151ffa48c69ca8bef7dbce513d6f12551b22d063a951644fcaadbec5c115672040b2af8e7 SHA512 0916b411857045af6e01032b3093e295e7f3cfb1ae92f25adb03d97d3196741f8805104c627b17ad4f7f4305db3a4bcd5516bfd2c60fbea02b497dc296f97a16
 DIST nbd-3.20.tar.xz 535136 BLAKE2B e707ab5565ca2281052d04e0b8854222a14b3dd365a2bb71b6544a9253204aad49df652bb888a035fbcc3b352530ccf59ab5374280ae78feea012f91fd4fa24c SHA512 d115939d8f086a1d99637d71453cbcc000a9145a85912a7edf701fad1b90d79e7bba1bc065fc54baa20c8a7665f47ad886cf8493bbabb15854eeede45cf176bc
 EBUILD nbd-3.18.ebuild 1294 BLAKE2B 2d403e7c993df9acb2d90678fffd852154ee5d4eefcef4dd3e8c462b9f2bbb0d2d3adc76e3b9dc5de5cadc0883150a8b44a62cfaf5c8a13f38e5e274c29ff990 SHA512 c6cbfb3748c4380133060501ef1f4453f50f33d5a44008bdab9f4e0a1bdc748a5ef5b83accec9cd425689988b9d18f0cd359f1b641e6a9b8e4f30e91b3ede73e
-<<<<<<< HEAD
-EBUILD nbd-3.19.ebuild 1300 BLAKE2B 5b577d3a883821588764d6cfe3bc7e990e7493c7690a6664ecf54753c9b67d16caa2499b719a9323ff1a03b61b48b164462fe4eed88e77a3df393f7427e48386 SHA512 b6d18e6d129d0645c199344d0ce4ec6fa9f168783a126795b9d704de0c724c800f1c46888ddd9d115a5f429401bdfffab804349c80c863e802a7b39a83e005e8
-=======
-EBUILD nbd-3.19.ebuild 1296 BLAKE2B d277a7537f2b507081d34d3f4be80ac04e2b19c3740a643ce59ff8707508fbb0b53b34e1ec7dcf3916ec3434a7f7f990f00951ca43b3570c25c5db51aeace906 SHA512 aa3b0a5e795dc6d75959e92753bf784dbbf9258dcb03f098dc5c797f2c90d9f2c0bf567f013f239fec0f8a1c1fe5670dc16ba002859a65e16a5822a74f0cebc6
->>>>>>> next
+EBUILD nbd-3.19.ebuild 1295 BLAKE2B 3d8baefc09ef790cdbfe32e839dd6b1b523c6ccaa091cf4ddca871167f467cda95794da46a9c96346ada153ee81fc6a10dbfdd9bca500575f4b77ea4d6b323ed SHA512 12c9dd3f32858048f7827b99b86bf8bba9e8ed43d0c1650f4ac188921bb34ecde4995b29d72b14e7f43f9407efa26558e0c85fc5e4c50d639ed37d82cd267666
 EBUILD nbd-3.20.ebuild 1309 BLAKE2B 26288bdfdb8cda4425f74618119f089bd073ff4cd51b0a2fcdbf7636f4e399cb43117bf30dd9b2fe11f79dd33be5487a061f7804d1b6009c17c3bfd8c50c58bb SHA512 14ecb279342da915ebaedfd8a4ffaa4051f0c528f3852e9c3b9f47421995f81de8d7053b569728f7b0fe9aa2c76c4ccf8797a189b1156166253bb053bf7b33bc
 EBUILD nbd-9999.ebuild 1309 BLAKE2B 26288bdfdb8cda4425f74618119f089bd073ff4cd51b0a2fcdbf7636f4e399cb43117bf30dd9b2fe11f79dd33be5487a061f7804d1b6009c17c3bfd8c50c58bb SHA512 14ecb279342da915ebaedfd8a4ffaa4051f0c528f3852e9c3b9f47421995f81de8d7053b569728f7b0fe9aa2c76c4ccf8797a189b1156166253bb053bf7b33bc
 MISC metadata.xml 428 BLAKE2B 517a7a18e27635aee079f823c121ad151ffad3c815c63853bef3ac17fd05f6f3a5e8028a0189fdde60cd339774a8ee34334ee724044368ecc92de07c1b995cb8 SHA512 6cf2e9181f243ca20efac7684b470f288f5f75de387e3e2389dc21f41e4e037d6962a98c4eb249f009f1e02038ba53858d2feb41218e0422d05d11d1ab067cc0
diff --git a/sys-block/nbd/nbd-3.19.ebuild b/sys-block/nbd/nbd-3.19.ebuild
index a69d6ef1f0b7..d7fd329715ed 100644
--- a/sys-block/nbd/nbd-3.19.ebuild
+++ b/sys-block/nbd/nbd-3.19.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" = 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/NetworkBlockDevice/nbd.git"
 else
 	SRC_URI="mirror://sourceforge/nbd/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86"
 fi
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-block/noflushd/Manifest b/sys-block/noflushd/Manifest
index 864ab7621048..3cf3006195c0 100644
--- a/sys-block/noflushd/Manifest
+++ b/sys-block/noflushd/Manifest
@@ -1,7 +1,5 @@
 AUX noflushd.confd 241 BLAKE2B e2b4a7b6ec13597d790c111655106f00d74698e2f19f44028b858ef4f40a4d0ca7f8266b5449c9307ebb2f89acbf3568e944791350e5c3d1dd1d4d4ead770aa8 SHA512 74a427fec3eb3ad7266f9cf28c4e9b153961367681a1126fb18182d7519d74f7d7f0098601483f6c6bfdd55dcabc8f117f1e904c554833e489e21e3d4005d993
 AUX noflushd.rc6 664 BLAKE2B 64e084160e015ca15bb0d4505be844457c0493a65877530d9e90c22ee0a0334a445b622cf38bc426ad800032bae1211b30d6aac0f7577f9128dfb32c6b77e90a SHA512 f541bc82ebc81fe4c09fbd02a8aee1668d3e8fec738c552219dd4d5741be5ac1a4abb544cb800d6f182b00f6021fe84858f0befbb1317ca5ec5a9092d64ba2cd
-DIST noflushd-2.7.3.tar.gz 145328 BLAKE2B 66506b268176d291986791b5e1d38131f6e796a20844cd3924b05336e288c3a0be88c1acde4a314638b76b1c85ab1d12f2381b4a1894e77228a5f08643bc02dc SHA512 3db9f5d005dd097211df65dbeb6dcb44fc66dfac66de63e004337762e5128748f5f15fd5550dad5f346bd774c664d509acf0c69b6fd33414439f5ee17689ba05
 DIST noflushd-2.8.tar.gz 180386 BLAKE2B b3b90dc09ff6e61f874c3e738c3df31351c684e397ef6c357a864fb0265a905e927e5663b95bdb194b343a66dbf514deb0591684a9f9c9ece17f8e78a4c5373f SHA512 2bffb61aa380409efc43e7ff93d1efd93812dd2c66b4635101a608f1bd5094545e4db64e03fd318be3d3ac50be6e7278b17d9bb9ccd30c52f5e2e4337f749b50
-EBUILD noflushd-2.7.3.ebuild 956 BLAKE2B 74ea9aadd87fe34b9ddac074ad654f4117d900b289918503d3274ba2a41bbb2559334973497178cb2287d1e4d052873259244f9511e5ed6c472ba20eb9de7441 SHA512 583580d79860041cb55226e966684b31ee83dc8ea370a1fb1bb6a19c7e0aa01e82c29aac70870eda395be8d090fdd707f5187a76810d02a05a3fb3e28e22ab9a
-EBUILD noflushd-2.8.ebuild 735 BLAKE2B 927c828efcb9d6ef1675763420975757ce29fce9f69a415214e09d3b63b552bfce89d6f82226bbaf56bb40e6b8b888095c1837f13e25acb3afee1bdcfc441304 SHA512 5c68a7dc940452dfba1ee886fa93d44c6055593b13480f2abe97a6016d36a9d60d6d7d4c41b441017cc5b75b610797692ac59c7d374ce6b832ac86f7105514de
+EBUILD noflushd-2.8.ebuild 729 BLAKE2B a6eac0c9b94ec66a27467fcc4be109ba532149b0b4547d4ed6251602f91c33ad043d10920763bedf84a935b6790e9816385fb07de6051dd2d2dac960c3bb770b SHA512 cf2a3a55e4f2a9fd50ec525baab6b307a54040d50890b3cbcc4577f9a89086e8b562ab1a50f994c1bf1ffb89646789ba94434a58bd8f635575cf1aa0f396ae77
 MISC metadata.xml 328 BLAKE2B 0360db5b7dcc12efa157d0b845445a989f9edb2b3339c84943cd9c9a98078f16ad05bee3a09a6e55f0402cf24b6deb440a3a5a76edd83a0627d280eb9889d794 SHA512 f7e518c8e327d595d8d325bd29f2723556870034444a11eb4ad010ff79d237756e3cd75b91f29650c2d8f7236c9bcb485e3627640455a89ec363ac27fdba57ab
diff --git a/sys-block/noflushd/noflushd-2.7.3.ebuild b/sys-block/noflushd/noflushd-2.7.3.ebuild
deleted file mode 100644
index 740968775333..000000000000
--- a/sys-block/noflushd/noflushd-2.7.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A daemon to spin down your disks and force accesses to be cached"
-HOMEPAGE="http://noflushd.sourceforge.net"
-SRC_URI="mirror://sourceforge/noflushd/${P}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-SLOT="0"
-
-src_compile() {
-	./configure --prefix=/usr \
-		--host=${CHOST} \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--with-docdir=/usr/share/doc/${PF} || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install () {
-	dosbin src/noflushd
-	doman man/noflushd.8
-	dodoc README NEWS
-
-	newinitd "${FILESDIR}"/noflushd.rc6 noflushd
-	newconfd "${FILESDIR}"/noflushd.confd noflushd
-}
-
-pkg_postinst() {
-	einfo 'Run "rc-update add noflushd default" to add it to the'
-	einfo "default runlevel."
-
-	ewarn "noflushd works with IDE devices only."
-	ewarn "It has possible problems with reiserfs, too."
-}
diff --git a/sys-block/noflushd/noflushd-2.8.ebuild b/sys-block/noflushd/noflushd-2.8.ebuild
index c94cfcaffd46..b1c15b456d91 100644
--- a/sys-block/noflushd/noflushd-2.8.ebuild
+++ b/sys-block/noflushd/noflushd-2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/noflushd/${PN}-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 src_configure() {
diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index c41ee9fd1346..567e439d9400 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -3,12 +3,12 @@ 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-20.debian.tar.xz 87496 BLAKE2B 4409826b35b42093f16f80b1ab2f41b4caf2264c9dcfe9572fa1ddf5f51eeffa2208fc187bd7a98290ee2df92604928eae84fd2fdee78d688ec19e81f8b9efac SHA512 83f14befdd7d048976572b3e2eebfaa42649458cbcfd659db704737dce991980ddb2bc65013c5b31b04a17fc17fb756da0dda76edbcba93708afca34c56e0d22
+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_p20-r1.ebuild 1740 BLAKE2B fb283538a1fb4bff9efc65fc1fdbad622288dbec7f18c0b5c81ec05a96c7c321fed34d1f6fc3aa3d306638c55cb6167e590875e68c74b0c63b3866d02722f3f5 SHA512 90378164b7d0d4d4b7f0cb71c589860d592fcbc7cc4199914287c00d0ebd36b9bdc7d3a8e1e0782ec29962df4f9993c050347b4a3c3dd8aa7ba21a48d4c13b2e
 EBUILD parted-3.2_p23.ebuild 1708 BLAKE2B 0e7fe667d2a5abf26d22c5565eab5d844ba5ee88c33fb3a114e1b53374b070c917c02f3a3559eca3fac48455075cec394a4cdb9ba3c856c3a038be1a1a81fb64 SHA512 8359721e7f4fc1df27168f596d3101910fbad078d43a4c8139d318d5630f451a8a96c229241f312b7465385b5bf34e46f16ef0626d6122f8678ab347c08f831f
 EBUILD parted-3.2_p25.ebuild 1709 BLAKE2B 99b89316a52c01528ddc7e51b9cd3415945c1e4a79bd6669b5c3abb161d7edb3607db4d6814d8f1d81894eef364ce6d71105c009dc6c1231c49ddf1a3ec5b0c2 SHA512 afd60957fe6cf5d5cd9900128fcded9c7910b2288beb14129d0a4987950ce926b5506ecdec8502d8c906b2e66539d1563aa551a7b3e4c0da86f771c258b48972
-EBUILD parted-99999.ebuild 1447 BLAKE2B ec61ea53abdf1d4a7d6575269b02e832fe21e5721677a79cfae9157395ef98a43a8f29328a17bc3f165c1fbfdef1316569afe4091934b1c5b83d02ea67ff8250 SHA512 622b3d39d9f7c88de9c29f7216d2149c45b881c669e2cdfd4c6910c4f2940c8dc8fffbb5c51b6c77007551c562a4b0df2a6c981c9649b7e53985cad153c0f677
+EBUILD parted-3.3.ebuild 1322 BLAKE2B 9956c9f5a1b368c6b747ec7b7b818ececc4be5a6b0f41a859e6f8d1093ce3b29876d1ddab30128872a5b885c1142aad53e378800f9d4c25448a5e5de053d82e0 SHA512 a43ca5c881ce2e89f51463ad3b906265292b853d1120e76698a774ecfa59938dc0a37021340a2552adb704d72c6611af2714a4128802e45391c6f503b99cb826
+EBUILD parted-99999.ebuild 1434 BLAKE2B 9f3244f06da51245e21f7931888c9358f564fede3b3332c8c47f5aec5ddaff97419a6197d11baa0ebc79671f6604707d7e47f11046c658c95523dee79e09c2eb SHA512 4c4415068e0a4dd5ff10f583e6314b542efef47437460c9dd7fee3ef19c0b29a4048d4d8f655964e90e953dcade09be240e289558992ff8594206d493c67bd75
 MISC metadata.xml 754 BLAKE2B 6bf44d26295c82c00691f9ba11e114f43c2674e98b1a0f332280e2753c08aeeb5b5a402c2288e9f0c654d4d91be1ed20810eb4b19cf277b76d326423ee6b19a8 SHA512 b5ced0310e8a606de46a5a2a690d7a549c5528eb843616621486db93a9fc45266eafbcbacc90d38d8005cd0366fee671705fc98c54c79bf0b3519d182d15c184
diff --git a/sys-block/parted/parted-3.2_p20-r1.ebuild b/sys-block/parted/parted-3.3.ebuild
index 8547e2cb78ea..aa855d377c10 100644
--- a/sys-block/parted/parted-3.2_p20-r1.ebuild
+++ b/sys-block/parted/parted-3.3.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils flag-o-matic
+EAPI=7
 
 DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
 HOMEPAGE="https://www.gnu.org/software/parted"
 SRC_URI="
-	mirror://gnu/${PN}/${P/_p*/}.tar.xz
-	mirror://debian/pool/main/p/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
+	mirror://gnu/${PN}/${P}.tar.xz
 "
 
 LICENSE="GPL-3"
@@ -32,21 +30,8 @@ DEPEND="
 	virtual/pkgconfig
 "
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.2-devmapper.patch
 	"${FILESDIR}"/${PN}-3.2-po4a-mandir.patch
-	"${FILESDIR}"/${PN}-3.2-sysmacros.patch
 )
-S=${WORKDIR}/${P/_p*/}
-
-src_prepare() {
-	default
-	sed -i -e '/atari\.patch/d' "${WORKDIR}"/debian/patches/series || die
-	for patch in $(< "${WORKDIR}"/debian/patches/series); do
-		eapply "${WORKDIR}/debian/patches/$patch"
-	done
-
-	eautoreconf
-}
 
 src_configure() {
 	use elibc_uclibc && append-libs -liconv
@@ -66,5 +51,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/parted/parted-99999.ebuild b/sys-block/parted/parted-99999.ebuild
index a3d6fcc40698..a4bb63aa3d01 100644
--- a/sys-block/parted/parted-99999.ebuild
+++ b/sys-block/parted/parted-99999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools flag-o-matic git-r3
+inherit autotools git-r3
 
 DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
 HOMEPAGE="https://www.gnu.org/software/parted"
diff --git a/sys-block/partimage/Manifest b/sys-block/partimage/Manifest
index 13574b8b7c66..2e9c9bd3be0b 100644
--- a/sys-block/partimage/Manifest
+++ b/sys-block/partimage/Manifest
@@ -6,5 +6,5 @@ AUX partimaged.init.2 628 BLAKE2B 872f72a4407ca0f923220e2c313779a0e52b6179b75356
 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-r1.ebuild 3552 BLAKE2B dba353cce1eb9dd2f374016b1af83e2a33de522ab6beb9923bc5ccebc15a22d23bc57bf08392453c4f323a40db78062b2881c83b2170fde0f04833b4982768c4 SHA512 a9856ca19830ae37afc4d6202a0f1124176e16322e626423f4dd6db3119d955c5e85ff8cc515ae4ac88b667ef61c4666aab2c2f3714fbfb9ccfe8afbebf8aa50
 MISC metadata.xml 427 BLAKE2B 33870f2fc393bed75dcdbda1bb16d6cc947cfa4f7321e7f219338cab014be901eca6d3e2dc11c0ecd50be28922f0f1a746a8756c3d860d8f10549098c3479cad SHA512 e5e5377e9f6cf6337b93ea8609424ce4b9514b0b0d9628ef22999537af616f24e4882a915cf6249f8d0e721b5e25e0a50f5e046b8ac9991c130b4f5892298e67
diff --git a/sys-block/partimage/partimage-0.6.9-r1.ebuild b/sys-block/partimage/partimage-0.6.9-r1.ebuild
index 7391cf5ed375..400f801dd5f9 100644
--- a/sys-block/partimage/partimage-0.6.9-r1.ebuild
+++ b/sys-block/partimage/partimage-0.6.9-r1.ebuild
@@ -18,7 +18,7 @@ LIBS_DEPEND="app-arch/bzip2
 	>=sys-libs/slang-2
 	sys-libs/zlib:=
 	ssl? ( dev-libs/openssl:0= )"
-PAM_DEPEND="!static? ( pam? ( virtual/pam ) )"
+PAM_DEPEND="!static? ( pam? ( sys-libs/pam ) )"
 RDEPEND="${PAM_DEPEND}
 	!static? ( ${LIBS_DEPEND} )"
 DEPEND="${PAM_DEPEND}
diff --git a/sys-block/sas2ircu/Manifest b/sys-block/sas2ircu/Manifest
index 9c63a0e1bd05..b5170b294a2f 100644
--- a/sys-block/sas2ircu/Manifest
+++ b/sys-block/sas2ircu/Manifest
@@ -2,6 +2,6 @@ DIST SAS2IRCU_P19.zip 2664125 BLAKE2B a005c556750bb8eeb3cb02a2aa138182ffeb248908
 DIST SAS2IRCU_P20.zip 2777958 BLAKE2B ba8c3ef1cf353af90f32a53722b3a7039768c0f48e1d5b48766acdf1c1c05a039692e1edc2586140da5af0f1f2378f4bfaca219895317dc7974004f3aed25343 SHA512 a0a4fa7d07959aa6a81d3540e71e3cc248c23267875ca098da6a80850e008cbdf57b2d6456b5fe17ef890fd39ac550788c9769d169a0673578632f1a8c8a8311
 DIST SAS2IRCU_User_Guide.pdf 794046 BLAKE2B e976f57ada3c51b58bfee24cd2f5d059f59b48bf388d93b146238d54aa09b06f6d450e3ccf149903871dfcdb32807a35d6f379738e149b410b7c1279f811153f SHA512 515869794be428ffbefcbfadac992912fb0eebab0cda640b315b4a231b5f25f1205978605f108b9009380015f3058c47e0ce4352c693ef23ab31980ea8b821a0
 DIST SAS2_IR_User_Guide.pdf 999388 BLAKE2B 4f1a198ccaa04cf250430106e3254cfb37fd16a1e89861030ed92f52de1d8cff17337709bb641093d78acb44995c03fceff739a0c416f7e3b1692c3b8c6a85dc SHA512 7370b54021978eb543270c992569637092571eaad73896b4bfdf7c7bc45bfd0cb0c6f8f34468255372103f562eb1e3ce2ad30cc6f0d37e7f9bc23f61ee166355
-EBUILD sas2ircu-19.ebuild 3427 BLAKE2B 94a7f245f3187e6feb5060c131c617b09eb8f9df59f8671c6ce36c59a6e8ba8cfa51ec8aa3c64bcfce5b4f914fd637e2a550b91bfd33ab65f2631f41945d7033 SHA512 aa45104f0349366b27aca85b22dcb1314cd919745f214c7bbc1ce301636733288b3b2ef759acf37e73d1396f7144aceac4c9d0c3a0aa18175acb0a47e5265462
-EBUILD sas2ircu-20.ebuild 3341 BLAKE2B 3531662db9211e0bb41fb71208fb1aae7eb0ee6482ab6ae699f57ab0b52a5bea97b1dd8a1311d2d55210c6ebca5f9f9f9621eca348854965a5955cce78d19fa3 SHA512 60ff1ab73216098d2650cef2627fcbfb96a974d7df7062ab25bda926f7775f689793bf04bb026de1a8966ce6ef408d0f6d8168e911d9c5d9cff0e414d0262a98
+EBUILD sas2ircu-19.ebuild 3405 BLAKE2B a759f11d9209cf5bd6284a8554453a8a58095c4b93658274f9cade08821ea8c41cf037915ab8f0c5634fffc300f0120e80bb2806ad41b518caf5242786991934 SHA512 1e2d46cee261e2a421ddf18c3c1cc460adb82a2a089787b799ddef57c258aaf03ee6672eaba76c46571c9f2eaa47ec2302df9544294f44f9edc4f83e2c366489
+EBUILD sas2ircu-20.ebuild 3319 BLAKE2B 2e4363e67797433c0dcac5e4395ce4ca109418a6197e13671550d82aee42e76c968433839c7a0892ca71282d43fc1dc1215da4612b1a0392b4281b26edc7f627 SHA512 59f3d87de60b972d2556c9f527d5ed0aa3f562878c662933e88fb67be48b16b427c79fc9ff84105763d855e04aaaab5ca0d5193d5605672164e38d4b8cc4965b
 MISC metadata.xml 312 BLAKE2B 577d974392eb1ce437f0d37fb672838b00d37905df265b805a0b6a569735d29d2e51ec519298c9b6a524f7c48261f1954e9ef3f37f36998d87b040ae9d6cd678 SHA512 124c27e52e4e80fd1f377204adc8b369cba9d688b53908b40338f8313173f57933b3739f6086a7de64bd1cbc880e1c6d696cdf1078f6ec48a4948484436850e1
diff --git a/sys-block/sas2ircu/sas2ircu-19.ebuild b/sys-block/sas2ircu/sas2ircu-19.ebuild
index b7910bb86de3..88676b9d5913 100644
--- a/sys-block/sas2ircu/sas2ircu-19.ebuild
+++ b/sys-block/sas2ircu/sas2ircu-19.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="LSI MPT-SAS2 controller management tool"
 HOMEPAGE="http://www.lsi.com/support/Pages/download-results.aspx?component=Storage+Component&productfamily=Host+Bus+Adapters&productcode=0&assettype=Miscellaneous&productname=&keyword=SAS2IRCU"
 LICENSE="LSI"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="-* ~amd64 ~ppc64 ~x86 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="efi doc"
 RESTRICT="strip fetch mirror"
 DEPEND=""
diff --git a/sys-block/sas2ircu/sas2ircu-20.ebuild b/sys-block/sas2ircu/sas2ircu-20.ebuild
index 3e36b2357e94..bc80be95dc45 100644
--- a/sys-block/sas2ircu/sas2ircu-20.ebuild
+++ b/sys-block/sas2ircu/sas2ircu-20.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="LSI MPT-SAS2 controller management tool"
 HOMEPAGE="https://www.broadcom.com/products/storage/host-bus-adapters/sas-9207-8e#tab-archive-drivers4-abc"
 LICENSE="LSI"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="-* ~amd64 ~ppc64 ~x86 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="efi doc"
 RESTRICT="strip fetch mirror"
 DEPEND=""
diff --git a/sys-block/sas3flash/Manifest b/sys-block/sas3flash/Manifest
index b85f6a669eec..1be553e39541 100644
--- a/sys-block/sas3flash/Manifest
+++ b/sys-block/sas3flash/Manifest
@@ -1,4 +1,4 @@
 DIST SAS3FLASH_P15.zip 5284358 BLAKE2B 8602db381d7ce7fbca7b55c0f7a9ec4868153264624a5c64d7602a5b094e16c274df22d4e4e8c2f3dca08ff5b550b5aa8dc72d25fef74a65b8eb24f4dd213934 SHA512 19fe0b313a210c02017234e0784dffde83eb9a9bcca1c98221bc5fd56e0cc196e53f857c5c0d0db37176f59d70cb85aaef3983b1f900a9f2031b9fcd2cfaf9eb
 DIST sas3Flash_quickRefGuide_rev1-0.pdf 301289 BLAKE2B c52a00b7dd6abd14d2a476ed2fca9d56d59555c7f92b802cd37f9876c17d83a9919df6e9c64697eefd2195bec01a1eed14884c3f7daa82195f276032d37a146b SHA512 88129695ac971a28d472f3cea3af8a99fcff508b29b2c7c74994b6854515710239a6bbff766fc4fd31af8726784a3799b2a63a9dd8241e97b34d4e05638e088b
-EBUILD sas3flash-15.ebuild 2225 BLAKE2B ebd5ddbe9c36e4353c999b75cc044669251726d352e5dcc14a9ea0e821f29a7c7c873b9760afc0d05dd8b7b7552d97b9caf47399edda054110f8516bf3ac7c09 SHA512 9b947d9a72ddec235e7c3688c19366c5baf8caf26d760c181c8b7342f978fa83ee35e352b76710c2a59ec1e4bd989352722e3c1acbc648976bc465421af56545
+EBUILD sas3flash-15.ebuild 2203 BLAKE2B 6fc020bfdeeb4bbd6c77b863ad47cb3c9f39d25c83b9b6b8f2386304564d78f319d7d77a00221058507fe2e3235818b516ad7ea571f32883fae6c0a67e51f070 SHA512 61738738efc9be7cdb247a9f1f5056783b7114bf1505b10e1d450c3f2fb13ff80282c27445ca2f825b2be2b9f5707175dcd1003710315b5ae0a0e88d95797656
 MISC metadata.xml 306 BLAKE2B db3bc70d010eab74af1f8c3e7a4813d1cf0613eaf68ec37b4c32773b7a0b58dcf4ae81c3b42d8a296f571aaa380401329e3cf3c5ec161de08c582080e609c438 SHA512 eaf88a3817a6749ed5239605d4de8cdfb1a219355be17e60b9fd3eae741b83ceef0269f79ac89896e78ddcea0d9dd8da186fd619965ee1fb7f0350c779f561ce
diff --git a/sys-block/sas3flash/sas3flash-15.ebuild b/sys-block/sas3flash/sas3flash-15.ebuild
index cad93d23f67d..f364b432260d 100644
--- a/sys-block/sas3flash/sas3flash-15.ebuild
+++ b/sys-block/sas3flash/sas3flash-15.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="Flash utility for LSI MPT-SAS3 controller"
 HOMEPAGE="https://www.broadcom.com/products/storage/host-bus-adapters/sas-9300-8e#downloads"
 LICENSE="LSI"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="-* ~amd64 ~ppc64 ~x86 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="efi doc"
 RESTRICT="strip fetch mirror"
 DEPEND=""
diff --git a/sys-block/sas3ircu/Manifest b/sys-block/sas3ircu/Manifest
index 821eb642837f..941b070246a9 100644
--- a/sys-block/sas3ircu/Manifest
+++ b/sys-block/sas3ircu/Manifest
@@ -3,7 +3,7 @@ DIST SAS3IRCU_P15.zip 6577897 BLAKE2B 8bb7a9deefee875f88f4ac7ac8432e9e5d7ac01224
 DIST SAS3IRCU_P5.zip 2655605 BLAKE2B 78b7b3555d725166bad03b6619e890c025901fd41be80ac7657945acf9429fa05b91881fe98dd76061c676a373c95079c429196ba73b24407ccfae7f11f48a41 SHA512 233ec5ea8e32123652382a9072831fa35f496ce0755d8fd7113139f43e57837053e00eb7cae5f5273177510444f384fc6f08f7278232fe3d6601771ee214d9dc
 DIST SAS3IRCU_UG.pdf 690245 BLAKE2B 781ec32443eaa99dc0c7d30739ecde21deb62e013b6c08d617cd46567d3905913711a36cd26eccf6e260fda9ed1ec4c0aaffee4a434224ca864379519967debb SHA512 9e7a47f32bd19b708b1eedd63d7d7112a17c8da952b74630196dc2891cd14f758394dcc14b8be05666e6133a3bb10e77784bd62749fe4b1e2d7f7c71ae26fe2b
 DIST SAS3_IR_UG.pdf 714573 BLAKE2B 09a3a47abf6118343f023f4cdf85ab2f5f583f806e305dafa6397d1099fc01ecc33b331afd10d63ac8bb75a365d09c931c19fc673fa707b5171feb23d64f97bf SHA512 4db16dedcadc3daf853e62531ac620af4a3e41d001b58fcd333692f9121d1ca3ec8b9de0113693506b31da714b9368ff55addb0398f2f843e4a6a1bf3d665433
-EBUILD sas3ircu-14.ebuild 2259 BLAKE2B 07abbe1a38d50b57df89aefedec3575ddac5d507f549e75d9b3f10d3d9f5694f63fdc48c3c28423df9c2c05383259f3c1c820567983409456f033e5bcc710bd1 SHA512 727c1bbf8e32172d5cc95df347562ee8d1181cc1026c0677314d9d4ddb7cd024bcf501ca3c77e7949170a8e04883580422581f8cba68dc640775fff8bc6a4c9a
-EBUILD sas3ircu-15.ebuild 2414 BLAKE2B 80b22bf042df5fcc951e72961fe917447eeb937127be55d0a64dfbfb8cfcc60f8e275b2ab333dd2319e516490821b12fdc28e7da7e0e5fe479c7dbe9d25dcc4c SHA512 a6b573f41704cbf0b42deaec6c1efb968a4877a7d9ccfdbf25e599d6a4ba76705d54b4c9d3ca4db5c6000463b8b8fc8a8dc97cf7e117ea1220f9c85a9323db4c
-EBUILD sas3ircu-5.ebuild 2357 BLAKE2B 3fa780c42b344f34459359315afe6a7afd0c7ea179120e9d5e71f244cfd78ed7eaf4653c5ef23a068513902209cafc0548c263b437c6d0c572324db09c7cddce SHA512 7b5c6cbfad7238189c321fb1af8c10d8cc04c77e024d9f060dbd4b4c5ef09b9ba87f786b4713e148db68b8dc548a9ebde45bf25cc1f9dce251a99c3c86f50b5b
+EBUILD sas3ircu-14.ebuild 2237 BLAKE2B 0dbe78a53b2986b53cad3db6bc4bd6d85daa90d66aefa1eac008c105052e79a651c0f585294bd8a5b5f34bfc7902072f3cdcd25ddcc836eeb8bba6779ab05d02 SHA512 cdba1bd9db4168bc9b6e3207e3b4cde8a0b3113060434419bc485ba672e2a0a5c7014374d09e4becf21799066db66a4739353d7d15971944ca93586df6c09ece
+EBUILD sas3ircu-15.ebuild 2392 BLAKE2B 7de7a238bc842c5b533b85b485ad0cf8a0a9d78089453979aa9ac0641228717f294b2a8fe4ac775cbb244c92b53c50f10f5fa06c180f0d605830f9237560c606 SHA512 9b16ca6157ed2da5ac5e9ab8bb46c2b536ffc7361570f849a77cd512f9147cdbba56c0c1388c728dfcf77ff1dfcc420c52613687c6d09edc9108c5c763c84fe6
+EBUILD sas3ircu-5.ebuild 2335 BLAKE2B ff78c2fe266a4363a7a6fd25466e48ed46b69e0e934e9c9d2605370ac7f1fbfc65da585a9c3b3e8c70519f0025f4abb23c8c181005fb943f508a829067088459 SHA512 0fa165f278977f7141aaaf4dc1e7aea4b0e7673a725b7dd1905f7fdb35ca7481473d5c26670474f71f9b989dfaf155666f345dd50d03840e278b6c2154a40f1d
 MISC metadata.xml 312 BLAKE2B 577d974392eb1ce437f0d37fb672838b00d37905df265b805a0b6a569735d29d2e51ec519298c9b6a524f7c48261f1954e9ef3f37f36998d87b040ae9d6cd678 SHA512 124c27e52e4e80fd1f377204adc8b369cba9d688b53908b40338f8313173f57933b3739f6086a7de64bd1cbc880e1c6d696cdf1078f6ec48a4948484436850e1
diff --git a/sys-block/sas3ircu/sas3ircu-14.ebuild b/sys-block/sas3ircu/sas3ircu-14.ebuild
index 231bf500cfa1..a6ab6b69ff29 100644
--- a/sys-block/sas3ircu/sas3ircu-14.ebuild
+++ b/sys-block/sas3ircu/sas3ircu-14.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="LSI MPT-SAS3 controller management tool"
 HOMEPAGE="https://www.broadcom.com/products/storage/host-bus-adapters/sas-9300-8e#downloads"
 LICENSE="LSI"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="-* ~amd64 ~ppc64 ~x86 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="efi doc"
 RESTRICT="strip fetch mirror"
 DEPEND=""
diff --git a/sys-block/sas3ircu/sas3ircu-15.ebuild b/sys-block/sas3ircu/sas3ircu-15.ebuild
index 6d14acdfd8de..ad7d44f65f7a 100644
--- a/sys-block/sas3ircu/sas3ircu-15.ebuild
+++ b/sys-block/sas3ircu/sas3ircu-15.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="LSI MPT-SAS3 controller management tool"
 HOMEPAGE="https://www.broadcom.com/products/storage/host-bus-adapters/sas-9300-8e#downloads"
 LICENSE="LSI"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="-* ~amd64 ~ppc64 ~x86 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="efi doc"
 RESTRICT="strip fetch mirror"
 DEPEND=""
diff --git a/sys-block/sas3ircu/sas3ircu-5.ebuild b/sys-block/sas3ircu/sas3ircu-5.ebuild
index 6fb5dff1d1a9..3ec87152d048 100644
--- a/sys-block/sas3ircu/sas3ircu-5.ebuild
+++ b/sys-block/sas3ircu/sas3ircu-5.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="LSI MPT-SAS3 controller management tool"
 HOMEPAGE="http://www.lsi.com/support/Pages/download-results.aspx?component=Storage+Component&productfamily=Host+Bus+Adapters&productcode=0&assettype=Miscellaneous&productname=&keyword=SAS3IRCU"
 LICENSE="LSI"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="-* ~amd64 ~ppc64 ~x86 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="efi doc"
 RESTRICT="strip fetch mirror"
 DEPEND=""
diff --git a/sys-block/tw_cli/Manifest b/sys-block/tw_cli/Manifest
index 05dc0331dab3..090637508c9b 100644
--- a/sys-block/tw_cli/Manifest
+++ b/sys-block/tw_cli/Manifest
@@ -2,6 +2,6 @@ DIST 368_tw_cli_debian8_beta.tgz 1958337 BLAKE2B 5e10c253a36132c8ee74e555b7e9151
 DIST CLI_freebsd-from_the_10.2.2.1_9.5.5.1_codesets.zip 1531484 BLAKE2B 6bd1a5523a80c32f6251cf4e841f16f3a09ffe77eb452d7b40f37d9f476fec3f379454f4c05b15d4753dd12fd0d5b50acf07dbafbd4f80ca5a1ecb13605bab16 SHA512 04738e9bd644561cf33d2f687159a0bcaf1ab56f340d19d88ecd0b038b89d5dd136b462189452c0578b90e1b276f9d0edc3204e5baebfc2730f319147b636708
 DIST CLI_linux-from_the_10.2.2.1_9.5.5.1_codesets.zip 1878621 BLAKE2B 628070e5f6dc4dbc75f029067298be278b696b84afb245d19761043183bc6232fcf48dfe46954ef61e027082d974905244f6b3e73b596fbbe8d7955375859be2 SHA512 e8a7f27401e7811d5f8533d839066bdf6d93eeb2cb1242b00af7fc559b0a34316f8e6dc80f68e869d97f44290ea32c9e65d1d857c1010009ad1a540252400e31
 DIST LSI-tw_cli 35638 BLAKE2B 8267d311b7b09dd3f0e619fd7d5aadcaf5b24afa1958c99e838b9280b175b8f070dc58164622bf3ab54dc5ddfc24a4a4ea06971a919b17a3c2594541e43ea41f SHA512 1a1d35395ffccf70004b0c111d8c4a7e408cf0c57503bb4d1fdd608f9b71d6ea4d7488307dd6806eaf6557d65badd9c43aeea3e7c1ddae1c56962c85c2b868c9
-EBUILD tw_cli-10.2.2.1-r1.ebuild 4547 BLAKE2B cfe539046bdc4be7e2d4f726c278ebbaaad173c9d04d2883db6ef10214df38932bb19fe3069d690f9c1b4ba53699d47a473c7e2fb5390f5ff58ff2e87f613764 SHA512 791054e601097d6de04aa51f74b8590710667206b4e7b0fb5598b14698b3e40b096942390788c95d032d36930cdc7d7597ac049741b4e063b33e42ebae5901b4
-EBUILD tw_cli-10.2.2.1.ebuild 3920 BLAKE2B 4a9f17bc35ef2308a7d193a9fd23c912e79b968282b90747b095223006ca347dc22604c4cccc561f7753cd114b786b1a6faa14de4a43640578f4bb458ab91040 SHA512 0a2a6514554990ba57f07a86e516e0c2573c6ed3cd5df0399f05b6824efdd9766583ae8a4f7ea411187a5dada0b39c3b407a0a20f1c70e2ae3b6e65c5f091bc6
+EBUILD tw_cli-10.2.2.1-r1.ebuild 4536 BLAKE2B 4c49f9a1ef393b5d49a2dad15c49a5691545f09e893ca7499040e33aa0fac33ff620903bab803ce464a27889699f52652c1239eb6d0ca05e8c4d6a681499e89a SHA512 32ed7290cea9271c44605b756676ce1df3ac9717591d607e1da48be1bf1ca2ec579e4ba71725ac6ac06da6463b9d19b5637514a82231d945f7093662fcf49f60
+EBUILD tw_cli-10.2.2.1.ebuild 3887 BLAKE2B 4716658ce80408affba8df3c8f1c2872a65271c642ae4d79e10d87450253fbd2963a6a561d714d94871b8353025ef37bbc30da5eec717b6b80bdc0989e2b45cb SHA512 2bedbbaf98296b02dcf78747eff982abf148475feacfe23868d99f4fc1b4b139ebaa784553ed3f44edabd8593178095e84f0de8f6418c702d4d7ed5d10bce926
 MISC metadata.xml 311 BLAKE2B 56fbd3d73b4ff55b0f80481c6c22a68371cfd71e0ce195ca24e8f9e90894a89368982a699a5e39c3ed0b108750674d6b065d1b63c168cc3596a9f300cbddcaf9 SHA512 f60d7a3782e3920dfe2fe2e2986426738be4974c1589d48a1c3991a1ff4ff11fd246124ac2ed740818c6ac801ce9b31ad570cd2b968328c2902c13a97fd197f3
diff --git a/sys-block/tw_cli/tw_cli-10.2.2.1-r1.ebuild b/sys-block/tw_cli/tw_cli-10.2.2.1-r1.ebuild
index b12d697f06f1..0239fca6f4fb 100644
--- a/sys-block/tw_cli/tw_cli-10.2.2.1-r1.ebuild
+++ b/sys-block/tw_cli/tw_cli-10.2.2.1-r1.ebuild
@@ -59,7 +59,7 @@ SLOT="0"
 KEYWORDS="-* amd64 x86"
 IUSE=""
 
-RESTRICT="strip primaryuri"
+RESTRICT="strip"
 QA_PREBUILT="/opt/tw_cli/tw_cli"
 
 # binary packages
diff --git a/sys-block/tw_cli/tw_cli-10.2.2.1.ebuild b/sys-block/tw_cli/tw_cli-10.2.2.1.ebuild
index 10fb9c3732af..87251bc687a0 100644
--- a/sys-block/tw_cli/tw_cli-10.2.2.1.ebuild
+++ b/sys-block/tw_cli/tw_cli-10.2.2.1.ebuild
@@ -50,10 +50,10 @@ SLOT="0"
 
 # This package can never enter stable, it can't be mirrored and upstream
 # can remove the distfiles from their mirror anytime.
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 
-RESTRICT="strip primaryuri"
+RESTRICT="strip"
 QA_PREBUILT="/opt/tw_cli/tw_cli"
 
 # binary packages
diff --git a/sys-block/viaideinfo/Manifest b/sys-block/viaideinfo/Manifest
index 56c5888b2ee8..ead487565793 100644
--- a/sys-block/viaideinfo/Manifest
+++ b/sys-block/viaideinfo/Manifest
@@ -1,3 +1,4 @@
 DIST viaideinfo-0.5.tar.gz 87428 BLAKE2B 6f2834378f58ad091cec7c60f18d3124b1e67b90be08a5550c56679e95186dcc8da961ec7eed0d3b9e9f83ccd1a1cfddc1f56a483b0f78ab1f984a99a62fc0d8 SHA512 8b697f5192828db9393706bbc4b679c664a1f3f5668820bfad7aaf1b8767586e49fe428fdc61e9223ee4cc2a16601f6060a2ec206690c098a864e9f26915e7c2
+EBUILD viaideinfo-0.5-r1.ebuild 448 BLAKE2B 7b854f6b92f08127c3485109195f1477397c9651764c216b2e3aae06c26a6e14d9bb032bef3288cd21652a40a1b95817932a9cdc234ded948afc409db59b1a16 SHA512 550eede0671983be23dcc51fca16f8a78f19164316121f3eb775f591dcb22ea7e89dea3cef7677e11ccebcf015bc9dea2f84b40c8a5d69dd7dc7a824b41f9c50
 EBUILD viaideinfo-0.5.ebuild 483 BLAKE2B a27dffb10c2a178edaba70774482f5a1fcbb8404bda47238e73290bf8ae9b9602a86c851804d07080312feacecd1fd7e600ce8c7c2ae1acafb64c617200f26f2 SHA512 b4e1352dd953043a419fe15358638afc6bc45b200d7de3df5b8321df01363177a29645cc2bed66d494ccc9cc2d88f878f4eb6135466ba93351c1122e7d3a4f3b
 MISC metadata.xml 240 BLAKE2B 64fe413f69832b5396b621f50bc6f618ddea15ddd4044ac76da4557d7dc0d963ce6ba36c0d1c0a8911af48fd71a6e84c4981f15ac7bad40bbd801e52b568a23b SHA512 25affa2d6d2fe48707ae81553343451aff9797885b4232e73973a29d4cc1d28a937d024cefca49f92383f01eb8cb811546cd2334cbb78f8e66f1db1f63ff4572
diff --git a/sys-block/viaideinfo/viaideinfo-0.5-r1.ebuild b/sys-block/viaideinfo/viaideinfo-0.5-r1.ebuild
new file mode 100644
index 000000000000..c936f5478a5a
--- /dev/null
+++ b/sys-block/viaideinfo/viaideinfo-0.5-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Query VIA IDE controllers for various information"
+HOMEPAGE="http://www.reactivated.net/software/viaideinfo"
+SRC_URI="http://www.reactivated.net/software/viaideinfo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=sys-apps/pciutils-2.2.0"
+RDEPEND="${DEPEND}"
+DOCS=(
+	ChangeLog NEWS README THANKS
+)