gentoo resync : 14.05.2020

38 files changed, 65 insertions, 98 deletions

diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 5db1ff73db2d..fb2c06fc7e5a 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/acl/Manifest b/virtual/acl/Manifest
index bbcdac73832d..96b6c26d2ae1 100644
--- a/virtual/acl/Manifest
+++ b/virtual/acl/Manifest
@@ -1,4 +1,4 @@
-EBUILD acl-0-r1.ebuild 405 BLAKE2B 8c681bb96bad6d38cb3e8f18090a86f9da5cd6350bc865d2109e351ff3dca1a6c713d518494c34d5a0f6652c097fda2f308da5564577ce1799d398120afd14df SHA512 a4641aeff88f9e3ee012bdbe75d78de1248fe1ebb16fb607d492ca44cf077a67ed02b5c184ffc63bef085da856cba52b3609d64269d907d870f1e4b9429b0b83
-EBUILD acl-0-r2.ebuild 491 BLAKE2B 31d9bb4db3135c3586274454e0ea1ceb4b472f42b8591d7878bb6a88153fccddb8c801ce6556cb6ae9377909f56d4d708b60a7c472818dc572b261e4f93bb9ba SHA512 9e1cfa516303b461d48a82c0323a6a98e54da1701317456714f610c7e49434c6e2c5d7daadbf50525aebe573ac19b75593c2f0aaf90a912de03c4981474a49f3
-EBUILD acl-0.ebuild 361 BLAKE2B e9de18e26594c1593e1d22c8953da53300b08be8f6c0f0fc886365179a8b46b3687493ec34c50d45903b87e60bb98c3a808634561f6b9bc7238a027168ac3c29 SHA512 daf2ab60d36a723260294c1a6427b683261c2fd21962f61f0e42282d4618cf49345b3892a79c90c711e5998568d6eae425064b82c2340ecd2e54b4c8346fddd8
+EBUILD acl-0-r1.ebuild 360 BLAKE2B 54e19daca79e6aa87c575455e5dabead9ead4d855ffbae924ab4274cf56bcc03badd64917c3b4bc9101085785f1845e78c479d339c94b6e458874de07dcee9eb SHA512 86eae5a44b5fbb266b0221b475cbe0d3e63d1d0b5e55fe2b60b56f58bc118526a009a81d98cc0d4248b87ff29454dc422ff616226d2d18db8162f8be209e7406
+EBUILD acl-0-r2.ebuild 416 BLAKE2B 4144830da347084afc3942b0568870e57ced5fa95d6973c28a51dd5ffa07243356882c42906cb5081fe9d652b1d6c1d5d56c2cd2bd9f4ac44fbfa1729249af1d SHA512 0733c3cbe067eeb1bb57b2ba64926944ab0991b76c9638edaa16648cffcc80ea63f5fbaae345c79ef775a6923c857c7a42979a92c034287073f1020bb6c5a5f1
+EBUILD acl-0.ebuild 316 BLAKE2B 0f5b8ae38252cf7436dd485e43e7e787e0e23231d4a4b9f137f20c52f5ff44dda0e6b2f6acaee2d065c2e446548f97a87d25ba97dd483b8d758d02f735e8e2a0 SHA512 6a48d04b3f3eb78dc81ef497479841658e3820fbf798099782feb4665cc0936470ee64f6093305d8210fb071ca3b864d8f843862836f23650589eb8c99ddc5cb
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/virtual/acl/acl-0-r1.ebuild b/virtual/acl/acl-0-r1.ebuild
index 0eb2f2bd75e8..28c500d66e0e 100644
--- a/virtual/acl/acl-0-r1.ebuild
+++ b/virtual/acl/acl-0-r1.ebuild
@@ -8,5 +8,4 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
-RDEPEND="kernel_linux? ( sys-apps/acl[static-libs?] )
-	kernel_FreeBSD? ( sys-freebsd/freebsd-lib )"
+RDEPEND="kernel_linux? ( sys-apps/acl[static-libs?] )"
diff --git a/virtual/acl/acl-0-r2.ebuild b/virtual/acl/acl-0-r2.ebuild
index a8f7c078e23e..c45d2c97c160 100644
--- a/virtual/acl/acl-0-r2.ebuild
+++ b/virtual/acl/acl-0-r2.ebuild
@@ -10,5 +10,4 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
-RDEPEND="kernel_linux? ( >=sys-apps/acl-2.2.52-r1[static-libs?,${MULTILIB_USEDEP}] )
-	kernel_FreeBSD? ( >=sys-freebsd/freebsd-lib-9.1-r10[${MULTILIB_USEDEP}] )"
+RDEPEND="kernel_linux? ( >=sys-apps/acl-2.2.52-r1[static-libs?,${MULTILIB_USEDEP}] )"
diff --git a/virtual/acl/acl-0.ebuild b/virtual/acl/acl-0.ebuild
index 39ef2f39ac1e..3af85ef40482 100644
--- a/virtual/acl/acl-0.ebuild
+++ b/virtual/acl/acl-0.ebuild
@@ -7,5 +7,4 @@ DESCRIPTION="Virtual for acl support (sys/acl.h)"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="kernel_linux? ( sys-apps/acl )
-	kernel_FreeBSD? ( sys-freebsd/freebsd-lib )"
+RDEPEND="kernel_linux? ( sys-apps/acl )"
diff --git a/virtual/dev-manager/Manifest b/virtual/dev-manager/Manifest
index cbc62cc738d8..c365af0ab1f3 100644
--- a/virtual/dev-manager/Manifest
+++ b/virtual/dev-manager/Manifest
@@ -1,2 +1,2 @@
-EBUILD dev-manager-0-r2.ebuild 373 BLAKE2B cfc291173511447296e574db893d91c6ca703e219ce5080160342a64ef0ab52aa09c164847a86b98f2da57db69ebba31a4326da64095cf343ed714feacba2c4f SHA512 ab44d933571759de3ef859c4c2ac11cf77def8bd5aa0f596b78fec5caa28fc1991cffe0cb1360744d5316725ee6b27091a929da288cc283285396b4702f594e2
+EBUILD dev-manager-0-r2.ebuild 348 BLAKE2B e164a00d19ee737e6f2b61150cc3a9408160435e7e2d298e8369c8e47931ab8352139b162b57cef0741f386304a963c64b3cda4116747a659ca3bb3fbb86652d SHA512 93634230fa6e3bb86ed8c0f66ea984128a1cd79e62b016d653d3f5ed054a17be3301926944edd01db3d57897c897ea59f2356a6b1fab3e7d386b81bcf526aa68
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/virtual/dev-manager/dev-manager-0-r2.ebuild b/virtual/dev-manager/dev-manager-0-r2.ebuild
index dbd0980f2fae..a53a86593ec0 100644
--- a/virtual/dev-manager/dev-manager-0-r2.ebuild
+++ b/virtual/dev-manager/dev-manager-0-r2.ebuild
@@ -7,9 +7,9 @@ DESCRIPTION="Virtual for the device filesystem manager"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 
-RDEPEND="|| (
+RDEPEND="
+	|| (
 		virtual/udev
 		sys-apps/busybox[mdev]
 		sys-fs/static-dev
-		sys-freebsd/freebsd-sbin
 	)"
