Sync with portage [Tue Jun 23 23:58:09 MSK 2020].

4 years ago · 114a885ea0
parent 9734bde4dc
commit 114a885ea0
615 changed files with 4519 additions and 3229 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29466 BLAKE2B 9ce11f2871759ba33bbb1f93a6a0d770357945aef11a93b83a8c33876d59c38a606c37d7c7f666f66616470aa0c776da4895d97974061848916a63dc6c428228 SHA512 7299304490ad6b1df18c4196cc00db987ed868682425940e8d148464bc6f7ad839b4a28cf39bf5b245a3f6f0058744c0078bac3a6038418bfd9f890317a89c1d
-TIMESTAMP 2020-06-23T06:08:22Z
+MANIFEST Manifest.files.gz 29476 BLAKE2B fb95492dcce7a46f626d4f310e7d11b6cdbb785be329f391ae9376e7e459dd6adcd615d630c92b157319156582146bf1336136fbe2fdb4aa0c989be9cfe69caa SHA512 f0c0cddac2944aef3f24455262b2865e2dadb266594c0d52525a56c9f852fd6ada2bd94e67d8f4c2b2a07d1332651e1776c3534d33714ac69284c38d3df298d7
+TIMESTAMP 2020-06-23T20:08:23Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl7xnFZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl7yYTdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCtJA//bTcR2F+ofYyy3itw4tsNRdTsK8ctc77KCxuOdWVP7BYgFKmpg4+z38uL
-velGCV4AkgIUMLEyqwZ2MLFdyNOe+297ncdpi87SNXhveBs2lvM+/3FnxByBy9La
-oXXSDtxu3knTROZH9m0f3dZue/ZtsYN2nV+554H3wnB3t48RXwH0evrJLxeHPn3K
-BhmGxxLU+Zam5QchvjwIFnPm37hRarit5Aq3rsMyuqcw6xBVWW00mUwULIiCbk2d
-4KFNp3yhWbTBy9pXMGTq8tzf1APT03SEGisj3VffM117Nk8XlJUvpVKMRv1bIAgU
-EN74wPq+eLazvUUf3fE6JCs+Kz7ChvmRYjw7q5oeswy30gFA1bW148/kSdaLDYnz
-F+junpr1tC7LInxHQKh43Gsp6T7RWlke6nh6bjWVGrvtMAFXBuAMraCQ0fy/JSZI
-aUaFMS/ikD/3J736Z80uvAIvPt9qMZ/J+J/J+ASYLAUf96nCADEDTd+OfkoCmBxd
-60YnfoHd98gEpIWFrpynudkh3In2Z6J0btCXJSWp984HzlrgyTHfY6RMYGAhBV2h
-ttTwNomiOivgk+tyDeQkSEl55/KTfjgcR3mfHv1MaJAlkL1rHV98yXMtCIriVP0k
-iMrgfPyLrmPVRIEBBcfKOL5trSkDseS/nEekIOcRj8N4MbhwEKo=
-=yYxs
+klCzVQ//dQwT/0naedveBSg7a0cbUTAYIJV+gb7JL6NDZejJeG/vq2/0XtJJemvt
+NAJS/5S7XD3/0ykhyNqNv4JXD0QZBK0q9REt2NMarY27XnRzDY0mkVldGD7BXXl4
+01Hi6pSlMJunE/J3gH1S/QHBxs8RRxAPGUxKCS7JF5i94zXgCqCxu3HqEqD7hQEe
+lIWrpfIbwEZxYFpSBn+q/cIrTET3HIB7bkFBFFm8mX+X0ouCDi8W7B77U7evuEnp
+gv12lUxAolA2s4So1X8207m4HtykQW76UQ6zc9gG8iWOe/BKnQC/qADAM+weQ2YK
+X8QUiSRkLOSAzGhuICeVdtQnkGoqyG+hF2Lr1r/eGEA4XF66LHZrqkm4vmvYI2M
+17uUV1q9kvAuivkNtfjys92Z648ZmoQGUHUYKHqNuEbUwjme29t24Le/0nbolisU
+r8I6srO848gcLW0JOZv4TkjsIk4uqEF+ZQpCtyittqzH33feLxZDCcgL8KtyJovH
+FoO8xbp2px2KxWlX/8YigerwCnIJoAzR5ZBF0j765/Jm6Ujd2+HTmSCSCoJoayWs
+/IuHCyB8HPFU9JsbN2BlC5B3XhfF/+lNGufSCyBalJ9ynxYC6alFPWgPBhsFfgLI
+3V1D8JE70i2NOC4ybrdq59VnvDl2HyK9FOSjHNS+7UUvjGRiEN4=
+=TpUC
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@ -8,4 +8,4 @@ EBUILD dar-2.5.18.ebuild 2398 BLAKE2B da4f12e9a5a975303cc0801c1081bc2742454b8f0f
 EBUILD dar-2.6.10.ebuild 2599 BLAKE2B c23775fb216e9491460528e7bfc87dbafb1937c12417d8ff059948f12b5fdf6c6f92b8dbe597c566aefebc2b875b6ab2d7e97cd22de9c3c5c5653cf342de181b SHA512 002c0a42a2af1254c2fe2bd72f13b289f4de9bc04c5a30872b7f405b1dbff699ef5a339238f41d75d5da5604c799757bde9e3190926601f0c4966ce6ab936091
 EBUILD dar-2.6.5.ebuild 2572 BLAKE2B e1059c669c9cf569cad16f5d53492e4c9ab396173b51bead7f0a0e3529809bcb4a5a6f9ab8f2872f1c836405da011bc71ed8cbeeeef5ad1bfa202f287de4c9f4 SHA512 59144b0755ebe5e88147c4c0276f85c63893ff49a926ec904d50e0c74cd2d3c8139454877bb4d2143bc9d5370ea93fe302da8d3b0c2d05897cd98a9e6f8d0d88
 EBUILD dar-2.6.9.ebuild 2599 BLAKE2B c23775fb216e9491460528e7bfc87dbafb1937c12417d8ff059948f12b5fdf6c6f92b8dbe597c566aefebc2b875b6ab2d7e97cd22de9c3c5c5653cf342de181b SHA512 002c0a42a2af1254c2fe2bd72f13b289f4de9bc04c5a30872b7f405b1dbff699ef5a339238f41d75d5da5604c799757bde9e3190926601f0c4966ce6ab936091
-MISC metadata.xml 887 BLAKE2B 7fc6c15d3f725d59a115a839feb6d138b806e1f0e168c6e726e83c9f0185c46cbf869284e17872a376ce52f515fc0446134b5f3a449a578a33c10154876fa1f5 SHA512 9210de7c2f273c52c39555e2db525b1bdaa58c44d22deab887d1bf96e42ac9e8f32545461c7129d4673ced220a6445ddda68c6c2733e5660fcad05e98db56817
+MISC metadata.xml 839 BLAKE2B 9a7022a2e4a20a5519d5242e1d67d30918c5f723f970e6725c7dfb39a16d8130d117fd1cea49a76c209921ed960b6ac9b94ed37aa54e5e41afd39c3e68f23a0c SHA512 e877836606715f1624a67d8b32fb0d586d646b05e5ea6c589adf3c4c8ca4950c251edd212da7b07a0cf763d94e0e0f1c5f8f89c3019e4bfd8c1e3bd89aacd393
--- a/app-backup/dar/metadata.xml
+++ b/app-backup/dar/metadata.xml
@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>rich0@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 Backup directory tree and files.
 Full featured archiver with support for differential backups, slices,
 compression, ATTR/ACL support. DAR also supports Pipes for remote
 operations, including with ssh.
-</longdescription>
+	</longdescription>
 	<use>
 		<flag name="dar32">Enables --enable-mode=32 option, which replace infinite
 		by 32 bit integers</flag>
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/e3/Manifest
+++ b/app-editors/e3/Manifest
@ -1,4 +1,4 @@
-AUX e3-2.8.2-makefile.patch 936 BLAKE2B cd06fbaa470d50fbd971b8925d6813ae5040f3826ada652d891e0d5bd3850a0c8136c13b461426115abbefe2c4e5a87d8443ef6471209833972c2ac9f3516dcf SHA512 77fbe6345d0d9285d3e46458c34b09b08e112db1851626ada6aa31aec3a3115a15d3a4a62c78689b228cbbf06a9e4252b85594785a9310461fe5b19c2aeb8112
+AUX e3-2.8.2-makefile.patch 897 BLAKE2B e93fb544396a6f4e6b0abb0f57124e42ad66c2b9fbb13886498e091ff73bc60c4f1779cbd14c52b800a0579a905fa908423f790b6309d3664ba4a41d5340d857 SHA512 0929387f75bd2d933f030ed319191dbba781564d47f36788bd7ec6ecfffa4bccb367691edbbf9b8241b4905b6cafe7ebc7a5b3e6951765f91ade20962bd54f4a
 DIST e3-2.82.tgz 115504 BLAKE2B 09edea9063657373cf6d7d9d8290dddf17b8fb516538d89b83462176127b8b43832bd81f326eec5504116f05ab780023832b8b5d41d72e3ab8e726d89e364a36 SHA512 07c7e40d26879871b60d7e89839805d779383dbaabe42a6a3a7047fa8a4c501c4cd0cdc828a9d29d4ac1c5b949bda07946d8e71e1320c6c303ffce88a3038547
 EBUILD e3-2.8.2.ebuild 881 BLAKE2B 66552a5b2346ff6685025e570dfb5ba6fa2d5dbb315283c4cd239c2cf8d7115a8e23f2b7b73ec99e0fb0058af6e46d98f11018e5b831073148fd96bf5884537b SHA512 65b7d9b207e0bacb5b187dc5478f90fa92037b6980704a67ed515c3103c76a2a750fec42e61cebce37e1a1a1ff6705e34f2187e8db8e938f61c15300062414b9
 MISC metadata.xml 918 BLAKE2B a0bd5163da7fe48664cc720d60b08c11af32234b0b265a8e2cca6d980a3af3b29ad223fdd5a81886ea3b528875fadd0520650a463894040b2f48ad00eabdf8c6 SHA512 9e8d5b6557a492d39c79c06507ea3ee670729e315cee2456e595d53f88178801b629595ac8903ac70878a63e85b46e934c761d70fef328fdfddc78e0c7416f4d
--- a/app-editors/e3/files/e3-2.8.2-makefile.patch
+++ b/app-editors/e3/files/e3-2.8.2-makefile.patch
@ -30,7 +30,7 @@
 	cat e3.asm | sed -f e3_32to64.sed  >e3.tmp
 	$(ASSEMBLER64)
 -	ld -b elf64-x86-64 --oformat elf64-x86-64 -o e3 e3.o
-+	$(LD) -b elf64-x86-64 --oformat elf64-x86-64 -o e3 e3.o
+	$(LD) -o e3 e3.o
 ifneq	($(DEBUG),true)
 	strip e3
 endif
--- a/app-editors/hteditor/Manifest
+++ b/app-editors/hteditor/Manifest
@ -5,5 +5,5 @@ AUX hteditor-2.1.0-gcc-6-uchar.patch 1443 BLAKE2B e08ca71c4c0499f8344174ea09fa32
 AUX hteditor-2.1.0-gcc-7.patch 724 BLAKE2B 030fe4de475ce4b140f5dcee8cb0268bb0b6dc19f1e50b94cf0f3b8f0546d462025ca30a1a75acc16f7560c9318efaa8adeb6a29c33789c304c97512b31994c5 SHA512 afdc2fef1c05a225e9a8e8d4ccd25a8b1912ff6532dd09a320f6df031edb732d9b9b99fb77f39cd41ccc45fd9818fae1b802ca1831669a0e2825b59094094de9
 AUX hteditor-2.1.0-tinfo.patch 176 BLAKE2B 936f60f54424b9d69986b7b9564abd3c5de2a321611e66e386aac47ea504f7a40d3c6614f4430a70052b39dcdf68f4540cf1ae4a2dd0a4b237857cd611bbf8fe SHA512 1800a7010f0d94da473bd10e3ab36bea2b99c2d9b78b01f0c3ce7c35d2f9ee33eb3da9a2b091482f213136f23c97bc3afd9a10f59c7e56b36817cb5ba34f4c36
 DIST ht-2.1.0.tar.bz2 884139 BLAKE2B c979563cbfc4df7e14f587b250fbf099d9f4683afddb3afc88693284c378c45466dfa3c47555fc69e83e2972cfabab63f3cdd42fd85602842854372131e4063d SHA512 6b5fc5fcbc63b9b7c85721158e044e4578ebfdc38618c760c0e6de06a276bccd3a960ab8bed172de788934515ad94d86349c4abd3228da66b1601deaaa2ce410
-EBUILD hteditor-2.1.0-r1.ebuild 1189 BLAKE2B 9f8d20d19df3f7d853e2a6a7fa132a595ebbad5ff0837d247f2ed14cc886e0e517d72ad7dbbb200aecb23f3154cd308761615237c054d3edd1785ff9c98fa324 SHA512 8a2e8a8271926882de6f878aee001c54324730c621a1a83d32fed7c3c4ebddd65fd2ee3e83250e1e60ea7626c472236d42e98258b32ee59778ceaa9b9bf0e793
+EBUILD hteditor-2.1.0-r1.ebuild 1414 BLAKE2B 6baa7517d6218432641a95c1c79a865b0f1f63b9fcb06571f9fe0414a903194e943b1d4c5c200ee5363a0cad84fc3c24a1e5fafd166d73922cda0e16dd7ab153 SHA512 12f147751d3da898d9336e34fa795bbe3a315ab430995af6c47ea8babacb61b386ebf0186e6cc18f8db93f9e5a03e5873073c49fb79afa9192898cb3882d1be8
 MISC metadata.xml 464 BLAKE2B 7fdb5c881881e21f4a74db09bf905c4d0aebdb5077598916186266ca12dca891c1619ce550a37ac3400ef92138ff2521dffd91c25bf254d8e49e0b628ea7ebca SHA512 b08be8368d7459a56096769aec6cdb6607225968b87ac12d22c788081287d16345060f071c09c0d505a8caffcb5de9378328250758b13c9229eb1fc5c10a8388
--- a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
+++ b/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
@ -3,7 +3,7 @@

 EAPI=6

-inherit autotools toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs

 MY_P=${P/editor}