diff --git a/virtual/gnustep-back/Manifest b/virtual/gnustep-back/Manifest
index 362be9817c91..60c7942b171a 100644
--- a/virtual/gnustep-back/Manifest
+++ b/virtual/gnustep-back/Manifest
@@ -2,4 +2,5 @@ EBUILD gnustep-back-0.25.0.ebuild 412 BLAKE2B dc3c9582a2cc1d08644354a5952b20532c
 EBUILD gnustep-back-0.25.1.ebuild 416 BLAKE2B 432eba680298b04fcfef22f5d731224b082d896d2c243f2d88b596b7058b1e5756244cb42c64d7b463f64509eeb4d826b5a4c3e435bcb50707f48a3c55e2dc09 SHA512 52d35a8f2e795807a1ee083438dbe0e0236a00dcf355aeb82fbee06286f60e01c0e5ea19f76abffa23647241abb254a512e8de9e39f0833db822414ece4d3669
 EBUILD gnustep-back-0.26.2.ebuild 416 BLAKE2B 3c8559113b450211c18645df2b3bd609189b813f0e62a0c1546612c7ceb6e63bf81177ff15ee67e1dcff37cadac23f80b990cd9be93d039dc5bbee54197c974e SHA512 26303053199c85c1b13785ad61e16c33c2554f9228fa412918be9ece72971babff7411948997a1e5aeb8f4d3f5b3dbcfdb4ddbdd03f40427ad531ae79de06eb5
 EBUILD gnustep-back-0.27.0.ebuild 413 BLAKE2B f75d7993c441685ada316eb10cf630c0cb0b51f54c0649da0821da155f2597bef1f2ddc561527db8e189c31caf0b6dd5b5e084d619e8456b43b8437a9e78fbb3 SHA512 b17d8a70afbd03e739e1a7e14105fd616152ff5260a300cf9d88b29ccd02a3954f28fb05dbacdc17d38fdef0b0fc8b3a85482a77bc79a4125f7a445e2123f671
+EBUILD gnustep-back-0.28.0.ebuild 413 BLAKE2B 3c31798231237b4d9fbdaeec49a1ca3019c21cb7048125378117f30cdae52969b2cdc278b12b8a9f283b6be6de772ebc08c61584cd504f1bcae4a84f64ed09dd SHA512 e8880176101bba34478b09d0ed4715ca2db2da5096edfb99ca30ae352019e88fffed57c2d7c5a88da1ab62835a7bdba96ec9f4e002a8331f9abd54cd3370a4dd
 MISC metadata.xml 374 BLAKE2B 0b108d08382041cbcd88ed2036d4c824d33172b4e05a0ef76b1593a2e5645c2170cbbc0098847dab42975b9f2420e717c1ef25304074b7d80d737c0c7bb3b181 SHA512 fe6a8db888a291887e72a26db7440e5d10217d21341b5f812ca03862fa85db26e0dee58a12eade84eca8ee33d9230d4ae031e9b4bfeb3e63a366d3c8c13daef3
diff --git a/virtual/gnustep-back/gnustep-back-0.28.0.ebuild b/virtual/gnustep-back/gnustep-back-0.28.0.ebuild
new file mode 100644
index 000000000000..057e571e8e1f
--- /dev/null
+++ b/virtual/gnustep-back/gnustep-back-0.28.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for back-end component for the GNUstep GUI Library"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="|| (
+		~gnustep-base/gnustep-back-cairo-${PV}
+		~gnustep-base/gnustep-back-art-${PV}
+		~gnustep-base/gnustep-back-xlib-${PV}
+	)"
diff --git a/virtual/libc/Manifest b/virtual/libc/Manifest
index 20459f111559..147639147d0e 100644
--- a/virtual/libc/Manifest
+++ b/virtual/libc/Manifest
@@ -1,3 +1,3 @@
-EBUILD libc-1-r1.ebuild 852 BLAKE2B a0a563675aa75137193ecee2bb0d090af681406ef2fd0b9b680f28a190212c9b1fb6a5739ec15397394d0b26416fdd11a30957b2af1cb68efcd4f2010d216c4a SHA512 d36997da2eeab62e1ca5a1fed3448c4f2e646fce8aec4fd3f68ec808afddd764d2ecc7cd7a99e446814bba9fb1ac533838fe4aac7c19475a47d12665f09a9909
-EBUILD libc-1.ebuild 843 BLAKE2B fbd6ab8a5ce4a67936ed1dae9ef66a39433c67410e31628c05aa3d69ed55778ce24f1169385bdfc96fbac135e9246025c810ed1ac0600d38017ba9cd56e8d2f3 SHA512 dc72604a16bab71a54fb36b288a63356aa0296158f393f2480eb9d43601e5febdef6f658140144894a0f4501c8560dec8965a1fe23ae012a0009557d45ba1c4a
+EBUILD libc-1-r1.ebuild 825 BLAKE2B b46fabfcb5419274b1ed5d41cd6c0feda51383122b9d58c9f72761ea65a681f439c44775278d60b1312fa484e3c7ec8b269dfae6bffba91e75ca4d212b0c0085 SHA512 9797d556aa9c832a8afb0a8110026e74ea18629fc57f3e0f3fd0931c4cf3319329540aed02280de74b337dab52c4fe1f59c803e586ae922d4755ad13a1cdfc52
+EBUILD libc-1.ebuild 816 BLAKE2B ab09f702385a02e3f37d2aad82ba134bb1dc6a15e84b53abff949d54801a90a1cd5aca9fd4251c1092866fe35ef58048d6459bf49f789aa1f404c31ba86da74b SHA512 9eee98dba05909c2038b4598b7c3728c7e368d8431b4f8d89a7bdb82cec5eb94869bc254f7cc9f8663b25ffda37ab6fc872e4fb66e946aab7ff28b4de3d13551
 MISC metadata.xml 365 BLAKE2B 5a045bfed52c49ec0cfe074512001e5ab3aea429bb6211812c2c4ac0b91acc4831613141e750827b1f56b8c9c69cf6970317a9ed0ae23ecab0bca8daccd26a24 SHA512 b4b656f72037c54182557618adb9a8f5da16f1a0e0b8fda545a760e5500d9b8b52b78084f16c0cf6c2cbe58d8aa577550e4423cf28d10b6edc7f4027efc1eeb0
diff --git a/virtual/libc/libc-1-r1.ebuild b/virtual/libc/libc-1-r1.ebuild
index 61b2be760b58..8aca9128d50d 100644
--- a/virtual/libc/libc-1-r1.ebuild
+++ b/virtual/libc/libc-1-r1.ebuild
@@ -21,5 +21,4 @@ RDEPEND="!prefix-guest? (
 		!sys-libs/musl
 		!sys-libs/uclibc-ng
 		!sys-libs/uclibc
-		!sys-freebsd/freebsd-lib
 	)"
diff --git a/virtual/libc/libc-1.ebuild b/virtual/libc/libc-1.ebuild
index b346372baaf6..adea1bc43100 100644
--- a/virtual/libc/libc-1.ebuild
+++ b/virtual/libc/libc-1.ebuild
@@ -21,5 +21,4 @@ RDEPEND="!prefix-guest? (
 		!sys-libs/musl
 		!sys-libs/uclibc-ng
 		!sys-libs/uclibc
-		!sys-freebsd/freebsd-lib
 	)"
diff --git a/virtual/libcrypt/Manifest b/virtual/libcrypt/Manifest
index d1a974492a96..29e10475c4d9 100644
--- a/virtual/libcrypt/Manifest
+++ b/virtual/libcrypt/Manifest
@@ -1,3 +1,3 @@
-EBUILD libcrypt-1.ebuild 684 BLAKE2B 40970299637150ccfea3af703e6dc42f71926a8a347c223aedea92f9e4b19e53643362747a32b2a4bd925cb004ca8ceb206508730a7577dcb15fcc16dff8f520 SHA512 6c923390fb15445e3ab1c4173951e0f6295cc3be5f8e620f5cd0c93261f36e2b6d444fbac5989b01bab5150ed72d5601f1fccb72908fa616af8932e1237e4376
+EBUILD libcrypt-1-r1.ebuild 632 BLAKE2B 51a797a5db8434a6288e815fb43b10172ef087467025ea4272e7f0692e1a36e37f8940ffa78f25708c9cfb140ac16271d1542ca1cee2c3fc9f71623e98b1837c SHA512 624a49c12d1f2b55525d182bf7883a6f1a288d4b6058a460a5158abab863bfbd2dd839e0845d0867acbb0f94d684fd6c1df38ccb269523b043a13fa55b134ee2
 EBUILD libcrypt-2.ebuild 656 BLAKE2B 62e40479aa920a3291be7dcc32f5193dbeb9ac684f6274c6acc034fe5d6ca44de541db672cb8af612be0fc7ac56d9c80d00e4ae40d3d2c66e5599a6664a46cdc SHA512 3e478a8dac8ef6840e6d6ef1197a3c6a6d3cdc86df94bc6d8d374d0cca2831929df0a0a594f978c3b4fd6b0055f799beefc254f66773a13f93d2141556871056
 MISC metadata.xml 261 BLAKE2B caf1cd4155f618105164d2fe3addfb4a06a504d56d9a387830f3b7f2b85864260b891897f0a2a6c56a83f72e2dcc1c66ecba2cfe25cf0dcaa54167cda74a117c SHA512 fd47d9491bf53a7f5b4232a4996dabba1ce2cc74a3fdfea0a7d831e0d3351a42c5d1187a05c8c69410fe91a80b7c3c3c087e08ab1fc5ba6a925c46a105d96ac9
diff --git a/virtual/libcrypt/libcrypt-1.ebuild b/virtual/libcrypt/libcrypt-1-r1.ebuild
index 549b652f3736..e4ab9cdaf26b 100644
--- a/virtual/libcrypt/libcrypt-1.ebuild
+++ b/virtual/libcrypt/libcrypt-1-r1.ebuild
@@ -12,12 +12,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sp
 IUSE="+static-libs"
 
 RDEPEND="
-	elibc_glibc? (
-		|| (
-			>=sys-libs/glibc-2.30-r2[crypt(-),static-libs(+)?]
-			<sys-libs/glibc-2.30-r2
-		)
-	)
+	elibc_glibc? ( sys-libs/glibc[crypt(+),static-libs(+)?] )
 	elibc_musl? ( sys-libs/musl )
 	elibc_uclibc? ( sys-libs/uclibc-ng )
 	elibc_Cygwin? ( sys-libs/cygwin-crypt )