@ -39,6 +39,12 @@ PATCHES=(
 src_prepare() {
 	default
 	eautoreconf
+
+	# Many literals are concatenated with macro definitions.
+	# Instead of patching them all let's pick old c++ standard
+	# and port to c++11 upstream.
+	# https://bugs.gentoo.org/729252
+	append-cxxflags -std=c++98
 }

 src_configure() {
--- a/app-editors/jasspa-microemacs/Manifest
+++ b/app-editors/jasspa-microemacs/Manifest
@ -1,3 +1,4 @@
+AUX 20091011-cc-detect.patch 1002 BLAKE2B 9141e32930c9c433a7a682079a961511fd6e1e83f87d0fee17fcc181d88a6daafeacb634f47684de6f81796ae864da0e9ec3fbb1024aa8e665fed96eb571ead9 SHA512 9742c8050dfd724a6224158420ac3c60d3c5dab5ea7b5a3af454a2c63aa11c05e2c2b0f6ff24159e371f62b8faaab22c5d3740dca0a8f7ee19aab4bb77a02509
 AUX 20091011-linux3.patch 723 BLAKE2B 924852d26fc148c124e51e7d392d2a38482022b30bb1ad31e92ce12dd6efb97a154b7c05b8590788d4a4839c4de0bddb4f5576addf9cd64ac9d4511c6197801c SHA512 c3b0246cc83c6840b59b46cbd25ebe1f9364a029f555f916dbc3ca38d8e490514a9dfc9ae8748e751e49cc9a1f3be89af30d0fab95d35486d32cf87fec93431c
 AUX 20091011-ncurses.patch 583 BLAKE2B eaf5eafcfb9fbe6a889b64fcfe895016ec25d8be63975600c11e9cfb889b42b6d03426e1d574bf65899fd5bac00d0fd49a838c1d57e7ab7e3c2cb172664206af SHA512 d2a4ca646e825a9c517ed075205609d141f94735c9bba2f23f5c94ced05b9290e6e24a718d7e8cfbcad77663a6c07f311a387363e8737cb1cb4fc81cf34e9a22
 AUX jasspa-microemacs.desktop 282 BLAKE2B 4c881a43ab13c3043555bbced246aefd463247c467974f4c449d26f3d4db9e91fc47448afae30b478b6d0053da74d07e44f25f08a1e310c4072c45ddc63725e8 SHA512 e55698b2faf0a5a8fbb04e837400ab0d9be00d50ab20fd3d84718edf75a4bedef1155f04654ea1d491c3b456f1bf047e4b90f05efb0702deeb2f496c9ad091d2
@ -5,5 +6,5 @@ DIST jasspa-mehtml-20091011.tar.gz 628008 BLAKE2B 97c8326e7acfdc4bc4ddd2ef6bbcf0
 DIST jasspa-memacros-20091017.tar.gz 1105437 BLAKE2B 0a74715db55498fed646f209a9121a96c673cb34c487968c4f838bacf6404db717fbd8392d26f8fa120174923724af91e4a14bda088bf229765d1e99c785d8ba SHA512 08908acac4dbe56695362172dabe621b8cca77a35da599c6cf5b4e87700c03f4ee190ca12d5c69b2d88c623cec527daac0980dec2ed713ff563e88ebe636a725
 DIST jasspa-mesrc-20091011.tar.gz 810128 BLAKE2B ce627dab7cf4ec09b099e755c3eb17e773c64fbff60741244cdb134ee1555ffff592ef3684eecae72d5da36c10cd7caa23a03112154c616ad3c7667d913354b4 SHA512 60cc5a83b3cafd8e517f88732dc94feb0329b962bc714eaa5616ba89776fbfac41833be88fd3a666443291184086494434fb8763747c1dc5e216ce793b694b68
 DIST meicons-extra.tar.gz 43345 BLAKE2B 5b3d6e8a76604364d8e5464ba764aec96d822054c02bffed4cd763f7691f78bc3455904cd06d89ddcf8a0861134ada3c7d228751d4f3685e6700ebfc3dda2354 SHA512 bb6879fb12ec1c7b346bc1df2412a837ffdd0569f6be2800a433307a7736bb31798b3c2a71e02cebdce39c59d93d1a986f80c92184604e4292606c98285fe02a
-EBUILD jasspa-microemacs-20091011-r3.ebuild 2276 BLAKE2B e9ba6dbc37f281d0d2f413dccdfe07d425d24b7e126ba340c18d262abc863b8b1e9582ff5feaaf2edc08476dc2b62457dcb749cfda862d66c098455cc571559e SHA512 180227bc3c5d549d29cc28a6bdb7aa398baf55522329244cf381763a22c8fc00cdb16226b18c40ef5405a5035ad1f9a4c0e08953198591197591e0c756ef4711
+EBUILD jasspa-microemacs-20091011-r3.ebuild 2313 BLAKE2B cbc697d1f7ea0900d3c0042e29729af2b5528d9cf73da4458908e18db43dc697c9a9b9912625337db2c71a5ebbbccb51cfc5559c4bd119f9ccc1027eb62ecaac SHA512 1d3ba93a4ced2ba2b4be6e36a8b8709e653854d80b21f3d8965d596c391369f8de0a5cade2f19376d3d22dbb3bcdb1104a3f25222549f7f154a0b740d6718eb9
 MISC metadata.xml 1094 BLAKE2B 9983b2ebf7f9d7a979180ea0d4aa063ace2fa5a3a630339bb8112a8691eb6b46964d298d9b49c2d02b2dba2750e501b5740de2242da00abc4b24ba08af8d7fb1 SHA512 2116ed586b24da86206c4d38977c118bcf2381d455a3cd0fb9d672f8d709b5113fe4c8767e2d2f20f8c879a71f0e6bfb6384b9efe30cba82e177fa75dc4e0d6a
--- a/app-editors/jasspa-microemacs/files/20091011-cc-detect.patch
+++ b/app-editors/jasspa-microemacs/files/20091011-cc-detect.patch
@ -0,0 +1,32 @@
+https://bugs.gentoo.org/729258
+
+--- me091011-orig/src/build
+++ me091011/src/build
+@@ -158,12 +158,8 @@
+         exit 1
+     fi
+ 
+-    # use cc by default if available
+     if [ -r $MAKEBAS.mak ] ; then
+-        # try to detect cc, if found use it in preference
+-        if [ "`type cc | cut -b 1-5`" = "cc is" ] ; then
+-            MAKEFILE=$MAKEBAS.mak
+-        fi
+        MAKEFILE=$MAKEBAS.mak
+         # Special rules for sun, if cc is /usr/ucb then this is a dummy.
+         if [ $PLATFORM = "SunOS" ] ; then 
+             WHATCC=`/usr/bin/which cc`
+@@ -173,12 +169,8 @@
+         fi                      
+     fi
+     if [ -z "$MAKEFILE" ] ; then
+-        # failed to find cc, try gcc
+         if [ -r $MAKEBAS.gmk ] ; then
+-            # try to detect gcc, if found use it in preference
+-            if [ "`type gcc | cut -b 1-6`" = "gcc is" ] ; then
+-                MAKEFILE=$MAKEBAS.gmk
+-            fi
+            MAKEFILE=$MAKEBAS.gmk
+         fi
+     fi
+     if [ -z "$MAKEFILE" ] ; then
--- a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild
+++ b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -37,6 +37,7 @@ S="${WORKDIR}/me${PV:2}"
 PATCHES=(
 	"${FILESDIR}"/${PV}-ncurses.patch
 	"${FILESDIR}"/${PV}-linux3.patch
+	"${FILESDIR}"/${PV}-cc-detect.patch
 )

 src_unpack() {
--- a/app-editors/teco/Manifest
+++ b/app-editors/teco/Manifest
@ -1,8 +1,9 @@
 AUX teco-double-free.patch 907 BLAKE2B 4be36191ed98cd9c210ff523dac796ec7a78697abcbb776ccff526cc1172e2bf6e5da0387df65e70020cbc7041ef6e7ca66245fb886fafe78b5d0f1e67e7ebc0 SHA512 01711be1a61217ed3040f3b13fbcaf52160118c90251098bdf65efe1551a3198ff41228bd9895be7f55e11344858898276f162cff1e207595e3f5e6dfef507ba
 AUX teco-gcc4.patch 294 BLAKE2B b09e7058029fb3d2fe2ded138ab92389f412cdc9613ae30eb3fd5b050f95e6efd48016e8f816a67d25b7d813e1ac2b813c20d60ac240b9138d635d958c7bc10f SHA512 ed7cf0fbe3a13dfb310be93460e07dcff50773ff1d0a1b5e3cfb304ecf5ef972243a7d3e7d429c743478b5cc2942a9ec562a25c1504324f59045685e69611d2b
 AUX teco-no-common.patch 289 BLAKE2B ce84e9132f53b0b465ab1118ef53246d83188f9c6b38ff617a63e52e91f2443ee718e495dceb9d32d8bc81b381923fbad5e837f9fb57474bcf98466244d821f3 SHA512 f0059e69090c345925e1ce50d9074d7c7d0e692e2d529233538cb640bb6705b0c27901ee4d780e2b99500f604e17f521db5a39e2a518396514631ee6c6bd05d7
+AUX teco-void-functions.patch 12115 BLAKE2B f72d87f9ae2a03d7b83aed09c009c05fbe89f80101fb9c62ec4273bdf347a554c0bbe80d9c0742c8d3afbcd176c16338641ca0a773ba731d711d4a5d85375b08 SHA512 27568f730408a6ed3d9cb02c32065a53c2b1f3f469824dc4d2c8e69444f190e266b5c396a8284f191880f59ab1ebd2e4422ba9bee716b96ac2f53a9befc56f9b
 AUX teco-warnings.patch 1206 BLAKE2B f9f8312c66e506d86cdd7544288965927895822eac3ad6f49dd0f1280ddc72f9d2cb2c6e4e7eca7c36c435677559e25bd4c9f6816a9e41816d23a39d64ee445b SHA512 7294ef66917eb549d9437327b32160317313d343c731423e34a07ed407e5595e7ac52d57c55bc1e5c6732f5ed0840533aa9c546ee32f4ea2bef54adf5a91b249
 DIST teco-36_p19940820.tar.gz 61305 BLAKE2B 9bb15fcb20948dbcac1928e32b4ac69c4861be3b0c01d5be68836138d9478e71cc0dd5198d9ac6816245605c34f8b21fcd4e62c48c097e56cd585579df119939 SHA512 686b3944a82d088a2fce12a9b770f4aa5f58aaadde064b3d3342114f0ece2d7cbae27d0e92fd026def6f62a3ff0dc82b37146e30a93b2ec195dc7f376b45fdf7
 DIST tecodoc.tar.gz 154109 BLAKE2B 70b9cd99281ab6180e4c13845f3fc97ccd6c142b4b9a3454ac9dcf189e2a65bfaf9b033312aeb9773301ff4d2ec166f79d587f79158b2b0f3f985f77b06f86c1 SHA512 1819450a08e296bdd3d4c282d9a9c7c58203acf82a67bdc9713b0cdfa2d0c4aa046c86ee4ee6f3b2d9ef0f3052705a13dd3d8afbf372bd3b1be8d4c5e8e96fef
-EBUILD teco-36_p19940820.ebuild 1496 BLAKE2B e6ab0702aa988e1323ff018dce667cd482848e6feaa34600faa33158fdbea82f447db576c46160c2cfd41314c857864f274693be722236e543dd543d8a3cb1e6 SHA512 dd772f5da48194e7b48115a05235b526a225bb41ae274f6a53aac4db2e3eb0a96b16078c2cd3721c1c4c020cdfb8b60790566c5090b0983eef7ba4fdf8c0addb
+EBUILD teco-36_p19940820.ebuild 1538 BLAKE2B 41ed663d279ca03df2e125f02b29f66b63c3e722942717a6b2cff570d03d79422b05521e887286920d8c422f43b85bcc05998bf49f2bed6b6cc1200fdae9b35b SHA512 0560fc4a55badd2b184d5971014fe45f59b5258e99016370f836e4736b08c9e6a53b1408a12ddbe0792863675b472cc9d98eb8ca79bfb7ecb4fdf0fd64f8c5c6
 MISC metadata.xml 1356 BLAKE2B a433a260d80042f9a4e034f93e94793b8ae3e9725d44cf4369f5baf506d6dcf9be045d3a4ccbefa842004c8bccd629d55f947ef591ce37a662c4199d4f27f2ca SHA512 3e8680b16e6de3e239f453d13d4b0cb41545aace84af0e9cf8103c0f605cec29467bb0b5feebd592dbded84cd109360c42f63da69115870fb57c97f8137dfdc0
--- a/app-editors/teco/files/teco-void-functions.patch
+++ b/app-editors/teco/files/teco-void-functions.patch
@ -0,0 +1,536 @@
+https://bugs.gentoo.org/729254
+
+--- teco-orig/te_chario.c
+++ teco/te_chario.c
+@@ -24,6 +24,8 @@
+ #define SIGINTMASK 2
+ #endif
+ 
+void crlf(), type_char();
+
+ int lf_sw;                                  /* nonzero: make up a LF following an entered CR */
+ int ttyflags;                               /* flags for (stdin) file descriptor */
+ #ifndef _POSIX_SOURCE
+@@ -44,6 +46,7 @@
+ /* operation; normal mode is none of the above.  TTY_OFF and TTY_ON do this     */
+ /* absolutely; TTY_SUSP and TTY_RESUME use saved signal status.                 */
+ 
+void
+ setup_tty(arg)
+     int arg;
+     {
+@@ -213,6 +216,7 @@
+ #ifdef _POSIX_SOURCE
+ sigset_t  oldmask;
+ 
+void
+ block_inter(func)
+     int func;
+     {
+@@ -313,6 +317,7 @@
+ 
+ /* type a crlf */
+ 
+void
+ crlf()
+     {
+     type_char(CR);
+@@ -340,6 +345,7 @@
+ 
+ /* routine to type one character */
+ 
+void
+ type_char(c)
+     char c;
+     {
+--- teco-orig/te_defs.h
+++ teco/te_defs.h
+@@ -320,7 +320,7 @@
+ extern char mapch[], mapch_l[];         /* char mapping tables              */
+ extern unsigned char spec_chars[];      /* special character table          */
+ 
+-extern char skipto(), find_endcond(), getcmdc(), getcmdc0();    /* routines that return chars */
+extern char skipto(), getcmdc(), getcmdc0();    /* routines that return chars */
+ 
+ extern FILE *eisw;                      /* indirect command file pointer    */
+ extern FILE *fopen();
+--- teco-orig/te_exec0.c
+++ teco/te_exec0.c
+@@ -8,6 +8,7 @@
+ #include <time.h>
+ #include <sys/time.h>
+ 
+void
+ exec_cmdstr()
+     {
+     char c;
+--- teco-orig/te_exec1.c
+++ teco/te_exec1.c
+@@ -6,6 +6,7 @@
+ /* version for multiple buffers  04/13/89 15.55                             */
+ #include "te_defs.h"
+ 
+void
+ exec_cmds1()
+     {
+     char command;                   /* command character */
+--- teco-orig/te_exec2.c
+++ teco/te_exec2.c
+@@ -12,6 +12,9 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
+void do_en_next(), set_var(), write_file(), write_stream();
+void kill_output(), pop_iteration(), find_enditer(), find_endcond();
+
+ struct qh oldcstring;                       /* hold command string during ei */
+ 
+ /* file stuff for input/output files */
+@@ -26,6 +29,7 @@
+ 
+ /* process E commands */
+ 
+void
+ do_e()
+     {
+     char c;                         /* temps */
+@@ -567,6 +571,7 @@
+ 
+ /* routine to get next file spec from "EN" list into filespec buffer */
+ 
+void
+ do_en_next()
+     {
+     char c;
+@@ -669,6 +674,7 @@
+ 
+ /* fetch or set variable */
+ 
+void
+ set_var(arg)
+     int *arg;           /* argument is pointer to variable */
+     {
+@@ -764,6 +770,7 @@
+ /* arguments are qp to start of text, number of characters, */
+ /* and an "append FF" switch                                */
+ 
+void
+ write_file(wbuff, nchars, ffsw)
+     struct qp *wbuff;
+     int nchars, ffsw;
+@@ -779,6 +786,7 @@
+ /* Unix processes.  Arguments wbuff, nchars as above; file  */
+ /* is stream pointer, crlf_sw zero converts CRLF to LF      */
+ 
+void
+ write_stream(file, wbuff, nchars, crlf_sw)
+     FILE *file;
+     struct qp *wbuff;
+@@ -809,6 +817,7 @@
+ 
+ /* routine to kill output file: argument is pointer to an output file structure */
+ 
+void
+ kill_output(outptr)
+     struct outfiledata *outptr;
+     {
+@@ -825,6 +834,7 @@
+ 
+ char panic_name[] = "TECO_SAVED.tmp";           /* name of file created to save buffer */
+ 
+void
+ panic()
+     {
+     if (!outfile->fd && pbuff->z) outfile->fd = fopen(panic_name, "w"); /* if buffer nonempty and no file open, make one */
+@@ -838,6 +848,7 @@
+ 
+ /* do "F" commands */
+ 
+void
+ do_f()
+     {
+     struct buffcell *delete_p;
+@@ -954,6 +965,7 @@
+ /* pop iteration: if arg nonzero, exit unconditionally */
+ /* else check exit conditions and exit or reiterate */
+ 
+void
+ pop_iteration(arg)
+     int arg;
+     {
+@@ -973,6 +985,7 @@
+ 
+ /* find end of iteration - read over arbitrary <> and one > */
+ 
+void
+ find_enditer()
+     {
+     register int icnt;
+@@ -988,7 +1001,8 @@
+ 
+ 
+ /* find end of conditional */
+-char find_endcond(arg)
+void
+find_endcond(arg)
+     char arg;
+     {
+     register int icnt;
+--- teco-orig/te_main.c
+++ teco/te_main.c
+@@ -44,6 +44,8 @@
+ 
+ #include "te_defs.h"
+ 
+void cleanup(), print_string(), save_args(), read_startup(), get_term_par();
+
+ main(argc, argv)
+     int argc;           /* arg count */
+     char *argv[];       /* array of string pointers */
+@@ -103,6 +105,7 @@
+ 
+ /* reset screen state, keyboard state; remove open output files */
+ 
+void
+ cleanup()
+     {
+     window(WIN_OFF);            /* restore screen */
+@@ -115,6 +118,7 @@
+ /* print string for error message */
+ /* argument is subscript of a qreg qh, prints text from that buffer */
+ 
+void
+ print_string(arg)
+     int arg;
+     {
+@@ -137,6 +141,7 @@
+ 
+ /* copy invocation command line to a text buffer */
+ 
+void
+ save_args(argc, argv, q)
+     int argc;
+     char *argv[];
+@@ -171,6 +176,7 @@
+ 
+ char startup_name[] = "/.tecorc";       /* name of startup file */
+ 
+void
+ read_startup()
+     {
+     char *hp, *getenv();
+@@ -192,6 +198,7 @@
+ 
+ /* routine to get terminal height and width from termcap */
+ 
+void
+ get_term_par()
+     {
+     char tbuff[1024];   /* termcap buffer */
+--- teco-orig/te_rdcmd.c
+++ teco/te_rdcmd.c
+@@ -6,6 +6,7 @@
+ /* version for multiple buffers  04/13/89 10.22                             */
+ #include "te_defs.h"
+ 
+void retype_cmdstr();
+ int ccount;             /* count of chars read in */
+ 
+ int read_cmdstr()
+@@ -227,6 +228,7 @@
+ 
+ /* retype command string: entirely (arg = '*') or most recent line (arg = ' ') */
+ 
+void
+ retype_cmdstr(c)
+     char c;
+     {
+--- teco-orig/te_subs.c
+++ teco/te_subs.c
+@@ -17,6 +17,7 @@
+ /*    n is the returned number of chars moved   */
+ /* max is the maximum number of chars to move   */
+ 
+void
+ movenchars(from, to, n)
+     struct qp *from, *to;       /* address of buffer pointers */
+     register int n;             /* number of characters */
+@@ -69,6 +70,7 @@
+ 	}
+     }
+ 
+void
+ moveuntil(from, to, c, n, max, trace)
+     struct qp *from, *to;       /* address of buffer pointers   */
+     register char c;            /* match char that ends move    */
+@@ -249,6 +251,7 @@
+ /* leaves bb pointing to end of that text */
+ /* insert2() copies rest of buffer */
+ 
+void
+ insert1()
+     {
+     int nchars;             /* number of chars in cell */
+@@ -269,6 +272,7 @@
+ 
+ 
+ 
+void
+ insert2(count)              /* count is the number of chars added */
+     int count;
+     {
+@@ -289,6 +293,7 @@
+ /* subroutine to delete n characters starting at dot    */
+ /* argument is number of characters                     */
+ 
+void
+ delete1(nchars)
+     int nchars;
+     {
+@@ -314,6 +319,7 @@
+ 
+ struct qh obuff;        /* tag string buffer */
+ 
+void
+ do_o()
+     {
+     int i, j;           /* i used as start of tag, j as end */
+@@ -460,6 +466,7 @@
+ 
+ /* find number of characters to next matching (, [, or {  (like '%' in vi) */
+ 
+void
+ do_ctlp()
+     {
+     int i, l;
+--- teco-orig/te_utils.c
+++ teco/te_utils.c
+@@ -37,6 +37,7 @@
+ 
+ 
+ /* free a list of buffcells */
+void
+ free_blist(p)
+     struct buffcell *p;
+     {
+@@ -51,6 +52,7 @@
+     }
+ 
+ /* free a list of buffcells to the "delayed free" list */
+void
+ dly_free_blist(p)
+     struct buffcell *p;
+     {
+@@ -92,6 +94,7 @@
+ 
+ 
+ /* free a list of cells */
+void
+ free_dlist(p)
+     struct qp *p;
+     {
+@@ -107,6 +110,7 @@
+ 
+ /* build a buffer:  called with address of a qh */
+ /* if no buffer there, get a cell and link it in */
+void
+ make_buffer(p)
+     struct qh *p;
+     {
+@@ -178,6 +182,7 @@
+ 
+ /* set up a pointer to a particular text buffer position */
+ 
+void
+ set_pointer(pos, ptr)   /* first arg is position, 2nd is addr of pointer */
+     int pos;
+     struct qp *ptr;
+--- teco-orig/te_window.c
+++ teco/te_window.c
+@@ -21,6 +21,10 @@
+ #define MAX 0x7fffffff          /* maximum positive integer, for "last modified" location */
+ #define W_MARK 0200             /* "this loc is special" in screen image */
+ 
+void window(), window0(), window1_both(), window1(), window1_abs();
+void window1_inc(), window1_after(), w_rmcurs(), window2(), vtm();
+void w_makecurs(), w_type(), w_init(), w_separators(), w_move();
+void w_scroll(), w_ebol();
+ 
+ /* image of current window */
+ 
+@@ -74,6 +78,7 @@
+ /* routine to perform simple scope operations */
+ /* (an attempt to concentrate VT-100 specific things in one place) */
+ 
+void
+ vt(func)
+     int func;
+     {
+@@ -132,6 +137,7 @@
+ int win_max[]  = { 4,  W_MAX_H, W_MAX_V, 1, MAX, 12, -1,  20,   20, -1, -1 } ;  /* max values */
+ int win_data[] = { 4,  132,     24,      0, 0,    0,  0,   0,    0,  0,  0 } ;  /* window parameters    */
+ 
+void
+ do_window(ref_flag)
+     int ref_flag;                   /* nonzero forces "refresh" operation */
+     {
+@@ -196,6 +202,7 @@
+ /* routine to update screen size with numbers obtained from environment */
+ /* (called by main program's initialization)                            */
+ 
+void
+ set_term_par(lines, cols)
+     int lines, cols;
+     {
+@@ -215,6 +222,7 @@
+ /* WIN_LINE:    does WIN_REFR unless that wouldn't do anything, in which case       */
+ /*              it does effective 1EV output                                        */
+ 
+void
+ window(arg)
+     int arg;
+     {
+@@ -288,6 +296,7 @@
+ /* used for ev, es, and <BS> or <LF> as immediate commands                  */
+ /* starting char position is in w_p1; argument is number of lines           */
+ 
+void
+ window0(num)
+     int num;
+     {
+@@ -364,6 +373,7 @@
+ 
+ struct bh *old_pbuff;
+ 
+void
+ window1_both()
+     {
+     pw0 = &win_1;
+@@ -396,6 +406,7 @@
+ /* if scroll mode is enabled, the VT100 screen is split and only the upper part */
+ /* is used by this routine; else the whole screen is used.                      */
+ 
+void
+ window1()
+     {
+     int i, j, m, lflag;
+@@ -500,6 +511,7 @@
+ 
+ /* routine to redraw screen absolutely */
+ 
+void
+ window1_abs()
+     {
+     int i, j;
+@@ -531,6 +543,7 @@
+ 
+ /* redraw screen incrementally */
+ 
+void
+ window1_inc(wd)
+     int wd;                     /* argument is earliest change */
+     {
+@@ -559,6 +572,7 @@
+ 
+ /* routine to move window downwards: scroll up or redraw as appropriate */
+ 
+void
+ window1_after()
+     {
+     int i, lflag;
+@@ -591,6 +605,7 @@
+ 
+ /* routine to remove the existing cursor */
+ 
+void
+ w_rmcurs()
+     {
+     register struct w_data *pw = pw0;
+@@ -609,6 +624,7 @@
+ /* called with w_p1 at starting char, curr_y, curr_x at starting coordinate         */
+ /* rewrites to end of screen if arg = 0, or only until line with cursor if arg = 1  */
+ 
+void
+ window2(arg)
+     int arg;
+     {
+@@ -794,6 +810,7 @@
+ 
+ /* routine to move cursor to current location and then call vt */
+ 
+void
+ vtm(arg)
+     int arg;
+     {
+@@ -807,6 +824,7 @@
+ /* routine to set reverse video and save cursor location */
+ /* first argument is char at cursor, 2nd is value for curs_crflag */
+ 
+void
+ w_makecurs(wc, crflag)
+     char wc;
+     short crflag;
+@@ -851,6 +869,7 @@
+ /* routine to type one character:  arguments are char and a */
+ /* "mark" bit.  If mark is set, the char is always retyped  */
+ 
+void
+ w_type(c, m)
+     char c;
+     int m;
+@@ -875,6 +894,7 @@
+ 
+ /* initialize display image */
+ 
+void
+ w_init()
+     {
+     short i, j;
+@@ -907,6 +927,7 @@
+ 
+ /* write separator lines between windows on screen */
+ 
+void
+ w_separators()
+     {
+     int i;
+@@ -929,6 +950,7 @@
+ /* put character followed by appropriate number of nulls for "other control function" */
+ /* if argument is 0, output filler chars only */
+ 
+void
+ putchar_d(c)
+     char c;
+     {
+@@ -942,6 +964,7 @@
+ 
+ /* put out appropriate number of filler chars for display function that scrolls (LF, etc.) */
+ 
+void
+ scroll_dly()
+     {
+     int i;
+@@ -952,6 +975,7 @@
+ /* move terminal cursor to stated y, x position */
+ /* uses incremental moves or absolute cursor position, whichever is shorter */
+ 
+void
+ w_move(y, x)
+     short y, x;
+     {
+@@ -993,6 +1017,7 @@
+ 
+ /* scroll screen: argument is count: + up, - down */
+ 
+void
+ w_scroll(count)
+     int count;
+     {
+@@ -1025,6 +1050,7 @@
+ /* clear line to left of curr_x */
+ /* if some chars nonblank, does erase from start of line */
+ 
+void
+ w_ebol()
+     {
+     short i, j;
--- a/app-editors/teco/teco-36_p19940820.ebuild
+++ b/app-editors/teco/teco-36_p19940820.ebuild
@ -26,6 +26,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-gcc4.patch
 	"${FILESDIR}"/${PN}-warnings.patch
 	"${FILESDIR}"/${PN}-no-common.patch
+	"${FILESDIR}"/${PN}-void-functions.patch
 )

 src_prepare() {
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@ -1,11 +1,12 @@
 AUX de-translation-newline-1.patch 432 BLAKE2B 2b546cd7200f0d736bffd255bbb79d4e997241a35159e052598d4b9da77ca402a0eb90fcb6fae74ac7d9dca9b8383843fd67fb88b6cab474e547d892ac414d4b SHA512 2857ec4e4856d47340163c10644805ee7a65a0095539c7fdc422b874d1af645187a1de0aff4844d9ed0387cebbd82dbb33da32a839b6dda02df4c3d741e88d76
 AUX lxd-4.0.0.confd 582 BLAKE2B 88ce8ec99eb50174bffea7d3b8bddc67b50fe6677d54df115c9069311b5fb59a72170a15988f50714740074f7ec4f2cd32fb47b6d8c52cf69b8c6fa332162a06 SHA512 96d922ae81677eebace3f8d2dff7f67d58701c40c09e2435677f9289cca89fe260c0d9526059d3772c3405a5b8ec52466bf7d7a920dcdd7551f1b3f01f2fc9c4
 AUX lxd-4.0.0.initd 1097 BLAKE2B 8cd967f37edc7c87a5d225dc77a39e6696596fb9d53829289b75b3f136572aaaaede5ad78360c0ca2055bcf23627fd75102616ff9da604785bdcbdcb57ae81ff SHA512 5a40f0e7a6fe5e8b301f8fc22344fed64fe8b8894a175600e938f147f49ccf4fa71c75fdfe25ba936c65435fcabdc5f7a606993093e5ffdb7dbc4e0b9f03621d
+AUX lxd-4.0.1-clang.patch 2566 BLAKE2B 1cc6db796393569512dda9b483afaac810a0d2f852308901d1a79e76ffd6def7b4d6a269054c1ec9180de616d0550f4e2542f6aa5417ce91d51ab3ac6cb72fca SHA512 748cf9bf93d4b86de230bf85313ba90e435e8e7011383cba39f4a5767c9cf9e818eb8eae3213d8745ed114a62ae633b311d2088e3e35b1ccef6f5ede5a0f424c
 AUX lxd.confd 538 BLAKE2B f020d83375bddc3e88f752d4be49c65893901893eaa572f212c655f4d3c5631b41238ed917c70f16b4c092d82ced13011edd6e91140cda251ebf8745591cd886 SHA512 9ea61647a8da82bc595f78882adf5a6c71483c7adf8965d7d32016a67a0da6510f8dc3d09fd29f77d5f6d5f18282bca3b3b5c2abffaa67265a4fd4ddb07f31a8
 AUX lxd.initd 853 BLAKE2B 0b48de1a596767db356850adcb5682c5c351e7477b0d49d81aebf857a01e4eb75067087d323ba4b5d6fbf8765a76cf161ad2cfaa0eba480fb86e91fdb95b0e79 SHA512 960aceb2845cc3b454b2f916c73273f4b1ec6f87e5d569c27c8c58e0db153c084e03addbdcc91dc8761fc6f0e306261d87db73f8610fda197e55f9ec6756fd56
 AUX lxd.service 174 BLAKE2B 8686d57a79fbc3a9ec2e1a3197012599a5d6b81b62188e779cdb9a86f9f413fa485090c79dab8c4aa8891e0e35604b85fb1cdb1da313918b34a974b61699b24a SHA512 6f9d71d5c08c49653f28511bc793d1365604af6bf105789caea27f4685d721fbb283f888e3b7310997b73ff2fc5bb1a47e7500c4678cb3d39124cab723523140
 DIST lxd-3.14.tar.gz 26141949 BLAKE2B 69004501012c9a873eef77a60df7e5dba25c692224d27b02cd2d2b27533012e71bd7562cb64a17920234746e8be2819bb773365c01422c0b776dd2b7c36b69fe SHA512 3d2d4e61298fc9fde49defad776a398fcccf7639485e810173c9c7f7d939c354a9ad8112a4a631b0850f6eb54435012d289236ff61839416caf95434eb23c8ff
 DIST lxd-4.0.1.tar.gz 25027762 BLAKE2B 1154a427558ad5eda62b63501a2f62a5c3a1b740fac061432b06a1034b75cb906f38d6c43e8215cab8ae0bed328d75a7612c1bb7af3272cdbe3f93235d5bb920 SHA512 1f47f8239cc1d3425fc4cd075487678e219e94deddec10f52a1cd18fbdc0515f54b67552e7b41d0052803c317a861b34cfc83a25776eae7b9673b5c5fd50d70f
 EBUILD lxd-3.14.ebuild 6865 BLAKE2B 56a86d6bb704c3c562654d01953b566f34e9d57abf915972899b663b61e8d9fe1e50523a439a406b013e7396c3286e104859bf4ca23106306ee719ef41810d80 SHA512 aadb152acac7f5784028bbd89c8ebc105992dd6898e22ed36b26889969b7ce1cffdb79e8db1c0e0a43ca98cae7feee3f133165c3f624b87611dfed1dbe0c8511
-EBUILD lxd-4.0.1.ebuild 5666 BLAKE2B be4c3963bc49a6f175a10abd8f4cc313c539e2edc2502212f728d4c185a11dcc10d23f1143bd51b4044638b564ba6a9339d88d04376894690a76472bf67029ee SHA512 cfa22dca8eb526eee15aa7d3ec5f0df4be22791e1103bc01208403efc48a3ad5803797a3d9ec6389368041e619e8788004b82f26d97dc0f3876fbf834cda5312
+EBUILD lxd-4.0.1.ebuild 5715 BLAKE2B 7b5da6fd786bfbcd0381d02fe00a3f6d2da680f3ac497d2e890cac11f5b577271496540ac1e48c200a70f9d7be61887f95de0d209075386d55da509e416cef56 SHA512 c8083ec436f116f3bad879c05ab75f33c4113b79ec4ea241e2f95a85edd636166468cc76b991c53ad7469fb98ffefb8ce94de807c8d1db86f3d47026e48a27a7
 MISC metadata.xml 925 BLAKE2B 74a89f515bf441f62686a9a2fc2576ec8986705b681e52c9e8267acd6839b06fdafe82dd27df43c39b5e09bba87e63bbb27cc4da18ed31931393946b90add05b SHA512 e4fc6d70a790e164366349e4980f5161db0ca1b4d1996c1ce32223a75926a38ea46f8e08e6c708c6f41c2c81aebde3dbe0d0ce5c63f9340f7ae6f895b5fde144
--- a/app-emulation/lxd/files/lxd-4.0.1-clang.patch
+++ b/app-emulation/lxd/files/lxd-4.0.1-clang.patch
@ -0,0 +1,76 @@
+From c7ce94825871ea5d0946e92762e981354628b8ad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@ubuntu.com>
+Date: Mon, 22 Jun 2020 22:17:02 -0400
+Subject: [PATCH] lxd: Fix building with clang
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Closes #7573
+
+Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
+---
+ lxd/main_forksyscall.go |  8 --------
+ lxd/seccomp/seccomp.go  | 16 ++++++++--------
+ 2 files changed, 8 insertions(+), 16 deletions(-)
+
+diff --git a/lxd/main_forksyscall.go b/lxd/main_forksyscall.go
+index a304405c2e..14895b6ce0 100644
+--- a/lxd/main_forksyscall.go
+++ b/lxd/main_forksyscall.go
+@@ -34,12 +34,6 @@ extern void attach_userns_fd(int ns_fd);
+ extern int pidfd_nsfd(int pidfd, pid_t pid);
+ extern bool setnsat(int ns_fd, const char *ns);
+ 
+-static inline bool same_fsinfo(struct stat *s1, struct stat *s2,
+-			       struct statfs *sfs1, struct statfs *sfs2)
+-{
+-	return ((sfs1->f_type == sfs2->f_type) && (s1->st_dev == s2->st_dev));
+-}
+-
+ static bool chdirchroot_in_mntns(int cwd_fd, int root_fd)
+ {
+ 	ssize_t len;
+@@ -209,8 +203,6 @@ const char *ns_names[] = { "user", "pid", "uts", "ipc", "net", "cgroup", NULL };
+ 
+ static bool change_creds(int ns_fd, cap_t caps, uid_t nsuid, gid_t nsgid, uid_t nsfsuid, gid_t nsfsgid)
+ {
+-	__do_close int fd = -EBADF;
+-
+ 	if (prctl(PR_SET_KEEPCAPS, 1))
+ 		return false;
+ 
+diff --git a/lxd/seccomp/seccomp.go b/lxd/seccomp/seccomp.go
+index 8945fd9197..025efb3141 100644
+--- a/lxd/seccomp/seccomp.go
+++ b/lxd/seccomp/seccomp.go
+@@ -91,21 +91,21 @@ static int device_allowed(dev_t dev, mode_t mode)
+ {
+ 	switch (mode & S_IFMT) {
+ 	case S_IFCHR:
+-		if ((dev == makedev(0, 0))) // whiteout
+		if (dev == makedev(0, 0)) // whiteout
+ 			return 0;
+-		else if ((dev == makedev(5, 1))) // /dev/console
+		else if (dev == makedev(5, 1)) // /dev/console
+ 			return 0;
+-		else if ((dev == makedev(1, 7))) // /dev/full
+		else if (dev == makedev(1, 7)) // /dev/full
+ 			return 0;
+-		else if ((dev == makedev(1, 3))) // /dev/null
+		else if (dev == makedev(1, 3)) // /dev/null
+ 			return 0;
+-		else if ((dev == makedev(1, 8))) // /dev/random
+		else if (dev == makedev(1, 8)) // /dev/random
+ 			return 0;
+-		else if ((dev == makedev(5, 0))) // /dev/tty
+		else if (dev == makedev(5, 0)) // /dev/tty
+ 			return 0;
+-		else if ((dev == makedev(1, 9))) // /dev/urandom
+		else if (dev == makedev(1, 9)) // /dev/urandom
+ 			return 0;
+-		else if ((dev == makedev(1, 5))) // /dev/zero
+		else if (dev == makedev(1, 5)) // /dev/zero
+ 			return 0;
+ 	}
+ 
--- a/app-emulation/lxd/lxd-4.0.1.ebuild
+++ b/app-emulation/lxd/lxd-4.0.1.ebuild
@ -67,6 +67,8 @@ QA_PREBUILT="/usr/lib/lxd/libdqlite.so.0.0.1
 EGO_PN="github.com/lxc/lxd"
 GOPATH="${S}/_dist" # this seems to reset every now and then, though

+PATCHES=( "${FILESDIR}"/lxd-4.0.1-clang.patch )
+
 common_op() {
 	local i
 	for i in dqlite raft; do
--- a/app-emulation/x48/Manifest
+++ b/app-emulation/x48/Manifest
@ -1,3 +1,5 @@
+AUX x48-0.6.4-static.patch 317 BLAKE2B 0ba80504f6dfdb992735496198808445778d6f75ecd7d21f276801857efcbf5a6d215d081b8ea79031fe5fcadf2dc1875854f80f6003575d9e2be03c2f7cb21f SHA512 22c97b2236b78c148cab19386718ea0be333eef8ab356da20f80d7805fdae4e73a1552faab15bd86a4644e2b149a924f65ba57cba5bef8f740ecb69930e7b794
+AUX x48-0.6.4-void_return.patch 657 BLAKE2B d72125691d4cabe90ea326f03204061ef3eca46e2b47cc43c91a67b3a994f8f995fbc313d368bbec1d3782d1aff46ff7064ebaf65f503efa28f0d468874f1256 SHA512 48d8fffff6f7a9727c813dbbc6332577d8d9f8622466af9658c135a2503a2b5b961f4c193cab3127352308716a9ab92bb6eb120897bdca9ae52482eacd12ac6e
 DIST x48-0.6.4.tar.bz2 227991 BLAKE2B 8db2962860eeb161a8efc9d46730c71d95d0331157e3e2481a978385ad54b04b7a4eb601c68e7df966194b23e0cd04bed4e80511d22695bb7ccdd3959d8fd8d7 SHA512 60fdba1171a02e4a5f9bcefb29fff9398fdbda50553c3d3b952fab0b4ebf87b219d4615139ca3673b1c61ff6d6559aab3e93218334aa6cdb442d4861347138ce
-EBUILD x48-0.6.4-r2.ebuild 1677 BLAKE2B 2714c1760be4efb7c50365b2873a3db3a548cd819478d4df54db06fd6efc616bb73890c064e83c712abc536b9d49a6fc263f72c991dedeb944d98aea425735a1 SHA512 0742749fb892adbe543155c3ef58ddf8e0458c7c2c3cc81372e2af638716aa9d98524047dc3761cf33fc50e5727fa12c588a17d4a1224d57d16b788a2005ffcd
+EBUILD x48-0.6.4-r2.ebuild 1659 BLAKE2B 0563a9afe94bc637528c92ed63968023877031529daa67e8cb5086ac1fb2fab124666278e95cec50a1ea0e9c75de408ab6626c9c79c9d6deac1ed3e58fb96b66 SHA512 ebf6faa4954df214b72082c0b22b34734ccac4a5909a6e6b0996ba1a05050e9c80d4dd9e756e2b8eddaf80877bc8aa948b4f8dc3e51acf5a29757669819f05ee
 MISC metadata.xml 723 BLAKE2B 98911516312cc5d5617bbf9d6e33915608b30639c2354024cc74407888a699cf7464261fc7d40afad3fd6632ae39da74b5f90ede1bd51e491d0193c759d8ed07 SHA512 0de7f42012bc6624f1eca6d08c3807185f5fcd7b44a34fd701cd7af2ede5b0ab21f41b41fc7b784b3fe641b3b12b58ae412a2969679fbfcc1edbfd99b6e39685
--- a/app-emulation/x48/files/x48-0.6.4-static.patch
+++ b/app-emulation/x48/files/x48-0.6.4-static.patch
@ -0,0 +1,12 @@
+diff -Naur x48-0.6.4.orig/src/emulate.c x48-0.6.4/src/emulate.c
+--- x48-0.6.4.orig/src/emulate.c	2011-11-15 04:03:40.000000000 +0100
+++ x48-0.6.4/src/emulate.c	2020-06-23 21:30:30.895538239 +0200
+@@ -695,7 +695,7 @@
+   }
+ }
+ 
+-inline int
+static inline int
+ #ifdef __FunctionProto__
+ decode_8_thru_f(int op1)
+ #else
--- a/app-emulation/x48/files/x48-0.6.4-void_return.patch
+++ b/app-emulation/x48/files/x48-0.6.4-void_return.patch
@ -0,0 +1,24 @@
+diff -Naur x48-0.6.4.orig/src/debugger.c x48-0.6.4/src/debugger.c
+--- x48-0.6.4.orig/src/debugger.c	2011-11-15 04:03:40.000000000 +0100
+++ x48-0.6.4/src/debugger.c	2020-06-23 21:33:16.071667987 +0200
+@@ -1528,7 +1528,7 @@
+   struct se *se_next;
+ };
+ 
+-char *
+void
+ #ifdef __FunctionProto__
+ get_stack (void)
+ #else
+diff -Naur x48-0.6.4.orig/src/x48_x11.c x48-0.6.4/src/x48_x11.c
+--- x48-0.6.4.orig/src/x48_x11.c	2011-11-15 04:03:40.000000000 +0100
+++ x48-0.6.4/src/x48_x11.c	2020-06-23 21:33:32.132680745 +0200
+@@ -3833,7 +3833,7 @@
+ 
+ int last_button = -1;
+ 
+-extern char *get_stack(void);
+extern void get_stack(void);
+ 
+ int
+ #ifdef __FunctionProto__
--- a/app-emulation/x48/x48-0.6.4-r2.ebuild
+++ b/app-emulation/x48/x48-0.6.4-r2.ebuild
@ -22,15 +22,15 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-libs/libXt"

-src_unpack() {
-	mkdir -p "${S}"
-	cd "${S}"
-	unpack ${A}
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-static.patch
+	"${FILESDIR}"/${P}-void_return.patch
+	)
+
+S=${WORKDIR}

 src_prepare() {
 	default
-	sed -i '698s/inline/static inline/' src/emulate.c || die
 	eautoreconf
 }

--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
--- a/app-forensics/honggfuzz/Manifest
+++ b/app-forensics/honggfuzz/Manifest
@ -1,4 +1,4 @@
 AUX honggfuzz-2.0-no-werror.patch 518 BLAKE2B aaf123687ea5f7fd584d1fd5e57f2f6ac50a8d80c3a1555d8b01d42df91a106848ec1d73007e6b67127e767770d91effa5e95dd9016f47fecac0e465e74cfe61 SHA512 7775f683cd5b22d91d3cf16cb0f8e7df50f5159a3f16ef42dc6125c961a856ddfc59c944319575e403747a2af768cd3f93437fc0bbc32bfc12f833f4cd7db0eb
 DIST honggfuzz-2.2.tar.gz 65219878 BLAKE2B f842c6d3dea22525d1335fbdbdffa349ace743762386e81e40f1eab99dafa8f34b935c1cb4871b25ade76e3ac8f846d0329ef01bc0097a888e60b400819ada2d SHA512 8e6a0cf027d521967a69828afa6e0ae5306ad7387c595405f9d3151344e2aa91f9537355fafdf03f06e6702014e2faa0609c3d249f22af5793663f3c9d09180d
-EBUILD honggfuzz-2.2-r1.ebuild 725 BLAKE2B efd2a59d70673ccec16ff9b5d7ceac00666c70d631a9de09b970674ae3c0e69023b754bca761f82a01d738c8fc1a20afeb55f57d17ad8b8565014eb9441f4742 SHA512 bf2756e1958817778bed394a37ae88ac7579d726e5d43c41767a8cf0f08c069e9b22828da6b1181fca2aaf8f50f7daaff41b957765386d94cf2a6adbe7e4fde5
+EBUILD honggfuzz-2.2-r1.ebuild 889 BLAKE2B fb3cb5de46a07de47eae801c194c7f9bac6ba2db50e6b4f1b5461605b609ae645d7f0d2ab8e3406e8042309c203bf7c619381713d75f9ded986ec6344104f7bf SHA512 b5424870b89000c22109c02c43d0d673841e9930f9bf717a3456bce6ba7cf167c9dee31f779a74c296ced287a152d5a517a7e5beecb2dc229f9cc9c98645604e
 MISC metadata.xml 332 BLAKE2B 72702618670b8f8ef24ef68d5f9b1b29c8d25c3630cc5fb22ef859ea7879af84d0c7fc758a02a0b4175e10707f2c161930151b65e2e3d07f154a1b2c48fee152 SHA512 1f75a39cce6995d550344225849dafb3a980df19cc6afd10025e58e6c08086a27a67173ff435c084660970cb4ed18183914afeba712dc461d7fd55f83f9e679d
--- a/app-forensics/honggfuzz/honggfuzz-2.2-r1.ebuild
+++ b/app-forensics/honggfuzz/honggfuzz-2.2-r1.ebuild
@ -33,6 +33,12 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.0-no-werror.patch
 )

+pkg_pretend() {
+	if tc-is-clang; then
+		die "${P} does not work on clang due to incomplete -fblock support: https://bugs.gentoo.org/729256. Please try gcc."
+	fi
+}
+
 src_prepare() {
 	default
 	tc-export AR CC
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/beep/Manifest
+++ b/app-misc/beep/Manifest
@ -1,7 +1,5 @@
 AUX beep-1.3-CVE-2018-0492.patch 3292 BLAKE2B fafed7dbe65438869adccf674b19c4e5b6655dca794043bbb9914879fc8e9bb6eac67b35254f47ec61a9ad5147aac6b819edb3fc8633e81c79d555023a422147 SHA512 e7ba3db3e70d2560c2a8701d9424db43a2e94988728b84bc84c5e6d777fc1e0596d767470fca41774a104cba9d2e58ef59f6449570c3d3887c1bf97861bc5bad
 AUX beep-1.3-Makefile.patch 516 BLAKE2B f69b5907e7a1342a574bedc273e609415e5853939aa694894c732333e482f2507462748cfb9ba1f0945f4778653d44c3fa04c4aca3eb78afb7152597beba759a SHA512 b21f788780a13bbef436b80ec020b8727b9c1a8ddac3552cb8bf05d7ab937851d05d72279b53b51dd0ae1f99e44f55caa494b7e61b59800d91dd186497b65009
-DIST beep-1.3.tar.gz 19344 BLAKE2B 4f9cf12f6983eeb53502fd85e5e1d428e1c1af481f8f424f6ae18cbe104462e8fdcc96670a72daa8a8a0d1430d00824d8795b4db53437e7bb7320cddfd84cfd3 SHA512 3f71146202208fa0c0cda360d125dd972ea003cf8cd62da21d67eb544c92f7b82640e7ce7c3835cbc65c75909a882edfa54dbd8d8b748d6f243711ea331477fd
 DIST beep-1.4.9.tar.gz 83154 BLAKE2B 073169ccb4919c17c0291951834fea682c87021f18562629013293432292750f6d6b3235e8882fa9cf26c9e055e1283cfa629c2e88e0f87a301b238c38380498 SHA512 46e6066cb4d9ad4a0c55a03bf5a2163426648ce3831fe1f7bafa2f02d0e407b50c52e58cc2b123c346df96e92b73d2458b473c3fb001d9a0d1470b7cf38cc35b
-EBUILD beep-1.3-r3.ebuild 678 BLAKE2B 8544f8f0ff6aa10875b13d401de593f49c1e6e1b14aca45dff03a053fc2b7c4350dc671766706b05ca87af655ad4db0c154f5eb67f524ca7c20c40501bd978de SHA512 e05d59079f1d8931e7c9626598a47e9d335f7fbd8fa564a35ff566656abfc09b10010922bbcb8d05a5b926820fd529620c3f678d994faf95769915f0925c8e84
-EBUILD beep-1.4.9.ebuild 1045 BLAKE2B 713fe116faf8e3befc33e2d7ac0b10840f66ba79de0a728797c8b751ff09f4cde3296801ba05ba572fb88d48f37a40a8dc1d735b410bd72b5762e9e0cb886c70 SHA512 aaea0eb986c5bb8404a711d2c65b73384e7278505e03be503d167d617e42cfa6ca5ed4664363cc8b7b1c2fe52cc111e6fee1a11b45bc110111161e837ebfde5c
+EBUILD beep-1.4.9.ebuild 1044 BLAKE2B 2de3a51eb677557cc0012aad4573594c5bf0f86d489e95e1f32cfc73f2a33d18606e35158aa3af342833a768547d86a71f7c33a62ea3d98624b03ee57b7c2d57 SHA512 1a66a24c42965a2b2c80e4ba9698aa710d2beefc7bc40c3cae0933198a2a2f51a5b319c6f5fde1249dc47edc044332c2ae65409071640b1bdd84641c8c56f675
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
--- a/app-misc/beep/beep-1.3-r3.ebuild
+++ b/app-misc/beep/beep-1.3-r3.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="The advanced PC speaker beeper"
-HOMEPAGE="http://www.johnath.com/beep"
-SRC_URI="http://www.johnath.com/beep/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
-IUSE="suid"
-
-PATCHES=(
-	"${FILESDIR}/${P}-Makefile.patch"
-	"${FILESDIR}/${P}-CVE-2018-0492.patch"
-)
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_install() {
-	dobin beep
-	if use suid; then
-		fowners :audio /usr/bin/beep
-		fperms 4710 /usr/bin/beep
-	else
-		fperms 0711 /usr/bin/beep
-	fi
-	unpack "./${PN}.1.gz"
-	doman "${PN}.1"
-	einstalldocs
-}
--- a/app-misc/beep/beep-1.4.9.ebuild
+++ b/app-misc/beep/beep-1.4.9.ebuild
@ -48,7 +48,7 @@ src_install() {
 	dobin beep
 	doman "${PN}.1"

-	if use suid ; then
+	if use suid; then
 		fowners :audio /usr/bin/beep
 		fperms 4710 /usr/bin/beep
 	else
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@ -1,8 +1,9 @@
 AUX recode-3.6-as-if.patch 472 BLAKE2B b42518eea02219eae014faea4eea71e475b778de61c8645e21d86fd97bcae8f86accd5063370fdec40054263ede74842491841db48688c85d1796c93c311eff1 SHA512 5209779be9d03b770f679c2be736bc68a710e1c064b1f4a2fbb9963a8ca59a258a22b5d34ed6ac19e7a40ca83c64995f37aa9f466e49841ba2662b89d0789763
 AUX recode-3.6-gettextfix.diff 514 BLAKE2B cbe2dc00927ce9215d1719f78eb78bdea0cc8c5b6b72bc46f43ed14d658396c977053aad83df25a666739e8a431a512ffe4f7d6da9a36b0a5eb90d1c634c8380 SHA512 71408313ed269aeb8b015c171a6d16663e2bc7a3fe5ad4e0dc16ae0ec0e1f769605d92d7e32aec908a42a5ee148cd1f00ad2c069e947c0c4f64fb3b9f7dfb1b3
+AUX recode-3.6-recode.texi.patch 445 BLAKE2B d612b6b513908fdd7756cf3b0d8bf2730071d71acd91d330f32b149bb42fcdc2da353f00bd77e5d39d87abfce3ecb917b97c5471ceb79f6777778f36854fcd9d SHA512 bb25c3d36e77e415577518561f1c4060e923c0f2a992eaa4cf561cc27372820810e7bc8ae3db70dcbf20dc1ba7384370a51c6072a71b1a22c4b71d5a1369fcdb
 DIST recode-3.6.tar.gz 1751886 BLAKE2B 94436343969da0ee6d16ed69a211d4f36b7a9cb59ce931ef71cfc1e0f11e5709e67ee1e0bb24f5320e6c7d6d01920a6c4d9edce87ff2c6aaaa8c80e30f3b536d SHA512 68de277ac8cd5f6023bb077b959ab5778a78edac1299d507bab906824080b6f86e9bfcd89169aa474197c2faa9af2ceb1ed272c8dd4d50caef373afa05daed1b
 DIST recode-3.7.6.tar.gz 2210564 BLAKE2B 8c99b6d2eb93482785fe7e36063514e4c153516cc8059a9b98fc9f1b08704314b7933390a5fd7921525648ef58e9f995242182b8de23b7db33cbf94383e28f29 SHA512 ababefc445fcc47b6bf9ed640b767aed374bb8ce93cdccb641dd1ba5d298360583dd79070a0bb458f1190a8d6f1ddeb3b04eec34a61305b69def0963cec5843f
 DIST recode_3.6-20.debian.tar.gz 341117 BLAKE2B 748ee36b68f1d1501edde23e8afcbd58df70a86745e7c366a27a33496e539dcae11b746fb46767e95ae99b68a18684e3e85c1ea961692ac57ad1a01a895734a7 SHA512 bc586534e77b49da7d387187a8ddb042a12871f87f4f32c818ce7218b7254ac5ba6eccb14aaaf0312579f27958883f2da620016a7049c3af24c8bfba81acc3ef
-EBUILD recode-3.6_p20-r1.ebuild 1639 BLAKE2B df12bfe979aa5b6cedaec6ca58148d972e8ab71905088cbccecaf8ebb516c6fffe53ac96d7a266c5e32756ac2207892219c9634ad540d9a6c88554d13d717f78 SHA512 b0afd29e6b220be63f88ffe9cccc00bed68582ea01b7486490a9ae90f8dc094b3427b15cdb7cb6b0505489782231bc002a7e8a77d41af73cbdaa4e3193cda3d2
+EBUILD recode-3.6_p20-r1.ebuild 1683 BLAKE2B 41458adc86e9e77bf02c0ad8aa3405024efd4ea808f61cda13842ba82f5e4740af30a37432c0a9d332c4c64bfbe027cab73b4a5f7410fe6d40e0d63e9866254b SHA512 d96dfcb1094e9a7b8af27c1b8c42637b59aa3a1a0113787ba19fe0fae3f69b3ef6cf16ccee0e098752da4263e5c4b86b98223ada5741a1cfff65af1e04274050
 EBUILD recode-3.7.6-r1.ebuild 1024 BLAKE2B ecc79b0cc686ea88b765bb1fa035d7c41fd908496daf094dd2c11573a94843faeef067d91ecac570f0058ed81d645c0ab58e4d5fbe6809288e7bb25eaec4dee9 SHA512 a9ed1b358366995d2905796458379ad713bea5ef1e7a807b708b4a22869841b27a14f46adc4af300635dec1333c7bba786259be3546c96602f3977bf42e7da3e
 MISC metadata.xml 346 BLAKE2B 0a6af84d8b6ea322f62bf1f741e332892a60eee2704265685615240a178ddd965f524586179882867e609cef66ef021cfc56950581d1c0915f04a2a669dea9ba SHA512 6c5caba02d69998dc08954f52c9e126db6546eaa0d0f4abc166e96896fdfa8e73371f1206318fa00ebd0f266600c79105d43d5e300c07e7f7b0c3645f9537b2e
--- a/app-text/recode/files/recode-3.6-recode.texi.patch
+++ b/app-text/recode/files/recode-3.6-recode.texi.patch
@ -0,0 +1,11 @@
+--- a/doc/recode.texi	2020-06-23 07:43:20.959074594 -0000
+++ a/doc/recode.texi	2020-06-23 07:43:32.262338563 -0000
+@@ -3713,7 +3713,7 @@
+ between HTML and various other charsets.
+ 
+ Here is a list of those HTML variants which @code{recode} supports.
+-Some notes have been provided by François Yergeau @email{yergeau@@alis.com}.
+Some notes have been provided by Francois Yergeau @email{yergeau@@alis.com}.
+ 
+ @table @code
+ @item XML-standalone
--- a/app-text/recode/recode-3.6_p20-r1.ebuild
+++ b/app-text/recode/recode-3.6_p20-r1.ebuild
@ -35,8 +35,9 @@ src_prepare() {

 	rm "${WORKDIR}"/debian/patches/series || die
 	epatch \
+		"${FILESDIR}/${MY_P}-recode.texi.patch" \
 		"${FILESDIR}/${MY_P}-gettextfix.diff" \
-		"${FILESDIR}"/${MY_P}-as-if.patch \
+		"${FILESDIR}/${MY_P}-as-if.patch" \
 		"${WORKDIR}"/debian/patches/*
 	sed -i '1i#include <stdlib.h>' src/argmatch.c || die

--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
--- a/dev-cpp/waylandpp/Manifest
+++ b/dev-cpp/waylandpp/Manifest
@ -1,3 +1,4 @@
+AUX waylandpp-0.2.7-fix-std-runtime_error.patch 743 BLAKE2B 4f528ce32190cbc6d54c07beab484297a3bb17982f94162c74f87302bcbe692f252b6f359cd1d3f8571d5e70587c49bef53596e869e3e4b766af5c30817dd5dc SHA512 485272837f4d32b251678cd15a581b8f174ea01a58fd91aa78219b22470426734ce610ca397ff86ff1828d0757e0a66417e18f60b5380324afee14338d26df3e
 DIST waylandpp-0.2.3.tar.gz 180539 BLAKE2B 8941200b46235c8b65926065a3a758871581fe21ffbcc17dc33a00c546c920247739d3137b528fe8971b7c1c2240b5a056387dcbaa1437047709e079cb2e58c2 SHA512 424ccef67e1faedfb03aa7465917e4dfc0eae578a1eb42bcdbe71df02955fef00fc1b480acb4828e168f051a82a13f923e0c9be93d3ede221e791a7af88647a5
 DIST waylandpp-0.2.4.tar.gz 240718 BLAKE2B 4493f3e19dd546412f110227c44440a422d0e1156eb24ed8bc3e58e5ebda22c0aee16e5f2a2efc1328a697c5436f81c11c67d7c46855f32f7531783a1d514ae1 SHA512 74855ea86926692a9f6ccb5645a7ed30000bab0f01a2f37a30f2c0a341d67d511ae217b8f69adc52fa2c25ac65afa182a6dbf2318360435a02b6ff428b4c9d51
 DIST waylandpp-0.2.5.tar.gz 177735 BLAKE2B 9add6147b7694d275f2f15f03476aef5bddebdca029f012743a0c0c388c7ef7394536b4401c78830487bb1c36a0b29ea348bc2acf60617af7bcbf917a5b691dd SHA512 a8c80282022b2ede3c3d0f5516e236aedaf3ef685565da8c61214fe37eda139bf152093eb29960be1889798eef5631b9d68a5e832c10cf1160c4a90f45eccb6e
@ -7,6 +8,6 @@ EBUILD waylandpp-0.2.3.ebuild 833 BLAKE2B 7556dc863efb653831be0c99d190726c9e8729
 EBUILD waylandpp-0.2.4.ebuild 757 BLAKE2B d142eade552ed0a09e10de4c4dda27b167b94f1be1f0797196c89a089c52244e92a1646ab7be804f20608e749546f173fcb281c8c12f00177316f6bf3d649d45 SHA512 79f2f9fddd63335d46edf4edb5312c0c62a7deef0ccfb78eb3fe3989f841455c3350f28225c25dd513a8294a81d6a11cfb140b42031dc5612808b61ba40a777f
 EBUILD waylandpp-0.2.5.ebuild 760 BLAKE2B 521de67f5f289aa32a539b6d5e86aa85b270e794acc3a6272deac56004fff5c60c07350151267f7c77af2f73cb339a2086c84ea17b0b9158605e8745a1bc47d6 SHA512 7620b5e841fbead64b3211f1968e3e7b3f1a83a0cd5769ef4e19104bb4be71884fa4f9eca9ca9b13637409bea4a6d921efa3a50e976e9df7a3244b2754fffe92
 EBUILD waylandpp-0.2.6.ebuild 760 BLAKE2B 521de67f5f289aa32a539b6d5e86aa85b270e794acc3a6272deac56004fff5c60c07350151267f7c77af2f73cb339a2086c84ea17b0b9158605e8745a1bc47d6 SHA512 7620b5e841fbead64b3211f1968e3e7b3f1a83a0cd5769ef4e19104bb4be71884fa4f9eca9ca9b13637409bea4a6d921efa3a50e976e9df7a3244b2754fffe92
-EBUILD waylandpp-0.2.7.ebuild 760 BLAKE2B 521de67f5f289aa32a539b6d5e86aa85b270e794acc3a6272deac56004fff5c60c07350151267f7c77af2f73cb339a2086c84ea17b0b9158605e8745a1bc47d6 SHA512 7620b5e841fbead64b3211f1968e3e7b3f1a83a0cd5769ef4e19104bb4be71884fa4f9eca9ca9b13637409bea4a6d921efa3a50e976e9df7a3244b2754fffe92
+EBUILD waylandpp-0.2.7.ebuild 821 BLAKE2B be4fa401d22e2d9a069db5894e1b7cf8fbf8df4b3e0eab5e76b7f8c3000e9afb42cc1e7a64e1c0407aad7a94aa57bd8ca0d333ed2deb02a84f7af66929686939 SHA512 ad87fffc7d847b285a30051374e7e8df4c0127fa122117682470008fe68a8317169621a71c2c84cde8f753d5e62017cc51fd4bedad25bd4cd38154195085cfb0
 EBUILD waylandpp-9999.ebuild 760 BLAKE2B 521de67f5f289aa32a539b6d5e86aa85b270e794acc3a6272deac56004fff5c60c07350151267f7c77af2f73cb339a2086c84ea17b0b9158605e8745a1bc47d6 SHA512 7620b5e841fbead64b3211f1968e3e7b3f1a83a0cd5769ef4e19104bb4be71884fa4f9eca9ca9b13637409bea4a6d921efa3a50e976e9df7a3244b2754fffe92
 MISC metadata.xml 401 BLAKE2B 3270a9fb51a7a5a0cede7e9bc863f1445db1eda5a3b132b8ed9d2eaaaddeb60b85720484a136e09d3e00b80240a637a9f8a9533311e2b6f17fb9798e2ed19ef6 SHA512 3501904a23158eeae58c78bcc7cc3549bd877cf13f6490a8d63a0586ed080c28e27a6d302a9170020b571460dd0ca64acde471d765c8880bb2427d6c8ed76ada
--- a/dev-cpp/waylandpp/files/waylandpp-0.2.7-fix-std-runtime_error.patch
+++ b/dev-cpp/waylandpp/files/waylandpp-0.2.7-fix-std-runtime_error.patch
@ -0,0 +1,25 @@
+From 695c0881101435a57d24c84d04cbcb79eec49903 Mon Sep 17 00:00:00 2001
+From: Rechi <Rechi@users.noreply.github.com>
+Date: Sat, 18 Jan 2020 23:37:46 +0100
+Subject: [PATCH] [fix] add missing stdexcept include after 2d834a6
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fixes error: ‘runtime_error’ is not a member of ‘std’
+---
+ include/wayland-util.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/wayland-util.hpp b/include/wayland-util.hpp
+index 9cf5d04..1609651 100644
+--- a/include/wayland-util.hpp
+++ b/include/wayland-util.hpp
+@@ -28,6 +28,7 @@
+ 
+ #include <algorithm>
+ #include <memory>
+#include <stdexcept>
+ #include <string>
+ #include <typeinfo>
+ #include <utility>
--- a/dev-cpp/waylandpp/waylandpp-0.2.7.ebuild
+++ b/dev-cpp/waylandpp/waylandpp-0.2.7.ebuild
@ -32,6 +32,10 @@ DEPEND="${RDEPEND}
 	)
 	"

+PATCHES=(
+	"${FILESDIR}/${P}-fix-std-runtime_error.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOCUMENTATION=$(usex doc)
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@ -21,7 +21,7 @@ DIST redis-5.0.8.tar.gz 1985757 BLAKE2B e46af2133e066ccb91a8eb2c2fbfefe3747e1cfa
 DIST redis-5.0.9.tar.gz 1986574 BLAKE2B 7802d0556d11c9be8577b9bb3f4dbad8c2419b38659001421f96040e8a64a4a304e9dc1f06d82802ce1c92515d166cfd37c2f347df4c4cda0c2c4c2bb10d27c5 SHA512 d2c7bc1f769bc5d179bfe6e71954962813b50597eafc752a9b1edf2fd87e84707b7daf0910db56dd0e89cb3bdb3e551da7f111ae4899f505bac5f77f99744c13
 DIST redis-6.0.5.tar.gz 2217666 BLAKE2B 6c85b344ada4a8b9981bf0403e883d7584b391b5275f14b4335f51924c2e9dc2eb7886694cd62eec2ac2c4e747468161b75cde3a4b373e496453787cbc994c43 SHA512 62ce42bb5ac9443e0736f5dfeffa7609542cef5b3c6c7d689ad8427cf788f3daf321531fdaa0329942e746e2eee47461be9d8771b89ae25adcc5badc225ebf26
 EBUILD redis-4.0.14.ebuild 4641 BLAKE2B 970a3440789c6bc964339b0de7df7c7882a492e259e503a65f0182aa77c7e54b2d477903f623dda0f1526de8e9985075a658a2050952484a3070a04ddfa49c60 SHA512 0ec94984ce74d537d13028d64d1a503f7de7cd5514f25a57d89872e6389a69d8cc747e1e9448f13e8395faed6e7d733c5183174029cb10af8d7b27320c659670
-EBUILD redis-5.0.8.ebuild 4670 BLAKE2B 50c9fa61224453be6a8196121f82feb8c1a5896f66d57e2400235061bcf5767a8f89cef89020975b060af2ecebaf69a880dfb8e21ad6e4b3aedbe2d1771ae445 SHA512 d82e7f2408c47d5966d400c56846e07ea8b75e604b13afd7afcbec76e6d77d764945f9e3ab9d9a0569fb1fc4e59d34250733b9627e1dc0f4681e500606df4e13
+EBUILD redis-5.0.8.ebuild 4669 BLAKE2B 79265c316a1ecb3a7ce5bf5b0af70c68ba9cf4f0439f67a190cdd19dc16158ee40b7379e088de990b122d21157a6aaa415f4f70e1e237861fb5c268dc8e60175 SHA512 340ec29034e795225dc54a2ccb120046bbd8ea3d241988b6ef10d249f3070e17857098d2d3c742e6737205b3adf5b0fbafd79ec53d0fe0ec8caf6abfcd2e7f78
 EBUILD redis-5.0.9-r1.ebuild 4744 BLAKE2B 911a324ae75ab43090425efbb15fec52b2568e09944656450d13eb82d730466466b638adab70bf71378726d08da982a05d1a7b0bf0db7e8d7fc65606ded549de SHA512 270f9e9b8037799c2e59037c968796155d9c5dcbb29a69e72e1544cd310f0921a9e26101e37b6d4d6701b40ad6114bd1f931d36d8be2d96994ad861ce6cc39ac
 EBUILD redis-5.0.9.ebuild 4676 BLAKE2B 2de30fcbfb59d8b8fb75fe956d493f1ea7af8b6e5c9345a063722f5b85a31865d8acfad4cfd2b97dbe96e13f9734dc772a5b3c67eabf68239035721e6c0391b9 SHA512 ad8055de14691a842f160f0dfdd9530ed290417cca01f7e668fccece5433c18da26c153d20fd9df15ec58deaf56c6f7cc6aca83540fc6bd3e12c9bc2be27e43c
 EBUILD redis-6.0.5.ebuild 4705 BLAKE2B f7082975e525a81280bbbfef7ca72e662cdcde23391f033cd7851c8ec780d3239cba21b71a0808a721d28356233590ec41eb6160f7e9c4b82664ceb7ae33e9bc SHA512 47cf629bf66800b00a545fff07aecc6889bd28c526e666763254d8598e9ad8dd567c08c73f3c006843f161f369278bca27e3b62a3927ac1af1ba18177545d6c9
--- a/dev-db/redis/redis-5.0.8.ebuild
+++ b/dev-db/redis/redis-5.0.8.ebuild
@ -10,7 +10,7 @@ HOMEPAGE="https://redis.io"
 SRC_URI="http://download.redis.io/releases/${P}.tar.gz"

 LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
 RESTRICT="!test? ( test )"
 SLOT="0"
--- a/dev-erlang/Manifest.gz
+++ b/dev-erlang/Manifest.gz
--- a/dev-erlang/eimp/Manifest
+++ b/dev-erlang/eimp/Manifest
@ -1,7 +1,9 @@
 DIST eimp-1.0.12.tar.gz 3476420 BLAKE2B 147b910aa65fd28a73799353df6ff653dc815c5fc4ad878e8611748d79bd19fbf453bb24604ecde8669d24bcba2ac843a0d127e26086f4c9cf889104d176372f SHA512 512570da35e398094bbe7c3eb68b769b6510dd8a52897f23a425600782463c3dd7d2fdca67bb97de1cb86d29cf3c50076e56fadd10a79bb466d56c7672f98795
 DIST eimp-1.0.14.tar.gz 3476416 BLAKE2B a2aa13cf128133cfb504b2879e02ab8b60ea617deaf12eca4bb7aa65063ecb092bc6284dd92084477aedbd7ca274c2a1ce92f0a7271cb1237fa1cd29ef8a19cc SHA512 4f5f8c8c54dfcb6df0cfbdd2ab67c940c701c0dfea11c5cf4c689458d514897ab32733e6d3f606e5f8aa111983dd6a6db950ed0b36c0607e712a27606d8f9ce4
+DIST eimp-1.0.15.tar.gz 3476420 BLAKE2B 09836d8fcb4ff653da37f3be52ae2f2ec930e88d49e774d4915202fe96bab2eb3374786e294ceafe0e97bade804fb70945011ef6d8c8d655fc8a480468c7aee1 SHA512 53038a71c5bb834cd22d1c6cffaf2fbeb09317f2faf69156f6e908f8e70f5322f19ae18ab27ea881dacc4b28c2795529c7e747a83c8ded9037487c2665ad0c41
 DIST eimp-1.0.9.tar.gz 3471343 BLAKE2B 672e14cda50917a431d5bb29ef127c6bdf026234a5aeb66777540cd59167b48cfa1f264fdd631ef09c33a5ec9817d6d13c9763eecc5b076431976700f3af0ea7 SHA512 a86bf4927cf1da8004f140861a86d358c953a4871af34aa4768877f2b0618918c5a95d557e8535ce1615e272bfc3c9f27275ad4e5f5365c91a4a381ac2463977
 EBUILD eimp-1.0.12.ebuild 612 BLAKE2B 4752873f3af05a4a66b175e9d5658ba052bd06951f167a44edbadf88b4a92bd5cf8e6532fdfb4a986439ecf8886412e315d81b4d4a13ab0e5460949c7cff44e8 SHA512 85ea2af9e56e35f7fc991a33c85acd03537352aeeefec1ca7a4abfbb4ce45d24f9a33f086adea1c8aad0fe0a3b477a659d935cdbc3c981990c401dee7c06c4f3
 EBUILD eimp-1.0.14.ebuild 612 BLAKE2B 0e680d85e36f7eaa62738fda8bba7c205536739e010c4a0eb380bfbc79bd9ba03ee1f66b686362ad441bfa9cc730dfb497b9b23a4cd0c70c5af3dddda4284a99 SHA512 871ac91d6ec845c381a619e3aee8725a617c089716e3a65722d4c305099d21b473d37eb511179d784ea5d7f7744db655f18229948e7a4bf37b260a7c238c6f29
+EBUILD eimp-1.0.15.ebuild 612 BLAKE2B fd1c9332d33c50466f67b313828010636a0ff99e43aa872c8ec3102949b870ae700083dcc2103f92e083073684eae6fcee57c53ea142f12676224e84bc5959d7 SHA512 1a63ef987b0ff641584a36b3cbabdbec8e21395ffe80a6f494032ebcafe7fb2d74f7f4330e3ca7fb01fe2a077dba9373142072cb278e359a3847dcfc2c154cbe
 EBUILD eimp-1.0.9.ebuild 779 BLAKE2B 1638a892e479ddce06d341f7b4a1bbfe4341c6913595b8d2c834dc3879c5f7aca6b8df89f1c70b1e6d6c148002d677a1ddbb2d9ba309e7f895a445c3263047ac SHA512 e6220bb3347a467d01a05cbeeafb066d050ffbad6fb1e83c8c2eeb479b36c7207b37c402e597094c2f8b270d5965981de33dbabc322bebc38cd2bba5f1f7e617
 MISC metadata.xml 300 BLAKE2B 42710a5ed8bf7db4b090862b3a24ca028ebc0dda2f869857b11f7a02be03f2dd7bbd6fb0ede4d81c99fa0821642a092615aaab76dd3494b14a4b867a45e2e848 SHA512 bf280078b8e095533909d040da770268ff65d376e32f01745d1241758bc7bfd2f3d49eead64cffe409367ec852bbc3db5c578a80f52c914bab231fa7f018afa1
--- a/dev-erlang/eimp/eimp-1.0.15.ebuild
+++ b/dev-erlang/eimp/eimp-1.0.15.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Erlang Image Manipulation Process"
+HOMEPAGE="https://github.com/processone/eimp"
+SRC_URI="https://github.com/processone/eimp/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-lang/erlang-17.1
+	>=dev-erlang/p1_utils-1.0.19
+	media-libs/gd[png,jpeg,webp]"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_test() {
+	mkdir -p .eunit/priv/bin || die
+	cp priv/bin/eimp .eunit/priv/bin/ || die
+	rebar_src_test
+}
--- a/dev-erlang/jose/Manifest
+++ b/dev-erlang/jose/Manifest
@ -1,3 +1,5 @@
+DIST erlang-jose-1.10.1.tar.gz 279187 BLAKE2B 18b606e5a2fd93b96a26b989a52235af08bd925eb610a9010b4ff930c1feb50bf8143456bd6b4743b53342948185eb5e4d4df760f774fc4bce1dc6a11fb2acf6 SHA512 2887a1d43e212516b32a0a690d5a94e6a797b4802b21fa0a51cc4830790f56625575db38af8fb1c0f4cf4694740c6149eb75989cfbd51867af69c1b23b7ba8ee
 DIST erlang-jose-1.9.0.tar.gz 258407 BLAKE2B c6036e743b062cd18518537ffee03cc138f55f3973a2ab538410d362757747e2c8880a899326d494914068f36ffaf2bb902e83ba7899c3256d6cfc7b89f07156 SHA512 59f7123fe589c8e9bf0bab5a21089301d6b3a1c35316b9f530386bd0d9de8da8f5f956769ea6b1166c545a51d119668ed18db57e8adfa02e6f4327b01168db68
+EBUILD jose-1.10.1.ebuild 968 BLAKE2B d104720a8c4ce732608efef8fd982f2359313a1f900f94fa7905c4a7714a1ace905f98c86e95de6e2e6ae1f29c3cb9751622d5a5d007ba7a012b6ea1a894f63d SHA512 37373bc6135bb2d26378f56cd3635df662abd63905ac905f51d3b249e6cfa6788e8ce600229fba2067a50ef01f9c20bd14dfd7b139ab9d12c4b753d19203e619
 EBUILD jose-1.9.0.ebuild 758 BLAKE2B e48f6253daca6746cc534cea3a66ebf5d477763d2bcf1fe955ba83613c5dbf7f58a691b91d1d2a776c4f7424dfaa4bdc87c66029ebe999ce52519def93b78089 SHA512 2c811754d4d59acf2fd9e369b41fd19a7ea45a75f8f49115fcfce611c1157ffaa8361e229ccd75dc1f2d427bbee01e1e036e1202bc74ab791c3c3bb1aba28a1e
 MISC metadata.xml 308 BLAKE2B 7206d5d69299b11b8f0e595423649507bd340034f021e7dad826f984f42ddac0b09ba0ad9c5a537a7b15773c5196f7c48f5fc36157a6abd141096f813cff500a SHA512 f64bf6d1f188bc6c61ca8390db4619a7a06d94be956cc0736943b9287a379e8f5372fed00a4ad123068a2829432ef289fd697d0f74d86c46fafe1255e109a519
--- a/dev-erlang/jose/jose-1.10.1.ebuild
+++ b/dev-erlang/jose/jose-1.10.1.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="JSON Object Signing and Encryption (JOSE) for Erlang and Elixir"
+HOMEPAGE="https://github.com/potatosalad/erlang-jose"
+SRC_URI="https://github.com/potatosalad/erlang-jose/archive/${PV}.tar.gz
+	-> erlang-${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/erlang-19.0"
+RDEPEND="${DEPEND}"
+
+DOCS=( ALGORITHMS.md CHANGELOG.md README.md examples/KEY-GENERATION.md )
+
+# TODO: jose has test suite, but it require lots of dependencies. It may not be
+# TODO: urgent, but it would be nice to have those sooner or later.
+RESTRICT=test
+
+S="${WORKDIR}/erlang-${P}"
+
+src_prepare() {
+	# disable warnings_as_errors for erlang 23 compatibiltiy
+	# https://github.com/potatosalad/erlang-jose/issues/87
+	sed -i -e 's|warnings_as_errors||g' \
+		-e 's|debug_info,|debug_info|g' rebar.config
+	rebar_src_prepare
+}
--- a/dev-erlang/p1_utils/Manifest
+++ b/dev-erlang/p1_utils/Manifest
@ -1,7 +1,9 @@
 DIST p1_utils-1.0.13.tar.gz 56548 BLAKE2B a92aa78960673f2a52b5247dc48ea94e73e018f1a9504b57c15ebfb3b12eb9b6b5dd4e706782f4200cd35f07d3193c4cf07eff462bc74b4714d1e3da4d97077d SHA512 eb4fa41a46973c300b752efa273554e293c19235c3649166f1cb52d9512d0bfa3f032053a35ca10aec1d6594f352c386720ecb193233cebea226f45e0c0add34
 DIST p1_utils-1.0.16.tar.gz 63418 BLAKE2B f7384737ba2c758ef25aedf9b1ddbe870c858172db5ed37dd146eeda0640cd589f9176f946e6c53d04d1f3d5c711d9c58e3fdd66245b603e94d9b04ce72ba086 SHA512 f7e2ae20771cb7405092b194af4f63c5d25d5f7a245ee343994ce626d5e80626f94af1bf3ec75c3d102d10c8b64238e3f90437ec6a932d8fd22877f9d4764b6a
 DIST p1_utils-1.0.18.tar.gz 63459 BLAKE2B 6b08dd1dfd68a473e014cbf5ef98f74c92ab14b3e78d2dc31e5cf9b88e1f81c18a4850aaab46ff5d43b3200b9b93004cbc05ac633f1d92756edb4f5b28fe1d8c SHA512 e7719c090ece0b86ee674eaff28bf20402542730d7f25771f95a6c53e5ee727d82b856fa9d83857979cd1991f80620d4a6255231b6e0de332607f9b6a3d571a9
+DIST p1_utils-1.0.19.tar.gz 63649 BLAKE2B 0fe55dc6fdd436b5e77ad02bba923afe17cbac71374aee53a752739a93bb1d07c1ad85327e7c198cc442722a57928b750efd6d35f4a30cacb923045dd39e57c5 SHA512 bcc4b2abcd7d783d307e53b154da22bb548be05dd0636e455485423e8ab74acf097f1b3be58989dcdd5cc178746777b3062c332e73d2d9e4771973aa6e523376
 EBUILD p1_utils-1.0.13.ebuild 482 BLAKE2B 5906c03cbb6673196e9f888ba30df322323a1c5966c120baf6930240c71294b642a7c56f50ef2f5c02636a4ed4d2e83212e9de814691a4a4d88c355b370e6d41 SHA512 e21379cd2211b2c6f30b385fef30b3c58b92114c28263387234d567f7c4ad0cab85d9beb8aed1a335d9223327b43c488350ed07a8faf19b1607eb61f7a63f807
 EBUILD p1_utils-1.0.16.ebuild 486 BLAKE2B 9e1a80202c2afec5529539817013875c7d8588c964132b748e5a3673a2fc0598bc325ea512e39d0a632932252757568b4a772580453350a67f90a04f30ea0fc0 SHA512 0e8df6f8ee701d707b140c524de9a6fb83beacdbe6ce867634fae8c91792c381219cdfefe3b7d2dfb1a02617f694f0bbe4a01fac923bc666637d24ccc37bb6f3
 EBUILD p1_utils-1.0.18.ebuild 486 BLAKE2B 86ce01267391c253b07922deb8ac5cac27e7f5e3b9a7a52923a8fa12a5febb87bd14379b462ea3b1a4f545e86f6a02172acb7c020c5146fa3122d515701ce445 SHA512 0e11efc76d8f71deded0b65216894a9239629d74cc9429afbdadce65bc86f29a85aeab1bd1171fdf54a3a1b69ce362c1447359e58ccc7653d1122e690c410bc3
+EBUILD p1_utils-1.0.19.ebuild 486 BLAKE2B 86ce01267391c253b07922deb8ac5cac27e7f5e3b9a7a52923a8fa12a5febb87bd14379b462ea3b1a4f545e86f6a02172acb7c020c5146fa3122d515701ce445 SHA512 0e11efc76d8f71deded0b65216894a9239629d74cc9429afbdadce65bc86f29a85aeab1bd1171fdf54a3a1b69ce362c1447359e58ccc7653d1122e690c410bc3
 MISC metadata.xml 474 BLAKE2B dd0f46e4c69d981a6341dc888b33f3bab4bc233df0208fbf09c16dc3bbacde133af147ed348f3f619836f3b3c52137b3b861c903d305a018ea61d535b3b5909c SHA512 9b19dd7b2c377527c69241c9af6d5599c9f8413c329297ea29fe38ea481a9a05e10c7f91656cc77e3b090dba6152d1d59f64f71e74b0530eced45af0ae7fd121
--- a/dev-erlang/p1_utils/p1_utils-1.0.19.ebuild
+++ b/dev-erlang/p1_utils/p1_utils-1.0.19.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Erlang utility modules from ProcessOne"
+HOMEPAGE="https://github.com/processone/p1_utils"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1:="
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@ -1,7 +1,7 @@
 AUX java-config-2.2.0-prefix.patch 653 BLAKE2B 837f741e45b8228944e6287a57b05e933d85db00375ea68690e32b101da45b8150bcc6665d1d03ed6836724bbe43c4bfe1e89fb9449723fb4532dca4f4dcf01a SHA512 591591828ddadf76b5ed65811f7ed9e1e60583c5575926edf175ebc7ed1d76562ec980ec3bb530dedc7626f841dc7d143383bad25303399eac2ad49328d63dc0
 AUX java-config-2.2.0-py38.patch 1685 BLAKE2B 3fe59a1839a9fe1f954e6c96bdf42bd28f795881601b0e53353864ee4cdec57d891a5c1fee7e7f7060aba521da23934be8b5ea2717339e16f291671937df1af7 SHA512 9fa254fd108ec05d69d39260841fb8f946d6405b3fa37223af3b53117383bad94243c7a20f3f53de1a5d0609f433a14deb50fb7b9f857c56b41d1f3e8d5c4ef0
 DIST java-config-2.2.0.tar.bz2 51851 BLAKE2B 7b7c15dc988d2f5f54ebacba224f57193577e24f99a798657b40d83d723280562e314ba71319958a83be44defc6a48ac1114cce37eaeddea025ea31f26cf331a SHA512 a491cfe86bde8afadfc5b875740d79f9077526d8650ffb034fdad67a7ffa1b02646f67b1ef0eab7b0fe3ae57b5d767fa6a0d5593fe07416993d60588a8ed595a
-DIST java-config-2.3.tar.gz 26586 BLAKE2B 00fbc9bd606cb87bfde9f72837a062de540465a0299393016fc34543b89cf381a85b68ec5a884c0f76fe6b3188aa27498ed93e858187f2e51f6a23a2dcea7b67 SHA512 06e7c1ffe3fa0b903c5444ddcb9f72052773870c6543122440089a24bf0d8ec6c475e5f72a7ee9c3790432fdfeb786976af28e8aa7d18484168af16f5bb1b2ea
+DIST java-config-2.3.1.tar.gz 26165 BLAKE2B 948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13 SHA512 62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4
 EBUILD java-config-2.2.0-r4.ebuild 1063 BLAKE2B ad07cf002078f3adba19c4c59d00f084640349d64a728758bfe968eedd372e3a6e47ef0ef9b45751ec9a51c17851c764e6edd5a1d6ccf063fbc2beae25165f52 SHA512 e2976feaf12b9e208f39b33457e72a410bc74844e1ac283efefb989d0028083c6c663f96b5eb1ac15c2b13214dfe18b44c1f8621bf2ed6b82ec1ac58713825b2
-EBUILD java-config-2.3.ebuild 981 BLAKE2B 0008b72941bb915b5b7286cbff96da84a0e46120b898acaca9ebf3d45dbe61d014ccfb7e845326798720c548e1937bcdca2bc3c66e5b641202b0481326376b5b SHA512 a3f91027edc4f8abecb6d76d904980b3608df04f6fc3356db0c32d90915dce64b374f1036e2f7a356e75be9d558e9e8f122959c02ded259a4c9e0b6d0a54ae88
+EBUILD java-config-2.3.1.ebuild 981 BLAKE2B 70fda09145a45807c9f8c45e3a77a2350640ab4694f45c7fe41d6a81198f71ac0d184e708c813747238d9ad1e26e257371e8f6444589ca37b9914338200476e6 SHA512 07c75d5aff5c125046303376f049a9020ce75f2434a19e5d92498e312a2ac4fe3fd2011a52f849fe90d435af5bbc7f2e52702b282044afa4f1715f35fa1aa2ee
 MISC metadata.xml 560 BLAKE2B a2cc44cb88cb8e0b80ef1fb56ed610fc10257a0858725fc01f793ae9275fc5ef6e37708c377ccf56425c08eacceea6e52a84eee35a7b2c239484080b6203c4d7 SHA512 9bd085048548f98faa638b23333ee0cf83b870c962b1aba62fa2df897393ce37c2b2e60736c988230252f29fc42e9dbe58ab8e720f7ec05a3e0b3d4c999e2c8a
--- a/dev-java/java-config/java-config-2.3.1.ebuild
+++ b/dev-java/java-config/java-config-2.3.1.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

 # jython depends on java-config, so don't add it or things will break
 PYTHON_COMPAT=( python3_{6,7,8} )
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/mozart/Manifest
+++ b/dev-lang/mozart/Manifest
@ -3,9 +3,9 @@ DIST mozart-1.4.0-gentoo-patchset-5.tar.gz 24700 BLAKE2B c3b14bd7d8a762b84a098a9
 DIST mozart-1.4.0-gentoo-patchset-6.tar.gz 25878 BLAKE2B 831fa3accc587c769ab40ae4289e45ca28171af572095b7c3b93b69e82ff4bcaeb425d68c7a76aa9b2724b610ba21020647b6d1e3aa525ce58edbc9446d88791 SHA512 5a292bcc81c8062ebd5a948b224e8131302fc61b60303b8e3257ed20e751d0a874303611aeba6d1aacddbf92ec611428e49c2c17bc1dff5e182d0198afe655bf
 DIST mozart-1.4.0.20080704-doc.tar.gz 4085020 BLAKE2B 33eaf57c91dd62d9aa79651095aa5d095086d76dfa16bd5f520962229338c00556fcf3ac01eca1769c687f990110e95fa887d56391346af780d55166708338a1 SHA512 25f8f4b603ae7f4ef054a79a2baa4e10074f8a95f762b75fd88480526fb073b5b4874c269d116a960017a9e7ef989dd9f41853b0ff76e08b2cad2de2090c2eb4
 DIST mozart-1.4.0.20080704-src.tar.gz 11848201 BLAKE2B 0ceeb7dbd3f6858d1a4fee76f2a99eeb3127a07fd31b6760748ac8b8b638c36caaa873154be6481c3dc4b5196ef04cb0c10be421bd87dc3bc4e6b29357622d8d SHA512 f1114662c8c603cc2ac530d4ea1d22a0581f6e1b4d5cb57ccf899b8051ea48dbcf2fa2b62173359a754367a5456a7cb121a208d6a246248207599b0470525229
-DIST mozart-2.0.1-gentoo-patchset-0.tar.gz 10888 BLAKE2B 2b41560021bec70bb60cfb4439b5db13a6e7ac7d7b1b7e1be6fd584f5e7de566db40f67fccec66f53a39150b1985a4e41a45cbd41aa8b77ff740fd60ce708f05 SHA512 082187494ef4c7a5655bde22d9b6df9c37fada5512cae2f15440dd298229e48777d1de4a2461f127279fa8f36da9900c78c6927fbde03bfa4d2006200923e33e
+DIST mozart-2.0.1-gentoo-patchset-1.tar.gz 39069 BLAKE2B 7490d13665314b3a998fb21bd8a342f262d92a395c3b0bbfa9a7813c044220c82ac02eb0103409127862c9bb4e4c44765b1228a7bdea2cb247492c94264f4fe0 SHA512 ce3cdb8ffebd95d6065439432905ad68b9cd8b86f58478092ab55df7ae7c72498a3e29bda462f3305aff6c99d010c45d786f905e2e906550ee61656ba122bbc6
 DIST mozart-2.0.1.tar.gz 2281261 BLAKE2B 7f071e9ec130a0b482b299f4dac15d64f632702d6ecf55b7af0993087064e533b4de80f77520a725f69f68648a9ce763c8c8826bb24e52af49eda8c3ccfba0b5 SHA512 a72a6fa68296d06af72327fd11310b3be152e5ad9a56f1fc4200ac7b89cd177e9a23a38c6721e1885d4f2ed0870065e919fb9fe3c9a2833fcd8e4ac0fd43aeb4
 EBUILD mozart-1.4.0-r3.ebuild 2907 BLAKE2B 51d3f72aa2e7fa96029a9ff8abb21f52153dbaf044a6a9c84ea6c9ab6431447e5b2c469166bede84c5f6fb9e2a3b62a059424d569f455eb9723db7cff1783a7f SHA512 f860e6013bb7e8efeecb8ec020f7884718e082ea7917b70e9c9343961ae0f72d188b256ce647897d7e2f284dc6ac3cb349ace59eaf00fd69d775f43fae11b11f
 EBUILD mozart-1.4.0-r4.ebuild 3080 BLAKE2B 1363240805a389a5e111d30a5e38287dff565d1716b39b10f7a80ac73aa5f0c6f3e4c8fb2ab8ed93dc7512c8e18ed045421db1a750105d4098761425606769ea SHA512 e4347d58bf3233a4db2aebb7c94d71ff3a1e5408179e72975a84e8f31a0a53b59b75ebffa0a3c510a6fb80d6b3995095abdd07b955cc259047bdb71b1a76b029
-EBUILD mozart-2.0.1.ebuild 1905 BLAKE2B 556dca43823869f867365bc4c961fa351c15847968560b33bd223ecf4bbbda6ce28b7b23ad856576b7d8b4a2e82bfa9c0727ae94ac5c0cb5eede1d01285e9b20 SHA512 33010d4a4a399e66cb1db5e61ea5245243ae7074c1e83f667edcccc5f983000ecf3973a9a5214e10445c29487fe4ea63462cae6942bee0325a60168ae4cb5c05
+EBUILD mozart-2.0.1.ebuild 1917 BLAKE2B 9c22edd0f78f0c23b72f65660538d275328e2fbada5b1bf06354f932247ace47e262ed94693bbfcd9f4cf7cd68bc1f2dbb35c8c196d1f09ca61063f67deb73fd SHA512 31afb967f59b5c353bdeb44b2d881400196eb1f225f5178dd66c8749bb6768ddf7f9a20d91c9cf6886b4f1ec290253aab010e13900ea894c88fd87881fd844dc
 MISC metadata.xml 248 BLAKE2B 15dcca8e423036aaf3d73f9557507d39f7a22a6fa36d83405d8180df441adc50b9d61f8dd720a9d0045f5b3e6ebc9785fcf8f1340c253b2d277404672d395c1b SHA512 b296da55efb17a1040203bc1f5f3bfa8160711fdb72f0543739e6efe48b75427c082eb6c405d99b3256e8d536d3d29f71fdd0fd8d281cb9a9967060ea467a034
--- a/dev-lang/mozart/mozart-2.0.1.ebuild
+++ b/dev-lang/mozart/mozart-2.0.1.ebuild
@ -5,7 +5,7 @@ EAPI=7

 inherit cmake-utils java-pkg-2 java-ant-2

-PATCHSET_VER="0"
+PATCHSET_VER="1"

 DESCRIPTION="Advanced development platform for intelligent, distributed applications"
 HOMEPAGE="http://mozart2.org/"
@ -28,8 +28,8 @@ DEPEND="${RDEPEND}
 	dev-java/ant-core
 	>=virtual/jdk-1.8:=
 	|| (
-		dev-lang/scala
-		dev-lang/scala-bin
+		dev-lang/scala:2.12
+		dev-lang/scala-bin:0
 	)
 	test? ( dev-cpp/gtest:= )"

@ -60,7 +60,7 @@ src_configure() {

 src_compile() {
 	if has_version "dev-lang/scala"; then
-		EANT_GENTOO_CLASSPATH="scala"
+		EANT_GENTOO_CLASSPATH="scala:2.12"
 	else
 		EANT_GENTOO_CLASSPATH="scala-bin"
 	fi
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@ -10,9 +10,9 @@ DIST vala-0.46.7.tar.xz 3402828 BLAKE2B c028875e2c6036a6657244bff62d3a2eec2104c0
 DIST vala-0.48.6.tar.xz 3451004 BLAKE2B 9c880cff885b934e1d82d21285839e040addecb0b3ce81936d5be118a951bd219eea2b8381ea42f13e6e858a1937a3789a3dee6d067735e5ee21eaced38b4646 SHA512 220a916d42cbae3853afdd7c35a72afb446a92fca039d8c660a478fd793686a0c82cbaf90a7c94ae182c1f41eec6df1aedb804013ab38e6e4bcc6d26e40e5375
 EBUILD vala-0.36.20.ebuild 801 BLAKE2B 28a0b45feb749184a38652c09c10e4e10fa89e13ae613394fc89395244249783d5d66e63b9a808a3d2b6d0585f6f03c70d418874ab103032502df7830e64ef0f SHA512 fb5d44393b0ecb62098873f25f16ee9f9f2b268faa5524268923ba88258ada9b6e9d74f3ab4d0d9c11d1972d869ae1e97bae848f4005ebbe29069219a4078d47
 EBUILD vala-0.40.20.ebuild 1188 BLAKE2B 9754e3990f8b9d97a9db2d475a8338dbad1ac0daa74118a4966d08709bbb8d713817ae4a163bdc79ef2ce26aad00e633418734a2333a4e2c72b8a10b6a53d814 SHA512 d55a8a950eda084f4d527d090fa768436808922b4adafbd756cdaed73fb7214d9a1f74c77fc1c0d232e3dc6bd7548ded04ff3fbe566c609c7c2677404e757636
-EBUILD vala-0.40.23.ebuild 1196 BLAKE2B e2c6de7f13f532e577c26db204f440ee0d9256844618ab02d1f4761646f1cb74f1f268fadb5d043701aa64f014464bc9b6c9116856ef7c96abde436f10c5d62f SHA512 a4bbd7dfdcf4e6351f7abb0a4ffe7fbfe09846e883152c9e178f78f108c22e8cc9c3d2d340eb409f60fe923c97805fe503254b16e3a3e7f6779a32c48188c3f3
+EBUILD vala-0.40.23.ebuild 1195 BLAKE2B 9e60855ce0d124d660d20f12955479ca4e32cc03232ebcd51dac047678d3e865231d27f183730549460c58efaf1bc52201e65796ad29ca37f79fa5324992d618 SHA512 04469d41a8db2b319eb7b46559f2195999684e2c84ed2ae94fb046cb7f0bdc719b5c032033c8de047f920bd57c6db2741d091406c7bf3c0f455808f2feb860a7
 EBUILD vala-0.44.11.ebuild 1110 BLAKE2B caa359b186daa04e09b9f3c2185280dfedabd8428ad060304e78cad7fe106ec00c1ec023dcd2f0a7f4239ab5be705413667cfa9683fc30ac88ee2b0b1389e588 SHA512 e14b37221c39f2b50c788c31c28b929251db44e944bae83cb81907c2d304e4b6a9838c7173fc5c74f2ffdecc89d8d0f1ee3cb8d6ffea023491e8f7f92e25c79f
-EBUILD vala-0.46.10.ebuild 1312 BLAKE2B 4419e7f83b6eff1279058671fbe8ff62e2d1cf562a07f10d22d09e41c5dccf2b3a4b9694c7be6ce2c671efbb258d0e5caa66c5ce5b30edbc04ae534acc4d27b7 SHA512 3edde48c1cef97c1ef17b3c4587bf26763f14ca300017acb178e32fdf40b7dd25ba462b93b870859ec584e3a1ae1bbf935570c0f783df5871194d8ca033c5ae2
+EBUILD vala-0.46.10.ebuild 1311 BLAKE2B f3a0ea01a957309e1bb216f0095856fb9a52c53e93449c09f21ccb3f2e009e560b4403b0014a55ec8db2ba48837f2487abffd44d8aa8fd3aa9e791c6e39e18a7 SHA512 5521da7772c7fd1a73be2cc64bb5e936062ba037b6a488a93c7020e9cf81664aa17725040a95c9b95ee8dad828e9d1ed659b7341b8b35d2c0f0bee1ed5ed3a60
 EBUILD vala-0.46.7.ebuild 1303 BLAKE2B 9eab2887ca949595c7673fb81cd9066bacdcec0a3a3608924ae7d42ce38f8c60609a7ea641d48e379ed882908743d4dd3b62401ec1f97ba12992b5a8ff755efa SHA512 a7d042b51962a8e9d921d2dd04bc4dc6a3e6db4061c894aad3eb60bd142c655f1982f3277224ed85107ee1b20f8d407c2c2f836885f446c9392203cb08b103de
-EBUILD vala-0.48.6.ebuild 1312 BLAKE2B 2a5c969f40a6f1ec8869e5de0e41e16ee78db748069bc0016e9b5b5ecb1dbc2be307995939134fe36a37b94e4a89284478d4704c04f32db9ae9c0a2786b875b8 SHA512 7354b9ffa72a263f0035b6803d6ab4071c7870cc90a1c9a57355ca637392420e78be6d5bedb866f327a522c0f852f1c78ea798ba66c62f8b5753fac9ec21a969
+EBUILD vala-0.48.6.ebuild 1311 BLAKE2B 7fba9845bee20e54fe695f79507c235e1a5019651e21bc6bba399f472c3e11691b33a88bdb0003f662b90869050530b75236a703110cea888ece320757ec9d52 SHA512 eed9fa69f5910bef21540c462465c4d0b0b880005fac04cc28cf430b88e6d9bd3e31a782a7acacf1620a7ecdce16e3f6b99ec9d3be13ad11d9ebe0923c965c46
 MISC metadata.xml 345 BLAKE2B de3110ae281a87f8cb8f6c10d93705f56f0cfed972cd893a063e66c2629150d491498a29b35b4efe19fa5b6baa740f1d989bad440924befc60ef56423096f108 SHA512 163aa55430a075974d504a5bbb71ad9a249cb215de12a82b3141de18bb05f1e0c2078c02c617cf7d98a97c7f8dd407077183754d8c82c77e80dd0d7b2ec38283
--- a/dev-lang/vala/vala-0.40.23.ebuild
+++ b/dev-lang/vala/vala-0.40.23.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"

 LICENSE="LGPL-2.1"
 SLOT="0.40"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x86-linux"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"

--- a/dev-lang/vala/vala-0.46.10.ebuild
+++ b/dev-lang/vala/vala-0.46.10.ebuild
@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"

 LICENSE="LGPL-2.1+"
 SLOT="0.46"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x86-linux"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"

--- a/dev-lang/vala/vala-0.48.6.ebuild
+++ b/dev-lang/vala/vala-0.48.6.ebuild
@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"

 LICENSE="LGPL-2.1+"
 SLOT="0.48"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x86-linux"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"

--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@ -10,5 +10,5 @@ AUX boost-1.73-property-tree-include.patch 1832 BLAKE2B 7488cf768209bde32af608f3
 DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6
 DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
 EBUILD boost-1.72.0-r1.ebuild 11337 BLAKE2B bb6e82cc6c0dd49627cbd9841a4e02cf80e5e4dc3588a10c93abe587327bf3ad0d2e427bd3eb4944a8c0dee53c48de617e7305ba80091385e1a448c3e86cb544 SHA512 f07607be1571a204f050a9ae7d8c2994b944259301c1c3cb0bb81d7c84c4721b8baba8bd2795abaf01585e6a36749492527b5c8ce56c2d3fe81ba52590d9e2e0
-EBUILD boost-1.73.0.ebuild 11203 BLAKE2B 606b48ca8b250af8d7a23cc545229d56de31478f66c33bac345892c1b3ba3c9ddc1bb057ab38b83267a1cd5b9ee8a1e3ca751dbcc5df9e48cb413e0d927bff77 SHA512 5eb05cf61066eb6db9e7ef8a7ada144dc649d53e373c0bea2189f125930cdde2413b07eb5b2ca0a395dfb8af0845c6a2d39dcb098543fbfdcb92f3a538d7c40f
+EBUILD boost-1.73.0.ebuild 11236 BLAKE2B 13312c8b44e2c0ac3633d773e7790d241557342d494887357a6f62d561bcd622715245e4b02259cb6d3ed92d7566453034f463fa4370234146892367e4207c08 SHA512 37deefaf6f5eed06e96774782fca198e508f69c2c26c5337e23c5598d68834c85da0d188a0cd8cca46b479cc54a5d2cf5e09cbbf145b403a1317e6dff573c204
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
--- a/dev-libs/boost/boost-1.73.0.ebuild
+++ b/dev-libs/boost/boost-1.73.0.ebuild
@ -32,6 +32,7 @@ RESTRICT="test"
 RDEPEND="
 	!app-admin/eselect-boost
 	!dev-libs/boost-numpy
+	!<dev-libs/leatherman-1.12.0-r1
 	bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
 	icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
 	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
--- a/dev-libs/popt/Manifest
+++ b/dev-libs/popt/Manifest
@ -1,4 +1,6 @@
 AUX fix-popt-pkgconfig-libdir.patch 519 BLAKE2B d31d6d121f745f208c743aed94c071343efd09b8396c777f7887e8931f87d4fd8e4fa1eff7ec340300a68ae67862cdd7bb05d6bd60e08289c406d3cc9f4ead6d SHA512 8862cb25283f38d734aa1abaa4d29d1f018718be77d03a4f0533b6b8b2518581abf277eefd3b3d56d5f9ab9e00b544e816e83fca6863e86a66dacae0f9abbfd0
 DIST popt-1.16.tar.gz 702769 BLAKE2B 37767ec50118f3675e8bfa780dca7989e092ea71c3ea1e1ab80d7cc13bf20a3b5f0681df2a7e0b1e3404404a0952f7b7f0135083d4166026dc26880a5a17ab3f SHA512 bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694
+DIST popt-1.18.tar.gz 580569 BLAKE2B c9c42eb12aa21764cde5e9b4a8b30125b547ae690b4d9d0d40b45bd3c1f7ae0b09d5086a588cf37e7bed71fe770ff840c0fd40ecf4ce5b7c1e874b938b6e0324 SHA512 86422e8762adda3d02d46c20ac74ffe389d4f991d552b6fea729f007345b6426cbeb71160284e2deaa2ce44ce754a9e6cf6ccbd64bff9bc2253df40cdc2f79a5
 EBUILD popt-1.16-r2.ebuild 874 BLAKE2B 881c6fad5ba54ce1d2fb79035fc4820adb5f863fc0f5f045481c51b089fdc528b1ff43546f59ed67e918dd8a93a3102db542e928fa58bde91904bbc1350a26b9 SHA512 dea4a0fb8a4a121ee6d2591d017e431095532e76dafb00abe6d2e07584dc626d44eb7fee0124942af9e1d811e01565dd1f9d5db7615c9f1840fabd2fa08c1337
+EBUILD popt-1.18.ebuild 952 BLAKE2B a99b227262456ecd3feeb3d1c71973f0c97d099cf574bb9771f752328a1111ffec777d1538dd7ad37a4b5469186e4351ae99c59b780254cf839c33bdad2a5b75 SHA512 99260d125e99c9e76077b181cc26af53379cf182a3fb9e086e5acadcc66224f0d4cdfee2cf96b094e85d006a7e4562c60792cf011135dafd66c832f5083d2e07
 MISC metadata.xml 347 BLAKE2B 1b9847aceced4a814bc94e483d32082dd6c2dcd4b99c48c8e2cfd062cff0d2f1a0fc102a7b7c4ba3f620db6837d61a880b0cdd395c7e19348acf0e2831640d6a SHA512 ab5ebecf77f7aee7c2de528a7e6b84dde079d33d020fa910420001b6a8dc63ca6c014f3d4122794d7e9099e3d7d53de60338a4fbca563a90fe6a5d2747f50d2f
--- a/dev-libs/popt/popt-1.18.ebuild
+++ b/dev-libs/popt/popt-1.18.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-minimal libtool
+
+DESCRIPTION="Parse Options - Command line parser"
+HOMEPAGE="https://github.com/rpm-software-management/popt"
+SRC_URI="http://ftp.rpm.org/${PN}/releases/${PN}-1.x/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="nls static-libs"
+
+RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+	sed -i -e 's:lt-test1:test1:' tests/testit.sh || die
+	elibtoolize
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable nls)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	dodoc CHANGES README
+	find "${ED}" -type f -name "*.la" -delete || die
+}
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@ -3,5 +3,5 @@ DIST vala-0.46.7.tar.xz 3402828 BLAKE2B c028875e2c6036a6657244bff62d3a2eec2104c0
 DIST vala-0.48.6.tar.xz 3451004 BLAKE2B 9c880cff885b934e1d82d21285839e040addecb0b3ce81936d5be118a951bd219eea2b8381ea42f13e6e858a1937a3789a3dee6d067735e5ee21eaced38b4646 SHA512 220a916d42cbae3853afdd7c35a72afb446a92fca039d8c660a478fd793686a0c82cbaf90a7c94ae182c1f41eec6df1aedb804013ab38e6e4bcc6d26e40e5375
 EBUILD vala-common-0.46.10.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
 EBUILD vala-common-0.46.7.ebuild 645 BLAKE2B 5a40dd45432a9ba163abe1b2749d1ec4dd46b2dec2f8c343d548a13cffe1a9364f0fc5675944540cd3b5b0dfa03e7660a7c572a81462366416a7227c9b2da18d SHA512 2dd63a63255cb20f3fc7fab488f9ea2a15dcfd20723bfdbe190dac19b2d706cdd388343d39045aaaca06f7b5d148050cf3860eac74a658227ed6191f00304d33
-EBUILD vala-common-0.48.6.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
+EBUILD vala-common-0.48.6.ebuild 653 BLAKE2B 737502a8dca5c2f63171f3870a6d112d3dea89d21c97cfe9566f2f9dcb0211878acdc120a1683ab967047c283db67650d0e9c7f0ea1a98f2a122543a16178b19 SHA512 e4608b8538c339c1b357b99e5449ef373342c183b9db3fca687d1579f895c479aab38ef431a51140a0457bd4cb84497031201077f6921a894acdad8ab9686551
 MISC metadata.xml 325 BLAKE2B f1a8eb879889fa0b33809e44ee815a95f07c1d65d1e4fcb3af8797e27f258f76e7774b4a8eba9677a9e6c8a1051fbbe70a0f3675a12f9d52531d361f70826087 SHA512 3be77f30dff008c941c9513d9b8a4c689aba5f2f1005ecdb98f6cf9bc1000f562bad638cddd373f223a5570b40ea83e44656dbf848544a96ce0d166cc46805e2
--- a/dev-libs/vala-common/vala-common-0.48.6.ebuild
+++ b/dev-libs/vala-common/vala-common-0.48.6.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"

 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""

 RDEPEND=""
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@ -3,9 +3,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD llvm-ocaml-10.0.0.ebuild 3219 BLAKE2B 8d2ac0dc88b865f723c527315aaabb6bbd75773660b63197c833c72d7915495e494d73144f84a451dec3793d45a2f7f44dc22beb5c60f55dfd88a23bb04aede0 SHA512 fa83b587c1170564e25c040e2809daf6dc13d1718074d22a7093f08e7444d6378dbeb2f5ddc57f681f4a93b14c95275c87027c9e9191757b1fba4c9008464d38
-EBUILD llvm-ocaml-10.0.1.9999.ebuild 3288 BLAKE2B 7d5b7a5dd2c3a78eb9a5e57ce60bd4c1149d34c4b7c348c535a0999c04aa713df12710cd30dca54f0d76218e92c0e1e490bae7e662613c231f7600e88688dee7 SHA512 3d5c358dcbb34f39894a2c19d0ecd235b47dd8476e2699cce199f7517ef1ed12c06f881ac18a51f7f658c6b131c77fca16bd92fbc1cd604520c8a2cf653426a2
-EBUILD llvm-ocaml-10.0.1_rc1.ebuild 3245 BLAKE2B d97a0aec60d364da29f24529fb3f759c1a58539b7462d225849c4ef69de37b6a0f0043bdcb0cb1244505b202484116430c9f25c054b6c68be2637c9537a91547 SHA512 a68284736cd4b2f418cf19a3eef30f78bead858bd449da510e6b523b96365f42de2997abc27ffa6487398374e95be49465557cf779fd9603faaebba3d8d027e9
-EBUILD llvm-ocaml-11.0.0.9999.ebuild 3288 BLAKE2B ce014ec9c876645defb9484f374579aa69767cfbab0dc2ac96729ff91cde86be7090c3aa8fc58b9907aea0fff835c1141021e21c74cdd254893c3c9b0ebe522f SHA512 0593a39a81f0528bd6cc4a57d6c46c163c06cc19aa33915bccaa21ae17f5f3e33b26d7c9f8219e539246facc87f00da9ec561df13bc468acd6405b89b4aaf001
+EBUILD llvm-ocaml-10.0.1.9999.ebuild 2981 BLAKE2B 20e8be985a1a936e0eb43605f200d13e5d0c80d1622acce5289bb6e2558a62c3c68dbc9bc098d0d00546c582cec7d24290e945d73853fcd6183066488269b04b SHA512 d500a27f06f21979477307e42b971a9c098e784396e6964f1ae337c57d8ed2ebc464530c0b857b67b39cdb928e22d16dd46c1ee2a04e3f2d2d4a9da760fd6017
+EBUILD llvm-ocaml-10.0.1_rc1.ebuild 2944 BLAKE2B 90f05263b560f7efd2fa7ee1faa072dc53815c06539fae050d16547ca4d806041e6f4e93762a8faf74cd26a10d66f7da5f96930b6c2dc14d0857a6f329e7857e SHA512 577a51d77a5bac32c2d2f66659ea718b89691f5a0535abde10836aaafae0dddc84d6c328c85af24267a2a908956370dca902eb148e161bfd272318f1054fc73d
+EBUILD llvm-ocaml-11.0.0.9999.ebuild 2981 BLAKE2B 57a3eb858bd42118df84f90463f18a99e71f9c5f5c50afbb5e33dc22b9b283aa96eadb71a4a39be0d5b0dba877b77279c1a4b272ee69dde718d73b0026bd6850 SHA512 2316cc30a99d5045a2de69267e962be0cfa7d708ae919252390318504c37e3900cfa14af4887aba462d17d317588283c8f1e4b9887844ab03fcf869d48ebd4d0
 EBUILD llvm-ocaml-8.0.1.ebuild 3064 BLAKE2B 41792ef0b7764c4b7c297a05ee56d4e613cbfbcb2e2157e7b70c8ecbb71aea698079abca2324291f9e0b9565e36509e81ee313bd152bb0c15c74c6b69c5f4dd6 SHA512 042075a171609318603e93320a6080f6b75319b7a6490a85bced7138001d30a72b45a0bf348a0e7c5a80f56c8c7cf3e6f921ed5fea41b62ece3226d00dde49d3
 EBUILD llvm-ocaml-9.0.1.ebuild 2922 BLAKE2B d7ae97c680d9f223a0fbaf2989ee60c4ae2baebf73664c9909485fea6c99f5c4c817ff522bee6175a741a5632687d1d0ea5b7b961587a258ca0737ac419390ac SHA512 dc30f078950d944a5c9d18d8804db82300845564afc05878cc7b157d37ad32259c528b358b9cd12684da3b9885b62e92cc6a32b46b8c4cbf48269839bd4cfa02
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
--- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.9999.ebuild
@ -4,7 +4,7 @@
 EAPI=7

 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
+inherit cmake-utils llvm llvm.org python-any-r1

 DESCRIPTION="OCaml bindings for LLVM"
 HOMEPAGE="https://llvm.org/"
@ -38,24 +38,11 @@ BDEPEND="
 	test? ( dev-ml/ounit )
 	${PYTHON_DEPS}"

-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 pkg_setup() {
 	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-any-r1_pkg_setup
 }

-src_prepare() {
-	# Python is needed to run tests using lit
-	python_setup
-
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake-utils_src_prepare
-}
-
 src_configure() {
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
@ -89,7 +76,7 @@ src_configure() {
 	)

 	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)

 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
--- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild
@ -4,7 +4,7 @@
 EAPI=7

 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org multiprocessing python-any-r1
+inherit cmake llvm llvm.org python-any-r1

 DESCRIPTION="OCaml bindings for LLVM"
 HOMEPAGE="https://llvm.org/"
@ -38,24 +38,11 @@ BDEPEND="
 	test? ( dev-ml/ounit )
 	${PYTHON_DEPS}"

-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 pkg_setup() {
 	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-any-r1_pkg_setup
 }

-src_prepare() {
-	# Python is needed to run tests using lit
-	python_setup
-
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 src_configure() {
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
@ -89,7 +76,7 @@ src_configure() {
 	)

 	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)

 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
--- a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
@ -4,7 +4,7 @@
 EAPI=7

 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
+inherit cmake-utils llvm llvm.org python-any-r1

 DESCRIPTION="OCaml bindings for LLVM"
 HOMEPAGE="https://llvm.org/"
@ -38,24 +38,11 @@ BDEPEND="
 	test? ( dev-ml/ounit )
 	${PYTHON_DEPS}"

-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 pkg_setup() {
 	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-any-r1_pkg_setup
 }

-src_prepare() {
-	# Python is needed to run tests using lit
-	python_setup
-
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake-utils_src_prepare
-}
-
 src_configure() {
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
@ -89,7 +76,7 @@ src_configure() {
 	)

 	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)

 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@ -3,9 +3,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD clang-python-10.0.0.ebuild 926 BLAKE2B 9234b7b3e5159f7f9e9d99148a6b784be909d9241484200c6578d877e4b1f1266df92c16034e8758bbd0280a1b626b5a5f914b94b37b0fa1ad60306f1c09b215 SHA512 2afd8a595225835e276a62edfec73d0834a5b3d5d4fedf8416ce115db9208da87cd3f3ec5675fb46a4205001e5d734c7479ea5eef86571d1e2a54377fa14e9ad
-EBUILD clang-python-10.0.1.9999.ebuild 954 BLAKE2B de6f4430aad3d78ea95d8ec676c1dcba2d977139f16f1bec6494aba402d4f353654f3900a78a7bb3a27cd925e235efdb883dab145cce9a1e925bb8db0b0094b3 SHA512 eb4656837cf0e0ac87615530d46e3003ce6fd8a339e5ab33c9ea6eb748784690b5a416742f323088995140b5057d983c9fcc4bbbc1a2229890675300c10d1ca2
-EBUILD clang-python-10.0.1_rc1.ebuild 954 BLAKE2B de6f4430aad3d78ea95d8ec676c1dcba2d977139f16f1bec6494aba402d4f353654f3900a78a7bb3a27cd925e235efdb883dab145cce9a1e925bb8db0b0094b3 SHA512 eb4656837cf0e0ac87615530d46e3003ce6fd8a339e5ab33c9ea6eb748784690b5a416742f323088995140b5057d983c9fcc4bbbc1a2229890675300c10d1ca2
-EBUILD clang-python-11.0.0.9999.ebuild 954 BLAKE2B de6f4430aad3d78ea95d8ec676c1dcba2d977139f16f1bec6494aba402d4f353654f3900a78a7bb3a27cd925e235efdb883dab145cce9a1e925bb8db0b0094b3 SHA512 eb4656837cf0e0ac87615530d46e3003ce6fd8a339e5ab33c9ea6eb748784690b5a416742f323088995140b5057d983c9fcc4bbbc1a2229890675300c10d1ca2
+EBUILD clang-python-10.0.1.9999.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
+EBUILD clang-python-10.0.1_rc1.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
+EBUILD clang-python-11.0.0.9999.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
 EBUILD clang-python-8.0.1.ebuild 1110 BLAKE2B aa66d47aef5cad5d7819dc064d618a70e1b38fe6b6cf7c8ea15ac3a6b814770e95abd86a482f5fc874f4bdaf230c3330c0fdb39df1afd88e2c40ae9a6349b49b SHA512 a5b3aace7ab68a0bf9e8624e2b1b23f83dc79a299090479ddde3794f2ff7e344459e8c7167b256748a57ce73099272c2eeb8d8778901c710ccbb08d2c6c12a35
 EBUILD clang-python-9.0.1.ebuild 924 BLAKE2B 8a666866e1c2fa2806c29ae6c6787cee7dd7bbb33ac8d2d99e9072d13f8fd0b1a98388de9f655b9f26bc43085269af402592d62c29dd1ff3f2e1564c2e8a4c39 SHA512 c0c164894497d871a3016ec8dc19e09142f5f77d194dfe27d9ad12043daf22df7abaacefaa2294e7355aab2d45fe7f578e80ff7df87af6dcc0c75e8128f885ca
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
--- a/dev-python/clang-python/clang-python-10.0.1.9999.ebuild
+++ b/dev-python/clang-python/clang-python-10.0.1.9999.ebuild
@ -27,11 +27,6 @@ RDEPEND="
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"

-src_prepare() {
-	cd "${WORKDIR}" || die
-	default
-}
-
 python_test() {
 	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
 }
--- a/dev-python/clang-python/clang-python-10.0.1_rc1.ebuild
+++ b/dev-python/clang-python/clang-python-10.0.1_rc1.ebuild
@ -27,11 +27,6 @@ RDEPEND="
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"

-src_prepare() {
-	cd "${WORKDIR}" || die
-	default
-}
-
 python_test() {
 	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
 }
--- a/dev-python/clang-python/clang-python-11.0.0.9999.ebuild
+++ b/dev-python/clang-python/clang-python-11.0.0.9999.ebuild
@ -27,11 +27,6 @@ RDEPEND="
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"

-src_prepare() {
-	cd "${WORKDIR}" || die
-	default
-}
-
 python_test() {
 	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
 }
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@ -3,9 +3,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lit-10.0.0.ebuild 878 BLAKE2B 547175d48388b3f2cbf56a4d43e1407e3ffdc3bbc0114f526e5a8022232af42fa8ff53ea91536c28511ae8d301bf9768fca03bad7a55a288279c3b85a4e792d7 SHA512 a2c001ea7099368852f53c488f348c92308a25a069e77b14212c7319e70a39f7a9f7c59f90b865079b3fc35435ad3632bb199e8aced8601f8bd427d1bec44383
-EBUILD lit-10.0.1.9999.ebuild 916 BLAKE2B e1b8a23b1a64a86f61c137977eff305731958d77d5b27185dc4c63841cab02a4e91165ff4ed9dd6810a40ce3058e544b3dbf93182683a88abe07e57696e8ad7d SHA512 cda7c70a9549ae77e097d5a210f75256a0370f45343bd59a543bcc5b36621411e587364fe11349fe2755ce350c4a7d800ec578349181c1ec7fdaf77246f320cb
-EBUILD lit-10.0.1_rc1.ebuild 916 BLAKE2B e1b8a23b1a64a86f61c137977eff305731958d77d5b27185dc4c63841cab02a4e91165ff4ed9dd6810a40ce3058e544b3dbf93182683a88abe07e57696e8ad7d SHA512 cda7c70a9549ae77e097d5a210f75256a0370f45343bd59a543bcc5b36621411e587364fe11349fe2755ce350c4a7d800ec578349181c1ec7fdaf77246f320cb
-EBUILD lit-11.0.0.9999.ebuild 916 BLAKE2B e1b8a23b1a64a86f61c137977eff305731958d77d5b27185dc4c63841cab02a4e91165ff4ed9dd6810a40ce3058e544b3dbf93182683a88abe07e57696e8ad7d SHA512 cda7c70a9549ae77e097d5a210f75256a0370f45343bd59a543bcc5b36621411e587364fe11349fe2755ce350c4a7d800ec578349181c1ec7fdaf77246f320cb
+EBUILD lit-10.0.1.9999.ebuild 878 BLAKE2B 1be4b6806f763182f310c13d0d98aac1e7f8ef440384c161887c1e0b9a41a7954f4059df2196858e144650741d73ba5452d3dcd5fc0d6a315759a0c8f1d73c03 SHA512 ebb181a5875c4451c04d39372411bd296934497aeebd518cdb1aa4ee6efc13ab185ce1542926eb5e750fb09f19a2c4cf4a33fdc3bb16d33731fc66604943ae56
+EBUILD lit-10.0.1_rc1.ebuild 878 BLAKE2B 1be4b6806f763182f310c13d0d98aac1e7f8ef440384c161887c1e0b9a41a7954f4059df2196858e144650741d73ba5452d3dcd5fc0d6a315759a0c8f1d73c03 SHA512 ebb181a5875c4451c04d39372411bd296934497aeebd518cdb1aa4ee6efc13ab185ce1542926eb5e750fb09f19a2c4cf4a33fdc3bb16d33731fc66604943ae56
+EBUILD lit-11.0.0.9999.ebuild 878 BLAKE2B 1be4b6806f763182f310c13d0d98aac1e7f8ef440384c161887c1e0b9a41a7954f4059df2196858e144650741d73ba5452d3dcd5fc0d6a315759a0c8f1d73c03 SHA512 ebb181a5875c4451c04d39372411bd296934497aeebd518cdb1aa4ee6efc13ab185ce1542926eb5e750fb09f19a2c4cf4a33fdc3bb16d33731fc66604943ae56
 EBUILD lit-8.0.1.ebuild 1022 BLAKE2B 8a84bd40ba13ff7a42357bb8a94c4589c3127f9601ca9ccd099f2ab0387319c4487a77bb1972499563e505f0ea8ffaaeb3c3952f3e1ff9a2cc63f04868ec074a SHA512 76a11a6df5516b37723818a956461f6dd303027de1f50321b581636e35c1704711266f3d2721e6846d9525bb0aed347273ce16baed2561c61be9085221fd0993
 EBUILD lit-9.0.1.ebuild 871 BLAKE2B 58a0933e8024a1dd2cf8cd09d08c3730e42a4c4480db7ac97eeb84569871df33156eda941c2965a1170be9eac7ac28950149e811d7cb75317b6b3fc6058bec8f SHA512 3d9e4a1f3348e215e9551cd7e419fdbc266a880d3ece2d0127eac5165f4b7f3089de7c188d4476666bcb525c50a8e5aff8ab4c8094b2f7aa233a4f0ea2e93e3d
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
--- a/dev-python/lit/lit-10.0.1.9999.ebuild
+++ b/dev-python/lit/lit-10.0.1.9999.ebuild
@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6..9} )

-inherit distutils-r1 llvm.org multiprocessing
+inherit distutils-r1 llvm.org

 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
 HOMEPAGE="https://llvm.org/"
@ -34,6 +34,6 @@ src_prepare() {

 python_test() {
 	local -x LIT_PRESERVES_TMP=1
-	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
-		-vv tests || die
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
 }
--- a/dev-python/lit/lit-10.0.1_rc1.ebuild
+++ b/dev-python/lit/lit-10.0.1_rc1.ebuild
@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6..9} )

-inherit distutils-r1 llvm.org multiprocessing
+inherit distutils-r1 llvm.org

 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
 HOMEPAGE="https://llvm.org/"
@ -34,6 +34,6 @@ src_prepare() {

 python_test() {
 	local -x LIT_PRESERVES_TMP=1
-	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
-		-vv tests || die
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
 }
--- a/dev-python/lit/lit-11.0.0.9999.ebuild
+++ b/dev-python/lit/lit-11.0.0.9999.ebuild
@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6..9} )

-inherit distutils-r1 llvm.org multiprocessing
+inherit distutils-r1 llvm.org

 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
 HOMEPAGE="https://llvm.org/"
@ -34,6 +34,6 @@ src_prepare() {

 python_test() {
 	local -x LIT_PRESERVES_TMP=1
-	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
-		-vv tests || die
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
 }
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@ -3,5 +3,5 @@ DIST mypy-0.781.tar.gz 2056785 BLAKE2B aa95d71400d5d46223a141adae5a8d797d2f076d3
 DIST mypy-typeshed-0.760-a06abc5.tar.gz 498726 BLAKE2B 9a2b3621806101cab009ac38e73c8683fba2789cad55da0a6739afd37bfb3ac4d8ea4e6b9cb9ba154a6fd45790f8dfda9e921d98485305c244573adf745d2adf SHA512 82559a91cc482f0cbd0cf5042d5975de21abc143708605a08c54088ee9ce3c9f52607ed3c00950442f4f526fd57f9ad4ada12a4f2acfb383759ac05f2be1a0a4
 DIST mypy-typeshed-0.781-e199c2e.tar.gz 541588 BLAKE2B f663d0feccffb315efd1b6e3ebc54bbe3cf4c7873c240ed54c7be1042807e2213326db8756b5a540fd9bf5ae95a2c0850e8cb35ae2e849ec3e9a628367fabe72 SHA512 57f3159d909799838779c04ccc6541322c27c01efb026c26a145676fa75076f64b8cd3e99f7488501582c743e1102cad59320512d52d4a058d8731c54c0705cd
 EBUILD mypy-0.760.ebuild 1716 BLAKE2B 26e0aeded0092360541dd435e85965cf0ee3627e28669d5b58b1e88dcf5f29a8c2501cccb4c7f3ee86a580c6f87372a01dc1a0ac83994a0deb04e26379c30482 SHA512 8238bf9823d63090257b5cb2f2c8dfa0599d570234c00faf02226f4ddeec7e94ab1aedec1f424aaa0e8cf7818d877ccbc7d95521efa3981c487aba6fdb6148ae
-EBUILD mypy-0.781.ebuild 1802 BLAKE2B 0e3c3921a3d744c37a308c91ee40512b19e8da969c4219657d8d26442e5dd5a1214f23771cf0d3eec97d2533e093e6c7eac21788372f13bfb125cc9e5d5ffd12 SHA512 84de9aab12b68fe410ea74f144b2ad0141a46000cbe2b3b65b64423ad1e639483e4b19b9c570a785a795f0c1cbfa7d8ac4ade7d917da5b3ebadd6e3a6fad37cd
+EBUILD mypy-0.781.ebuild 2001 BLAKE2B 974ed8df84eca164787da4c08a35d75aaab50d982d5dd5aea560a86a6594381546fefb8e2c50208dd7cfcb9671a885a2227f9f9e2006ae22be29dc9afc2a6aba SHA512 b7cbb95577a8b749358d572a3b2850efeaa965acc82a9f7729d20e534dfb76bdb13433dd0830c6764003e1a800891bf8e7adcb5a1a6cb37f11916d06a580f779
 MISC metadata.xml 318 BLAKE2B 26aeab57c568a3ebc431f846d61405428034bf9cf8333e5f52f43ec68d51fbbc2cb71deef622c07291312f63f46f29007ba4b02c21e90b4af3db039a43fda4ed SHA512 9e3c8432730d94d7ad9c65ccd1a48d7afc1b43662097f0844048ad107e81ba30e03bea99f64ee8a4171ff0504f1ff04d8d9a84407f414ff228cecadcb80c7c43
--- a/dev-python/mypy/mypy-0.781.ebuild
+++ b/dev-python/mypy/mypy-0.781.ebuild
@ -27,8 +27,12 @@ IUSE="doc test"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/flake8[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}] )
+			>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
+			>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
+			>=dev-python/pytest-cov-2.4.0[${PYTHON_USEDEP}]
+			>=dev-python/psutil-5.4.0[${PYTHON_USEDEP}]
+			>=dev-python/lxml-4.1.1[${PYTHON_USEDEP}]
+			>=dev-python/py-1.5.2[${PYTHON_USEDEP}] )
 	doc? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@ -1,5 +1,5 @@
 DIST oslo-config-6.11.2.tar.gz 152842 BLAKE2B 9217232e11252cd59bed9ae35ebad28fe8013f5608fe45544f7fb1d35cfb0a27c1172fd2f565f812ca3d9672d30df2962ac51de551cc50c8fefaae2266943959 SHA512 47e92c14d873a127e12fa734d975032bfa560a624111625b622d1b1896ce6e786ca661312afa894176941d4e8b13a2f6f5b44a05092e23f5fe1f8f78596498ae
-DIST oslo-config-8.0.2.tar.gz 148224 BLAKE2B 5f3bc55857a01429063a0c7afbce041f48952ca1db7bd732e83d40d68f86951db9bcdb79a80926c5b7ec747fde574817cc6a562c217b441b0bb61381d70ca4b6 SHA512 675ec0602cc8850e7a25733d24ead104a85541f09983924d90b829687fde22c5fe3947a67e0b8a024927b3fd40973cc7c144b26ba751cd86650ca210686ea8e5
+DIST oslo-config-8.0.3.tar.gz 147691 BLAKE2B 9af2a1ff399b52261561d268f6b9cc673629af572faadc736e851826ccf84ea8fcb8b8846b62f85671934f5214f289301157da7197dd5a15ad6e9ec1792bdb31 SHA512 09c49b0917d20c74e59efd6b8cca0394f98c337b075f916ae21f6072ce6f28a90a701a3f63f0737e4b3161cf4795fdb2be9b01091fd00828990cbc715683b0f4
 EBUILD oslo-config-6.11.2.ebuild 1306 BLAKE2B b5487b165d8d0033e059f12e8659d65337cb5440bdb1842cdbe8a5f4cc7dc7955b35d0b903a1a3eb107c979debd205ef7de6346e21550a880536fa3a1b6f7806 SHA512 cfc567e14554504a9a4251a50cc6a6404938063868d19d5a4f9fc85d7a675c0870f4f2c50e32492400ff0a83cf1f3edea888ed4d16e528e7e9f49604a7c70893
-EBUILD oslo-config-8.0.2.ebuild 1265 BLAKE2B 3c283fc58e731e4e1de29a806bef99019966b6da3596add9434e02ac69b94a1c31064c76f011df5ec4e5c1074ceffee3277f1728532813e0aa2807b092c03c3b SHA512 43045a80be041b522081373fac8038f87f1b61103b48edc1c7f2fbbb7f63b219162571f4b3f7d557809186b996419307f57774c29a7fa51c00c3ce9a1fe13876
+EBUILD oslo-config-8.0.3.ebuild 1265 BLAKE2B 3c283fc58e731e4e1de29a806bef99019966b6da3596add9434e02ac69b94a1c31064c76f011df5ec4e5c1074ceffee3277f1728532813e0aa2807b092c03c3b SHA512 43045a80be041b522081373fac8038f87f1b61103b48edc1c7f2fbbb7f63b219162571f4b3f7d557809186b996419307f57774c29a7fa51c00c3ce9a1fe13876
 MISC metadata.xml 670 BLAKE2B 5e3551e2fb4d57226dd82ad46f361f624d1b05ccdeffc1ce86a90692a385841ed26739a3ab01e72284fd6dc47a2607ee1bf30548a2b754944a9b975629fef261 SHA512 c09cd1761655f29d25e689ec95939fa59f4fb9a3fbd48509c0a65d2d289e073b3c60faa838e4075efafe32b2caf2b7fc3ae46af556cd50f66c37ac5ed8a1d52c
--- a/dev-python/oslo-config/oslo-config-8.0.3.ebuild
+++ b/dev-python/oslo-config/oslo-config-8.0.3.ebuild
--- a/dev-python/oslo-messaging/Manifest
+++ b/dev-python/oslo-messaging/Manifest
@ -1,5 +1,7 @@
 DIST oslo.messaging-10.2.0.tar.gz 255431 BLAKE2B 971f24845b4d0440fb600b459b4a41c94220e387cbe2ef16a5c93d72e0582116702254c4d8106f5f3f3a3435b1c5bfaceffbb1c6ed3e671f7c269fb6d5ca3cb3 SHA512 404aed31f2808de744d7fd141257aca3d2db2b65645eebfffa7edb364e50803621af98886dc60b46042e525a7a98a12f3208ba472dcf805524cd0defdd441060
 DIST oslo.messaging-12.1.0.tar.gz 253854 BLAKE2B 6db26884f69be59cecd904b8ca0edc44a7f4e6a50ada154f28bf3a2a431896345ea7981ad7b195c12abe3f4d78d259c036e18e5544d2564e04d373c7cf2575b0 SHA512 1649f3520b6785eb5bf0f68cf174c1f60f32675ab6fa1400997704e97df7b24dcd63de751ab2313b839619b4eb250612ea32996c6c3c9956f7145010ca38cba2
+DIST oslo.messaging-12.1.1.tar.gz 255540 BLAKE2B 54ab60244090d3602de9395ea4f6ffa4bfa78783642aecaf7bb37db62c1a5cb63d69c612d2d1085ef96611429a8c7b337ac1849d93ed857a2cb51bbae6265ed2 SHA512 0f55f2c21dfd5f83efbf53f8c0cfa65d8572166662a183998c896c61475a38c47ae6e2376c5a153049d2f91e3321d6a75accf4de4ef11b4ec8626b448c0637a9
 EBUILD oslo-messaging-10.2.0.ebuild 1659 BLAKE2B 2c7381dfc84b54ae7260f68699baba2f017233738829259c3623fd57b87ff988fa299be89f4c37bfeb10419f8876fe2e323a3ad94fcaabeb955354107042f60a SHA512 b08d716fc977fd966c27d0fe873f229fc6a8bdda96895e975436785c9e9d6f435e31176a914f0be6ffcd4f122a354d57b0452dbbf4e6c20a89dc8065f9ac039a
 EBUILD oslo-messaging-12.1.0.ebuild 1655 BLAKE2B 39675af234182615ecb6be434e76b453cca4b4c41decd32a56fcff6ce3a48063da0e3ef1c5aaca6c3c19b8a85abc4e7344b17a9150a42ea4236d3709b7a6e229 SHA512 826aa5ce473aa5b1f30e046adf856b9ba213a5762c4669c5df40bc6cad73c645dde5a9da87792d308404512156fa2284583851508db21f8a3c6f2f6bebd88ad6
+EBUILD oslo-messaging-12.1.1.ebuild 1657 BLAKE2B ee3291ac61488c7d758eacdf0c4e3464d4744b731305d652ac74196fff83c004a5cd0be289af1fe79644528b268dbeb2aeffa4ed9d0b045f2e8e39c1d7beedb3 SHA512 331e6a745f999bb295f5a1abc14c3a54126b4f63a9c78bfb093a951d601a2f0105237f66dea5606b154866590ea7705da2ef48776a3c708282a001c218346449
 MISC metadata.xml 606 BLAKE2B 8ec973e563bc5efc9566d127aed486c8ebb7e71183c845f87d9c073971800868e7c2eda9056dd05da0310f82a121aedfa73204709f34477e75df34937202830e SHA512 c59bfd0c40ee7623a4194afa2848759b968c81955986f5b6a692d9ec59cbf11a14734466383da626535f9fb795193ba4994f8e57ff6c6cb732a9748abdccfd35
--- a/dev-python/oslo-messaging/oslo-messaging-12.1.1.ebuild
+++ b/dev-python/oslo-messaging/oslo-messaging-12.1.1.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
+HOMEPAGE="https://pypi.org/project/oslo.messaging/"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
+S="${WORKDIR}/oslo.messaging-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.37.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+	>=dev-python/py-amqp-2.5.2[${PYTHON_USEDEP}]
+	>=dev-python/kombu-4.6.6[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
--- a/dev-python/ovs/Manifest
+++ b/dev-python/ovs/Manifest
@ -1,7 +1,5 @@
-DIST ovs-2.10.0.tar.gz 98548 BLAKE2B 9ab3ea02dbfab1622106ead1e19a96b279d73ee758fbdcfadcb50526b8652a80443c817513b0df92b78a6e788d7215386f18c5e9e59d71536cf481eac8b3a264 SHA512 9b7de41aceb2f3c08df765b97c5149cd66579f361b427b3bb6c24ab20cf922de688a82a99b1d98778311f15b37c73be2769a95b01c96db4fed122e272aab2adf
 DIST ovs-2.11.0.tar.gz 98933 BLAKE2B 8735cd4db64291790327fc1e8b144b76e4804472a99990488d57686c9eaf51ec1ee4cc0d4e1b0c3aaf979b547936c77cdb6f7656b0b16e16df45fe0d9b8c5f8d SHA512 104d9f783a1ff0bfe93fc17235c7a9d595fab5007ee3bb490ef064f7893756fdc4c7306c0b03f4c2fb5179efbb038ed163ca4de8c9c417426c6e157c0f17c39b
 DIST ovs-2.13.0.tar.gz 100450 BLAKE2B 943486bf0aad0e8e9eac96c85aeccb32fd36c60689623acc76175eafc286f4689142d6ea6953224e0a4ea8e4437c56738cb5b113286114de0898bf783cd49668 SHA512 7ec8980257ae87d24dbabc5900cf81253490bcfa0431f96b79280603da04a972fc536055bf532d2b251e03e007b49b34e8118b0f323e5fee05c116824d68562c
-EBUILD ovs-2.10.0-r1.ebuild 482 BLAKE2B 5bf09859d32c50a0ecb761790eff692da2f01ea1715d92943179ec59fb4a5289fe133b8ca26d72fa4edf95300e7d16c10dbd48e1db0021568362f1f90c6f6079 SHA512 04012f532bb553c7dc24c2eccefba17c234f44d3295b0fca870b3741410b50e70a321b15c575938521ecd08e97f683ce23e731ea099f7581da065cadca154507
 EBUILD ovs-2.11.0.ebuild 482 BLAKE2B 5bf09859d32c50a0ecb761790eff692da2f01ea1715d92943179ec59fb4a5289fe133b8ca26d72fa4edf95300e7d16c10dbd48e1db0021568362f1f90c6f6079 SHA512 04012f532bb553c7dc24c2eccefba17c234f44d3295b0fca870b3741410b50e70a321b15c575938521ecd08e97f683ce23e731ea099f7581da065cadca154507
-EBUILD ovs-2.13.0.ebuild 485 BLAKE2B 3aafdca5b4f76c0505d9d31768b0d31f37afbaeb75910e56678dc17a34f4f294fe24d393966e416940f95e7da73491566ccb59f3e85933cb7f8cb32dfd33533e SHA512 2cb1a411010e17cce962f7ff12065f32fd46cab97312c2477384ae1a8be2d7edace524cf2f3dcd0f00564a70948cd2f68284c1102f782147310f64059dacdf1e
-MISC metadata.xml 455 BLAKE2B 4b3662feee3f99c83ee91117f441d7bae841764b4f6a153dfe96574e7f8181e0db9e6f94c93f59b009e419a3879f8825e2cd76699a7ca82b5c88fb9df449f87a SHA512 53fad2964967c6b5d0a17cea549a01a23b0365a22ea53aa8a82d5bc26a2491651cd0ee276566493bc497a2c033b1a2139a516865ef99ba639365d1709410be5b
+EBUILD ovs-2.13.0.ebuild 484 BLAKE2B 8e45f2127ac5826bf56a95f65623e147bc7f704d3d56eb6ea02a54ff90dac18e6d079c354fed1f3e4d2d9fcc5c931c63ac81c477624da963aac6bedad7e21e40 SHA512 34bc16b3c97ac0c56d0e6e89974be2daaf0a13bdcb6b74ea70e2e844425aa1913d1b2adc6e12fa4e2fc70410e642610654e898957e08037d14d8bf70a6520f15
+MISC metadata.xml 375 BLAKE2B 19b2550d0f82a3aa091d80fe888a2d1d1ff657a8cd74da54e47a5d7a888a8180309385b1677fe99fa76dbf94547f7686ddcc5abccec70b711c52922815f3f969 SHA512 c30b29dd16ce17b01bb126ea62b15ec72e740584e50ff5b329e29902969c080e7761fef4aa59900ccfb8a87aa38205e59afacc765cec513680872d53726e7444
--- a/dev-python/ovs/metadata.xml
+++ b/dev-python/ovs/metadata.xml
@ -5,9 +5,6 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		Openvsywitch python bindings
-	</longdescription>
 	<upstream>
 		<remote-id type="github">openvswitch/ovs</remote-id>
 		<remote-id type="pypi">ovs</remote-id>
--- a/dev-python/ovs/ovs-2.10.0-r1.ebuild
+++ b/dev-python/ovs/ovs-2.10.0-r1.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="OVS bindings for python."
-HOMEPAGE="https://github.com/openvswitch/ovs/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/ovs/ovs-2.13.0.ebuild
+++ b/dev-python/ovs/ovs-2.13.0.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"

 RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@ -1,9 +1,5 @@
 DIST stevedore-1.31.0.tar.gz 505482 BLAKE2B c69ecf61b32ab996f23aa913a9f226f64164b94e9420da8b7dd5a8ba568a228bd2f536052ab9378167fd2fe2e0d8d7b42515580a966eeffb5beeaf55dbba69ad SHA512 07b641b63766eddd094690acad81c1417a9721d785f81ca11da0ec2afed455d1beedfea5be4dcfd833d9379d650b193e26207ec0411d274bdf399ea2acd321a0
-DIST stevedore-1.32.0.tar.gz 510344 BLAKE2B 96de6598245e88900ba0f0bd69b976425fc5be2c783f32c551ebb2536dc5fde7fab18121947f3f9caa4d7d822372ad502d272285cc66368bfc39c566821a0160 SHA512 98c66b9ac827f69737cc2522029108831380b4bf4c633786d9819b52be930f6116ce5bfab58e724a2efad147830fcb6353409322fc5e01617d35d1c8aafb0259
-DIST stevedore-2.0.0.tar.gz 508206 BLAKE2B c8e8d1044d1af4e2d0366cd836c36783f49a97c54761070d0af3d7c31b7a3bbdc8d98dfadf2425b73b30d7a37b3bb5ca3cde71a6eea76513f9c565aa7c94511d SHA512 10b091749b638330703c256e8614a9519059edcaf109944a0ca04bda5c5fde0d9ab473dc8293cde809867dbd1c2a23cd96d0faaa1f7d802ad68aa0a5aa972a0e
 DIST stevedore-2.0.1.tar.gz 505248 BLAKE2B 2fee9467b70aa605ca89060e839a2c00deec571f15f014cb8118710e9221fef65ec15172d727dbafb5d5e2adf15ce0e94919804e2ec7ee72ae9e47afe2a6b88f SHA512 1efe46983975b1a0f176f847874c68dd91538fc3c029facbbf0f96891894176e0eeaf28c19e674baa9e9dae024deabae0555c846e36211a9be6cbba5e2ecd710
 EBUILD stevedore-1.31.0-r1.ebuild 1231 BLAKE2B 1d3b70997d0c968acdc791eadb19b5792f6f7a112fb7bc6bbb98c7f27c40df122d1460719d5201a0731bbd9b01539a1ba7f033bfed87b859389374c8c732f447 SHA512 7ba44275a50e9a70d996b2056d60d80e20c47371e3a11282dcd2d0287707042413db665e358f24db063a501d3c07f3d222ce4b75926a84bd33715087232ee12a
-EBUILD stevedore-1.32.0.ebuild 983 BLAKE2B f18f58031cf154999d335cbcdbf6e94c96dbafef31a6b18d7420fd9df4161ac5b0afaca02a08f58c71573f548d65e376e482e0d372037c24e80781cd4c740e28 SHA512 e4b783883a4ebcba529911c8aa61b5948f9eeff507bcc339b2b2efa2cde4064621e7ec1edab3843d803462504d321df295afed29652ed43dd78d54fabdb96e8b
-EBUILD stevedore-2.0.0.ebuild 983 BLAKE2B f18f58031cf154999d335cbcdbf6e94c96dbafef31a6b18d7420fd9df4161ac5b0afaca02a08f58c71573f548d65e376e482e0d372037c24e80781cd4c740e28 SHA512 e4b783883a4ebcba529911c8aa61b5948f9eeff507bcc339b2b2efa2cde4064621e7ec1edab3843d803462504d321df295afed29652ed43dd78d54fabdb96e8b
-EBUILD stevedore-2.0.1.ebuild 980 BLAKE2B eec36e0eeb4d63f88fc175a5d68f391bb173cf14d99c1bafe696d8eeb71f4f422fbc3730ae426906e69c566b36c204168e1789b18fa0c830e27b8205a949190f SHA512 d286f0adf57ee30f4097f865cb38ebd39ddc6590c32df335d74339f844b764742d40fdaae160c7e95426e95c2aa7d7aee3db36eaa5a52f1ddd75e94edee6fa48
+EBUILD stevedore-2.0.1.ebuild 975 BLAKE2B a1214a513f6d8e9ce1169a75d78de1acc88d1a18bcca671364ba3431c2293830532967dcbb2f3f6f5b80299d93d41a418272c98b96c3394f4a7ded23581e23a8 SHA512 c72a9db74ad2cbbd020ca4e2f363f836735cdcf6d440517b452661953b62d8207e8ff71928c4849d0e22190ed8bb5061da0a0cf4e3d1688dc6c05e9b00269723
 MISC metadata.xml 521 BLAKE2B 6ac47530dc97a775a197bee97ee62ef419c402a134cb6785ba953a9efdd94bf0c4a79f01dbb7142774e9be25087334efbed7ad1f00b68544cdff9de8807078e5 SHA512 549144ae7c90fffb566c473e7301e3a461b47911cf7d2b1c03b5d0a39b1508f3462365e0ab27f5638d08c677556c8d2348a33b5fa018c68a5c64b2965a545fd2
--- a/dev-python/stevedore/stevedore-1.32.0.ebuild
+++ b/dev-python/stevedore/stevedore-1.32.0.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Manage dynamic plugins for Python applications"
-HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx 'doc/source' \
-	'>=dev-python/openstackdocstheme-1.18.1' \
-	'>=dev-python/reno-2.5.0' \
-	'>=dev-python/sphinx-2.0.0'
-
-python_prepare_all() {
-	# Delete spurious data in requirements.txt
-	sed -e '/^pbr/d' -i requirements.txt || die
-	distutils-r1_python_prepare_all
-}
--- a/dev-python/stevedore/stevedore-2.0.0.ebuild
+++ b/dev-python/stevedore/stevedore-2.0.0.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Manage dynamic plugins for Python applications"
-HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx 'doc/source' \
-	'>=dev-python/openstackdocstheme-1.18.1' \
-	'>=dev-python/reno-2.5.0' \
-	'>=dev-python/sphinx-2.0.0'
-
-python_prepare_all() {
-	# Delete spurious data in requirements.txt
-	sed -e '/^pbr/d' -i requirements.txt || die
-	distutils-r1_python_prepare_all
-}
--- a/dev-python/stevedore/stevedore-2.0.1.ebuild
+++ b/dev-python/stevedore/stevedore-2.0.1.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ~ppc64 sparc x86"

 RDEPEND="
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
--- a/dev-util/android-sdk-update-manager/Manifest
+++ b/dev-util/android-sdk-update-manager/Manifest
@ -27,4 +27,4 @@ EBUILD android-sdk-update-manager-22.ebuild 3131 BLAKE2B e62927b86f4840cd333bacc
 EBUILD android-sdk-update-manager-23-r1.ebuild 3311 BLAKE2B 4f25cb3fc06c5f4ca34ea133974aad91a17d5f696007dde500eaf85da6ce8f8e4a29033a83f6cdf9e3768d6e63f000e1cdc8aedd302b8388b0b3b3ae1f1f17f1 SHA512 23af7109d479d4a8b041f26828c3c302b11d5e5c4cfc3c158355727c4882faa403cd950c1d532c0952c8580ac1e61a86bb4172b3ed139b22767c2f21ad0b45fb
 EBUILD android-sdk-update-manager-23.ebuild 3305 BLAKE2B a4cf54975b768d49ad116f36ce8e9e3b39045357da70bfe1f44ddd7a517ecec4e5cabca082116c5ead2ded35fae758e39b46ec06ff1721fb132059b9971ebff8 SHA512 b2e5272a3d742d73118642d98b4706086a878a0227a5fdce4cbbd473af28cc04b39189d230e43bf3e9ac32866ab2f7a35eb7014071762f63497f2d37f205162f
 EBUILD android-sdk-update-manager-24.4.1.ebuild 3353 BLAKE2B 05e979a96b88dba1be33559d2b8eb48eb6aec5cfc8a02b53416f809f31e8c7f043e6fafc0b2ca8ae8767656c624757f7f4357433de4e41756fdadc067793fa3e SHA512 7d04b34c7d6364106ff48ec5c79c5d3a4a4bf6f01511a5dbfd18e8ef6331002c0054ff98b86c0f039c27013d4bd755a4623f38a7b7d6c0653dd5015e9cc91423
-MISC metadata.xml 214 BLAKE2B 48fe26dc32218c5f83cecefd288be1d07314b03aa871c0c322ff125643f0a42598d39b0bf2fb46daf63f3f39df78b869dd4398ab4671dd0f57d62060ce148a2c SHA512 2d699278683037614d2dc6595d6ae71ca4eb3a5b22506ccb0926d932f00bde85c1759caf8c0b1729cd949e652fca33c8ced0e7ac6e65af144f0f66eb064ceed3
+MISC metadata.xml 174 BLAKE2B 1738b3b33ef242919964fb6a498f2215dbd528720bd193469bb20020fbedda0e9102ef85539fa9d2c3924bf2e6c0dd560671134200481054111467ba8e88fcb1 SHA512 281aa8b74dd6915f9856e5e70db000388f8b04bd5393871e67b57cec316374c6986124202dfdf4855ba57dd60f1e2cfc323a1f2cc4c6fbe0f634f67f8fb40b17
--- a/dev-util/android-sdk-update-manager/metadata.xml
+++ b/dev-util/android-sdk-update-manager/metadata.xml
@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>rich0@gentoo.org</email>
-</maintainer>
+        <!-- maintainer-needed -->
 </pkgmetadata>
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@ -4,9 +4,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lldb-10.0.0.ebuild 2481 BLAKE2B eec1740e4eb28b77a1416b27ce0ab11f95d6d2e81ae6b8aaca04647bda9124422ffe9d414aa5c5f9410b616e473f2609c21201289955b6fe595e9d082b5519c9 SHA512 dfbe98bde465360bcd86ba6ca49c26693430c4ef08e556826af0fe992c57934f397963b6babf106be6594bcfc22f94b0a2a554026af94a7eab286bf916a58282
-EBUILD lldb-10.0.1.9999.ebuild 2541 BLAKE2B bd2c91bb4ef638e1ea8386b0a5baf93587ea8a923e09c6ac9a3e8d59c584ac8112399ae391a5bbd003dcc8de28ab5eb441c903972f82335bb9e084b155f8319e SHA512 5baabcc77fa5cd3076a69aa8d72ee912f55cb55c455d9ab5bf800af05ba73ed2c75f17daa1444b9fc81dc30b16e4e2c9e7e52a1b9974bc03cec271f6f1bc56ba
-EBUILD lldb-10.0.1_rc1.ebuild 2541 BLAKE2B bd2c91bb4ef638e1ea8386b0a5baf93587ea8a923e09c6ac9a3e8d59c584ac8112399ae391a5bbd003dcc8de28ab5eb441c903972f82335bb9e084b155f8319e SHA512 5baabcc77fa5cd3076a69aa8d72ee912f55cb55c455d9ab5bf800af05ba73ed2c75f17daa1444b9fc81dc30b16e4e2c9e7e52a1b9974bc03cec271f6f1bc56ba
-EBUILD lldb-11.0.0.9999.ebuild 2541 BLAKE2B bd2c91bb4ef638e1ea8386b0a5baf93587ea8a923e09c6ac9a3e8d59c584ac8112399ae391a5bbd003dcc8de28ab5eb441c903972f82335bb9e084b155f8319e SHA512 5baabcc77fa5cd3076a69aa8d72ee912f55cb55c455d9ab5bf800af05ba73ed2c75f17daa1444b9fc81dc30b16e4e2c9e7e52a1b9974bc03cec271f6f1bc56ba
+EBUILD lldb-10.0.1.9999.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
+EBUILD lldb-10.0.1_rc1.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
+EBUILD lldb-11.0.0.9999.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
 EBUILD lldb-8.0.1-r1.ebuild 3161 BLAKE2B 02f7f7c7461fed05baa15f6621ed8c32f669182395356a30e407582e74a63cf99b0d3b9c03031a976ea0b7734d3c61c64019b463ef68f315ae936ce679ceec77 SHA512 0a28c0147d2c37dc13dec96401f2d6e670db601735343c9befef24bf9626476a0effe715161703e4250066128c78b97b3f5e1ba5d6e67392b6cdacc0dd42dbfe
 EBUILD lldb-9.0.1-r1.ebuild 2391 BLAKE2B c0e73cf6e7c6fc153855681daa373618baffa2d45bd290855633d957464e99d86112918eec8aa0b43a975750e8ccd87fbffe2594b0110ac406eab8579c654f72 SHA512 8edadff2f01c15b75d894e30546a00826f140a81bc0ebfb5fb214eb5d133d8390b18a3075746fe94f061b36fcea9fb981ecd6de3d0567f73736c388af62c6320
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
--- a/dev-util/lldb/lldb-10.0.1.9999.ebuild
+++ b/dev-util/lldb/lldb-10.0.1.9999.ebuild
@ -4,8 +4,7 @@
 EAPI=7

 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org multiprocessing python-single-r1 \
-	toolchain-funcs
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs

 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="https://llvm.org/"
@ -43,21 +42,11 @@ BDEPEND="
 		sys-devel/lld )
 	${PYTHON_DEPS}"

-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 pkg_setup() {
 	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-single-r1_pkg_setup
 }

-src_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DLLDB_ENABLE_CURSES=$(usex ncurses)
@ -87,7 +76,7 @@ src_configure() {

 		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
 		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)

 	cmake_src_configure
--- a/dev-util/lldb/lldb-10.0.1_rc1.ebuild
+++ b/dev-util/lldb/lldb-10.0.1_rc1.ebuild
@ -4,8 +4,7 @@
 EAPI=7

 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org multiprocessing python-single-r1 \
-	toolchain-funcs
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs

 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="https://llvm.org/"
@ -43,21 +42,11 @@ BDEPEND="
 		sys-devel/lld )
 	${PYTHON_DEPS}"

-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 pkg_setup() {
 	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-single-r1_pkg_setup
 }

-src_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DLLDB_ENABLE_CURSES=$(usex ncurses)
@ -87,7 +76,7 @@ src_configure() {

 		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
 		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)

 	cmake_src_configure
--- a/Show More
+++ b/Show More