diff --git a/virtual/libelf/Manifest b/virtual/libelf/Manifest
index 512bef3a47c6..31b276ba0e6f 100644
--- a/virtual/libelf/Manifest
+++ b/virtual/libelf/Manifest
@@ -1,3 +1,3 @@
 EBUILD libelf-2.ebuild 397 BLAKE2B 7ac26c8a33689a7dca2fd93df491796c6e5931542a1d345bdba98a0c4fd09d0ccc366df8419d468ea2562cf110160c3187ef261ca74da1d3f6229fc1f480c962 SHA512 d21df3673a0023a6bb2b41c9f03664b9c41336fe3402c23810e4b039c10f517a48d4548f92fcb4bfe71cd5151a81e0bfdeba75038ab709a6d456a2c673f869bd
-EBUILD libelf-3.ebuild 458 BLAKE2B 2b8b0d1cd9f17915bb34a0103728b2764b2843536ef58ded1e8bc0e351a819b8e05bd7a8230075aa05d0b9a178910912159876b32ded9c10892ec2e8d7d823d2 SHA512 30e2dfadc1f4c716c66b10425c14c08bd34d1b57e79af4fe6d7ac78b8f64cf6d1964963e01d97681bd00d02212b66265b723e5aee9a24e470b3b17363856557e
+EBUILD libelf-3.ebuild 392 BLAKE2B 6c0227a740900dcf507a0ccb7b1b72023f21208b818d6a7069e1cb5bf5804f5ba9ff2d44b10d1d3bd0b2e6df5d77b7f02811d604e3f654abcfd74a910003bd92 SHA512 7f6c9664f80c5e85c382615db77c87f553fd064b2bc85f21d28f995599297568d30e6b6219be285c78c033c2b7d86b5ba7e75c9458bbd3f86909bdcf33aff80d
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/virtual/libelf/libelf-3.ebuild b/virtual/libelf/libelf-3.ebuild
index 0e22c66fb52d..57e3b8c9d987 100644
--- a/virtual/libelf/libelf-3.ebuild
+++ b/virtual/libelf/libelf-3.ebuild
@@ -10,7 +10,4 @@ SLOT="0/1"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
-	|| (
-		>=dev-libs/elfutils-0.155-r1:0/0[${MULTILIB_USEDEP}]
-		>=sys-freebsd/freebsd-lib-9.2_rc1[${MULTILIB_USEDEP}]
-	)"
+	>=dev-libs/elfutils-0.155-r1:0/0[${MULTILIB_USEDEP}]"
diff --git a/virtual/libiconv/Manifest b/virtual/libiconv/Manifest
index 961ea08fa3d6..d6bf2025c3ad 100644
--- a/virtual/libiconv/Manifest
+++ b/virtual/libiconv/Manifest
@@ -1,4 +1,4 @@
 EBUILD libiconv-0-r1.ebuild 716 BLAKE2B 121f7e903c0750f6d333dde53e6f25b565877eba87150cdeb02704fc23b0f6bc05528f758d4c6eec488dda77c2aacb182470053453ce0741cd5e5018ee60ca96 SHA512 87acc8cac7ddce774f265e0acf85aea873b43f710619465a5fdfbeb60b31c90c8938fe6cc194b0682ed322397fada0a06413789d78aa32e223278c6d5bafb501
-EBUILD libiconv-0-r2.ebuild 786 BLAKE2B e8a7172b25b8bfe5ccd34911c473a6ed789de9bf8f8304ed9e5d3eedb92f08fa7556c17f0fe9e0fddc27851aead079a13658e4c507731bf77fb276c9cd7154c3 SHA512 5ec60298948fb1994328e0828f113aaeb67fd951d0f4a4b2be35d6f40c32103493b9800c93e5dd09c2dbeaae711744114aa9c0b06ac548408ab09f03e7e9fe36
+EBUILD libiconv-0-r2.ebuild 728 BLAKE2B 6e647be62246abbd6525924ebd9a1f0aaa3725d831dc04d649686385dfcc173d77275c72ed43c8471b0d712baa1638644c1bcccc67c49495dcf3bd89c289eab3 SHA512 ac4ba0148cfd704604d134c38b7315a91845a9f045cd238c3ceed0d6f83fd48099a74415235a872c66b0d241333115b7193e90007d03d7c05e5cfce9efa7321a
 EBUILD libiconv-0.ebuild 628 BLAKE2B acd4607680b231f568f30444a249a84cdf123c24eca1098e08bd0d3d1cade77ac7f6807db62a653fece48b212232d16199d681219412cbc0aaff179db81ad8bc SHA512 1930e9a74047bffb85bd6d41b8d57f36b76d366d30dadb54d80bace4ff67398a5888c4e6f8df687aa1e80983c2d0ac9a381e6df836be10733f45883e8c238950
 MISC metadata.xml 218 BLAKE2B 82037a8a13bcba2ae00b1c4db95363a5992fdae654412ff76e70f0cdbc6c28c3ad1a3aa9746763e7271c7ff2f30b6103403bde6437ccb45e6897dbe060e205c1 SHA512 5f03bbfedc0f66afc7bc45f1aeeccdfc3c775dd337fb280bb7e80e29f618898ce92a05c66c126e79333e33ce7f422169c5ff1cdeeb30b58475c712e9bdc4e79f
diff --git a/virtual/libiconv/libiconv-0-r2.ebuild b/virtual/libiconv/libiconv-0-r2.ebuild
index 9026ca8fc994..5aba698f16da 100644
--- a/virtual/libiconv/libiconv-0-r2.ebuild
+++ b/virtual/libiconv/libiconv-0-r2.ebuild
@@ -12,4 +12,4 @@ IUSE="elibc_glibc elibc_uclibc elibc_musl elibc_mintlib"
 
 # - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
 # that and gcc
-RDEPEND="!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_mintlib? ( || ( >=dev-libs/libiconv-1.14-r1[${MULTILIB_USEDEP}] >=sys-freebsd/freebsd-lib-10.0[${MULTILIB_USEDEP}] ) ) ) ) )"
+RDEPEND="!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_mintlib? ( >=dev-libs/libiconv-1.14-r1[${MULTILIB_USEDEP}] ) ) ) )"
diff --git a/virtual/libusb/Manifest b/virtual/libusb/Manifest
index 25f13672e02f..ddd9cc6d6a76 100644
--- a/virtual/libusb/Manifest
+++ b/virtual/libusb/Manifest
@@ -1,4 +1,4 @@
-EBUILD libusb-0-r2.ebuild 447 BLAKE2B 72c9ec20b65f52f626119c9a783275110088dabe484ceca372a1ae613abe2a8e80d04da0b709211c9c2082be9fa3d6c096da4c24371a27ffaa017e978bd57d4e SHA512 f176cb42314da2d181380a12951c0f8fbb73fa52e3fffb2087cb4d74aabe077a9888733b0ca34a7a777863eb7f002149f18851ef9f46004664f87c3b1170d57e
-EBUILD libusb-1-r1.ebuild 463 BLAKE2B 6601b6ccd2b8fb504def6d3a5ccc2adca82ab43920e427d2bb7caff924a56808181a90350ed9cf8382ed9d3b37f87a4eff57ed764d194a8d6e261bfe59a68bf6 SHA512 414e786d3e1314e9ef26a9893d9ad15613273ef2b3d749e0f8e9e48a749842844532b4ccb2ad13eeb9bfafffc540335e741e8b56e477115923e9f492658eb185
-EBUILD libusb-1-r2.ebuild 625 BLAKE2B 7a06bce8a66224c90fcb74fb703ff836c7e7fad49c96aa440df52577199b5e5001193ce968804cc7c751bd2febf215796ef5ca24aeba6402728a894c5b33f212 SHA512 60468cc4ae7bb48e83227894e53972451f53b71b4d359d77eda3e6c0b67263adfa49de5532f116470296c36033d05b0e1df2a5cc792e23bc1f6a7c74ff435e00
+EBUILD libusb-0-r2.ebuild 382 BLAKE2B ef63b79fc89b4f2e5b2d7417a7eeced5e53613fbd67058ff51290e5bdfb3ffd094dcc44c3411224e2441aeec378b45d1a2fde3bbb27052053cc1266eddbd307e SHA512 05724d4dd0a1cd5066308cca24b1130dc8509a77fdd47943e3a54e11d1f05099abf0c4833c8dba7744210d5ef38ce7498856e1563c2cb4e21c4737edf057ed77
+EBUILD libusb-1-r1.ebuild 398 BLAKE2B b25809708647dcce8765a13b5bf222be2fc40e1a33e7637e9aac3eb701ffbd706e41a65dd7135baf44c1a2898276fdfb1fc842604c43e573e1d3667a6f2eb319 SHA512 45e0fad6b24b0da1a3d948ce0353689fec65705aff758efcfe8c1bb6c2152d859c37a66797a513f9fc53ddc38fd4c8a7620d5ba8c80afca16d55a53821ec1b8e
+EBUILD libusb-1-r2.ebuild 555 BLAKE2B 0958e8f342234cd0dc9f9c34ed0948f5d1ba098a97cdda58e786098a1682a9ba8c60dcf14769de977f1e97c6e53a1dd8054c11220abda7484a4b5712b9becb93 SHA512 200d18a405210deb5a134b3b0b0849ef27808f72fc1d269249c55952db3d2f28138d903897e81e57add6285832fdb76e70cb26364c2a8a1bfea6ed08dcf5e12c
 MISC metadata.xml 258 BLAKE2B a6fcc3580b114ca2b15b760b7e31af88ff854dbfe58715bdf35264771f6aa99f96eadbbb91d005905bf255f26e75d3b0a16ff9c04085c41d7466aaa4b11b90f7 SHA512 e1a07b8724003615826aa66143a03801309fd54fcc2a0f23075c13ca61d4ed35f1d105ea2b447845e2a3d917a84fa81f4f1d1cab6ba3b8d7f7e0ea025387ddf1
diff --git a/virtual/libusb/libusb-0-r2.ebuild b/virtual/libusb/libusb-0-r2.ebuild
index 1f71211998f6..e305dd6cdc2d 100644
--- a/virtual/libusb/libusb-0-r2.ebuild
+++ b/virtual/libusb/libusb-0-r2.ebuild
@@ -8,4 +8,4 @@ DESCRIPTION="Virtual for libusb"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
-RDEPEND="|| ( >=dev-libs/libusb-compat-0.1.5-r2[${MULTILIB_USEDEP}] >=sys-freebsd/freebsd-lib-9.1-r11[usb,${MULTILIB_USEDEP}] )"
+RDEPEND=">=dev-libs/libusb-compat-0.1.5-r2[${MULTILIB_USEDEP}]"
diff --git a/virtual/libusb/libusb-1-r1.ebuild b/virtual/libusb/libusb-1-r1.ebuild
index 574a5e17533f..81127ae91572 100644
--- a/virtual/libusb/libusb-1-r1.ebuild
+++ b/virtual/libusb/libusb-1-r1.ebuild
@@ -9,4 +9,4 @@ SLOT="1"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="udev"
 
-RDEPEND="|| ( >=dev-libs/libusb-1.0.9-r2:1[udev(+)?,${MULTILIB_USEDEP}] >=sys-freebsd/freebsd-lib-9.1-r10[usb,${MULTILIB_USEDEP}] )"
+RDEPEND=">=dev-libs/libusb-1.0.9-r2:1[udev(+)?,${MULTILIB_USEDEP}]"
diff --git a/virtual/libusb/libusb-1-r2.ebuild b/virtual/libusb/libusb-1-r2.ebuild
index bf1d68cde6b7..525b5bfabba5 100644
--- a/virtual/libusb/libusb-1-r2.ebuild
+++ b/virtual/libusb/libusb-1-r2.ebuild
@@ -12,8 +12,5 @@ IUSE="udev"
 # We force a recent libusb so that downstream consumers of virtual/libusb
 # can depend on us directly (and not have to force >=libusb-1.0.19).
 RDEPEND="
-	|| (
-		>=dev-libs/libusb-1.0.19:1[udev(+)?,${MULTILIB_USEDEP}]
-		>=sys-freebsd/freebsd-lib-9.1-r10[usb,${MULTILIB_USEDEP}]
-	)
+	>=dev-libs/libusb-1.0.19:1[udev(+)?,${MULTILIB_USEDEP}]
 "
diff --git a/virtual/logger/Manifest b/virtual/logger/Manifest
index b5734ac75ff7..b75415438cbc 100644
--- a/virtual/logger/Manifest
+++ b/virtual/logger/Manifest
@@ -1,2 +1,2 @@
-EBUILD logger-0-r1.ebuild 584 BLAKE2B 5625875b1dadb22e0a6e59c23d3afb4ecf1f611b0fe837da8ba6567802876654f1a9cb67bade5c1d86eee1b8371e38e071958a21c8194bfe0b7a55f2f988b736 SHA512 e4dcfd307dfa1d132fa4e39b4f5c2f9bfb058ba1a2a906236c931448e2c39d58bb580b9cc1129521323ed1b66c9657767744e33f5955122cf34d84044d661dff
+EBUILD logger-0-r1.ebuild 557 BLAKE2B 2c8e0979ae7d2b14d017961fb9e1cba5fd9a3829108d917238a436b9d54d9001f4fb4975b6f4d2ee61ea0aa9e60e7d69916c4ce18d801d93762b9dfd20a01bc2 SHA512 849fb650bbfbc7255521ae500e9ba932b2776095616dc44f40229264ce2905a1686817e98920c6bb71ead8b45a5f33100461d4c9b702a8d10be7d6a9bb3a14f0
 MISC metadata.xml 369 BLAKE2B 29642895d74d819ff7cb00b91809f80d01ef37a4e0df40ab3a366b898de2d7b99968bf02b6fbeb42d0b7867451920529cb6ff1bf69bd7480d3b55e2bd3abadec SHA512 a43e7a7e1fe1b62d12129442e43a1c1099fa51b0eea790c299dadd628180e2ea46412506277607571fff179f4860896685fae00f8e0b9e2a9d5c5753d2ade82f
diff --git a/virtual/logger/logger-0-r1.ebuild b/virtual/logger/logger-0-r1.ebuild
index 4f08b95036ca..4f113de3ea2d 100644
--- a/virtual/logger/logger-0-r1.ebuild
+++ b/virtual/logger/logger-0-r1.ebuild
@@ -13,7 +13,6 @@ RDEPEND="|| (
 	app-admin/socklog
 	app-admin/sysklogd
 	app-admin/syslog-ng
-	sys-freebsd/freebsd-usbin
 	sys-apps/busybox[syslog]
 	>=sys-apps/systemd-38
 )"
diff --git a/virtual/mailx/Manifest b/virtual/mailx/Manifest
index 429acda20e43..35cc1763516f 100644
--- a/virtual/mailx/Manifest
+++ b/virtual/mailx/Manifest
@@ -1,3 +1,3 @@
-EBUILD mailx-1.ebuild 411 BLAKE2B 8099b1e0427cffe05dd80c6f66dc3f88e932933162ffad835271ba257783dedbbb38ae38fe7c73fe4b860224482241d1abcbc6437b1b127ed339fff21ff4fa32 SHA512 33211706f04807895733ffde9496ed3ee642eedf82f9f129fbaf33b32b3bbc980af619ce190bcfa68396885d44ad663f77b478fe7068fd36782de1b9e0d7ce72
-EBUILD mailx-2.ebuild 443 BLAKE2B 76d739521d1f6257ab1452378011a470911760b54c8ca0aeae7ac7f90cd731a21718d5e53e6a41f27199af3e4d3507ea5e4b3ebbbcf846145f865a2df51d135a SHA512 b98545a9a590e5b1f76ec4671b00c3deea0e7e051270608271ac1f20ab02076111cfa780336ef1b992f8b19e089f5fc132ae4390f82514c3d9bcf004a2576e27
+EBUILD mailx-1.ebuild 382 BLAKE2B 17fea3055a19e68dd0fb4658fc4e40745196f2869188bfa2b4b848d46e9a949b286e1e7561586beda974dea5b02eb59b588efe2fe4c2b9b91d6d17dcc7a1652b SHA512 5878706435f45e6bfc67ecf54e88b869e7ec0045a2a13a35b423413bfc5995e3a60e2a99a69422b28e43ef93bfd2fa2a79b4d65a41228671737c7c7f3d8a1580
+EBUILD mailx-2.ebuild 414 BLAKE2B f2c391b1347564b37fb59d86f8df5d4e93970d2083b41835468697c0dad7cb867e8938b413c4abde086b3547429f535e945a0b72179be8e7f793f1eedf9e3131 SHA512 cea9b1604f4e21e4473ab8b99bd7c7d70a03de6022517e11b7d926f9836d1bbd482f75dc2b7e4a3a52bab5668e56d1c1e8c0f3cf8b26b7a4d3b7394d1b0eb79e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/virtual/mailx/mailx-1.ebuild b/virtual/mailx/mailx-1.ebuild
index 7ea326f9119f..55ee3a5c4786 100644
--- a/virtual/mailx/mailx-1.ebuild
+++ b/virtual/mailx/mailx-1.ebuild
@@ -9,5 +9,4 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd6
 
 RDEPEND="|| (	net-mail/mailutils
 				mail-client/mailx
-				mail-client/nail
-				sys-freebsd/freebsd-ubin )"
+				mail-client/nail )"
diff --git a/virtual/mailx/mailx-2.ebuild b/virtual/mailx/mailx-2.ebuild
index 422c3530d8f7..7a9c731e7361 100644
--- a/virtual/mailx/mailx-2.ebuild
+++ b/virtual/mailx/mailx-2.ebuild
@@ -10,5 +10,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~
 RDEPEND="|| (	net-mail/mailutils
 				mail-client/mailx
 				mail-client/s-nail
-				mail-client/nail
-				sys-freebsd/freebsd-ubin )"
+				mail-client/nail )"
diff --git a/virtual/notification-daemon/Manifest b/virtual/notification-daemon/Manifest
index 37a853d0e47b..ca0fee3e4d00 100644
--- a/virtual/notification-daemon/Manifest
+++ b/virtual/notification-daemon/Manifest
@@ -1,2 +1,2 @@
-EBUILD notification-daemon-0.ebuild 749 BLAKE2B d99a2aa913c7cee12eff91a2bc308c7dbec57f4514964d543e0b65e54f970a7ed3b75c7bbc64ae99fa41cbb293db186ad730a6317549bbf9ed67681d88eebe37 SHA512 26faeabe8e403641e14236e806273bff344d0a4b21ec8f794de63c56ff4c5a73c5adf23897c6d163d3d842defae11b74e13b40efd08dc57e64fc5d2a7a4d9bcb
+EBUILD notification-daemon-0.ebuild 765 BLAKE2B 18cc8e266bb97b59d3d88d6ef042e9a6ded3dad8e3148dfa30753d2afe00429962a6799bb63a69bdc869d4dfd35e70460f7a665198d089ba318cf35a7ddf9d23 SHA512 38b70d652c2e241027e27bfe2aa09c2284df5da21e9dd0db3c33669c459c848920e1e44b66428bd28d30ce8bd72dfcb4f0d5fd5c31369ba741c8cfe88d759340
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/virtual/notification-daemon/notification-daemon-0.ebuild b/virtual/notification-daemon/notification-daemon-0.ebuild
index 19452176b488..91e53ec6fba1 100644
--- a/virtual/notification-daemon/notification-daemon-0.ebuild
+++ b/virtual/notification-daemon/notification-daemon-0.ebuild
@@ -15,6 +15,7 @@ RDEPEND="
 	!gnome? ( !kde? ( || (
 		x11-misc/notification-daemon
 		gnome-extra/cinnamon
+		gui-apps/mako
 		xfce-extra/xfce4-notifyd
 		x11-misc/notify-osd
 		x11-misc/dunst
diff --git a/virtual/opencl/Manifest b/virtual/opencl/Manifest
index 5b6c64f44c80..679a0965de6d 100644
--- a/virtual/opencl/Manifest
+++ b/virtual/opencl/Manifest
@@ -1,3 +1,3 @@
 EBUILD opencl-2.ebuild 1258 BLAKE2B 8719496fdf06af7e5049c5bbf78360fc7bf2b330ce82c49ac3561a0516aeffaa5de1c374335867a97c1efc3f144247abc6150461b2dcea6df01bf2c40fa68123 SHA512 9de56a00eeda95723e37b93cc5ae8b249748f22b72a5264438195887fa7f6b35561bba8bc5a5d0f8dfe99290aec19a1fd19294fef0d2ebfe5abbaad98edef9a4
-EBUILD opencl-3-r1.ebuild 1371 BLAKE2B 89c16720018c0f4ba5ef323439db375d0504bc326973fc7a223c40588cfc078be33b5c44d519eb7ca1dcbaba5646236693c211a557375e19cc5a172ecde8b71d SHA512 69226356684150dcb86c260ef47dcb45d5e7e36fc68cce395b9870145bd08918d4a9a8fe2757621c9148f1f472cfa29b6d7b8154c23ed2aa68cd9909305aa429
+EBUILD opencl-3-r1.ebuild 1370 BLAKE2B e047fefb8aa436c4c413ecc367f0a985d303eb51bff1ea472a6303382c5bae09ac5573ff3ada1595a48423cd432080e9d0d7d39a3deb9fb0a3cb111bc0226f03 SHA512 9ff675f9829d1eb7e7deb184f66c24ce41ae87112713ef9436fb3cb3f23fba7fedbbda77041fa2af33c1377fc47fdd0ed1c8be8432c696c59110820a66ec2d34
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/virtual/opencl/opencl-3-r1.ebuild b/virtual/opencl/opencl-3-r1.ebuild
index 3a288d129429..f7caed35760a 100644
--- a/virtual/opencl/opencl-3-r1.ebuild
+++ b/virtual/opencl/opencl-3-r1.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for OpenCL API"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="|| ( dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
 	dev-libs/opencl-icd-loader[${MULTILIB_USEDEP}] )"
diff --git a/virtual/os-headers/Manifest b/virtual/os-headers/Manifest
index 9956ec84787b..ff4311e8c779 100644
--- a/virtual/os-headers/Manifest
+++ b/virtual/os-headers/Manifest
@@ -1,4 +1,3 @@
-EBUILD os-headers-0-r1.ebuild 799 BLAKE2B 808cbeb87facb4139f1e4e204b8dc7777eb23f8701ccea2961240e7a28eb59304e6067759998617624238ae7087db22c720ea2ed45b6c534c40adedd946c5929 SHA512 fead9aece80d9f1caae1c7d9c0fcb8d19af15f439a72c28e16979f2d549f34d6faeb3a65b0ba7f00f9519c8c6714c5f4da2ddec5395ae63293c7d47489db658e
 EBUILD os-headers-0-r2.ebuild 732 BLAKE2B c6248a04fd2c79ee95f4cc3540918eaaf2ca6ac0db9c3824c93aaa52f0c72b38cd65d39c7cc856eb22f2ecafc28b17213491baa1bc65ca9751bed94f7c6312d8 SHA512 c06551d9e86059c93b27e59bee85e52e07ecc89c8a6e22d332b947c56f4a5727b49a8380333d8f785cda3c37206e34179bcf2c9dec7a8d36bfbe4bcda75f1a70
-EBUILD os-headers-0.ebuild 620 BLAKE2B 8047e1ec9ccff46de9e06775f6bcff248ddc1d1b5c95137944c30d7409fadfecec3eb8144aa1aa8fb2e9ab0c17de782106d063fb103f20ab699113deaa23e6f9 SHA512 0f915030459cf37cabc8c9409af6ee13e17b77bba1915b775883167d3841455f8076ae4929d218f57aaf200633f245e02682e7a9b092d44d4c348a792b309091
+EBUILD os-headers-0.ebuild 571 BLAKE2B 72871736f222106e070ae9443c7e1495c43020e19f496c9733b6b00658d8e794aab8a5eefcf631d2fec1e5eb3eacce3aca213236c273724e36ce6df7a9db71ff SHA512 50d0a2311c0a8905e792fc660c7965fad7156a7fa5315c4f439adfbe93b3d4dcd41fa7c8e126316be4bf625de118c1cbb15908ce2526ae9b275b86ead5028e34
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/virtual/os-headers/os-headers-0-r1.ebuild b/virtual/os-headers/os-headers-0-r1.ebuild
deleted file mode 100644
index 9f1741673e86..000000000000
--- a/virtual/os-headers/os-headers-0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for operating system headers"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# depend on SLOT 0 of linux-headers, because kernel-2.eclass
-# sets a different SLOT for cross-building
-RDEPEND="
-	!prefix-guest? (
-		|| (
-			kernel_linux? ( sys-kernel/linux-headers:0 )
-			kernel_Winnt? (
-				elibc_mingw? ( dev-util/mingw64-runtime )
-			)
-			!prefix? ( sys-freebsd/freebsd-lib )
-		)
-	)
-	prefix-guest? (
-		!sys-kernel/linux-headers
-		!sys-freebsd/freebsd-lib
-	)"
diff --git a/virtual/os-headers/os-headers-0.ebuild b/virtual/os-headers/os-headers-0.ebuild
index b75ceddc508a..3de00fe5213b 100644
--- a/virtual/os-headers/os-headers-0.ebuild
+++ b/virtual/os-headers/os-headers-0.ebuild
@@ -10,7 +10,4 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sp
 # depend on SLOT 0 of linux-headers, because kernel-2.eclass
 # sets a different SLOT for cross-building
 RDEPEND="
-	|| (
-		kernel_linux? ( sys-kernel/linux-headers:0 )
-		!prefix? ( sys-freebsd/freebsd-lib )
-	)"
+	kernel_linux? ( sys-kernel/linux-headers:0 )"
diff --git a/virtual/python-futures/Manifest b/virtual/python-futures/Manifest
index 92a3cc9907f6..ebb7c4ea4f62 100644
--- a/virtual/python-futures/Manifest
+++ b/virtual/python-futures/Manifest
@@ -1,3 +1,2 @@
-EBUILD python-futures-0.ebuild 475 BLAKE2B d691ebbc984ce08722f83d11e8d7e356f690a779766daa61a59268c7e8134dca99bccad6ac07047612b0e1a63d111e487fe4af69f7d9264c644a0c312dd45134 SHA512 d72c2e0602039fedfa29d5b7dc5ad8da6920abce8a37c26b6ae3dd7a791386892a90e8238a53c3c194a1a6fdce8cedbce2df27f846197c73c9519e4cfcde445d
 EBUILD python-futures-1.ebuild 499 BLAKE2B f00cf215270ad168927c4803e8f703feb668e40640eaae5e8695b9de1e5d341c86c7099064e46ef869ace291e2a4f437999544be09b33a971caf5d5cb3c31376 SHA512 74b3bd4bbc5ff41dd59b33b1e766b73542b786185c5c42a3859698c3688ab5e8d14f563fc8224d46f506ac72b1a5041d7b944a4b2ace9b9ce483dade5f2fa9f3
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-futures/python-futures-0.ebuild b/virtual/python-futures/python-futures-0.ebuild
deleted file mode 100644
index 039b641cb158..000000000000
--- a/virtual/python-futures/python-futures-0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit python-r1
-
-DESCRIPTION="A virtual for the Python concurrent.futures module"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' python2_7 pypy)"
diff --git a/virtual/rust/Manifest b/virtual/rust/Manifest
index 5fd2baf5eac0..5bc368d99a00 100644
--- a/virtual/rust/Manifest
+++ b/virtual/rust/Manifest
@@ -1,4 +1,5 @@
 EBUILD rust-1.41.1.ebuild 342 BLAKE2B bee2a2bc6d441ba4887c61e3749e01b9663b2003b0192acf57b9842402f2066d5e65186c478ba7d19507fcc5b3c4c7b245cb6d1a798806cc026ba85812a44f23 SHA512 f79e8ad6430ab8e6ce92060058d1b4aec581d30f5b9453e677e5fad1c25b4f7c608c35d949c8a5fce88516191d759d94e9052a0c9bfca75e0a0676b231d24c83
 EBUILD rust-1.42.0.ebuild 346 BLAKE2B 7fd5602b6f12f8a2d6d92ffd34ef0666d661777de30423cc16b5a00ecc952e1061797a96c35da505414aae5e1200b3336ff74731ebe67ec7fd3e8c214b2e4858 SHA512 ab8e69c3ea3abc210a3d4fc2073ef1cd8776f6b1b1534f74315e4c94a435eb04789a9901bb9738b97c14d3e1207ec7ddb4a666623947f738b89f40f6a625bb9b
 EBUILD rust-1.43.0.ebuild 366 BLAKE2B 2e61e65e1fe468c83806dbe491e81ececa6fc104cce44e22fed1f3da914751d3c42af42003daf572599870baec244262f423a0d011a743cb4d4a5fc5071face2 SHA512 4b91281a8afd299843f6232974a9819a2aee78b70264433605cb10222fa75c45bb3605e3ab7e1cf31da399911172a34d0ed56319f0499b7a73f7f0e364be3ca8
+EBUILD rust-1.43.1.ebuild 366 BLAKE2B 2e61e65e1fe468c83806dbe491e81ececa6fc104cce44e22fed1f3da914751d3c42af42003daf572599870baec244262f423a0d011a743cb4d4a5fc5071face2 SHA512 4b91281a8afd299843f6232974a9819a2aee78b70264433605cb10222fa75c45bb3605e3ab7e1cf31da399911172a34d0ed56319f0499b7a73f7f0e364be3ca8
 MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/virtual/rust/rust-1.43.1.ebuild b/virtual/rust/rust-1.43.1.ebuild
new file mode 100644
index 000000000000..c04cb8fc40d2
--- /dev/null
+++ b/virtual/rust/rust-1.43.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for Rust language compiler"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+BDEPEND=""
+RDEPEND="|| ( =dev-lang/rust-${PV}*[${MULTILIB_USEDEP}] =dev-lang/rust-bin-${PV}*[${MULTILIB_USEDEP}] )"